diff --git a/.gitignore b/.gitignore index a01307c6b1..5f1493e3eb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,8 @@ baserom/ *.elf *.sra *.z64 +*.n64 +*.v64 *.map *.dump out.txt diff --git a/Jenkinsfile b/Jenkinsfile index 2247df2d6a..f07d196083 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,19 +5,17 @@ pipeline { stage('Setup') { steps { echo 'Setting up...' - sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom.z64' + sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' sh 'git submodule update --init --recursive' - sh 'make -C tools' sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler' sh 'chmod +x -R tools/ido*' - sh 'python3 extract_baserom.py' - sh 'python3 extract_assets.py' + sh 'make -j`nproc` setup' } } stage('Build') { steps { echo 'Building...' - sh 'make' + sh 'make -j`nproc`' } } } 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_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/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 4ca4e63c46..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(Title_Init) # $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(Title_Init) # 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 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 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 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 - -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/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/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/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/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_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_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 a1ecf65ae7..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 @@ -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/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 5f866e5482..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,7 +55,7 @@ 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 @@ -268,7 +268,7 @@ 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) 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_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_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_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 51173f7073..14b540a6fc 100644 --- a/asm/non_matchings/code/z_play/func_800BCA64.s +++ b/asm/non_matchings/code/z_play/func_800BCA64.s @@ -71,7 +71,7 @@ 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 +/* B33C8C 800BCAEC 0C024BCE */ jal Quake_Init /* B33C90 800BCAF0 00000000 */ nop /* B33C94 800BCAF4 00002025 */ move $a0, $zero /* B33C98 800BCAF8 02201025 */ move $v0, $s1 diff --git a/asm/non_matchings/code/z_play/func_800BEDD8.s b/asm/non_matchings/code/z_play/func_800BEDD8.s index 1be2fffa21..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) @@ -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 cf9a6fec69..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) @@ -272,7 +272,7 @@ 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 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 f8dea9f2f4..f8631dc8be 100644 --- a/asm/non_matchings/code/z_player_lib/func_800907E4.s +++ b/asm/non_matchings/code/z_player_lib/func_800907E4.s @@ -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 @@ -127,7 +127,7 @@ 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) 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 bfaf2a2470..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,7 +95,7 @@ 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 @@ -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) @@ -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,7 +293,7 @@ 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: @@ -416,7 +416,7 @@ 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 @@ -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) 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 d4ecbeac47..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) @@ -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/Sample_Draw.s b/asm/non_matchings/code/z_sample/Sample_Draw.s index 6a3a8fc58c..b3c4c8e967 100644 --- a/asm/non_matchings/code/z_sample/Sample_Draw.s +++ b/asm/non_matchings/code/z_sample/Sample_Draw.s @@ -18,7 +18,7 @@ glabel Sample_Draw /* 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 Sample_Draw /* 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 Sample_Draw /* 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_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_Draw2.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s deleted file mode 100644 index 661ca45611..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.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 SkelAnime_Draw2 -/* 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 Matrix_TranslateThenRotateZYX -/* 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 SkelAnime_Draw2Limb -/* 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/SkelAnime_DrawLimbSV.s b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s deleted file mode 100644 index df4a87b84c..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.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 SkelAnime_DrawLimbSV -/* 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 Matrix_TranslateThenRotateZYX -/* 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 SkelAnime_DrawLimbSV -/* 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 SkelAnime_DrawLimbSV -/* 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/SkelAnime_DrawSV.s b/asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s deleted file mode 100644 index a013d79309..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.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 SkelAnime_DrawSV -/* 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 Matrix_TranslateThenRotateZYX -/* 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 SkelAnime_DrawLimbSV -/* 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/SkelAnime_LinkChangeAnimation.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s deleted file mode 100644 index 3fec499471..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel SkelAnime_LinkChangeAnimation -/* 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 SkelAnime_CopyVec3s -/* 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 SkelAnime_LoadLinkAnimetion -/* 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 SkelAnime_LoadLinkAnimetion -/* 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/SkelAnime_LodDrawLimbSV.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s deleted file mode 100644 index 647fbad678..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.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 SkelAnime_LodDrawLimbSV -/* 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 Matrix_TranslateThenRotateZYX -/* 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 SkelAnime_LodDrawLimbSV -/* 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 SkelAnime_LodDrawLimbSV -/* 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/SkelAnime_LodDrawSV.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s deleted file mode 100644 index 0f0c661b6b..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.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 SkelAnime_LodDrawSV -/* 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 Matrix_TranslateThenRotateZYX -/* 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 SkelAnime_LodDrawLimbSV -/* 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_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_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 a3d3e672da..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 SkelAnime_AnimateFrame -/* 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 SkelAnime_AnimateFrame -/* 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_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_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_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 05465187bb..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 @@ -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 bd4ed9df1b..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 @@ -30,7 +30,7 @@ glabel ArrowFire_Draw /* 005EC 808662FC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 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) /* 00604 80866314 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -254,7 +254,7 @@ glabel ArrowFire_Draw /* 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 +/* 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 @@ -271,7 +271,7 @@ glabel ArrowFire_Draw /* 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) 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 ca4c44aad0..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 @@ -30,7 +30,7 @@ glabel ArrowIce_Draw /* 005EC 808682BC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 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) /* 00604 808682D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -262,7 +262,7 @@ glabel ArrowIce_Draw /* 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 +/* 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 @@ -279,7 +279,7 @@ glabel ArrowIce_Draw /* 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) 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 d17143562b..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 @@ -30,7 +30,7 @@ glabel ArrowLight_Draw /* 005EC 8086A29C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 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) /* 00604 8086A2B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -266,7 +266,7 @@ glabel ArrowLight_Draw /* 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 +/* 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 @@ -283,7 +283,7 @@ glabel ArrowLight_Draw /* 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) 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_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/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 f786982bac..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 @@ -10,7 +10,7 @@ glabel func_80874BE0 /* 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 +/* 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 @@ -101,7 +101,7 @@ glabel func_80874BE0 /* 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 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_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_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 c54f43209e..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 @@ -9,10 +9,10 @@ glabel func_8088BC40 /* 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 @@ -139,7 +139,7 @@ glabel func_8088BC40 /* 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) 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 4b948c685e..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 @@ -10,7 +10,7 @@ glabel BgMenkuriEye_Draw /* 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 @@ -94,7 +94,7 @@ glabel BgMenkuriEye_Draw /* 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) 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 42e5bfc46b..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 @@ -9,7 +9,7 @@ glabel func_808A3F58 /* 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 @@ -290,7 +290,7 @@ glabel func_808A3F58 /* 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) 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_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_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_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 738fab1d71..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 @@ -14,7 +14,7 @@ glabel BgYdanSp_Draw /* 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 /* 01200 808C0610 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -203,7 +203,7 @@ 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) 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 c7d27a06d4..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 @@ -42,7 +42,7 @@ glabel BossDodongo_Init /* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) /* 00878 808C1A08 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0087C 808C1A0C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 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 06a6257458..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 @@ -13,7 +13,7 @@ glabel func_808C32F4 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 603700c16f..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 @@ -20,7 +20,7 @@ glabel func_808C4940 /* 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 +/* 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 @@ -144,7 +144,7 @@ glabel func_808C4940 /* 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) .L808C4B80: 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 9614361afa..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 Math_atan2f -/* 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 Math_atan2f +/* 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_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_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_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index 6cd4a224c4..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 @@ -11,7 +11,7 @@ glabel BossFd2_Draw /* 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 @@ -35,7 +35,7 @@ glabel BossFd2_Draw /* 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 +/* 0376C 808D5DDC 0C024CDC */ jal Gfx_SetFog /* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03774 808D5DE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5DE8: @@ -102,7 +102,7 @@ glabel BossFd2_Draw /* 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 +/* 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 @@ -144,7 +144,7 @@ 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) 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 63b5e23ef0..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 @@ -12,7 +12,7 @@ glabel func_808D308C /* 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 SkelAnime_ChangeAnimationDefault +/* 00A4C 808D30BC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A50 808D30C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) /* 00A58 808D30C8 3C18808D */ lui $t8, %hi(func_808D3140) ## $t8 = 808D0000 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 60eb340f4a..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 @@ -51,7 +51,7 @@ glabel func_808D3140 /* 00B84 808D31F4 00000000 */ nop /* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 /* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 -/* 00B90 808D3200 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -72,7 +72,7 @@ glabel func_808D3140 /* 00BD4 808D3244 00000000 */ nop /* 00BD8 808D3248 45020004 */ bc1fl .L808D325C /* 00BDC 808D324C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC -/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00BE4 808D3254 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00BE8 808D3258 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC .L808D325C: 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 4b8e33017f..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 @@ -130,7 +130,7 @@ glabel func_808D3AE0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index 1cfae5173d..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 @@ -16,7 +16,7 @@ glabel BossGanon_Draw /* 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 /* 0A4B4 808E0D24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -34,7 +34,7 @@ glabel BossGanon_Draw /* 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 @@ -150,7 +150,7 @@ glabel BossGanon_Draw /* 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) 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 73a70ae971..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 @@ -47,7 +47,7 @@ glabel func_808D779C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 b7d6659c00..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 @@ -110,7 +110,7 @@ glabel L808D79E8 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -647,7 +647,7 @@ glabel L808D8220 /* 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 +/* 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 @@ -660,7 +660,7 @@ glabel L808D8220 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -740,7 +740,7 @@ glabel L808D83A4 /* 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 @@ -762,7 +762,7 @@ glabel L808D83A4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -790,7 +790,7 @@ glabel L808D8468 /* 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 +/* 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 @@ -894,7 +894,7 @@ glabel L808D8598 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -919,7 +919,7 @@ glabel L808D8598 /* 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 +/* 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 @@ -1012,7 +1012,7 @@ glabel L808D86B4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01F4C 808D87BC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01F50 808D87C0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87C4: @@ -1269,7 +1269,7 @@ glabel L808D8A98 /* 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 +/* 022F8 808D8B68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 022FC 808D8B6C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02300 808D8B70 0C02927F */ jal SkelAnime_FrameUpdateMatrix 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 564f1b3c77..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 @@ -155,7 +155,7 @@ glabel L808D94C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -269,7 +269,7 @@ glabel L808D9654 /* 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 @@ -373,7 +373,7 @@ glabel L808D9654 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -413,7 +413,7 @@ glabel L808D9900 /* 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 +/* 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 @@ -506,7 +506,7 @@ glabel L808D9A54 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -807,7 +807,7 @@ glabel L808D9E8C /* 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 +/* 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 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 d045e9add4..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 @@ -92,7 +92,7 @@ glabel L808DB404 /* 04BB8 808DB428 02002825 */ or $a1, $s0, $zero ## $a1 = 06001B0C /* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 /* 04BC0 808DB430 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC -/* 04BC4 808DB434 0C029490 */ jal func_800A5240 +/* 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 @@ -112,7 +112,7 @@ glabel L808DB448 /* 04C00 808DB470 02002825 */ or $a1, $s0, $zero ## $a1 = 06001FF8 /* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 /* 04C08 808DB478 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 04C0C 808DB47C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -189,7 +189,7 @@ glabel L808DB498 /* 04D14 808DB584 02002825 */ or $a1, $s0, $zero ## $a1 = 06000540 /* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 /* 04D1C 808DB58C E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 04D20 808DB590 0C029490 */ jal func_800A5240 +/* 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 @@ -474,7 +474,7 @@ glabel L808DB864 /* 050FC 808DB96C 02002825 */ or $a1, $s0, $zero ## $a1 = 06000FE8 /* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 /* 05104 808DB974 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 05108 808DB978 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -556,7 +556,7 @@ glabel L808DB99C /* 05220 808DBA90 02002825 */ or $a1, $s0, $zero ## $a1 = 06001440 /* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 /* 05228 808DBA98 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 0522C 808DBA9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 66d9db4c3b..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 @@ -8,7 +8,7 @@ glabel func_808DBAF0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 dc31dfd953..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 @@ -33,7 +33,7 @@ glabel func_808DC14C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0595C 808DC1CC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L808DC1D0: /* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -127,7 +127,7 @@ glabel func_808DC14C /* 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 +/* 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 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 c156327d25..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 @@ -35,7 +35,7 @@ glabel func_808DC75C /* 05F68 808DC7D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 /* 05F70 808DC7E0 E66601CC */ swc1 $f6, 0x01CC($s3) ## 000001CC -/* 05F74 808DC7E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -60,7 +60,7 @@ glabel func_808DC75C /* 05FC4 808DC834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 /* 05FCC 808DC83C E66A01CC */ swc1 $f10, 0x01CC($s3) ## 000001CC -/* 05FD0 808DC840 0C029490 */ jal func_800A5240 +/* 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 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 ff7fc739bb..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 @@ -92,7 +92,7 @@ glabel L808DCC88 /* 06448 808DCCB8 02002825 */ or $a1, $s0, $zero ## $a1 = 06004DA8 /* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 /* 06450 808DCCC0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06454 808DCCC4 0C029490 */ jal func_800A5240 +/* 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) @@ -113,7 +113,7 @@ glabel L808DCCD4 /* 06494 808DCD04 02002825 */ or $a1, $s0, $zero ## $a1 = 06003D40 /* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 /* 0649C 808DCD0C E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 064A0 808DCD10 0C029490 */ jal func_800A5240 +/* 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) @@ -145,7 +145,7 @@ glabel L808DCD20 /* 0650C 808DCD7C 02002825 */ or $a1, $s0, $zero ## $a1 = 060063CC /* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 /* 06514 808DCD84 E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 06518 808DCD88 0C029490 */ jal func_800A5240 +/* 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 @@ -177,7 +177,7 @@ glabel L808DCDA8 /* 06580 808DCDF0 02002825 */ or $a1, $s0, $zero ## $a1 = 060069A0 /* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 /* 06588 808DCDF8 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 0658C 808DCDFC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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) @@ -205,7 +205,7 @@ glabel L808DCE0C /* 065E0 808DCE50 02002825 */ or $a1, $s0, $zero ## $a1 = 060058C4 /* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 /* 065E8 808DCE58 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 065EC 808DCE5C 0C029490 */ jal func_800A5240 +/* 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 @@ -255,7 +255,7 @@ glabel L808DCEC8 /* 06698 808DCF08 02002825 */ or $a1, $s0, $zero ## $a1 = 06006028 /* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 /* 066A0 808DCF10 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC -/* 066A4 808DCF14 0C029490 */ jal func_800A5240 +/* 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 @@ -300,7 +300,7 @@ glabel L808DCF74 /* 06738 808DCFA8 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 /* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 /* 06740 808DCFB0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06744 808DCFB4 0C029490 */ jal func_800A5240 +/* 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 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 91d546684e..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 @@ -44,7 +44,7 @@ glabel func_808DD14C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 06980 808DD1F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) .L808DD1F8: /* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) 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_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_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_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_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index ec557c2175..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 @@ -15,7 +15,7 @@ glabel BossGanon2_Draw /* 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 +/* 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 @@ -146,7 +146,7 @@ glabel BossGanon2_Draw /* 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 +/* 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 @@ -303,7 +303,7 @@ 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 /* 08E50 80905D90 02202025 */ or $a0, $s1, $zero ## $a0 = 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 c5ee2ed0fa..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 @@ -130,7 +130,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -744,7 +744,7 @@ glabel L808FDF70 /* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 /* 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 @@ -854,7 +854,7 @@ glabel L808FE1C0 /* 01350 808FE290 24A52E6C */ addiu $a1, $a1, 0x2E6C ## $a1 = 06002E6C /* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) /* 01358 808FE298 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -1038,7 +1038,7 @@ glabel L808FE4C0 /* 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 @@ -1057,7 +1057,7 @@ glabel L808FE4C0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -1085,7 +1085,7 @@ glabel L808FE4C0 /* 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 +/* 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 @@ -1160,7 +1160,7 @@ glabel L808FE63C /* 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 @@ -1337,7 +1337,7 @@ glabel L808FE8E4 /* 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 +/* 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 @@ -1546,7 +1546,7 @@ glabel L808FEB70 /* 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 +/* 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 @@ -2190,7 +2190,7 @@ glabel L808FF51C /* 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 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 596224b294..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 @@ -34,7 +34,7 @@ glabel func_808FFDB0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 496ff372fb..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 @@ -7,7 +7,7 @@ glabel func_808FFF90 /* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 808FFFAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03074 808FFFB4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) /* 0307C 808FFFBC 3C0E8090 */ lui $t6, %hi(func_808FFFE0) ## $t6 = 80900000 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 2fef18bae0..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 @@ -7,7 +7,7 @@ glabel func_809000A0 /* 03174 809000B4 24A56510 */ addiu $a1, $a1, 0x6510 ## $a1 = 06026510 /* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0317C 809000BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 9d2de3f852..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 @@ -36,7 +36,7 @@ glabel func_80900104 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -49,7 +49,7 @@ glabel func_80900104 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 6cd60ad523..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 @@ -7,7 +7,7 @@ glabel func_809002CC /* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC /* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) /* 033A8 809002E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 033B0 809002F0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) /* 033B8 809002F8 3C0E8090 */ lui $t6, %hi(func_80900344) ## $t6 = 80900000 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 e45a37d378..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 @@ -66,7 +66,7 @@ glabel func_80900344 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -117,7 +117,7 @@ glabel func_80900344 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 18a98d2bd0..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 @@ -412,7 +412,7 @@ glabel L80900E4C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -456,7 +456,7 @@ glabel L80900E4C /* 04004 80900F44 00000000 */ nop /* 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 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 7bbeb189a0..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 @@ -574,7 +574,7 @@ glabel L80901968 /* 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 +/* 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 @@ -804,7 +804,7 @@ glabel L80901AB0 /* 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 +/* 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 @@ -878,7 +878,7 @@ glabel L80901E00 /* 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 @@ -1173,7 +1173,7 @@ glabel L80902290 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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_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 37587134e4..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 @@ -6,7 +6,7 @@ glabel func_80910D80 /* 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 SkelAnime_ChangeAnimationDefault +/* 0075C 80910D9C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00760 80910DA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) /* 00768 80910DA8 3C0E8091 */ lui $t6, %hi(func_80910DCC) ## $t6 = 80910000 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 7b0b11cb82..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 @@ -129,7 +129,7 @@ glabel func_80910DCC /* 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 +/* 0096C 80910FAC 0C029468 */ jal SkelAnime_ChangeAnim /* 00970 80910FB0 E7B60018 */ swc1 $f22, 0x0018($sp) /* 00974 80910FB4 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 @@ -143,7 +143,7 @@ glabel func_80910DCC /* 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) /* 009A8 80910FE8 9183014C */ lbu $v1, 0x014C($t4) ## 0000014C @@ -153,7 +153,7 @@ glabel func_80910DCC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 009C0 80911000 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 009C4 80911004 3C06C150 */ lui $a2, 0xC150 ## $a2 = C1500000 /* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) /* 009CC 8091100C 91A3014C */ lbu $v1, 0x014C($t5) ## 0000014C @@ -163,7 +163,7 @@ glabel func_80910DCC /* 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 @@ -193,7 +193,7 @@ glabel func_80910DCC /* 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 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 33009dae73..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 @@ -5,7 +5,7 @@ glabel func_80911294 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00C6C 809112AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00C70 809112B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) /* 00C78 809112B8 3C0E8091 */ lui $t6, %hi(func_809112D4) ## $t6 = 80910000 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 c764b0360e..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 @@ -26,7 +26,7 @@ glabel func_809112D4 /* 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 @@ -60,7 +60,7 @@ glabel func_809112D4 /* 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 /* 00D80 809113C0 00000000 */ nop @@ -70,7 +70,7 @@ glabel func_809112D4 /* 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 /* 00DA4 809113E4 00000000 */ nop @@ -80,7 +80,7 @@ glabel func_809112D4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 b84a63cf04..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 @@ -7,7 +7,7 @@ glabel func_809114E8 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00EC8 80911508 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00ECC 8091150C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) /* 00ED4 80911514 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 e87a5bb9bc..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 @@ -21,7 +21,7 @@ glabel func_809121E0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -38,7 +38,7 @@ glabel func_809121E0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01C30 80912270 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01C34 80912274 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 .L80912278: /* 01C38 80912278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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 6891c65dd3..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 @@ -35,7 +35,7 @@ glabel func_809122A4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 f51842f2b0..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 @@ -15,7 +15,7 @@ glabel func_809123D4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01DD0 80912410 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01DD4 80912414 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 /* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) /* 01DDC 8091241C 3C0E8091 */ lui $t6, %hi(func_80912448) ## $t6 = 80910000 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 b820280bad..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 @@ -15,7 +15,7 @@ glabel func_80912524 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01F20 80912560 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01F24 80912564 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 /* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) /* 01F2C 8091256C 3C0E8091 */ lui $t6, %hi(func_80912594) ## $t6 = 80910000 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 9fcad929d7..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 @@ -95,7 +95,7 @@ glabel func_80912594 /* 020A4 809126E4 02002825 */ or $a1, $s0, $zero ## $a1 = 06011F44 /* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 /* 020AC 809126EC E62601D0 */ swc1 $f6, 0x01D0($s1) ## 000001D0 -/* 020B0 809126F0 0C029490 */ jal func_800A5240 +/* 020B0 809126F0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) .L809126F8: /* 020B8 809126F8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 @@ -121,7 +121,7 @@ glabel func_80912594 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 c38a483bd1..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 @@ -204,7 +204,7 @@ glabel L80912FB4 /* 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 +/* 029EC 8091302C 0C029468 */ jal SkelAnime_ChangeAnim /* 029F0 80913030 E7A60018 */ swc1 $f6, 0x0018($sp) /* 029F4 80913034 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -224,7 +224,7 @@ glabel L80912FB4 /* 02A24 80913064 02002825 */ or $a1, $s0, $zero ## $a1 = 06000D84 /* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 /* 02A2C 8091306C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 02A30 80913070 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -459,7 +459,7 @@ glabel L809131C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -513,7 +513,7 @@ glabel L80913424 /* 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 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 fed9134134..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 @@ -30,7 +30,7 @@ glabel BossGoma_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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_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 90ef96c371..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 @@ -11,7 +11,7 @@ glabel func_8091A560 /* 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 +/* 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) @@ -301,7 +301,7 @@ glabel L8091A9B8 /* 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) 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_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 57a454798e..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 @@ -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_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 8d0fa18c79..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 @@ -19,7 +19,7 @@ glabel BossSst_Draw /* 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 @@ -237,7 +237,7 @@ glabel BossSst_Draw /* 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 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 472ed1cd0b..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 @@ -23,7 +23,7 @@ glabel func_8092CC58 /* 006D4 8092CCA4 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C /* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) /* 006DC 8092CCAC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) /* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) .L8092CCBC: @@ -886,7 +886,7 @@ glabel func_8092CC58 /* 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 +/* 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 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 12c9f77f3c..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 @@ -8,7 +8,7 @@ glabel func_8092DA6C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 014C0 8092DA90 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) /* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) .L8092DA9C: 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 47c64f9704..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 @@ -6,7 +6,7 @@ glabel func_8092DE48 /* 01888 8092DE58 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) /* 01890 8092DE60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01898 8092DE68 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) /* 018A0 8092DE70 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 b06ba36378..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 @@ -6,7 +6,7 @@ glabel func_8092E25C /* 01C9C 8092E26C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C /* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) /* 01CA4 8092E274 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CA8 8092E278 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 b4ece4e402..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 @@ -6,7 +6,7 @@ glabel func_8092E34C /* 01D8C 8092E35C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) /* 01D94 8092E364 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01D9C 8092E36C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) /* 01DA4 8092E374 3C188093 */ lui $t8, %hi(func_8092E3A0) ## $t8 = 80930000 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 94c5af3e3f..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 @@ -6,7 +6,7 @@ glabel func_8092E790 /* 021D0 8092E7A0 24A5ACD4 */ addiu $a1, $a1, 0xACD4 ## $a1 = 0600ACD4 /* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) /* 021D8 8092E7A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 021E0 8092E7B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) /* 021E8 8092E7B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 6f96d20bd0..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 @@ -10,7 +10,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 d0e1d241e5..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 @@ -17,7 +17,7 @@ glabel func_8092FBE4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 534563ea7d..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 @@ -91,7 +91,7 @@ glabel func_8093051C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 6b96f86ca8..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 @@ -9,7 +9,7 @@ glabel func_80931D04 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0575C 80931D2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05760 80931D30 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) /* 05768 80931D38 3C198093 */ lui $t9, %hi(func_80931D5C) ## $t9 = 80930000 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 41af913e68..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 @@ -10,7 +10,7 @@ glabel func_809352DC /* 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 @@ -283,7 +283,7 @@ glabel func_809352DC /* 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) /* 0915C 8093572C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 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 f203760a77..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 @@ -21,7 +21,7 @@ glabel func_8093639C /* 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 @@ -57,7 +57,7 @@ glabel func_8093639C /* 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 @@ -203,7 +203,7 @@ glabel func_8093639C /* 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 @@ -376,7 +376,7 @@ glabel func_8093639C /* 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) 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 3e1d17ef07..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 @@ -13,7 +13,7 @@ glabel BossTw_Draw /* 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 @@ -101,7 +101,7 @@ glabel BossTw_Draw /* 0A730 80943400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000008 /* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) /* 0A738 80943408 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000018 -/* 0A73C 8094340C 0C0253D0 */ jal Draw_TwoTexScroll +/* 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 @@ -133,7 +133,7 @@ glabel BossTw_Draw /* 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 @@ -176,7 +176,7 @@ glabel BossTw_Draw /* 0A858 80943528 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 /* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) /* 0A860 80943530 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 0A864 80943534 0C0253D0 */ jal Draw_TwoTexScroll +/* 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 @@ -197,7 +197,7 @@ glabel BossTw_Draw /* 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 +/* 0A8B4 80943584 0C024CDC */ jal Gfx_SetFog /* 0A8B8 80943588 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C /* 0A8C0 80943590 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -322,7 +322,7 @@ glabel BossTw_Draw /* 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 +/* 0AA80 80943750 0C024CDC */ jal Gfx_SetFog /* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) /* 0AA88 80943758 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L8094375C: @@ -450,7 +450,7 @@ glabel BossTw_Draw /* 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) 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 84a20b44bb..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 @@ -307,7 +307,7 @@ glabel BossTw_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -359,7 +359,7 @@ glabel BossTw_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -394,7 +394,7 @@ glabel BossTw_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 6f3c963dac..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 @@ -19,7 +19,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0142C 8093A0FC E484FF60 */ swc1 $f4, -0x00A0($a0) ## 000004C8 /* 01430 8093A100 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float 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 ecd084dbb6..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 @@ -313,7 +313,7 @@ glabel func_8093B1AC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) @@ -326,7 +326,7 @@ glabel func_8093B1AC /* 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 +/* 02968 8093B638 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0296C 8093B63C 02002825 */ or $a1, $s0, $zero ## $a1 = 06003614 /* 02970 8093B640 0C028800 */ jal SkelAnime_GetFrameCount @@ -352,7 +352,7 @@ glabel func_8093B1AC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 1187f3e5db..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 @@ -11,7 +11,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 03AFC 8093C7CC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03B00 8093C7D0 E480FB00 */ swc1 $f0, -0x0500($a0) ## 00000068 /* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 03B08 8093C7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 8e555b5ece..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 @@ -499,7 +499,7 @@ glabel func_8093C910 /* 04378 8093D048 26108E2C */ addiu $s0, $s0, 0x8E2C ## $s0 = 06038E2C /* 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 @@ -546,7 +546,7 @@ glabel func_8093C910 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04430 8093D100 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 .L8093D104: /* 04434 8093D104 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF 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 ada7c0dd29..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 @@ -10,7 +10,7 @@ glabel func_8093D3D8 /* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 /* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) /* 04730 8093D400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04738 8093D408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) /* 04740 8093D410 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 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 fa27c4cba2..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 @@ -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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -430,7 +430,7 @@ glabel L8093DAB8 /* 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 @@ -630,7 +630,7 @@ glabel L8093DC4C /* 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 @@ -656,7 +656,7 @@ glabel L8093DC4C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -782,7 +782,7 @@ glabel L8093DC4C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -961,7 +961,7 @@ glabel L8093E258 /* 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 @@ -1158,7 +1158,7 @@ glabel L8093E3E8 /* 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 @@ -1184,7 +1184,7 @@ glabel L8093E3E8 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -1282,7 +1282,7 @@ glabel L8093E3E8 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 f46944b66d..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 @@ -10,7 +10,7 @@ glabel func_8093F108 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 e18e0c49c5..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 @@ -300,7 +300,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) @@ -309,7 +309,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) @@ -318,7 +318,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) @@ -327,7 +327,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06978 8093F648 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) .L8093F650: @@ -350,7 +350,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069CC 8093F69C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 /* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 /* 069D4 8093F6A4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -359,7 +359,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069EC 8093F6BC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 /* 069F4 8093F6C4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -368,7 +368,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A0C 8093F6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 /* 06A14 8093F6E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -377,7 +377,7 @@ glabel func_8093F1C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A2C 8093F6FC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A30 8093F700 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F704: 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 a5b7faa969..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 @@ -11,7 +11,7 @@ glabel func_80945084 /* 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 @@ -33,7 +33,7 @@ glabel func_80945084 /* 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 /* 0C448 80945118 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 @@ -158,7 +158,7 @@ glabel func_80945084 /* 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 +/* 0C608 809452D8 0C024DC2 */ jal Gfx_SetFog2 /* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) /* 0C610 809452E0 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L809452E4: @@ -190,7 +190,7 @@ glabel func_80945084 /* 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 +/* 0C684 80945354 0C024DC2 */ jal Gfx_SetFog2 /* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) /* 0C68C 8094535C AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L80945360: @@ -223,7 +223,7 @@ glabel func_80945084 /* 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) 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 5ab2efcce5..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 @@ -10,7 +10,7 @@ glabel func_80949530 /* 10880 80949550 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) /* 10888 80949558 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 ca4d82e282..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 @@ -10,7 +10,7 @@ glabel func_80949BFC /* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) /* 10F54 80949C24 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 10F5C 80949C2C 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) /* 10F64 80949C34 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C 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 20a4d356c6..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 @@ -150,7 +150,7 @@ glabel func_80949E10 /* 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 +/* 1136C 8094A03C 0C029468 */ jal SkelAnime_ChangeAnim /* 11370 8094A040 E7A20018 */ swc1 $f2, 0x0018($sp) /* 11374 8094A044 1000000E */ beq $zero, $zero, .L8094A080 @@ -166,7 +166,7 @@ glabel func_80949E10 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 113A8 8094A078 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A07C: /* 113AC 8094A07C 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 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 05679e68a2..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 @@ -25,7 +25,7 @@ glabel func_8094A12C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 114C0 8094A190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A194: /* 114C4 8094A194 860E0178 */ lh $t6, 0x0178($s0) ## 00000178 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 999c8c6e5e..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 @@ -106,7 +106,7 @@ glabel func_8094A1C0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 3e69aa2bc8..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 @@ -10,7 +10,7 @@ glabel func_8094A608 /* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) /* 11960 8094A630 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 11968 8094A638 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) /* 11970 8094A640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index dba491b448..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 @@ -67,7 +67,7 @@ glabel BossVa_Draw /* 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 +/* 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 @@ -146,7 +146,7 @@ glabel L80959318 /* 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 +/* 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) @@ -182,7 +182,7 @@ glabel L80959318 /* 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 +/* 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 @@ -407,7 +407,7 @@ glabel L8095978C /* 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) 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 227d398b53..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 @@ -53,7 +53,7 @@ glabel func_80954454 /* 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 +/* 05264 80954524 0C029468 */ jal SkelAnime_ChangeAnim /* 05268 80954528 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0526C 8095452C 3C018096 */ lui $at, %hi(D_809668D0) ## $at = 80960000 @@ -135,7 +135,7 @@ glabel func_80954454 /* 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 +/* 05388 80954648 0C029468 */ jal SkelAnime_ChangeAnim /* 0538C 8095464C E7A00018 */ swc1 $f0, 0x0018($sp) /* 05390 80954650 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 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_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 b6d1d61a30..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 @@ -25,7 +25,7 @@ glabel func_8095A188 /* 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 @@ -950,7 +950,7 @@ glabel func_8095A188 /* 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) 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/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_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_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 592008f9d7..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 @@ -31,7 +31,7 @@ glabel func_8096B3E4 /* 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 +/* 01990 8096B460 0C029468 */ jal SkelAnime_ChangeAnim /* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) /* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) 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 8fcb2ef9cc..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 @@ -21,7 +21,7 @@ glabel func_8096B840 /* 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 @@ -115,7 +115,7 @@ glabel func_8096B840 /* 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) 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 958a629db6..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 @@ -20,7 +20,7 @@ glabel func_8096BF60 /* 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 +/* 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 @@ -111,7 +111,7 @@ glabel func_8096BF60 /* 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) /* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 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 39abcbdf6f..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 @@ -11,7 +11,7 @@ glabel func_8096D8C4 /* 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 /* 00450 8096D900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -105,7 +105,7 @@ glabel func_8096D8C4 /* 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) 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 e00047df2f..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 @@ -11,7 +11,7 @@ glabel func_8096DA80 /* 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 /* 0060C 8096DABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -159,7 +159,7 @@ glabel func_8096DA80 /* 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) 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_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 85ef1378f7..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 @@ -13,7 +13,7 @@ glabel func_80977950 /* 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 /* 00600 80977990 00000000 */ nop @@ -137,7 +137,7 @@ glabel func_80977950 /* 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 +/* 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 @@ -169,7 +169,7 @@ 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) 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 932a94bc18..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 @@ -20,7 +20,7 @@ glabel func_8097911C /* 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 /* 00848 80979178 00000000 */ nop @@ -65,7 +65,7 @@ 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) 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_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 fe9419abb5..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 @@ -61,7 +61,7 @@ glabel func_80983E28 /* 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 +/* 00C08 80983F08 0C029468 */ jal SkelAnime_ChangeAnim /* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00C10 80983F10 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 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 a736f7adf3..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 @@ -9,7 +9,7 @@ glabel func_8098441C /* 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) @@ -94,7 +94,7 @@ glabel func_8098441C /* 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) 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 1d28409eb2..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 @@ -15,7 +15,7 @@ glabel func_80985CE8 /* 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 @@ -86,7 +86,7 @@ glabel func_80985CE8 /* 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) 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 c815c5b443..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 @@ -14,7 +14,7 @@ glabel func_80987658 /* 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 +/* 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 @@ -86,7 +86,7 @@ glabel func_80987658 /* 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) /* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s 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/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_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 105f1b8f1f..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 @@ -31,7 +31,7 @@ glabel func_8098ECF4 /* 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 +/* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnim /* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00918 8098ED78 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 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 51110e9dce..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 @@ -21,7 +21,7 @@ glabel func_8098F1C0 /* 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 @@ -108,7 +108,7 @@ glabel func_8098F1C0 /* 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) 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 2627bdcd53..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 @@ -20,7 +20,7 @@ glabel func_8098FEB4 /* 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 +/* 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 @@ -106,7 +106,7 @@ glabel func_8098FEB4 /* 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) /* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 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_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/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_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 d8bb735d90..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 @@ -30,7 +30,7 @@ glabel func_80998C90 /* 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 SkelAnime_ChangeAnimationImpl +/* 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 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 1f6c6b96c1..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 @@ -42,7 +42,7 @@ glabel func_80998E5C /* 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 SkelAnime_ChangeAnimationImpl +/* 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 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 bd0d24f5b5..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 @@ -41,7 +41,7 @@ glabel func_80998FF4 /* 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 SkelAnime_ChangeAnimationImpl +/* 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 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 9f559b937b..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 @@ -47,7 +47,7 @@ glabel func_8099A508 /* 01E2C 8099A5AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 /* 01E34 8099A5B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E38 8099A5B8 0C0293F9 */ jal SkelAnime_ChangeAnimationImpl +/* 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 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 4fe71dea24..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 @@ -10,7 +10,7 @@ glabel func_8099B140 /* 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 @@ -123,7 +123,7 @@ glabel func_8099B140 /* 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 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 c09ba4467c..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 @@ -56,7 +56,7 @@ glabel func_8099B33C /* 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 /* 02CA0 8099B420 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -170,7 +170,7 @@ glabel func_8099B33C /* 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 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 cd4093213e..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 @@ -6,7 +6,7 @@ glabel func_809AE538 /* 00628 809AE548 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) /* 00630 809AE550 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00638 809AE558 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) /* 00640 809AE560 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 0d31ea466d..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 @@ -6,7 +6,7 @@ glabel func_809AE59C /* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 00694 809AE5B4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0069C 809AE5BC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) /* 006A4 809AE5C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 58ab6684e4..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 @@ -6,7 +6,7 @@ glabel func_809AE608 /* 006F8 809AE618 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) /* 00700 809AE620 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00708 809AE628 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) /* 00710 809AE630 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 b8a089e9c8..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 @@ -6,7 +6,7 @@ glabel func_809AE664 /* 00754 809AE674 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) /* 0075C 809AE67C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00764 809AE684 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) /* 0076C 809AE68C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 ca990e29eb..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 @@ -6,7 +6,7 @@ glabel func_809AE6C0 /* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) /* 007B8 809AE6D8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 007C0 809AE6E0 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) /* 007C8 809AE6E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 18bc4e75a2..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 @@ -9,7 +9,7 @@ glabel EnAni_Draw /* 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 +/* 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 @@ -56,7 +56,7 @@ glabel EnAni_Draw /* 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) 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 8034a09579..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 @@ -31,7 +31,7 @@ glabel EnAni_Init /* 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 +/* 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) 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_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_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index e281af7ce5..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 @@ -101,7 +101,7 @@ glabel EnArrow_Draw /* 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 +/* 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 @@ -242,7 +242,7 @@ glabel EnArrow_Draw /* 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: 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_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index 91a058c8be..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 @@ -31,7 +31,7 @@ glabel EnBa_Draw /* 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 @@ -106,7 +106,7 @@ glabel EnBa_Draw /* 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 @@ -224,7 +224,7 @@ glabel EnBa_Draw /* 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 +/* 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 @@ -263,7 +263,7 @@ glabel EnBa_Draw /* 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) 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 550ef3a2f8..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 @@ -5,7 +5,7 @@ glabel func_809B8E34 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 ba6a5bc6a7..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 @@ -163,7 +163,7 @@ glabel func_809B8EF4 /* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) /* 00E64 809B9144 45000005 */ bc1f .L809B915C /* 00E68 809B9148 00000000 */ nop -/* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 @@ -192,7 +192,7 @@ glabel func_809B8EF4 /* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 /* 00ECC 809B91AC AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 .L809B91B0: -/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00ED8 809B91B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -241,7 +241,7 @@ glabel func_809B8EF4 /* 00F7C 809B925C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 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 6f46d3bc25..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 @@ -5,7 +5,7 @@ glabel func_809B96EC /* 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 SkelAnime_ChangeAnimationDefault +/* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01428 809B9708 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) /* 01430 809B9710 3C014040 */ lui $at, 0x4040 ## $at = 40400000 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 6218a0be25..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 @@ -6,7 +6,7 @@ glabel func_809B9A54 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 5449f0df45..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 @@ -6,7 +6,7 @@ glabel func_809BA028 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 f84a7f921d..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 @@ -130,7 +130,7 @@ glabel func_809BA0D8 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 @@ -151,7 +151,7 @@ glabel func_809BA0D8 /* 02014 809BA2F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C /* 0201C 809BA2FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02024 809BA304 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 02028 809BA308 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 .L809BA30C: 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 46b913363f..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 @@ -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 SkelAnime_ChangeAnimationDefault +/* 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 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 9a58a7c9fd..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 @@ -5,7 +5,7 @@ glabel func_809BA590 /* 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 SkelAnime_ChangeAnimationDefault +/* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 022CC 809BA5AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) /* 022D4 809BA5B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 511a181ecf..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 @@ -9,7 +9,7 @@ glabel EnBigokuta_Draw /* 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 +/* 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 @@ -192,7 +192,7 @@ glabel EnBigokuta_Draw /* 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) 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 6dca4864f9..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 @@ -5,7 +5,7 @@ glabel func_809BD318 /* 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 SkelAnime_ChangeAnimationDefault +/* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) /* 006DC 809BD33C 3C01809C */ lui $at, %hi(D_809BF534) ## $at = 809C0000 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 4c68e326d4..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 @@ -6,7 +6,7 @@ glabel func_809BD3F8 /* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, 0x1CA4 ## $a1 = 06001CA4 /* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) /* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007B8 809BD418 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) /* 007C0 809BD420 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E 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 ff216e1c46..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 @@ -6,7 +6,7 @@ glabel func_809BD4A4 /* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 /* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00864 809BD4C4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0086C 809BD4CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 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 54080b3118..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 @@ -10,7 +10,7 @@ glabel EnBili_Draw /* 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 @@ -94,7 +94,7 @@ glabel EnBili_Draw /* 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) 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 8fc37980da..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 @@ -5,7 +5,7 @@ glabel func_809BFA14 /* 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 SkelAnime_ChangeAnimationDefault +/* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00190 809BFA30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) /* 00198 809BFA38 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 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 410377e2f0..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 @@ -5,7 +5,7 @@ glabel func_809BFA8C /* 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 SkelAnime_ChangeAnimationDefault +/* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00208 809BFAA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) /* 00210 809BFAB0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 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 afac54700f..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 @@ -5,7 +5,7 @@ glabel func_809BFB5C /* 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 SkelAnime_ChangeAnimationDefault +/* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002D8 809BFB78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) /* 002E0 809BFB80 240E0060 */ addiu $t6, $zero, 0x0060 ## $t6 = 00000060 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 db14117905..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 @@ -7,7 +7,7 @@ glabel func_809BFBC4 /* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 /* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC /* 00340 809BFBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00348 809BFBE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFBEC: /* 0034C 809BFBEC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC 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 1936637ec8..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 @@ -9,7 +9,7 @@ glabel func_809BFC48 /* 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 SkelAnime_ChangeAnimationDefault +/* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003D4 809BFC74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFC78: /* 003D8 809BFC78 921901E4 */ lbu $t9, 0x01E4($s0) ## 000001E4 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 925fdaec89..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 @@ -9,7 +9,7 @@ glabel EnBom_Draw /* 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) @@ -118,7 +118,7 @@ glabel EnBom_Draw /* 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) 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 e64d8391de..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 @@ -9,7 +9,7 @@ glabel EnBomBowlMan_Draw /* 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 +/* 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 @@ -54,7 +54,7 @@ glabel EnBomBowlMan_Draw /* 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) 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_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 d98c03e7a8..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 @@ -10,7 +10,7 @@ glabel EnBox_Draw /* 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 @@ -150,7 +150,7 @@ glabel EnBox_Draw /* 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) 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/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 1b7d2fe138..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 @@ -6,7 +6,7 @@ glabel func_809CAEA0 /* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, 0x1958 ## $a1 = 06001958 /* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) /* 003A8 809CAEB8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 003B0 809CAEC0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) /* 003B8 809CAEC8 3C18809D */ lui $t8, %hi(func_809CB218) ## $t8 = 809D0000 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 8c217277b3..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 @@ -6,7 +6,7 @@ glabel func_809CB008 /* 00508 809CB018 24A51678 */ addiu $a1, $a1, 0x1678 ## $a1 = 06001678 /* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) /* 00510 809CB020 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00518 809CB028 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) /* 00520 809CB030 3C0F809D */ lui $t7, %hi(func_809CB458) ## $t7 = 809D0000 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 261c769cc6..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 @@ -20,7 +20,7 @@ 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 @@ -210,7 +210,7 @@ glabel EnBw_Draw /* 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 +/* 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 @@ -313,7 +313,7 @@ glabel EnBw_Draw /* 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) 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 46e7347f81..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 @@ -6,7 +6,7 @@ glabel func_809CE9A8 /* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 /* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) /* 002E0 809CE9C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002E8 809CE9C8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) /* 002F0 809CE9D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 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 0287a13ca8..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 @@ -6,7 +6,7 @@ glabel func_809CFBA8 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 d8864f8d4d..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 @@ -6,7 +6,7 @@ glabel func_809CFF10 /* 01840 809CFF20 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) /* 01848 809CFF28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01850 809CFF30 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) /* 01858 809CFF38 3C014130 */ lui $at, 0x4130 ## $at = 41300000 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 5dc0073ae6..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 @@ -24,7 +24,7 @@ glabel EnBx_Draw /* 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 @@ -92,7 +92,7 @@ glabel EnBx_Draw /* 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 @@ -210,7 +210,7 @@ glabel EnBx_Draw /* 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) 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/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_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 35549e9d13..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 @@ -35,7 +35,7 @@ glabel EnCow_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) @@ -176,7 +176,7 @@ glabel EnCow_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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_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 68a1e3c357..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 @@ -38,7 +38,7 @@ 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 SkelAnime_ChangeAnimationDefault +/* 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 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 aa2da68f2f..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 @@ -11,7 +11,7 @@ glabel EnCs_Draw /* 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 /* 00D20 809E25D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -117,7 +117,7 @@ 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) 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 fe371de5f4..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 @@ -77,7 +77,7 @@ glabel EnCs_Init /* 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 +/* 00240 809E1AF0 0C029468 */ jal SkelAnime_ChangeAnim /* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00248 809E1AF8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C 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_Daiku/EnDaiku_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s index c98c07bf4c..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 @@ -8,7 +8,7 @@ glabel EnDaiku_Draw /* 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 +/* 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 @@ -81,7 +81,7 @@ glabel EnDaiku_Draw /* 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) /* 013BC 809E3EEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 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 2659ba612e..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 @@ -138,7 +138,7 @@ glabel EnDaiku_Init /* 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 +/* 002A0 809E2DD0 0C029468 */ jal SkelAnime_ChangeAnim /* 002A4 809E2DD4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A8 809E2DD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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_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 1ada9a4868..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 @@ -8,7 +8,7 @@ glabel EnDaikuKakariko_Draw /* 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 +/* 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 @@ -81,7 +81,7 @@ glabel EnDaikuKakariko_Draw /* 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) /* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 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 6b5a710ae1..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 @@ -127,7 +127,7 @@ glabel EnDaikuKakariko_Init /* 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 +/* 0027C 809E459C 0C029468 */ jal SkelAnime_ChangeAnim /* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00284 809E45A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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_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 b1cb1a6a60..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 @@ -12,7 +12,7 @@ glabel func_809E5F44 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007A8 809E5F78 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C /* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) /* 007B0 809E5F80 3C0F809E */ lui $t7, %hi(func_809E6ED4) ## $t7 = 809E0000 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 92ef275ee8..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 @@ -80,7 +80,7 @@ glabel func_809E7104 /* 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_ChangeAnimationPlaybackSpeed +/* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 01A58 809E7228 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 01A5C 809E722C 0C01DE1C */ jal Math_Sins ## sins? 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 1653c8645c..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 @@ -10,7 +10,7 @@ glabel func_809E858C /* 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) @@ -68,7 +68,7 @@ glabel func_809E858C /* 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) 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 9f16711e4a..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 @@ -21,7 +21,7 @@ glabel func_809E86B8 /* 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 @@ -196,7 +196,7 @@ glabel func_809E86B8 /* 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) 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 d57a0516d6..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 @@ -9,7 +9,7 @@ glabel func_809E89E4 /* 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) /* 03248 809E8A18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -53,7 +53,7 @@ glabel func_809E89E4 /* 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) 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 6eb0172848..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 @@ -5,7 +5,7 @@ glabel func_809E9770 /* 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 SkelAnime_ChangeAnimationDefault +/* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0022C 809E978C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) /* 00234 809E9794 3C0F809F */ lui $t7, %hi(func_809E9DFC) ## $t7 = 809F0000 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 45877d1949..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 @@ -6,7 +6,7 @@ glabel func_809E9800 /* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, 0x0E6C ## $a1 = 06000E6C /* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) /* 002B8 809E9818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002C0 809E9820 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) /* 002C8 809E9828 3C0E809F */ lui $t6, %hi(func_809E9F6C) ## $t6 = 809F0000 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 e18df59c54..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 @@ -5,7 +5,7 @@ glabel func_809E9920 /* 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 SkelAnime_ChangeAnimationDefault +/* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003DC 809E993C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) /* 003E4 809E9944 3C19809F */ lui $t9, %hi(func_809EA240) ## $t9 = 809F0000 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 b21177d05b..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 @@ -5,7 +5,7 @@ glabel func_809E9978 /* 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 SkelAnime_ChangeAnimationDefault +/* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00434 809E9994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) /* 0043C 809E999C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 ca4d31a437..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 @@ -6,7 +6,7 @@ glabel func_809E9AB4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 012294c461..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 @@ -11,7 +11,7 @@ glabel EnDh_Draw /* 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 @@ -127,7 +127,7 @@ glabel EnDh_Draw /* 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 +/* 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 @@ -217,7 +217,7 @@ 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) 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 6e3e8ab7c8..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 @@ -5,7 +5,7 @@ glabel func_809EB05C /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 f7bb5ccf86..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 @@ -7,7 +7,7 @@ glabel func_809EB4D8 /* 007AC 809EB4EC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 /* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) /* 007B4 809EB4F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007BC 809EB4FC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) /* 007C4 809EB504 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 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 3a0e5ff7a4..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 @@ -21,7 +21,7 @@ glabel func_809EBD78 /* 0107C 809EBDBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 /* 01084 809EBDC4 24A5375C */ addiu $a1, $a1, 0x375C ## $a1 = 0600375C -/* 01088 809EBDC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 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 aad42736e2..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 @@ -5,7 +5,7 @@ glabel func_809EC9C8 /* 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 SkelAnime_ChangeAnimationDefault +/* 00160 809EC9E0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00164 809EC9E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0016C 809EC9EC 0C03F66B */ jal Math_Rand_ZeroOne 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 2d70da7185..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 @@ -11,7 +11,7 @@ glabel EnDivingGame_Draw /* 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 /* 01710 809EEF80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -71,7 +71,7 @@ glabel EnDivingGame_Draw /* 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) 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_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/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_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_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 658c0305ac..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 Math_atan2f -/* 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 Math_atan2f -/* 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_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_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_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_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 b3d5ec5855..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 @@ -6,7 +6,7 @@ glabel func_809F89CC /* 0078C 809F89DC 24A54C20 */ addiu $a1, $a1, 0x4C20 ## $a1 = 06004C20 /* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) /* 00794 809F89E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0079C 809F89EC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) /* 007A4 809F89F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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_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_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_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 b361328423..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 @@ -11,7 +11,7 @@ glabel EnEiyer_Draw /* 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 @@ -85,7 +85,7 @@ glabel EnEiyer_Draw /* 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) 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 5ef062509e..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 @@ -7,7 +7,7 @@ glabel func_80A00218 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 739816bd51..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 @@ -18,7 +18,7 @@ glabel func_80A004BC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00564 80A00504 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00568 80A00508 E4EA0280 */ swc1 $f10, 0x0280($a3) ## 00000280 /* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) /* 00570 80A00510 3C1880A0 */ lui $t8, %hi(func_80A00C70) ## $t8 = 80A00000 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 406ed0c659..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 @@ -20,7 +20,7 @@ glabel func_80A006B0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00768 80A00708 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C /* 00770 80A00710 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 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 17112aaac0..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 @@ -40,7 +40,7 @@ glabel EnElf_Draw /* 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 +/* 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 @@ -453,7 +453,7 @@ glabel EnElf_Draw /* 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) 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 3863ea3247..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 @@ -31,7 +31,7 @@ glabel EnFd_Draw /* 019D0 80A0D090 240706D7 */ addiu $a3, $zero, 0x06D7 ## $a3 = 000006D7 /* 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 /* 019E8 80A0D0A8 00000000 */ nop @@ -215,7 +215,7 @@ glabel EnFd_Draw /* 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 +/* 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 @@ -256,7 +256,7 @@ glabel EnFd_Draw /* 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) 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_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 69175567f1..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 @@ -9,7 +9,7 @@ glabel EnFirefly_Draw /* 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 @@ -52,7 +52,7 @@ glabel EnFirefly_Draw /* 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) 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 84ff55c883..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 @@ -9,7 +9,7 @@ glabel func_80A14E28 /* 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 @@ -52,7 +52,7 @@ glabel func_80A14E28 /* 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) 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 870db11dfd..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 @@ -10,7 +10,7 @@ glabel EnFloormas_Draw /* 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 +/* 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 @@ -57,7 +57,7 @@ glabel EnFloormas_Draw /* 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) 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 078946b3d7..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 @@ -10,7 +10,7 @@ glabel func_80A17808 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) 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 a7559e869d..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 @@ -6,7 +6,7 @@ glabel func_80A17D4C /* 0084C 80A17D5C 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) /* 00854 80A17D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0085C 80A17D6C 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 /* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) /* 00864 80A17D74 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 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 a1684128da..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 @@ -10,7 +10,7 @@ glabel func_80A17D9C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) /* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) .L80A17DD4: 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 72b038cfa5..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 @@ -10,7 +10,7 @@ glabel func_80A1A350 /* 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 +/* 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 @@ -57,7 +57,7 @@ glabel func_80A1A350 /* 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) 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_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 15041a8148..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 @@ -12,7 +12,7 @@ glabel func_80A1CD24 /* 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 +/* 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 @@ -175,7 +175,7 @@ glabel func_80A1CD24 /* 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) 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 36543956e4..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 @@ -9,7 +9,7 @@ glabel EnFu_Draw /* 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 +/* 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 @@ -77,7 +77,7 @@ glabel EnFu_Draw /* 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) 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 b36aa92696..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 @@ -27,7 +27,7 @@ glabel EnFu_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 dc2c2577f2..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 Text_GetFaceReaction +/* 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/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_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 ccfcc85e3a..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 @@ -10,7 +10,7 @@ glabel EnGb_Draw /* 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 +/* 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 @@ -77,7 +77,7 @@ glabel EnGb_Draw /* 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) 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 60c1716e87..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 @@ -19,7 +19,7 @@ glabel func_80A30350 /* 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 /* 0122C 80A303AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -67,7 +67,7 @@ glabel func_80A30350 /* 012D0 80A30450 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 /* 012D4 80A30454 00006812 */ mflo $t5 /* 012D8 80A30458 31AE01FF */ andi $t6, $t5, 0x01FF ## $t6 = 00000000 -/* 012DC 80A3045C 0C0253D0 */ jal Draw_TwoTexScroll +/* 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 @@ -172,7 +172,7 @@ glabel func_80A30350 /* 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) 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 e8c7dc8b42..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 @@ -9,7 +9,7 @@ glabel EnGe1_Draw /* 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 +/* 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 @@ -56,7 +56,7 @@ glabel EnGe1_Draw /* 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) 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 0e4b3357e1..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 @@ -27,7 +27,7 @@ glabel EnGe1_Init /* 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 +/* 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) 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_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 74ce2f7c56..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 Text_GetFaceReaction +/* 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 06a51a35e7..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 @@ -10,7 +10,7 @@ glabel EnGe2_Draw /* 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 +/* 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 @@ -59,7 +59,7 @@ glabel EnGe2_Draw /* 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) 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 728e2666b9..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 @@ -26,7 +26,7 @@ glabel EnGe2_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 08e1dbf351..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 @@ -10,7 +10,7 @@ glabel EnGe3_Draw /* 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 +/* 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 @@ -59,7 +59,7 @@ glabel EnGe3_Draw /* 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) 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 d0737217bd..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 @@ -26,7 +26,7 @@ glabel EnGe3_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 b71607a802..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 @@ -13,7 +13,7 @@ glabel EnGeldB_Draw /* 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 @@ -40,7 +40,7 @@ glabel EnGeldB_Draw /* 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 +/* 04828 80A39B38 0C029468 */ jal SkelAnime_ChangeAnim /* 0482C 80A39B3C E7A60018 */ swc1 $f6, 0x0018($sp) /* 04830 80A39B40 86880312 */ lh $t0, 0x0312($s4) ## 00000312 @@ -232,7 +232,7 @@ glabel EnGeldB_Draw /* 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) 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 4b948f2694..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 @@ -6,7 +6,7 @@ glabel func_80A35D48 /* 00A48 80A35D58 24A5B6D4 */ addiu $a1, $a1, 0xB6D4 ## $a1 = 0600B6D4 /* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) /* 00A50 80A35D60 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00A58 80A35D68 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00A60 80A35D70 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 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 39c8429876..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 @@ -6,7 +6,7 @@ glabel func_80A367E4 /* 014E4 80A367F4 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 /* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) /* 014EC 80A367FC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 014F4 80A36804 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) /* 014FC 80A3680C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 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_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index ff6e561f3a..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 @@ -55,7 +55,7 @@ glabel func_80A3D838 /* 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 +/* 00230 80A3D910 0C029468 */ jal SkelAnime_ChangeAnim /* 00234 80A3D914 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00238 80A3D918 3C0E80A4 */ lui $t6, %hi(func_80A3E1EC) ## $t6 = 80A40000 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 8d76068fcc..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 @@ -9,7 +9,7 @@ glabel func_80A3E1EC /* 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 +/* 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 @@ -70,7 +70,7 @@ glabel func_80A3E1EC /* 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 /* 00C34 80A3E314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 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 9a2b76bdb9..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 @@ -10,7 +10,7 @@ glabel EnGo_Draw /* 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 +/* 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 @@ -108,7 +108,7 @@ glabel EnGo_Draw /* 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 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_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 566e96524e..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 @@ -19,7 +19,7 @@ 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 /* 02B54 80A410C4 00000000 */ nop @@ -80,7 +80,7 @@ glabel func_80A41068 /* 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) 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 77caa3f4d1..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 @@ -73,7 +73,7 @@ glabel EnGo2_Draw /* 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 +/* 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 @@ -139,7 +139,7 @@ glabel EnGo2_Draw /* 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) .L80A480C0: 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_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 66682b911b..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 @@ -19,7 +19,7 @@ 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 /* 04DDC 80A47B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -81,7 +81,7 @@ 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) /* 04ECC 80A47BFC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 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 22c8d33b7f..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 @@ -153,7 +153,7 @@ glabel EnGoma_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 90a3d04286..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 @@ -12,7 +12,7 @@ glabel func_80A4A470 /* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 /* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) /* 015E0 80A4A4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 dfe058384e..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 @@ -60,7 +60,7 @@ glabel EnGuest_Update /* 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 +/* 001C4 80A503E4 0C029468 */ jal SkelAnime_ChangeAnim /* 001C8 80A503E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 001CC 80A503EC 3C0E80A5 */ lui $t6, %hi(func_80A509D4) ## $t6 = 80A50000 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 69adb0928d..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 @@ -11,7 +11,7 @@ glabel func_80A509D4 /* 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 /* 007F0 80A50A10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -85,7 +85,7 @@ glabel func_80A509D4 /* 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) 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_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_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_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_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_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_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_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 79b9476a22..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 @@ -5,7 +5,7 @@ glabel func_80A574D4 /* 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 SkelAnime_ChangeAnimationDefault +/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002F0 80A574F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) /* 002F8 80A574F8 3C0F80A5 */ lui $t7, %hi(func_80A57B60) ## $t7 = 80A50000 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 acd872fc34..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 @@ -6,7 +6,7 @@ glabel func_80A57558 /* 00368 80A57568 24A52F7C */ addiu $a1, $a1, 0x2F7C ## $a1 = 06002F7C /* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) /* 00370 80A57570 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00378 80A57578 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) /* 00380 80A57580 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 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 b236070367..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 @@ -5,7 +5,7 @@ glabel func_80A576FC /* 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 SkelAnime_ChangeAnimationDefault +/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00518 80A57718 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) /* 00520 80A57720 3C0F80A6 */ lui $t7, %hi(func_80A58028) ## $t7 = 80A60000 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 77486665a8..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 @@ -6,7 +6,7 @@ glabel func_80A57744 /* 00554 80A57754 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 /* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) /* 0055C 80A5775C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00564 80A57764 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) /* 0056C 80A5776C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 bb9b4c8b82..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 @@ -7,7 +7,7 @@ glabel func_80A57790 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 89e412f76e..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 @@ -5,7 +5,7 @@ glabel func_80A57850 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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_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 4067d107b4..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 @@ -4,7 +4,7 @@ glabel func_80A68AC4 /* 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 SkelAnime_ChangeAnimationDefault +/* 00478 80A68AD8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0047C 80A68ADC 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 /* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00484 80A68AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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_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 e70865093a..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 Math_atan2f -/* 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_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_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 277e2bbfac..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 @@ -27,7 +27,7 @@ glabel EnHs_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index d03943622b..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 @@ -27,7 +27,7 @@ glabel EnHs2_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 7d8218e606..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 @@ -9,7 +9,7 @@ glabel EnHy_Draw /* 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 +/* 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 @@ -156,7 +156,7 @@ glabel L80A71E38 /* 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) 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/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 855fe988aa..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 @@ -10,7 +10,7 @@ glabel func_80A76798 /* 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 /* 024C0 80A767D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -275,7 +275,7 @@ glabel func_80A76798 /* 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) 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 7cd1495822..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 @@ -34,7 +34,7 @@ glabel func_80A7735C /* 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 +/* 030D4 80A773E4 0C029468 */ jal SkelAnime_ChangeAnim /* 030D8 80A773E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 030DC 80A773EC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 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 ef8cbdf336..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 @@ -9,7 +9,7 @@ glabel func_80A77844 /* 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) @@ -94,7 +94,7 @@ glabel func_80A77844 /* 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) 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 3383a3f640..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 @@ -9,7 +9,7 @@ glabel func_80A77EDC /* 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) @@ -94,7 +94,7 @@ glabel func_80A77EDC /* 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) 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 551ae6a6ae..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 @@ -9,7 +9,7 @@ glabel EnIn_Draw /* 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 +/* 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 @@ -81,7 +81,7 @@ glabel EnIn_Draw /* 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) 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_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 d373fb2883..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 @@ -9,7 +9,7 @@ glabel EnJj_Draw /* 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 +/* 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 @@ -73,7 +73,7 @@ glabel EnJj_Draw /* 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) 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 88f1c11cac..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 @@ -45,7 +45,7 @@ glabel EnJj_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 701517328b..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 @@ -27,7 +27,7 @@ glabel EnJs_Init /* 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 +/* 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) 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/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/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_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_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index 32a464bdda..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 @@ -14,7 +14,7 @@ glabel EnKarebaba_Draw /* 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 /* 01270 80A965C0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -274,7 +274,7 @@ glabel EnKarebaba_Draw /* 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 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_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 fada77405a..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 @@ -9,7 +9,7 @@ glabel EnKz_Draw /* 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 +/* 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 @@ -56,7 +56,7 @@ glabel EnKz_Draw /* 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) 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_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_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index dcaeb34325..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 @@ -11,7 +11,7 @@ glabel EnMa1_Draw /* 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 @@ -87,7 +87,7 @@ glabel EnMa1_Draw /* 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) 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_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index b578dfe044..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 @@ -11,7 +11,7 @@ glabel EnMa2_Draw /* 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 @@ -87,7 +87,7 @@ glabel EnMa2_Draw /* 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) 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_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index 58f01c55ba..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 @@ -11,7 +11,7 @@ glabel EnMa3_Draw /* 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 @@ -87,7 +87,7 @@ glabel EnMa3_Draw /* 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) 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/func_80AA6830.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s index 07f135400a..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 @@ -6,7 +6,7 @@ glabel func_80AA6830 /* 007F0 80AA6840 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 /* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) /* 007F8 80AA6848 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00800 80AA6850 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) /* 00808 80AA6858 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 66e403993f..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 @@ -5,7 +5,7 @@ glabel func_80AA6898 /* 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 SkelAnime_ChangeAnimationDefault +/* 00860 80AA68B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00864 80AA68B4 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) /* 0086C 80AA68BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 0022229e87..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 @@ -7,7 +7,7 @@ glabel func_80AA68FC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 45f8de0dec..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 @@ -5,7 +5,7 @@ glabel func_80AA6B80 /* 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 SkelAnime_ChangeAnimationDefault +/* 00B48 80AA6B98 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00B4C 80AA6B9C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B54 80AA6BA4 0C00BE0A */ jal Audio_PlayActorSound2 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 4ddede938c..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 @@ -27,7 +27,7 @@ glabel func_80AA77D0 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 f5fd701f9a..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 @@ -23,7 +23,7 @@ glabel func_80AA7CAC /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index 7b101908da..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 @@ -33,7 +33,7 @@ glabel EnMk_Init /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 262029e13f..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 Text_GetFaceReaction +/* 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 dd1fe2866b..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 @@ -10,7 +10,7 @@ glabel EnMm_Draw /* 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 /* 00F74 80AAE6E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -175,7 +175,7 @@ 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) 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 08a90c218c..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 @@ -72,7 +72,7 @@ glabel EnMm_Init /* 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 +/* 00230 80AAD9A0 0C029468 */ jal SkelAnime_ChangeAnim /* 00234 80AAD9A4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00238 80AAD9A8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 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_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index fe7598ec10..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 @@ -9,7 +9,7 @@ glabel EnMm2_Draw /* 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 +/* 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 @@ -56,7 +56,7 @@ glabel EnMm2_Draw /* 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) 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 a0be045d12..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 @@ -45,7 +45,7 @@ glabel EnMm2_Init /* 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 +/* 00298 80AAF0E8 0C029468 */ jal SkelAnime_ChangeAnim /* 0029C 80AAF0EC E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A0 80AAF0F0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 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_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s index d59f000feb..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 @@ -41,7 +41,7 @@ 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 @@ -95,7 +95,7 @@ glabel EnMu_Draw /* 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) 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 6201d6ebe9..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 @@ -15,7 +15,7 @@ glabel func_80AB1E2C /* 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 @@ -86,7 +86,7 @@ glabel func_80AB1E2C /* 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) 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_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 a8fe5ce658..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 @@ -8,7 +8,7 @@ glabel func_80AB2E70 /* 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 +/* 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 @@ -77,7 +77,7 @@ glabel func_80AB2E70 /* 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) /* 02224 80AB2FB4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 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 3db4ea8ca9..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 @@ -14,7 +14,7 @@ glabel func_80AB2FE4 /* 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 +/* 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 @@ -84,7 +84,7 @@ glabel func_80AB2FE4 /* 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) /* 023B4 80AB3144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 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 b5971356f0..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 @@ -14,7 +14,7 @@ glabel func_80AB410C /* 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 +/* 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 @@ -86,7 +86,7 @@ glabel func_80AB410C /* 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) /* 034E4 80AB4274 27BD0070 */ addiu $sp, $sp, 0x0070 ## $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_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_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 b3a7eb0b91..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 @@ -19,7 +19,7 @@ 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 +/* 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 @@ -67,7 +67,7 @@ glabel EnNiwGirl_Draw /* 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) 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_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 65d5e748d1..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 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) +/* 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 b2e848380f..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 @@ -130,7 +130,7 @@ glabel func_80AB9F24 /* 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 +/* 004D0 80ABA110 0C029468 */ jal SkelAnime_ChangeAnim /* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) /* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 @@ -157,7 +157,7 @@ glabel func_80AB9F24 /* 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 +/* 00530 80ABA170 0C029468 */ jal SkelAnime_ChangeAnim /* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) .L80ABA178: @@ -195,7 +195,7 @@ glabel func_80AB9F24 /* 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 +/* 005B4 80ABA1F4 0C029468 */ jal SkelAnime_ChangeAnim /* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 005BC 80ABA1FC 3C0980AC */ lui $t1, %hi(func_80ABAD38) ## $t1 = 80AC0000 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 f8383e4f3a..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 @@ -10,7 +10,7 @@ glabel func_80ABB228 /* 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 +/* 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) @@ -77,7 +77,7 @@ glabel func_80ABB228 /* 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) 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_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 32effd58b9..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 @@ -5,7 +5,7 @@ glabel func_80AC0B60 /* 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 SkelAnime_ChangeAnimationDefault +/* 00518 80AC0B78 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0051C 80AC0B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) /* 00524 80AC0B84 3C0E80AC */ lui $t6, %hi(func_80AC12D8) ## $t6 = 80AC0000 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/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index 15a2190529..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 @@ -41,7 +41,7 @@ glabel func_80AC6B3C /* 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 +/* 03F40 80AC6BE0 0C029468 */ jal SkelAnime_ChangeAnim /* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) 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 cd84cb31aa..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 @@ -42,7 +42,7 @@ glabel func_80AC6C54 /* 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 +/* 0405C 80AC6CFC 0C029468 */ jal SkelAnime_ChangeAnim /* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) /* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) 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 dcbeb0f7a0..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 @@ -42,7 +42,7 @@ glabel func_80AC6D30 /* 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 +/* 04138 80AC6DD8 0C029468 */ jal SkelAnime_ChangeAnim /* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) /* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) 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 f8645e2974..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 @@ -10,7 +10,7 @@ glabel func_80AC7DAC /* 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 +/* 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 @@ -65,7 +65,7 @@ glabel func_80AC7DAC /* 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) 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 c243d203be..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 @@ -11,7 +11,7 @@ glabel func_80AC80B4 /* 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 /* 05450 80AC80F0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -91,7 +91,7 @@ glabel func_80AC80B4 /* 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) 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 a8a445139b..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 @@ -10,7 +10,7 @@ glabel func_80AC8244 /* 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 +/* 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 @@ -81,7 +81,7 @@ glabel func_80AC8244 /* 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) 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 45f1ecd22b..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 @@ -11,7 +11,7 @@ glabel func_80AC83DC /* 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 /* 05778 80AC8418 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -83,7 +83,7 @@ glabel func_80AC83DC /* 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) 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 af5a2ab9da..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 @@ -10,7 +10,7 @@ glabel func_80AC854C /* 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 +/* 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 @@ -63,7 +63,7 @@ glabel func_80AC854C /* 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) 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 505ac6b48e..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 @@ -10,7 +10,7 @@ glabel func_80AC8668 /* 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 +/* 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 @@ -63,7 +63,7 @@ glabel func_80AC8668 /* 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) 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 657bd298fb..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 @@ -10,7 +10,7 @@ glabel func_80AC8784 /* 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 +/* 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 @@ -63,7 +63,7 @@ glabel func_80AC8784 /* 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) 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 79d6df8f3e..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 @@ -8,7 +8,7 @@ glabel EnOwl_Draw /* 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 +/* 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 @@ -57,7 +57,7 @@ glabel EnOwl_Draw /* 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) /* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 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 563905e637..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 @@ -5,7 +5,7 @@ glabel func_80ACFEB0 /* 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 SkelAnime_ChangeAnimationDefault +/* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) /* 00A34 80ACFED4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 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 75d4b68dca..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 @@ -5,7 +5,7 @@ glabel func_80AD0558 /* 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 SkelAnime_ChangeAnimationDefault +/* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) /* 010DC 80AD057C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 f203bf00d9..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 @@ -5,7 +5,7 @@ glabel func_80AD0720 /* 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 SkelAnime_ChangeAnimationDefault +/* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) /* 012A4 80AD0744 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E 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 914f05ae42..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 @@ -5,7 +5,7 @@ glabel func_80AD0F38 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 2ff10dfba6..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 @@ -5,7 +5,7 @@ glabel func_80AD1AA8 /* 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 SkelAnime_ChangeAnimationDefault +/* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) /* 0262C 80AD1ACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 ebe54a27a0..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 @@ -11,7 +11,7 @@ glabel EnPoDesert_Draw /* 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 /* 00B80 80AD3830 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -27,7 +27,7 @@ glabel EnPoDesert_Draw /* 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 +/* 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 @@ -43,7 +43,7 @@ glabel EnPoDesert_Draw /* 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 +/* 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 @@ -89,7 +89,7 @@ glabel EnPoDesert_Draw /* 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) 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 67ea56f782..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 @@ -14,7 +14,7 @@ glabel func_80AD2E64 /* 001E4 80AD2E94 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) /* 001EC 80AD2E9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 70885b066b..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 @@ -5,7 +5,7 @@ glabel func_80AD2FBC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00328 80AD2FD8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) /* 00330 80AD2FE0 3C0E80AD */ lui $t6, %hi(func_80AD3194) ## $t6 = 80AD0000 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 cf00b5a998..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 @@ -21,7 +21,7 @@ glabel EnPoField_Draw /* 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 /* 02E48 80AD6948 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -40,7 +40,7 @@ glabel EnPoField_Draw /* 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 +/* 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 @@ -63,7 +63,7 @@ glabel EnPoField_Draw /* 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 +/* 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 @@ -103,7 +103,7 @@ glabel EnPoField_Draw /* 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 +/* 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 @@ -187,7 +187,7 @@ 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 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 7dadf32356..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 @@ -7,7 +7,7 @@ glabel func_80AD3F4C /* 00460 80AD3F60 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 /* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) /* 00468 80AD3F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 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 13beff3544..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 @@ -6,7 +6,7 @@ glabel func_80AD3FF0 /* 00500 80AD4000 24A50608 */ addiu $a1, $a1, 0x0608 ## $a1 = 06000608 /* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) /* 00508 80AD4008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00510 80AD4010 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) /* 00518 80AD4018 3C014140 */ lui $at, 0x4140 ## $at = 41400000 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 e5b1c13f06..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 @@ -6,7 +6,7 @@ glabel func_80AD4190 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 664e8e65b1..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 @@ -9,7 +9,7 @@ glabel EnPoRelay_Draw /* 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 +/* 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 @@ -54,7 +54,7 @@ glabel EnPoRelay_Draw /* 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) 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 d467c63cec..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 @@ -28,7 +28,7 @@ glabel EnPoSisters_Draw /* 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 /* 04134 80ADD0C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 @@ -171,7 +171,7 @@ glabel EnPoSisters_Draw /* 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 @@ -432,7 +432,7 @@ glabel EnPoSisters_Draw /* 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) 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 fcbc56939e..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 @@ -6,7 +6,7 @@ glabel func_80AD9368 /* 003E8 80AD9378 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC /* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) /* 003F0 80AD9380 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 b92be2bd44..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 @@ -10,7 +10,7 @@ glabel func_80AD93C4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) /* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) .L80AD93FC: 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 426b34a668..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 @@ -14,7 +14,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 69bf91dc2f..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 @@ -16,7 +16,7 @@ glabel func_80AD94E0 /* 00588 80AD9518 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 /* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) /* 00590 80AD9520 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00598 80AD9528 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) .L80AD9530: 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 69a4462cbd..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 @@ -6,7 +6,7 @@ glabel func_80AD9568 /* 005E8 80AD9578 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) /* 005F0 80AD9580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 005F8 80AD9588 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) /* 00600 80AD9590 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 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 2cbf07fa74..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 @@ -6,7 +6,7 @@ glabel func_80AD96A4 /* 00724 80AD96B4 24A50A54 */ addiu $a1, $a1, 0x0A54 ## $a1 = 06000A54 /* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0072C 80AD96BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00734 80AD96C4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0073C 80AD96CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 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 1e3e59cb16..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 @@ -93,7 +93,7 @@ glabel func_80AD9AA8 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 bbd5604414..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 @@ -6,7 +6,7 @@ glabel func_80AD9E60 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 a5a8f3a393..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 @@ -6,7 +6,7 @@ glabel func_80AD9F1C /* 00F9C 80AD9F2C 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) /* 00FA4 80AD9F34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FAC 80AD9F3C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) /* 00FB4 80AD9F44 3C0B80AE */ lui $t3, %hi(func_80ADB770) ## $t3 = 80AE0000 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 2491bdccdc..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 @@ -23,7 +23,7 @@ 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 SkelAnime_ChangeAnimationDefault +/* 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 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 ca857f145e..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 @@ -6,7 +6,7 @@ glabel func_80ADA028 /* 010A8 80ADA038 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC /* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) /* 010B0 80ADA040 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 010B8 80ADA048 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) /* 010C0 80ADA050 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 44f6ddaec7..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 @@ -5,7 +5,7 @@ glabel func_80ADA25C /* 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 SkelAnime_ChangeAnimationDefault +/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 012E8 80ADA278 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) /* 012F0 80ADA280 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 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 61cb945e46..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 @@ -7,7 +7,7 @@ glabel func_80ADA2BC /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 4082cbfab9..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 @@ -5,7 +5,7 @@ glabel func_80ADE114 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 4f9e3ab8b3..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 @@ -5,7 +5,7 @@ glabel func_80ADE16C /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 298cfbf62e..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 @@ -5,7 +5,7 @@ glabel func_80ADE1BC /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 1d520d24e3..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 @@ -10,12 +10,12 @@ glabel func_80ADE20C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 004EC 80ADE23C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 /* 004F4 80ADE244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE248: -/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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: 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 825ceadcc1..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 @@ -6,7 +6,7 @@ glabel func_80ADE368 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 a87c7e8d7c..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 @@ -5,7 +5,7 @@ glabel func_80ADE514 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 0f45b74ffd..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 @@ -10,7 +10,7 @@ glabel func_80AE0EE4 /* 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 /* 031CC 80AE0F1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -148,7 +148,7 @@ glabel func_80AE0EE4 /* 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 +/* 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) 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 a0839f9535..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 @@ -10,7 +10,7 @@ glabel func_80AE1148 /* 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 /* 03430 80AE1180 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -56,7 +56,7 @@ glabel func_80AE1148 /* 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 +/* 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) @@ -76,7 +76,7 @@ glabel func_80AE1148 /* 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 +/* 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) @@ -94,7 +94,7 @@ glabel func_80AE1148 /* 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 +/* 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 @@ -145,7 +145,7 @@ glabel func_80AE1148 /* 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 +/* 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) @@ -165,7 +165,7 @@ glabel func_80AE1148 /* 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 +/* 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) @@ -183,7 +183,7 @@ glabel func_80AE1148 /* 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 +/* 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 @@ -299,7 +299,7 @@ glabel func_80AE1148 /* 03888 80AE15D8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 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) 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 8a5d18026e..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 @@ -18,7 +18,7 @@ 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 @@ -135,7 +135,7 @@ glabel EnRd_Draw /* 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) 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 7391a0f501..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 @@ -10,13 +10,13 @@ glabel func_80AE269C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002CC 80AE26CC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 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 SkelAnime_ChangeAnimationDefault +/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002E0 80AE26E0 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 00005D98 .L80AE26E4: /* 002E4 80AE26E4 0C03F66B */ jal Math_Rand_ZeroOne 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 95e0cf8fe0..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 @@ -45,12 +45,12 @@ glabel func_80AE2744 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 SkelAnime_ChangeAnimationDefault +/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00400 80AE2800 24A557AC */ addiu $a1, $a1, 0x57AC ## $a1 = 000057AC /* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 /* 00408 80AE2808 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 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 fc24bc2ccf..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 @@ -28,7 +28,7 @@ glabel func_80AE3454 glabel L80AE34B4 /* 010B4 80AE34B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010B8 80AE34B8 24A54268 */ addiu $a1, $a1, 0x4268 ## $a1 = 06004268 -/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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) @@ -84,7 +84,7 @@ glabel L80AE3538 /* 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 +/* 01188 80AE3588 0C029468 */ jal SkelAnime_ChangeAnim /* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01190 80AE3590 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 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/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_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_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 6b56a2e16a..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 @@ -15,7 +15,7 @@ glabel func_80AE7D94 /* 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 @@ -86,7 +86,7 @@ glabel func_80AE7D94 /* 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) 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 6a39a058a7..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 @@ -14,7 +14,7 @@ glabel func_80AE7FDC /* 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 +/* 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 @@ -82,7 +82,7 @@ glabel func_80AE7FDC /* 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) /* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 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 c223ed93c0..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 @@ -21,7 +21,7 @@ glabel EnRr_Draw /* 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 +/* 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 @@ -64,7 +64,7 @@ glabel EnRr_Draw /* 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 /* 01EA0 80AEA2E0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -180,7 +180,7 @@ glabel EnRr_Draw /* 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 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_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_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_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s index 287701edfc..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 @@ -21,7 +21,7 @@ glabel func_80AF0400 /* 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 @@ -109,7 +109,7 @@ glabel func_80AF0400 /* 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) 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 6489c7fbf8..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 @@ -22,7 +22,7 @@ glabel func_80AF05D4 /* 05A14 80AF0624 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C /* 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 @@ -108,7 +108,7 @@ glabel func_80AF05D4 /* 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) 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/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/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/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 ff4217e4d7..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 @@ -5,7 +5,7 @@ glabel func_80AFA8E8 /* 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 SkelAnime_ChangeAnimationDefault +/* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80AFA904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80AFA90C 3C0F80B0 */ lui $t7, %hi(func_80AFACE0) ## $t7 = 80B00000 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 c4e3a01a1d..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 @@ -6,7 +6,7 @@ glabel func_80AFA96C /* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, 0x4574 ## $a1 = 06004574 /* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) /* 00264 80AFA984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0026C 80AFA98C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) /* 00274 80AFA994 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 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_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 d2b7afb6df..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 @@ -10,7 +10,7 @@ glabel EnSkj_Draw /* 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 +/* 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 @@ -62,7 +62,7 @@ glabel EnSkj_Draw /* 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) 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_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 843af339ad..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 @@ -11,7 +11,7 @@ glabel func_80B01360 /* 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) /* 030EC 80B0139C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B @@ -62,7 +62,7 @@ glabel func_80B01360 /* 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) 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_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 fe58b3b9c0..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 @@ -38,7 +38,7 @@ glabel func_80B07734 /* 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_ChangeAnimationDefault +/* 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 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 b70a5c7f0b..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 @@ -11,7 +11,7 @@ glabel func_80B08258 /* 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 @@ -102,7 +102,7 @@ glabel func_80B08258 /* 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) 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_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/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/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_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_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 90cf9c8025..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 @@ -9,7 +9,7 @@ glabel EnTa_Draw /* 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 +/* 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 @@ -74,7 +74,7 @@ glabel EnTa_Draw /* 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) 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 9999e226a7..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 @@ -107,7 +107,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -123,7 +123,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -183,7 +183,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -220,7 +220,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -236,7 +236,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -406,7 +406,7 @@ glabel EnTa_Init /* 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 +/* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnim /* 006B8 80B14158 00000000 */ nop /* 006BC 80B1415C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -425,7 +425,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -439,7 +439,7 @@ glabel EnTa_Init /* 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 +/* 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 @@ -458,7 +458,7 @@ glabel EnTa_Init /* 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 +/* 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 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_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 1689009bba..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 @@ -9,7 +9,7 @@ glabel EnTakaraMan_Draw /* 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 +/* 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 @@ -54,7 +54,7 @@ glabel EnTakaraMan_Draw /* 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) 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 2171f44ba3..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 @@ -103,7 +103,7 @@ glabel L808637D4 /* 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 +/* 041C0 80863810 0C029468 */ jal SkelAnime_ChangeAnim /* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) /* 041C8 80863818 3C0C8086 */ lui $t4, %hi(D_80864510) ## $t4 = 80860000 @@ -158,7 +158,7 @@ glabel L80863884 /* 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 +/* 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 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 4d4f685f4d..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 @@ -5,7 +5,7 @@ glabel func_8085FDD0 /* 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 SkelAnime_ChangeAnimationDefault +/* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) /* 007A4 8085FDF4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 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 c62561092d..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 @@ -5,7 +5,7 @@ glabel func_8085FF28 /* 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 SkelAnime_ChangeAnimationDefault +/* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) /* 008FC 8085FF4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 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 972d24f43d..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 @@ -5,7 +5,7 @@ glabel func_80860068 /* 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 SkelAnime_ChangeAnimationDefault +/* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) /* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A 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 75d46a7ea1..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 @@ -19,12 +19,12 @@ glabel func_80860438 /* 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 +/* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 7e393fd06c..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 @@ -5,7 +5,7 @@ glabel func_80860BDC /* 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 SkelAnime_ChangeAnimationDefault +/* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) /* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E 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 5151d34318..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 @@ -5,7 +5,7 @@ glabel func_80860EC0 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 a0c2e4f81d..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 @@ -6,7 +6,7 @@ glabel func_80862050 /* 02A10 80862060 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C /* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) /* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02A20 80862070 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) /* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 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 09d1df6519..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 @@ -16,7 +16,7 @@ glabel func_808627C4 .L808627FC: /* 031AC 808627FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 ed0d469333..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 @@ -7,7 +7,7 @@ glabel func_80864158 /* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 /* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) /* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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) 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 9fbd2d0c9c..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 @@ -10,7 +10,7 @@ glabel EnTg_Draw /* 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 @@ -64,7 +64,7 @@ glabel EnTg_Draw /* 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) 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 7bec3646d9..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 @@ -6,7 +6,7 @@ glabel func_80B18C5C /* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 /* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) /* 001F4 80B18C74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 001FC 80B18C7C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) /* 00204 80B18C84 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 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 94a1656b1e..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 @@ -198,7 +198,7 @@ glabel func_80B18E7C /* 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 +/* 006BC 80B1913C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) .L80B19144: /* 006C4 80B19144 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 @@ -308,7 +308,7 @@ glabel func_80B18E7C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 e5d0a5ef10..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 @@ -5,7 +5,7 @@ glabel func_80B19524 /* 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 SkelAnime_ChangeAnimationDefault +/* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00AC0 80B19540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) /* 00AC8 80B19548 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A 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 46aef46900..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 @@ -5,7 +5,7 @@ glabel func_80B1985C /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 eb3cd0919c..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 @@ -8,7 +8,7 @@ glabel func_80B19E28 /* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 /* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) /* 013C8 80B19E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 013D0 80B19E50 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) /* 013D8 80B19E58 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 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 b80a03a9a1..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 @@ -6,7 +6,7 @@ glabel func_80B1A76C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 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 2e6b237106..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 @@ -11,7 +11,7 @@ glabel EnTorch2_Draw /* 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 /* 01EB4 80B1F834 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -111,7 +111,7 @@ glabel EnTorch2_Draw /* 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) 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 e2a10d1670..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 @@ -141,7 +141,7 @@ glabel EnToryo_Init /* 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 +/* 00204 80B20374 0C029468 */ jal SkelAnime_ChangeAnim /* 00208 80B20378 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0020C 80B2037C 960D01E8 */ lhu $t5, 0x01E8($s0) ## 000001E8 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 1d89391cf3..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 @@ -25,7 +25,7 @@ glabel EnTr_Draw /* 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 +/* 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 @@ -72,7 +72,7 @@ glabel EnTr_Draw /* 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) 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 27c13e901c..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 @@ -47,7 +47,7 @@ glabel EnTr_Init /* 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 @@ -73,7 +73,7 @@ glabel EnTr_Init /* 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 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 b545ee13ec..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 @@ -51,7 +51,7 @@ glabel EnTr_Update /* 00F7C 80B23C6C 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C74: -/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00F88 80B23C78 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC /* 00F90 80B23C80 00000000 */ nop @@ -77,13 +77,13 @@ glabel EnTr_Update /* 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 +/* 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 SkelAnime_ChangeAnimationDefault +/* 00FF4 80B23CE4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) .L80B23CEC: /* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 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 2d44891c69..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 @@ -37,7 +37,7 @@ glabel func_80B23820 /* 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 SkelAnime_ChangeAnimationDefault +/* 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 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 3063fdfd2b..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 @@ -45,7 +45,7 @@ glabel func_80B23A88 /* 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 SkelAnime_ChangeAnimationDefault +/* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 /* 00E54 80B23B44 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 @@ -62,7 +62,7 @@ glabel func_80B23A88 /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index 237b379f2b..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 @@ -11,7 +11,7 @@ glabel EnVali_Draw /* 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 /* 020A4 80B28754 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -35,7 +35,7 @@ glabel EnVali_Draw /* 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 +/* 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 @@ -83,7 +83,7 @@ glabel EnVali_Draw /* 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) 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 848b71cc8c..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 @@ -5,7 +5,7 @@ glabel func_80B26878 /* 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 SkelAnime_ChangeAnimationDefault +/* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80B26894 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80B2689C 3C1880B2 */ lui $t8, %hi(func_80B27098) ## $t8 = 80B20000 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 2e421fca59..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 @@ -6,7 +6,7 @@ glabel func_80B268FC /* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 /* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) /* 00264 80B26914 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0026C 80B2691C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) /* 00274 80B26924 27A2003C */ addiu $v0, $sp, 0x003C ## $v0 = FFFFFFAC 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_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 3ed8e03846..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 @@ -74,13 +74,13 @@ glabel func_80B2A300 /* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 /* 00214 80B2A414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 .L80B2A418: -/* 00218 80B2A418 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) .L80B2A428: /* 00228 80B2A428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) /* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A438: 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 95b6471018..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 @@ -29,7 +29,7 @@ glabel func_80B2A448 /* 002B4 80B2A4B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at /* 002BC 80B2A4BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 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 5d7c9ea554..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 @@ -27,12 +27,12 @@ glabel func_80B2A4D8 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) .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) .L80B2A564: 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 d9e2d23b96..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 @@ -285,7 +285,7 @@ glabel func_80B2A75C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) @@ -295,7 +295,7 @@ glabel func_80B2A75C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) @@ -312,7 +312,7 @@ glabel func_80B2A75C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) @@ -322,7 +322,7 @@ glabel func_80B2A75C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) @@ -343,7 +343,7 @@ glabel L80B2AC10 /* 00A14 80B2AC14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 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 @@ -354,7 +354,7 @@ glabel L80B2AC38 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -366,7 +366,7 @@ glabel L80B2AC60 /* 00A68 80B2AC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 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 @@ -377,7 +377,7 @@ glabel L80B2AC8C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -389,7 +389,7 @@ glabel L80B2ACB4 /* 00ABC 80B2ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) /* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -401,7 +401,7 @@ glabel L80B2ACE0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -417,7 +417,7 @@ glabel L80B2AD0C /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -434,7 +434,7 @@ glabel L80B2AD44 /* 00B5C 80B2AD5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C /* 00B64 80B2AD64 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00B68 80B2AD68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 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) @@ -521,7 +521,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -543,7 +543,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -580,7 +580,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -602,7 +602,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -628,7 +628,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -643,7 +643,7 @@ glabel L80B2AD44 /* 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 +/* 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 @@ -654,7 +654,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -695,7 +695,7 @@ glabel L80B2AD44 /* 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 +/* 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 @@ -706,7 +706,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -741,7 +741,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationPlaybackSpeed +/* 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 @@ -756,7 +756,7 @@ glabel L80B2AD44 /* 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 +/* 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 @@ -767,7 +767,7 @@ glabel L80B2AD44 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -781,7 +781,7 @@ glabel L80B2AD44 /* 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 +/* 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 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 d72e45251d..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 @@ -10,7 +10,7 @@ glabel func_80B2B4A8 /* 012C8 80B2B4C8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) /* 012D0 80B2B4D0 2407057D */ addiu $a3, $zero, 0x057D ## $a3 = 0000057D -/* 012D4 80B2B4D4 0C031AB1 */ jal func_800C6AC4 +/* 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 @@ -283,7 +283,7 @@ glabel func_80B2B4A8 /* 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) 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 0cc3b826c5..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 @@ -8,7 +8,7 @@ glabel func_80B2BA38 /* 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 +/* 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 @@ -442,7 +442,7 @@ glabel func_80B2BA38 /* 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) /* 01F00 80B2C100 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 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 02ec5fa5ce..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 @@ -8,7 +8,7 @@ glabel func_80B2C130 /* 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 +/* 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 @@ -75,7 +75,7 @@ glabel func_80B2C130 /* 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) /* 0206C 80B2C26C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 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 2686f2c953..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 @@ -11,7 +11,7 @@ glabel EnVm_Draw /* 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 /* 011F4 80B2E654 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -242,7 +242,7 @@ 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) 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 be49e7f95c..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 @@ -11,7 +11,7 @@ glabel EnWeiyer_Draw /* 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 @@ -85,7 +85,7 @@ glabel EnWeiyer_Draw /* 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) 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 4e9ba388b7..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 @@ -18,7 +18,7 @@ glabel func_80B32384 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0013C 80B323CC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00140 80B323D0 E4EA027C */ swc1 $f10, 0x027C($a3) ## 0000027C /* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) /* 00148 80B323D8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 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 3e0ca38788..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 @@ -6,7 +6,7 @@ glabel func_80B32434 /* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) /* 001BC 80B3244C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 001C4 80B32454 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) /* 001CC 80B3245C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 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 12a6532829..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 @@ -6,7 +6,7 @@ glabel func_80B32724 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 d9d00fdc10..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 @@ -9,7 +9,7 @@ glabel EnWf_Draw /* 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 +/* 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) @@ -122,7 +122,7 @@ glabel EnWf_Draw /* 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) 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 3f8c435bbc..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 @@ -6,7 +6,7 @@ glabel func_80B3455C /* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, 0xA4AC ## $a1 = 0600A4AC /* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) /* 008C4 80B34574 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 008CC 80B3457C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) /* 008D4 80B34584 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 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 eb1a0c31f1..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 @@ -6,7 +6,7 @@ glabel func_80B34CFC /* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, 0x98C8 ## $a1 = 060098C8 /* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 80B34D14 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0106C 80B34D1C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 80B34D24 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A 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/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_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 5990e6a7a1..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 @@ -15,7 +15,7 @@ glabel func_80B3E908 /* 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 +/* 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 @@ -85,7 +85,7 @@ glabel func_80B3E908 /* 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) 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 ec8041639f..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 @@ -15,7 +15,7 @@ glabel func_80B3EA7C /* 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 +/* 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 @@ -85,7 +85,7 @@ glabel func_80B3EA7C /* 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) 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 6a22bd70ad..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 @@ -16,7 +16,7 @@ glabel func_80B402C4 /* 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 @@ -173,7 +173,7 @@ glabel func_80B402C4 /* 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) 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 4235b035ae..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 @@ -9,7 +9,7 @@ glabel func_80B414AC /* 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 /* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -59,7 +59,7 @@ glabel func_80B414AC /* 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) 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 fcff30de40..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 @@ -15,7 +15,7 @@ glabel func_80B41BA4 /* 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) @@ -72,7 +72,7 @@ glabel func_80B41BA4 /* 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) 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 8fcda63aa5..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 @@ -10,7 +10,7 @@ glabel EnZf_Draw /* 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) @@ -157,7 +157,7 @@ glabel EnZf_Draw /* 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) 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 3a2f6eaf6c..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 @@ -7,7 +7,7 @@ glabel func_80B456B4 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 cd8fae9d21..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 @@ -6,7 +6,7 @@ glabel func_80B4604C /* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 /* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) /* 02014 80B46064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0201C 80B4606C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) /* 02024 80B46074 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 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 99f753eb3f..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 @@ -27,7 +27,7 @@ glabel func_80B462E4 .L80B46348: /* 022F8 80B46348 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 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 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 c9ce1b34ab..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 @@ -27,7 +27,7 @@ glabel func_80B483E4 .L80B48448: /* 043F8 80B48448 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 04404 80B48454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) /* 0440C 80B4845C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 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 ea5802dcf9..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 @@ -7,7 +7,7 @@ glabel func_80B49B60 /* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 /* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05B34 80B49B84 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 05B38 80B49B88 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float 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 783e04ef71..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 @@ -9,7 +9,7 @@ glabel EnZl1_Draw /* 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 +/* 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 @@ -85,7 +85,7 @@ glabel EnZl1_Draw /* 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) 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 883f82f316..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 @@ -30,7 +30,7 @@ glabel EnZl1_Init /* 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 +/* 00088 80B4ABC8 0C029468 */ jal SkelAnime_ChangeAnim /* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) /* 00090 80B4ABD0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 @@ -77,7 +77,7 @@ glabel EnZl1_Init /* 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 +/* 0012C 80B4AC6C 0C029468 */ jal SkelAnime_ChangeAnim /* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00134 80B4AC74 3C0F80B5 */ lui $t7, %hi(func_80B4BC78) ## $t7 = 80B50000 @@ -142,7 +142,7 @@ glabel EnZl1_Init /* 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 +/* 001F8 80B4AD38 0C029468 */ jal SkelAnime_ChangeAnim /* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00200 80B4AD40 3C1980B5 */ lui $t9, %hi(func_80B4AF18) ## $t9 = 80B50000 @@ -171,7 +171,7 @@ glabel EnZl1_Init /* 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 +/* 0025C 80B4AD9C 0C029468 */ jal SkelAnime_ChangeAnim /* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00264 80B4ADA4 3C0980B5 */ lui $t1, %hi(func_80B4AF18) ## $t1 = 80B50000 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_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/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_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index 569c8ba316..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 @@ -28,7 +28,7 @@ glabel func_80B523C8 /* 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 @@ -123,7 +123,7 @@ glabel func_80B523C8 /* 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) 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 62050f19a1..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 @@ -22,7 +22,7 @@ glabel func_80B525D4 /* 03C94 80B52624 2407067F */ addiu $a3, $zero, 0x067F ## $a3 = 0000067F /* 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 @@ -110,7 +110,7 @@ glabel func_80B525D4 /* 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) 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_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 354cd27b51..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 @@ -21,7 +21,7 @@ glabel func_80B59FF4 /* 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 @@ -111,7 +111,7 @@ glabel func_80B59FF4 /* 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) 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 6dcefcad7f..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 @@ -22,7 +22,7 @@ glabel func_80B5A1D0 /* 06E70 80B5A220 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D /* 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 @@ -110,7 +110,7 @@ glabel func_80B5A1D0 /* 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) 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 d1a4ecc2c9..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 @@ -38,7 +38,7 @@ glabel EnZl4_Draw /* 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 +/* 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 @@ -124,7 +124,7 @@ glabel EnZl4_Draw /* 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) 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/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_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 66d4c336fe..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 @@ -6,7 +6,7 @@ glabel func_80B62B04 /* 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 SkelAnime_ChangeAnimationDefault +/* 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) 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 7643494135..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 @@ -604,7 +604,7 @@ glabel L80B632DC /* 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 @@ -652,7 +652,7 @@ glabel L80B632DC /* 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 +/* 00AF4 80B634B4 0C029468 */ jal SkelAnime_ChangeAnim /* 00AF8 80B634B8 E7A40018 */ swc1 $f4, 0x0018($sp) /* 00AFC 80B634BC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 @@ -797,7 +797,7 @@ glabel L80B63670 /* 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 +/* 00D00 80B636C0 0C029468 */ jal SkelAnime_ChangeAnim /* 00D04 80B636C4 E7B20018 */ swc1 $f18, 0x0018($sp) .L80B636C8: @@ -978,7 +978,7 @@ glabel L80B63670 /* 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 +/* 00F98 80B63958 0C029468 */ jal SkelAnime_ChangeAnim /* 00F9C 80B6395C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00FA0 80B63960 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -1015,7 +1015,7 @@ glabel L80B63988 /* 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 +/* 01018 80B639D8 0C029468 */ jal SkelAnime_ChangeAnim /* 0101C 80B639DC E7A60018 */ swc1 $f6, 0x0018($sp) /* 01020 80B639E0 240C000B */ addiu $t4, $zero, 0x000B ## $t4 = 0000000B @@ -1161,7 +1161,7 @@ glabel L80B63988 /* 0121C 80B63BDC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 /* 01224 80B63BE4 A42B0AFA */ sh $t3, 0x0AFA($at) ## 00010AFA -/* 01228 80B63BE8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 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 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 1dfaa9d4b5..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 @@ -17,7 +17,7 @@ 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 0997f1bdd0..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 @@ -97,7 +97,7 @@ glabel func_80B6404C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 023c87d9d0..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 @@ -35,7 +35,7 @@ glabel func_80B6424C /* 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 +/* 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 @@ -167,7 +167,7 @@ glabel func_80B6424C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01AD8 80B64498 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01ADC 80B6449C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01AE0 80B644A0 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644A4: @@ -182,7 +182,7 @@ glabel func_80B6424C /* 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 @@ -239,7 +239,7 @@ glabel func_80B6424C /* 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 +/* 01BD0 80B64590 0C029468 */ jal SkelAnime_ChangeAnim /* 01BD4 80B64594 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01BD8 80B64598 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -359,7 +359,7 @@ glabel func_80B6424C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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 b90b47e405..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 @@ -207,7 +207,7 @@ glabel func_80B6476C /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 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_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index 1a26a72311..bad1555428 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -76,7 +76,7 @@ glabel Fishing_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 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 @@ -527,7 +527,7 @@ glabel Fishing_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 01328 80B6ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0132C 80B6ACCC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 /* 01334 80B6ACD4 00000000 */ nop @@ -545,7 +545,7 @@ glabel Fishing_Init /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0136C 80B6AD0C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01370 80B6AD10 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B6AD14: /* 01374 80B6AD14 0C02927F */ jal SkelAnime_FrameUpdateMatrix 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 695aa5c295..f703962947 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -4027,7 +4027,7 @@ glabel L80B748A0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B5C0 80B74F60 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC /* 0B5C8 80B74F68 3C014402 */ lui $at, 0x4402 ## $at = 44020000 @@ -4045,7 +4045,7 @@ glabel L80B748A0 /* 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 SkelAnime_ChangeAnimationTransitionRate +/* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B604 80B74FA4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B608 80B74FA8 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74FAC: 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 e0fcca3c39..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 @@ -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 28b56cd950..bb406545f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -9,7 +9,7 @@ glabel func_80B7A278 /* 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 +/* 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 @@ -239,7 +239,7 @@ glabel func_80B7A278 /* 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) 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_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 6b11cee4be..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 @@ -10,7 +10,7 @@ glabel ObjIcePoly_Draw /* 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 /* 00754 80B949B4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -64,7 +64,7 @@ glabel ObjIcePoly_Draw /* 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 +/* 00820 80B94A80 0C0253D0 */ jal Gfx_TwoTexScroll /* 00824 80B94A84 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) /* 0082C 80B94A8C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 @@ -91,7 +91,7 @@ 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) 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 ebf2d7cdde..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 @@ -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 e7396b8b8a..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 @@ -21,7 +21,7 @@ glabel func_80832B0C /* 00944 80832B54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) /* 0094C 80832B5C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00950 80832B60 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 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 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 3559a550ff..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 @@ -22,7 +22,7 @@ glabel func_80832B78 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 51de71c2da..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 @@ -10,7 +10,7 @@ glabel func_80832BE8 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 127e5255ab..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 @@ -9,7 +9,7 @@ glabel func_80832C2C /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 a27716ac76..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 @@ -10,7 +10,7 @@ glabel func_80832C6C /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 bc71e83a85..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 @@ -108,7 +108,7 @@ glabel func_808340DC /* 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_LinkChangeAnimation +/* 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 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 ad5adf59c1..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 @@ -52,7 +52,7 @@ glabel func_80834758 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 1b85422709..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 @@ -27,7 +27,7 @@ glabel func_80834BD4 /* 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 SkelAnime_LinkChangeAnimation +/* 02A30 80834C40 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) .L80834C48: /* 02A38 80834C48 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C 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 48ad61b41e..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 @@ -63,7 +63,7 @@ glabel func_808358F0 /* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 /* 037CC 808359DC 24C62608 */ addiu $a2, $a2, 0x2608 ## $a2 = 04002608 .L808359E0: -/* 037D0 808359E0 0C02901F */ jal func_800A407C +/* 037D0 808359E0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) .L808359E8: /* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) 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_80837704.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s index 968e293755..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 @@ -45,7 +45,7 @@ glabel func_80837704 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 fa87d19c89..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 @@ -86,7 +86,7 @@ glabel func_8083BF50 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 415685995a..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 @@ -103,7 +103,7 @@ glabel func_8083C2B0 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 4a3a0a0ea3..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 @@ -30,7 +30,7 @@ glabel func_8083CBF0 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 ab1035fe3e..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 @@ -38,7 +38,7 @@ glabel func_8083CD54 /* 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_LinkChangeAnimation +/* 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) 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 668e7d1607..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 @@ -90,7 +90,7 @@ glabel func_8083F570 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 65eac8052e..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 @@ -133,7 +133,7 @@ glabel func_808409CC /* 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 SkelAnime_LinkChangeAnimation +/* 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) 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 9228f8274a..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 @@ -249,7 +249,7 @@ glabel func_80843188 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 1744f8e4e7..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 @@ -78,7 +78,7 @@ glabel func_808435C4 /* 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 SkelAnime_LinkChangeAnimation +/* 114E0 808436F0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) .L808436F8: /* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) 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 d1de836a1d..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 @@ -37,7 +37,7 @@ glabel func_80843AE8 /* 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 SkelAnime_LinkChangeAnimation +/* 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 @@ -59,7 +59,7 @@ glabel func_80843AE8 /* 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 SkelAnime_LinkChangeAnimation +/* 119BC 80843BCC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) /* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843BD8: 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 d4fc9bf67a..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 @@ -149,7 +149,7 @@ glabel func_8084411C /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 7a05c2573e..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 @@ -37,7 +37,7 @@ glabel func_80846660 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 95e4893dc4..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 @@ -32,7 +32,7 @@ glabel func_808467D4 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 7051b44976..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 @@ -336,7 +336,7 @@ glabel func_8084BF1C /* 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 SkelAnime_LinkChangeAnimation +/* 1A1E4 8084C3F4 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) .L8084C3FC: /* 1A1EC 8084C3FC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 @@ -397,7 +397,7 @@ glabel func_8084BF1C /* 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 SkelAnime_LinkChangeAnimation +/* 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) 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 4ca89fda3a..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 @@ -147,7 +147,7 @@ glabel func_8084CC98 /* 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 +/* 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) @@ -388,7 +388,7 @@ glabel func_8084CC98 .L8084D210: /* 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 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 7d5eb07575..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 @@ -24,7 +24,7 @@ glabel func_80850F1C /* 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 SkelAnime_LinkChangeAnimation +/* 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) 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 731412ab9e..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 @@ -18,7 +18,7 @@ glabel func_80850F9C /* 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 SkelAnime_LinkChangeAnimation +/* 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) 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 c7f5fa1fb7..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 @@ -51,7 +51,7 @@ glabel func_808515A4 /* 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 SkelAnime_LinkChangeAnimation +/* 1F454 80851664 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) .L8085166C: /* 1F45C 8085166C 0C20C884 */ jal func_80832210 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 c377a6e28d..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 @@ -15,7 +15,7 @@ glabel func_80851B90 /* 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 SkelAnime_LinkChangeAnimation +/* 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 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 244bfd0552..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 @@ -36,7 +36,7 @@ glabel func_80851BE8 /* 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_LinkChangeAnimation +/* 1FA68 80851C78 0C028FC2 */ jal SkelAnime_ChangeLinkAnim /* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) .L80851C80: /* 1FA70 80851C80 3C058085 */ lui $a1, %hi(D_808551B4) ## $a1 = 80850000 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 890b763027..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 @@ -11,7 +11,7 @@ glabel func_809A16F4 /* 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 @@ -193,7 +193,7 @@ glabel func_809A16F4 /* 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) 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 23d1c37714..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 @@ -11,7 +11,7 @@ glabel func_809AC42C /* 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 @@ -112,7 +112,7 @@ 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) 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/z_quake.s b/asm/z_quake.s deleted file mode 100644 index c442fe4e0d..0000000000 --- a/asm/z_quake.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/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_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/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_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_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_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_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/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_quake.bss.s b/data/z_quake.bss.s deleted file mode 100644 index 5b88b46466..0000000000 --- a/data/z_quake.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/z_quake.data.s b/data/z_quake.data.s deleted file mode 100644 index 0ae0ac1708..0000000000 --- a/data/z_quake.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/z_quake.rodata.s b/data/z_quake.rodata.s deleted file mode 100644 index 66d56c13a5..0000000000 --- a/data/z_quake.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/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_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/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/include/functions.h b/include/functions.h index 69c6178aa5..9dcdad1af9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -403,8 +403,8 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim 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); @@ -690,6 +690,7 @@ 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); @@ -756,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); -void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, SubActor98Init* subActor98Init); +void func_80061ED4(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); +void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); // ? func_80061F64(?); // ? func_800622E4(?); // ? func_80062530(?); @@ -796,10 +797,8 @@ 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(?); @@ -1056,56 +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(?); +Gfx* func_80093F34(Gfx* gfx); +Gfx* func_80093F58(Gfx* gfx); 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(?); +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); @@ -1136,12 +1144,12 @@ void Scene_Draw(GlobalContext* globalCtx); 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 limbCount, +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 limbCount, +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor); s16 SkelAnime_GetFrameCount(GenericAnimationHeader* animationSeg); @@ -1151,7 +1159,7 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorD Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx); -void func_800A2E70(s32, Vec3s*, Vec3s*, Vec3s*, f32); +void SkelAnime_InterpolateVec3s(s32, Vec3s*, Vec3s*, Vec3s*, f32); void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx); void func_800A32F4(GlobalContext* globalCtx); void func_800A3310(GlobalContext* globalCtx); @@ -1167,28 +1175,31 @@ void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount); void func_800A3B8C(SkelAnime* skelAnime); -void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); -void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); -void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, - LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 arg4, - f32 frameCount, u8 arg6, f32 arg7); -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); -void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, - f32 playbackSpeed); -void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); -void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, - f32 playbackSpeed); +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 frame, - LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 arg5, f32 arg6, Vec3s* arg7); -void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame, - LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 arg5, f32 arg6, Vec3s* arg7); +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); @@ -1197,17 +1208,17 @@ void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHe void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animationseg); s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime); -void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 frame, - f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 unk0, - f32 frameCount, u8 unk1, f32 transitionRate); -void func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationseg); -void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); -void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); -void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationseg); -void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); -void func_800A5408(SkelAnime* skelAnime); +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); @@ -1252,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(?); @@ -1408,7 +1428,7 @@ 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(?); @@ -1518,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); -Gfx* func_800C6C28(Gfx* a0, Gfx* dlist); // branch dlist -// ? 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); @@ -2332,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(?); @@ -2366,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); @@ -2444,6 +2465,12 @@ void func_80110F68(GlobalContext* globalCtx); void func_80112098(GlobalContext* globalCtx); 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/macros.h b/include/macros.h index 217d01f841..ecd8c5acf4 100644 --- a/include/macros.h +++ b/include/macros.h @@ -39,4 +39,13 @@ (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/sched.h b/include/sched.h index 656e55661e..2873a310d2 100644 --- a/include/sched.h +++ b/include/sched.h @@ -13,16 +13,6 @@ #define OS_SC_RCP_MASK 0x0003 #define OS_SC_TYPE_MASK 0x0007 -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 { /* 0x00 */ char unk_00[0x12]; /* 0x12 */ s8 unk_12; 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/variables.h b/include/variables.h index e44e42f026..4b7c8d30a7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -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; @@ -263,14 +264,7 @@ extern s32 D_8011D3AC; 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; @@ -481,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]; @@ -3351,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; @@ -3545,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; @@ -3580,22 +3527,19 @@ extern u32 gSegments[]; //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; diff --git a/include/z64.h b/include/z64.h index c6ff0a1723..bb5569ffc6 100644 --- a/include/z64.h +++ b/include/z64.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -234,14 +235,48 @@ typedef struct { /* 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 { @@ -284,11 +319,49 @@ typedef struct { } Input; // size = 0x18 typedef struct { - /* 0x0000 */ char unk_00[0x28]; + /* 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[0xEC]; - /* 0x0120 */ u32 unk_120; - /* 0x0124 */ char unk_124[4]; + /* 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 { @@ -801,6 +874,13 @@ typedef struct /* 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; @@ -902,7 +982,7 @@ typedef struct GlobalContext { /* 0x11E00 */ EntranceEntry* setupEntranceList; /* 0x11E04 */ UNK_PTR setupExitList; /* 0x11E08 */ Path* setupPathList; - /* 0x11E0C */ UNK_PTR naviMsgSegment; + /* 0x11E0C */ ElfMessage* cUpElfMsgs; /* 0x11E10 */ char unk_11E10[0x4]; /* 0x11E14 */ u8 skyboxId; /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction" @@ -1277,4 +1357,86 @@ typedef struct { /* 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 91a1f9f716..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,22 +16,6 @@ struct GlobalContext; // From z64light.h struct LightMapper; -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; - typedef struct { Vec3f pos; Vec3s rot; @@ -80,13 +67,6 @@ typedef struct { } attack[32]; } ActorDamageChart; -typedef struct { - /* 0x00 */ u8 health; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ u8 mass; -} SubActor98Init; - 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 @@ -182,6 +162,21 @@ typedef struct Actor { /* From here on, the structure and size varies for each actor */ } Actor; // size = 0x14C +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, @@ -304,80 +299,83 @@ typedef struct { } 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[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]; + /* 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 { diff --git a/include/z64animation.h b/include/z64animation.h index 9076056446..598c25b362 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -4,11 +4,15 @@ #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; @@ -71,7 +75,6 @@ typedef struct { /* 0x001 */ u8 vecCount; /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; - /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType1; typedef struct { @@ -80,7 +83,6 @@ typedef struct { /* 0x004 */ Vec3s* unk_04; /* 0x008 */ Vec3s* unk_08; /* 0x00C */ f32 unk_0C; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType2; typedef struct { @@ -89,7 +91,6 @@ typedef struct { /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; /* 0x00C */ u8* index; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType3; typedef struct { @@ -99,14 +100,12 @@ typedef struct { /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; /* 0x00C */ u8* index; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType4; typedef struct { /* 0x000 */ struct Actor* actor; /* 0x004 */ SkelAnime* skelAnime; /* 0x008 */ f32 unk_08; - /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType5; typedef struct { @@ -142,7 +141,11 @@ typedef struct { struct SkelAnime { /* 0x00 */ u8 limbCount; // joint_Num - /* 0x01 */ u8 unk_01; // state? 00 = loop 02 = don't loop ? + /* 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; @@ -152,25 +155,21 @@ struct SkelAnime { LinkAnimetionEntry* linkAnimetionSeg; GenericAnimationHeader* genericSeg; }; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 animFrameCount; // ending frame? - /* 0x14 */ f32 unk_14; // Loop frame? + /* 0x0C */ f32 initialFrame; + /* 0x10 */ f32 animFrameCount; + /* 0x14 */ f32 totalFrames; /* 0x18 */ f32 animCurrentFrame; /* 0x1C */ f32 animPlaybackSpeed; /* 0x20 */ Vec3s* actorDrawTbl; // now_joint - /* 0x24 */ Vec3s* unk_24; // morf_joint - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; + /* 0x24 */ Vec3s* transitionDrawTbl; // morf_joint + /* 0x28 */ f32 transCurrentFrame; + /* 0x2C */ f32 transitionStep; /* 0x30 */ s32 (*animUpdate)(); - /* 0x34 */ s8 unk_34; - /* 0x35 */ u8 unk_35; // flags - /* 0x36 */ s16 unk_36; - /* 0x38 */ s16 unk_38; - /* 0x3A */ s16 unk_3A; - /* 0x3C */ s16 unk_3C; - /* 0x3E */ s16 unk_3E; - /* 0x40 */ s16 unk_40; - /* 0x42 */ s16 unk_42; + /* 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, diff --git a/include/z64scene.h b/include/z64scene.h index 28db2047e1..c808395878 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -66,7 +66,7 @@ typedef struct { typedef struct { /* 0x00 */ u8 code; - /* 0x01 */ u8 naviMsgNum; + /* 0x01 */ u8 cUpElfMsgNum; /* 0x04 */ u32 keepObjectId; } SCmdSpecialFiles; 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 55ba473563..2272230b53 100644 --- a/makefile +++ b/makefile @@ -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 #### diff --git a/spec b/spec index c615c43d24..43f0984284 100644 --- a/spec +++ b/spec @@ -314,12 +314,11 @@ beginseg 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/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" @@ -354,12 +353,8 @@ beginseg 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/z_quake.o" - include "build/data/z_quake.data.o" - include "build/data/z_quake.rodata.o" - include "build/data/z_quake.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" @@ -377,8 +372,8 @@ 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/src/code/code_800ACE70.o" include "build/src/code/z_vismono.o" @@ -430,10 +425,7 @@ 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" @@ -457,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" @@ -677,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 @@ -1413,8 +1397,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 @@ -1480,9 +1463,7 @@ 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 @@ -3637,9 +3618,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 @@ -4020,9 +3999,7 @@ 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/logutils.c b/src/boot/logutils.c index ca678a9fc0..693109d324 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -98,7 +98,6 @@ void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s } } -// there's probalby a macro like this : MACRO(exp) LogUtils_LogThreadId(__FILE__, __LINE__); osSyncPrintf(exp) void LogUtils_LogThreadId(const char* name, s32 line) { osSyncPrintf("<%d %s %d>", osGetThreadId(NULL), name, line); } diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index b6c7a8f13a..f5d01333a0 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -1884,9 +1884,8 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk 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); } } 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/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/padmgr.c b/src/code/padmgr.c index 5cc539dbf0..dc3e9c472a 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -143,8 +143,7 @@ void func_800C740C(PadMgr* padmgr) { } else if (var4 == 11) { padmgr->unk_2AE[var3] = 2; } else if (var4 == 4) { - LogUtils_LogThreadId("../padmgr.c", 282); - osSyncPrintf("++errcnt = %d\n", ++D_8012D284); + LOG_NUM("++errcnt", ++D_8012D284, "../padmgr.c", 282); osSyncPrintf(VT_FGCOL(YELLOW)); osSyncPrintf("padmgr: %dコン: %s\n", var3 + 1, "コントローラパックの通信エラー"); osSyncPrintf(VT_RST); diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 24c5768d01..c320a32862 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -298,7 +298,7 @@ void Matrix_RotateZ(f32 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. + * 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) { @@ -388,7 +388,7 @@ void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) { /* * Translates the top of the matrix stack by `translation` units, - * then rotates that matrix by `rotation` in Z-Y-X order + * then rotates that matrix by `rotation` in Z-Y-X order (roll-pitch-yaw) */ void Matrix_TranslateThenRotateZYX(Vec3f* translation, Vec3s* rotation) { MtxF* cmf = sCurrentMatrix; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 05546dde18..4b95dfe3a1 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -14,16 +14,16 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global f32 temp2; MtxF sp60; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; if (actor->floorPoly != NULL) { temp1 = actor->posRot.pos.y - actor->unk_80; 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); @@ -52,7 +52,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global 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); } } } @@ -74,9 +74,9 @@ void ActorShadow_DrawFunc_Squiggly(Actor* actor, LightMapper* lightMapper, Globa 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); @@ -92,7 +92,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, 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 @@ -103,7 +103,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa f32 spE0[2]; s32 i; f32* spAC; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; f32 temp_10; u8 temp_14; f32 temp_f0; @@ -139,9 +139,9 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa temp_s6 -= 2; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741); + Graph_OpenDisps(dispRefs, 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; for (i = 0; i < 2; i++) { @@ -209,7 +209,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa 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 @@ -316,7 +316,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Actor* actor; Player* player; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; TargetContextEntry* entry; s16 spCE; f32 temp1; @@ -331,7 +331,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { 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) { player = PLAYER; @@ -374,7 +374,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); if ((!(player->stateFlags1 & 0x40)) || (actor != player->unk_664)) { - gfxCtx->overlay.p = func_80093774(gfxCtx->overlay.p, 0x39); + gfxCtx->overlay.p = Gfx_CallSetupDL(gfxCtx->overlay.p, 0x39); for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++) { entry = &targetCtx->arr_50[spAC]; @@ -418,7 +418,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { 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); @@ -431,7 +431,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { 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") @@ -736,7 +736,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { s32 spB4; s32 spB0; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; if (titleCtx->unk_C != 0) { spCC = titleCtx->unk_8; @@ -746,7 +746,7 @@ 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; @@ -777,7 +777,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { 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); } } @@ -1331,22 +1331,22 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* 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* 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; } @@ -1357,7 +1357,7 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { Gfx* displayListHead; Gfx* displayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; lightDir.x = globalCtx->unk_10A4E; lightDir.y = globalCtx->unk_10A4F; @@ -1375,13 +1375,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { 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); } } @@ -1391,7 +1391,7 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { Gfx* displayListHead; Gfx* displayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; lightDir.x = globalCtx->unk_10A4E; lightDir.y = globalCtx->unk_10A4F; @@ -1404,13 +1404,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { 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); } } @@ -1807,7 +1807,7 @@ Color_RGB8 D_80116064 = { 0x64, 0xC8, 0x00 }; // 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; @@ -1830,7 +1830,7 @@ 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) { @@ -1926,7 +1926,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { 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); + 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, @@ -1962,7 +1962,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { 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 @@ -2192,13 +2192,13 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { 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); @@ -2253,7 +2253,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { 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); } @@ -2273,9 +2273,9 @@ void func_80030ED8(Actor* actor) { } void func_80030FA8(GraphicsContext* gfxCtx) { - Gfx* gfxArr[5]; + 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); @@ -2284,21 +2284,21 @@ void func_80030FA8(GraphicsContext* gfxCtx) { 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) { 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++); @@ -2326,21 +2326,21 @@ 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++) { // 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) { // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "青い眼鏡(外側)", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "青い眼鏡(外側)", 0); gDPPipeSync(gfxCtx->polyXlu.p++); @@ -2354,13 +2354,13 @@ 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) { @@ -2388,7 +2388,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { ActorListEntry* actorListEntry; GraphicsContext* gfxCtx; s32 i; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; Actor* actor; ActorOverlay* overlayEntry; char* actorName; @@ -2396,7 +2396,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { 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]; @@ -2406,8 +2406,8 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { 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; @@ -2485,7 +2485,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { 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) { @@ -3483,13 +3483,13 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) 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 - 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); @@ -3512,21 +3512,21 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) 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); + 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); + 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) { @@ -3572,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); @@ -3615,7 +3615,7 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { 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) { @@ -3887,9 +3887,9 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) { 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); @@ -3901,15 +3901,15 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim 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, 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); @@ -3920,7 +3920,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim 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) { @@ -3955,8 +3955,8 @@ void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) 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) { diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c index 4b9abb220f..3b83d1b71d 100644 --- a/src/code/z_cheap_proc.c +++ b/src/code/z_cheap_proc.c @@ -1,30 +1,30 @@ #include #include -void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) { +void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); } -void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist) { +void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index e5bc9199f2..adda7974bd 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -221,12 +221,12 @@ void func_80063D7C(GraphicsContext* gfxCtx) { void* unk2[6]; GfxPrint gfxPrint; void* unk[2]; - Gfx* dlFrame[4]; // stores state of GfxCtx next ptrs + Gfx* dispRefs[4]; // stores state of GfxCtx next ptrs - func_800C6AC4(&dlFrame, gfxCtx, "../z_debug.c", 628); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_debug.c", 628); GfxPrint_Ctor(&gfxPrint); sp78 = gfxCtx->polyOpa.p; - tempRet = func_800C6C20(gfxCtx->polyOpa.p); + tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p); gSPDisplayList(gfxCtx->overlay.p++, tempRet); GfxPrint_Open(&gfxPrint, tempRet); @@ -241,9 +241,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) { D_8011E0B0 = 0; sp7C = GfxPrint_Close(&gfxPrint); gSPEndDisplayList(sp7C++); - func_800C6C28(sp78, sp7C); + Graph_BranchDlist(sp78, sp7C); gfxCtx->polyOpa.p = sp7C; if (0) {} - func_800C6B54(&dlFrame, gfxCtx, "../z_debug.c", 664); + 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 e96ccdc2fe..914d70c890 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -72,9 +72,9 @@ void DebugDisplay_DrawObjects(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); @@ -92,14 +92,14 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo 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) { 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); @@ -113,5 +113,5 @@ static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, Global 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 dd47227d41..c2cad22064 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -272,15 +272,15 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* 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); + 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); + Quake_RemoveFromIdx(D_8015FCCA); } break; case 18: @@ -1867,7 +1867,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Gfx* displayList; Gfx* prevDisplayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; if (0) {} // Necessary to match @@ -1876,17 +1876,17 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { 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++; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 383ed1b4d8..ce07d2b360 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -169,37 +169,37 @@ void func_800694A0(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); 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) { 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); + 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) { 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), @@ -208,9 +208,9 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { 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); @@ -219,14 +219,14 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -238,9 +238,9 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) { 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), @@ -249,14 +249,14 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -268,9 +268,9 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { 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), @@ -278,21 +278,21 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { 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) { 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)); + 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]); @@ -302,14 +302,14 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -318,21 +318,21 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { 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)); + 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) { 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), @@ -340,39 +340,39 @@ static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { 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) { 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); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5); + 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) { 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)); + 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]); @@ -386,100 +386,100 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { 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) { 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)); + 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) { 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)); + 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) { 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)); + 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) { 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)); + 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) { 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); 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) { 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), @@ -491,27 +491,27 @@ static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { 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) { 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); 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) { 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), @@ -524,14 +524,14 @@ static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -544,34 +544,34 @@ static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { 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) { 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)); + 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) { 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), @@ -581,14 +581,14 @@ static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -602,14 +602,14 @@ static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { 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) { 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); @@ -625,20 +625,20 @@ static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { 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) { 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)); + 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]); @@ -646,14 +646,14 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -668,15 +668,15 @@ static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { 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) { 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), @@ -690,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 56fbb6b3e5..21f2bc75a2 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -10,13 +10,13 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020A50.s") void func_80020F60(u32 unused, GraphicsContext* gfxCtx) { - Gfx* gfxArr[5]; + 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") 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 85cc0e9c27..84107e8a4c 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -331,9 +331,9 @@ void En_A_Obj_Update(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); @@ -349,5 +349,5 @@ void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) { 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 348e983ba3..7d71802bb7 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -767,9 +767,9 @@ void En_Item00_Draw(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); @@ -789,7 +789,7 @@ void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) { 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); } /** @@ -798,11 +798,11 @@ void func_8001EF30(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); @@ -820,7 +820,7 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) { 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); } /** @@ -828,9 +828,9 @@ void func_8001F080(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); @@ -844,7 +844,7 @@ void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) { 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); } /** @@ -852,9 +852,9 @@ void func_8001F1F4(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); @@ -862,7 +862,7 @@ void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) { 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); } /** 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_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 3366c932d1..60928cc611 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -30,15 +30,11 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx) { 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); } diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 27050cf24f..cd430e55ae 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -206,9 +206,9 @@ 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)) { fullHeartCount--; @@ -379,7 +379,7 @@ void Interface_DrawHealth(GlobalContext* globalCtx) { } } - func_800C6B54(gfxArr, gfxCtx, "../z_lifemeter.c", 606); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 606); } u32 Health_IsCritical(void); diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 2c93435917..698715ffee 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -86,7 +86,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { s32 rectLeft; s32 rectTop; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; dungeonId = gSaveContext.dungeon_index; interfaceCtx = &globalCtx->interfaceCtx; @@ -101,7 +101,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { 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) { @@ -134,7 +134,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { 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) { diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 05a7a282c8..d6966544fd 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -37,9 +37,9 @@ void func_8007B934(s32 arg0, s32 arg1) { } void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { - Gfx* gfxArr[7]; + Gfx* dispRefs[7]; - func_800C6AC4(gfxArr, gfxCtx, "../z_moji.c", 86); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 86); if ((u32)gLetterTLUT & 0xF) { osSyncPrintf("moji_tlut --> %X\n", gLetterTLUT); @@ -54,14 +54,14 @@ void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { (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) { 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) { osSyncPrintf("font_ff --> %X\n", gFontFF); @@ -108,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_parameter.c b/src/code/z_parameter.c index 51de6e08c6..d0e69f5bc7 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1109,8 +1109,8 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) { } 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) { +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); @@ -1121,8 +1121,8 @@ Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 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) { +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); @@ -2582,10 +2582,10 @@ 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) { @@ -2601,10 +2601,10 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { 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); + 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, @@ -2660,7 +2660,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } } - 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) { @@ -2700,9 +2700,9 @@ void func_80088B34(s16 arg0) { } void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { - Gfx* gfxArr[5]; + 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, @@ -2716,7 +2716,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { 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 }; @@ -2733,11 +2733,11 @@ 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 @@ -2748,8 +2748,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { 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); + 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++); @@ -2876,12 +2876,12 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } 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); + 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); @@ -2890,10 +2890,10 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx); 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); @@ -2903,7 +2903,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 (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) { @@ -2911,10 +2911,10 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { 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]; @@ -2956,24 +2956,24 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { } 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); + 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) { 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); @@ -2991,7 +2991,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx) { 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) { @@ -3149,11 +3149,11 @@ 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); @@ -3170,7 +3170,7 @@ 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) { case SCENE_BMORI1: @@ -3193,7 +3193,7 @@ void Interface_Draw(GlobalContext* globalCtx) { 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); + Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); // Small Key Counter gDPPipeSync(gfxCtx->overlay.p++); @@ -3212,13 +3212,13 @@ void Interface_Draw(GlobalContext* globalCtx) { 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); + 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; @@ -3265,8 +3265,8 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, - 16, phi_s2, 206, 8, 16, 1024, 1024); + 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); @@ -3532,8 +3532,8 @@ void Interface_Draw(GlobalContext* globalCtx) { 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); + 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++; } @@ -3925,8 +3925,8 @@ 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++); @@ -3948,10 +3948,10 @@ void Interface_Draw(GlobalContext* globalCtx) { } 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); + 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); } } } @@ -3968,7 +3968,7 @@ void Interface_Draw(GlobalContext* globalCtx) { 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; diff --git a/src/code/z_play.c b/src/code/z_play.c index 8494f9b99b..99d454e6fb 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -26,8 +26,8 @@ void func_800BC88C(GlobalContext* globalCtx) { } 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_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") @@ -58,7 +58,7 @@ void func_800BFF0C(GlobalContext* globalCtx, s32 a1) { 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); diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 26482f38ea..286c6328ff 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -26,19 +26,20 @@ void PreNMI_Update(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) { 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 4aa711e00d..6472f300f7 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1,143 +1,1430 @@ #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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, 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), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 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(), + + /* 0x06 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_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), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, SHADE, 0, COMBINED, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, + PRIMITIVE, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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 | 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, SHADE, 0, COMBINED, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, COMBINED, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 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_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0), + 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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | 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), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 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_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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | 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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, SHADE, 0, 0, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 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_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), + 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_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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 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_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0), + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 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_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), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x34 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 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_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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | 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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x38 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + 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), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, 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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | 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), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), + 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 | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + 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 | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x41 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 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_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + 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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + 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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 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_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), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 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_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), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 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_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + 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), + 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, + 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; @@ -150,8 +1437,8 @@ Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height 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; @@ -168,8 +1455,8 @@ Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 w 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; @@ -181,14 +1468,128 @@ Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y 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); + 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 f74888438a..3990b11a11 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -18,7 +18,7 @@ Gfx D_801270B0[] = { 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(), }; @@ -38,10 +38,10 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { 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) { func_800342EC(&D_801270A0, globalCtx); @@ -71,7 +71,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { 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 @@ -105,12 +105,12 @@ 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) { func_800342EC(&D_801270A0, globalCtx); @@ -222,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") @@ -350,10 +350,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; @@ -399,7 +399,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { 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 { @@ -456,10 +456,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; @@ -505,7 +505,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { 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") @@ -558,8 +558,8 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { 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); + 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; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 9b9fa95593..fa995e06ea 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -15,10 +15,10 @@ void Sample_Draw(SampleContext* this) { u32 pad; GraphicsContext* gfxCtx = this->state.gfxCtx; View* view = &this->view; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; Mtx* mtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_sample.c", 62); gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment); @@ -32,7 +32,7 @@ void Sample_Draw(SampleContext* this) { 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 = func_80093708(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); + gfxCtx->polyOpa.p = Gfx_SetFog2(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); func_80093D18(gfxCtx); gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_1CYCLE); @@ -41,7 +41,7 @@ void Sample_Draw(SampleContext* this) { PRIMITIVE); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0xFF, 0xFF, 0x00, 0x00); - func_800C6B54(gfxArr, gfxCtx, "../z_sample.c", 111); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_sample.c", 111); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/Sample_Draw.s") diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 3a7121b040..6ad51d2ee3 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -260,8 +260,8 @@ void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) { 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]); } } diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 1bdfde9e32..f4893ac56f 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -646,12 +646,12 @@ Scene gSceneTable[] = { }; 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), + 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), @@ -682,14 +682,14 @@ void func_800994A0(GlobalContext* globalCtx) { // Scene Draw Config 0 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 }; @@ -698,16 +698,16 @@ u32 D_8012A2F8[] = { 0x0200BA18, 0x0200CA18 }; 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); @@ -716,27 +716,27 @@ 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) { 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 }; @@ -748,22 +748,22 @@ void func_80099878(GlobalContext* globalCtx) { 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 @@ -782,7 +782,7 @@ 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 @@ -790,12 +790,12 @@ 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; @@ -839,7 +839,7 @@ 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) { D_8015FCF0 = 1; @@ -856,27 +856,27 @@ void func_80099BD8(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)); + 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, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); + 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); @@ -884,31 +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) { 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); @@ -916,25 +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) { 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); @@ -942,20 +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) { 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); @@ -963,23 +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) { 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); @@ -987,28 +987,28 @@ 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) { 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) { gSPSegment(gfxCtx->polyOpa.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)); } 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++); @@ -1017,7 +1017,7 @@ 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 }; @@ -1026,20 +1026,20 @@ u32 D_8012A328[] = { 0x0200BD20, 0x0200B920 }; 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 }; @@ -1050,10 +1050,10 @@ void func_8009B0FC(GlobalContext* globalCtx) { 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 @@ -1065,72 +1065,72 @@ void func_8009B0FC(GlobalContext* globalCtx) { 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)); + 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)); + 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)); + Gfx_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)); + 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, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); + 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, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + 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, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + 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, 0xB4)); + 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, - 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) % 128, 0, 32, 32, 1, 0, 0, + 32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); 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, 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) { 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]); @@ -1138,44 +1138,44 @@ 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) { 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) { 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) { 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++); @@ -1184,7 +1184,7 @@ 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 @@ -1192,29 +1192,29 @@ void func_8009BC44(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp83; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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) { 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); @@ -1226,7 +1226,7 @@ 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 @@ -1236,17 +1236,17 @@ 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); + 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)); + 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 @@ -1259,25 +1259,25 @@ void func_8009C0AC(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp7B; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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); @@ -1289,7 +1289,7 @@ 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) || @@ -1305,21 +1305,21 @@ u32 D_8012A338[] = { 0x0200FAC0, 0x0200F8C0 }; void func_8009C3EC(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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 @@ -1329,30 +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) { 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); @@ -1360,26 +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) { 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); @@ -1387,22 +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) { 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); @@ -1410,7 +1410,7 @@ 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 }; @@ -1419,21 +1419,21 @@ u32 D_8012A340[] = { 0x0200F8C0, 0x020100C0 }; void func_8009CC00(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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 @@ -1443,11 +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; @@ -1459,7 +1459,7 @@ Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 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); + gDPSetPrimColor(displayList + 4, 0, 0, r, g, b, a); gSPEndDisplayList(displayList + 5); return displayList; @@ -1469,17 +1469,17 @@ Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 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); @@ -1487,28 +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) { 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)); + Gfx_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_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); @@ -1516,7 +1515,7 @@ 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 }; @@ -1524,11 +1523,11 @@ u32 D_8012A348[] = { 0x02005210, 0x02005010 }; // Scene Draw Config 44 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])); @@ -1538,7 +1537,7 @@ 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 }; @@ -1548,10 +1547,10 @@ u32 D_8012A358[] = { 0x02002350, 0x02001350 }; 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) { var = 1; @@ -1568,24 +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) { 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); @@ -1593,7 +1592,7 @@ 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 }; @@ -1602,21 +1601,21 @@ u32 D_8012A360[] = { 0x02014D90, 0x02014590 }; void func_8009D758(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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 @@ -1626,7 +1625,7 @@ 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 }; @@ -1634,15 +1633,15 @@ u32 D_8012A368[] = { 0x02018920, 0x02018020 }; // Scene Draw Config 25 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 @@ -1650,20 +1649,20 @@ 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); @@ -1691,7 +1690,7 @@ 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 }; @@ -1699,11 +1698,11 @@ u32 D_8012A370[] = { 0x02015B50, 0x02016B50 }; // Scene Draw Config 2 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])); @@ -1713,28 +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) { 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); @@ -1742,7 +1741,7 @@ 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 @@ -1752,7 +1751,7 @@ void func_8009E0B8(GlobalContext* globalCtx) { u16 spA0; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; spA3 = 128; spA0 = 500; @@ -1760,15 +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); @@ -1796,20 +1795,20 @@ 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) { 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))) { globalCtx->unk_11D30[0] = 87; @@ -1817,16 +1816,16 @@ void func_8009E54C(GlobalContext* globalCtx) { 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 }; @@ -1836,10 +1835,10 @@ 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; @@ -1847,7 +1846,7 @@ void func_8009E730(GlobalContext* globalCtx) { 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); @@ -1856,27 +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) { 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); @@ -1884,37 +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) { 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)); + Gfx_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, 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); @@ -1922,27 +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) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; 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); @@ -1958,21 +1957,21 @@ void func_8009EE44(GlobalContext* globalCtx) { 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) { 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); @@ -1980,7 +1979,7 @@ 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 }; @@ -1988,33 +1987,33 @@ u32 D_8012A380[] = { 0x02009678, 0x0200DE78 }; // Scene Draw Config 11 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) { 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); @@ -2022,25 +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) { 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); @@ -2048,19 +2047,19 @@ 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) { 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); @@ -2088,7 +2087,7 @@ 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 @@ -2097,21 +2096,21 @@ void func_8009F7D4(GlobalContext* globalCtx) { 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); @@ -2119,7 +2118,7 @@ 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 }; @@ -2128,15 +2127,15 @@ u32 D_8012A388[] = { 0x02009808, 0x02008FC8 }; 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); @@ -2148,7 +2147,7 @@ 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 }; @@ -2156,11 +2155,11 @@ u32 D_8012A390[] = { 0x020081E0, 0x0200FBE0 }; // Scene Draw Config 17 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])); @@ -2170,26 +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) { 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); @@ -2197,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; @@ -2211,23 +2210,23 @@ void func_8009FE58(GlobalContext* globalCtx) { 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) { 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)); + 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++); @@ -2279,7 +2278,7 @@ void func_8009FE58(GlobalContext* globalCtx) { 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; @@ -2292,21 +2291,21 @@ void func_8009FE58(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); @@ -2314,7 +2313,7 @@ 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 @@ -2331,16 +2330,16 @@ void func_800A057C(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); @@ -2348,7 +2347,7 @@ 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*) = { @@ -2364,7 +2363,7 @@ void (*sSceneDrawHandlers[])(GlobalContext*) = { void Scene_Draw(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; if (HREG(80) == 0x11) { if (HREG(95) != 0x11) { @@ -2385,14 +2384,14 @@ 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) { 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) { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 501797081a..099fa122e8 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -7,7 +7,6 @@ s32 func_800A3E0C(GlobalContext*, SkelAnime*); s32 func_800A4D9C(SkelAnime* skelAnime); s32 func_800A4EE0(SkelAnime* skelAnime); s32 func_800A4E38(SkelAnime* skelAnime); -s32 func_800A4AD8(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); @@ -26,6 +25,9 @@ static AnimationEntryCallback sAnimationLoadDone[] = { //.bss u32 D_801600B0; +/* + * 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) { @@ -34,10 +36,10 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; @@ -78,9 +80,12 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk appendDlistFunc, actor, dListIndex); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); } +/* + * 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) { @@ -90,16 +95,16 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); + osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); // Si2_Lod_draw (): skel is NULL. osSyncPrintf(VT_RST); return; } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); @@ -128,11 +133,13 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto } Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); } -#ifdef NON_MATCHING -// regalloc +/* + * 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) { @@ -141,7 +148,7 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[3]; + Gfx* dispRefs[4]; Matrix_Push(); @@ -153,17 +160,19 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* pos.x = limbEntry->translation.x; pos.y = limbEntry->translation.y; pos.z = limbEntry->translation.z; - dList[1] = dList[0] = limbEntry->displayLists[dListIndex]; + // 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; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); gSPMatrix(gfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); (*mtx)++; } else if (dList[0] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 954); @@ -185,45 +194,46 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* appendDlistFunc, actor, dListIndex, mtx); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawLimbSV.s") -#endif -#ifdef NON_MATCHING -// regalloc -void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, +/* + * 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* gfx[4]; + Gfx* dispRefs[4]; - mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * sizeof(Mtx)); + mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx)); if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); + osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); // Si2_Lod_draw_SV (): skel is NULL. osSyncPrintf(VT_RST); return; } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); + 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]); - if (limbEntry) {} pos.x = actorDrawTable->x; pos.y = actorDrawTable->y; pos.z = actorDrawTable->z; rot = actorDrawTable[1]; - dList[0] = dList[1] = limbEntry->displayLists[dListIndex]; + 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); @@ -248,12 +258,12 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s") -#endif +/* + * 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) { @@ -262,11 +272,11 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); @@ -306,7 +316,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele appendDlistFunc, actor); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); } void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, @@ -317,7 +327,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); @@ -328,7 +338,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); Matrix_Push(); rootLimb = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); @@ -359,11 +369,9 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); } -#ifdef NON_MATCHING -// close, needs a bit bmore work. Mainly seems centered around SEGMENTED_TO_VIRTUAL void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, Mtx** limbMatricies) { @@ -372,10 +380,10 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske Vec3f pos; Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[3]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); @@ -386,7 +394,8 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske pos.y = limbEntry->translation.y; pos.z = limbEntry->translation.z; - dList[0] = dList[1] = limbEntry->displayLists[0]; + 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); @@ -417,15 +426,10 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske appendDlistFunc, actor, limbMatricies); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s") -#endif -#ifdef NON_MATCHING -// Regalloc, pretty much same as SkelAnime_LodDrawSV -void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { SkelLimbEntry* limbEntry; @@ -435,9 +439,9 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor Vec3s rot; Mtx* mtx; GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; - mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * sizeof(Mtx)); + mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx)); if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); @@ -448,7 +452,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); @@ -457,12 +461,13 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); pos.x = actorDrawTable->x; - pos.y = actorDrawTable->x; + pos.y = actorDrawTable->y; pos.z = actorDrawTable->z; rot = actorDrawTable[1]; - dList[0] = dList[1] = limbEntry->displayLists[0]; + 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); @@ -489,11 +494,8 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor } Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_DrawSV.s") -#endif /* * Copies the rotation values from the rotation value table, indexed by the rotation index table @@ -518,14 +520,10 @@ void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32 for (i = 0; i < limbCount; i++, dst++, index++) { if ((dst == NULL) || (index == NULL) || (frameRotationValueTable == NULL) || (rotationValueTable == NULL)) { if (1) {} // Necessary to match. - LogUtils_LogThreadId("../z_skelanime.c", 1392); - osSyncPrintf("out = %08x\n", dst); - LogUtils_LogThreadId("../z_skelanime.c", 1393); - osSyncPrintf("ref_tbl = %08x\n", index); - LogUtils_LogThreadId("../z_skelanime.c", 1394); - osSyncPrintf("frame_tbl = %08x\n", frameRotationValueTable); - LogUtils_LogThreadId("../z_skelanime.c", 1395); - osSyncPrintf("tbl = %08x\n", rotationValueTable); + 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]; @@ -534,17 +532,21 @@ void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32 } } -s16 func_800A1FC8(GenericAnimationHeader* animationSeg) { +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) { @@ -593,6 +595,10 @@ Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skel 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) { @@ -604,7 +610,7 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorD if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); + osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); // Si2_draw2 (): skel is NULL. Returns NULL. osSyncPrintf(VT_RST); return NULL; } @@ -696,6 +702,10 @@ Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk 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) { @@ -710,7 +720,8 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(*mtx)); if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); + osSyncPrintf( + "Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); // Si2_draw2_SV (): skel is NULL. Returns NULL. osSyncPrintf(VT_RST); return NULL; } @@ -754,8 +765,60 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto return gfx; } -// Seems to be some kind of rotations update, somewhat large. +#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") +#endif s16 func_800A2DBC(GenericAnimationHeader* animationSeg) { GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); @@ -763,46 +826,51 @@ s16 func_800A2DBC(GenericAnimationHeader* animationSeg) { return animation->unk_02; } -s16 func_800A2DF4(GenericAnimationHeader* animationSeg) { +/* + * 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; } -s16 func_800A2E2C(GenericAnimationHeader* animationSeg) { +/* + * 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; } -#ifdef NON_MATCHING -// Functionally equal, but loop unrolling is way off. -void func_800A2E70(s32 limbCount, Vec3s* vec1, Vec3s* vec2, Vec3s* vec3, f32 unkf) { - Vec3s* pvec1; - Vec3s* pvec2; - Vec3s* pvec3; - s32 iVar3; +void SkelAnime_InterpolateVec3s(s32 limbCount, Vec3s* dst, Vec3s* vec2, Vec3s* vec3, f32 unkf) { + s32 i; + s16 dist; + s16 temp2; if (unkf < 1.0f) { - for (iVar3 = 0, pvec1 = vec1, pvec2 = vec2, pvec3 = vec3; iVar3 < limbCount; - iVar3++, pvec1++, pvec2++, pvec3++) { - pvec1->x = pvec2->x + ((s16)(pvec3->x - pvec2->x) * unkf); - pvec1->y = pvec2->y + ((s16)(pvec3->y - pvec2->y) * unkf); - pvec1->z = pvec2->z + ((s16)(pvec3->z - pvec2->z) * unkf); + 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 (iVar3 = 0; iVar3 < limbCount; iVar3++) { - pvec1 = &vec1[iVar3]; - pvec3 = &vec3[iVar3]; - pvec1->x = pvec3->x; - pvec1->y = pvec3->y; - pvec1->z = pvec3->z; + for (i = 0; i < limbCount; i++, dst++, vec3++) { + dst->x = vec3->x; + dst->y = vec3->y; + dst->z = vec3->z; } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2E70.s") -#endif void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx) { animationCtx->animationCount = 0; @@ -928,7 +996,7 @@ void SkelAnime_AnimationType1Loaded(GlobalContext* globalCtx, AnimationEntryType void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType2* entry) { if ((entry->unk_00 & D_8012A480) == 0) { - func_800A2E70(entry->limbCount, entry->unk_04, entry->unk_04, entry->unk_08, entry->unk_0C); + SkelAnime_InterpolateVec3s(entry->limbCount, entry->unk_04, entry->unk_04, entry->unk_08, entry->unk_0C); } } @@ -987,8 +1055,8 @@ 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) { + LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, + Vec3s* transitionDrawTbl, s32 limbBufCount) { char pad[8]; SkeletonHeader* skeletonHeader; size_t allocSize; @@ -997,7 +1065,7 @@ void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); headerCount = skeletonHeader->limbCount; - skelAnime->unk_34 = flags; + skelAnime->initFlags = flags; limbCount = (flags & 2) ? headerCount : 1; if (flags & 1) { @@ -1019,51 +1087,51 @@ void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, if (actorDrawTbl == NULL) { skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2364); - skelAnime->unk_24 = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2365); + 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->unk_24 = (Vec3s*)ALIGN16((u32)arg6); + skelAnime->transitionDrawTbl = (Vec3s*)ALIGN16((u32)transitionDrawTbl); } - if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->unk_24 == NULL)) { + 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_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, 0.0f, 0, 0.0f); + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, 0.0f, 0, 0.0f); } void func_800A3B8C(SkelAnime* skelAnime) { - if (skelAnime->unk_01 < 2) { + if (skelAnime->mode < 2) { skelAnime->animUpdate = &func_800A3D70; } else { skelAnime->animUpdate = &func_800A3E0C; } - skelAnime->unk_28 = 0.0f; + skelAnime->transCurrentFrame = 0.0f; } -void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { - skelAnime->animUpdate(globalCtx, skelAnime); +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { + return skelAnime->animUpdate(globalCtx, skelAnime); } s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { - f32 prevUnk28 = skelAnime->unk_28; + f32 prevUnk28 = skelAnime->transCurrentFrame; f32 updateRate = R_UPDATE_RATE * 0.5f; - skelAnime->unk_28 -= skelAnime->unk_2C * updateRate; + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; - if (skelAnime->unk_28 <= 0.0f) { + if (skelAnime->transCurrentFrame <= 0.0f) { func_800A3B8C(skelAnime); } - SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, - 1.0f - (skelAnime->unk_28 / prevUnk28)); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->transitionDrawTbl, + 1.0f - (skelAnime->transCurrentFrame / prevUnk28)); return 0; } @@ -1072,15 +1140,15 @@ void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime) { SkelAnime_LoadLinkAnimetion(globalCtx, skelAnime->linkAnimetionSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); - if (skelAnime->unk_28 != 0) { + if (skelAnime->transCurrentFrame != 0) { updateRate = R_UPDATE_RATE * 0.5f; - skelAnime->unk_28 -= skelAnime->unk_2C * updateRate; - if (skelAnime->unk_28 <= 0.0f) { - skelAnime->unk_28 = 0.0f; + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { + skelAnime->transCurrentFrame = 0.0f; return; } - SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, - skelAnime->unk_28); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, skelAnime->transCurrentFrame); } } @@ -1089,9 +1157,9 @@ s32 func_800A3D70(GlobalContext* globalCtx, SkelAnime* skelAnime) { skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; if (skelAnime->animCurrentFrame < 0.0f) { - skelAnime->animCurrentFrame += skelAnime->unk_14; - } else if (skelAnime->unk_14 <= skelAnime->animCurrentFrame) { - skelAnime->animCurrentFrame -= skelAnime->unk_14; + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; } func_800A3C9C(globalCtx, skelAnime); return 0; @@ -1109,90 +1177,91 @@ s32 func_800A3E0C(GlobalContext* globalCtx, SkelAnime* skelAnime) { skelAnime->animCurrentFrame = skelAnime->animFrameCount; } else { if (skelAnime->animCurrentFrame < 0.0f) { - skelAnime->animCurrentFrame += skelAnime->unk_14; - } else if (skelAnime->unk_14 <= skelAnime->animCurrentFrame) { - skelAnime->animCurrentFrame -= skelAnime->unk_14; + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; } } func_800A3C9C(globalCtx, skelAnime); return 0; } -void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) { - skelAnime->unk_28 = 1.0f; - skelAnime->unk_2C = 1.0f / arg2; +void SkelAnime_SetTransition(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 transitionRate) { + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; } -#ifdef NON_MATCHING -void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, - LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 frame, - f32 frameCount, u8 arg6, f32 arg7) { +void SkelAnime_ChangeLinkAnim(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 playbackSpeed, f32 frame, f32 frameCount, u8 animationMode, f32 transitionRate) { - skelAnime->unk_01 = arg6; - if ((arg7 != 0.0f) && - ((linkAnimetionEntrySeg == skelAnime->linkAnimetionSeg) || (frame != skelAnime->animCurrentFrame))) { - if (arg7 < 0.0f) { + skelAnime->mode = animationMode; + if ((transitionRate != 0.0f) && + ((linkAnimetionEntrySeg != skelAnime->linkAnimetionSeg) || (frame != skelAnime->animCurrentFrame))) { + if (transitionRate < 0) { func_800A3B8C(skelAnime); - SkelAnime_CopyVec3s(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); - arg7 = -arg7; + SkelAnime_CopyVec3s(skelAnime, skelAnime->transitionDrawTbl, skelAnime->actorDrawTbl); + transitionRate = -transitionRate; } else { skelAnime->animUpdate = &func_800A3BE4; SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, - skelAnime->unk_24); + skelAnime->transitionDrawTbl); } - skelAnime->unk_28 = 1.0f; - skelAnime->unk_2C = 1.0f / arg7; + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; } else { func_800A3B8C(skelAnime); SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); - skelAnime->unk_28 = 0.0f; + skelAnime->transCurrentFrame = 0.0f; } + skelAnime->linkAnimetionSeg = linkAnimetionEntrySeg; skelAnime->animCurrentFrame = 0.0f; - skelAnime->unk_0C = frame; + skelAnime->initialFrame = frame; skelAnime->animCurrentFrame = frame; skelAnime->animFrameCount = frameCount; - skelAnime->unk_14 = func_800A1FC8(&linkAnimetionEntrySeg->genericHeader); + skelAnime->totalFrames = SkelAnime_GetTotalFrames(linkAnimetionEntrySeg); skelAnime->animPlaybackSpeed = playbackSpeed; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s") -#endif -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { - SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); +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 func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, - f32 playbackSpeed) { - SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 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 func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { - SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 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 func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, - f32 playbackSpeed) { - SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 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->unk_24, skelAnime->actorDrawTbl); + SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->transitionDrawTbl, + skelAnime->actorDrawTbl); } void func_800A422C(GlobalContext* globalCtx, SkelAnime* skelAnime) { - SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24); + 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->unk_24); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, + skelAnime->transitionDrawTbl); } void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, @@ -1201,36 +1270,44 @@ void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetion skelAnime->actorDrawTbl); } -void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) { - SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, arg2); +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 frame, - LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 arg5, f32 arg6, Vec3s* arg7) { - Vec3s* alignedArg7; - SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, +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); - alignedArg7 = (Vec3s*)ALIGN16((u32)arg7); + alignedActorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); - SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)arg5, skelAnime->limbCount, alignedArg7); - SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedArg7, arg6); + 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 frame, - LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 arg5, f32 arg6, Vec3s* arg7) { - Vec3s* alignedArg7; +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)frame, skelAnime->limbCount, skelAnime->unk_24); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)transitionFrame, skelAnime->limbCount, + skelAnime->transitionDrawTbl); - alignedArg7 = (Vec3s*)ALIGN16((u32)arg7); + alignedActorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); - SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)arg5, skelAnime->limbCount, alignedArg7); - SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->unk_24, alignedArg7, arg6); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)frame, skelAnime->limbCount, + alignedActorDrawTbl); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->transitionDrawTbl, alignedActorDrawTbl, + transitionRate); } -void func_800A4454(SkelAnime* skelAnime) { - skelAnime->unk_01 = 2; +void SkelAnime_SetModeStop(SkelAnime* skelAnime) { + skelAnime->mode = 2; func_800A3B8C(skelAnime); } @@ -1242,22 +1319,18 @@ s32 func_800A4478(SkelAnime* skelAnime, f32 arg1, f32 updateRate) { updateSpeed = skelAnime->animPlaybackSpeed * updateRate; nextFrame = skelAnime->animCurrentFrame - updateSpeed; if (nextFrame < 0.0f) { - nextFrame += skelAnime->unk_14; - } else { - if (skelAnime->unk_14 <= nextFrame) { - nextFrame -= skelAnime->unk_14; - } + nextFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= nextFrame) { + nextFrame -= skelAnime->totalFrames; } - if (arg1 == 0.0f) { - if (0.0f < updateSpeed) { - arg1 = skelAnime->unk_14; - } + + if ((arg1 == 0.0f) && (updateSpeed > 0.0f)) { + arg1 = skelAnime->totalFrames; } + temp_f12 = (nextFrame + updateSpeed) - arg1; - if (0.0f <= (temp_f12 * updateSpeed)) { - if (((temp_f12 - updateSpeed) * updateSpeed) < 0.0f) { - return 1; - } + if ((0.0f <= (temp_f12 * updateSpeed)) && (((temp_f12 - updateSpeed) * updateSpeed) < 0.0f)) { + return 1; } return 0; } @@ -1269,7 +1342,7 @@ s32 func_800A4530(SkelAnime* skelAnime, f32 arg1) { } void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, - AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount) { + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* transitionDrawTable, s32 limbCount) { SkeletonHeader* skeletonHeader; skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); @@ -1278,28 +1351,28 @@ void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHead if (actorDrawTable == NULL) { skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 2968); - skelAnime->unk_24 = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->unk_24), "../z_skelanime.c", 2969); + 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->unk_24 = arg5; + skelAnime->transitionDrawTbl = transitionDrawTable; } - if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->unk_24 == NULL)) { + 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_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); } } void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, - AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount) { + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* transitionDrawTable, s32 limbCount) { SkeletonHeader* skeletonHeader; skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); @@ -1311,16 +1384,16 @@ void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHe skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3047); - skelAnime->unk_24 = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->unk_24), "../z_skelanime.c", 3048); + 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->unk_24 = arg5; + skelAnime->transitionDrawTbl = transitionDrawTable; } - if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->unk_24 == NULL)) { + 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 @@ -1328,7 +1401,7 @@ void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHe } if (animationSeg != NULL) { - SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); } } @@ -1341,9 +1414,9 @@ void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, Skeleton skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3120); - skelAnime->unk_24 = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->unk_24), "../z_skelanime.c", 3121); - if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->unk_24 == NULL)) { + 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 @@ -1351,14 +1424,14 @@ void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, Skeleton } if (animationSeg != NULL) { - SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); } } void func_800A49B0(SkelAnime* skelAnime) { - if (skelAnime->unk_01 < 2) { + if (skelAnime->mode < 2) { skelAnime->animUpdate = &func_800A4D9C; - } else if (skelAnime->unk_01 < 4) { + } else if (skelAnime->mode < 4) { skelAnime->animUpdate = &func_800A4EE0; } else { skelAnime->animUpdate = &func_800A4E38; @@ -1373,35 +1446,33 @@ s32 func_800A4A20(SkelAnime* skelAnime) { f32 prevUnk28; f32 updateRate; - prevUnk28 = skelAnime->unk_28; - updateRate = R_UPDATE_RATE * 0.33333334f; - skelAnime->unk_28 -= skelAnime->unk_2C * updateRate; - if (skelAnime->unk_28 <= 0.0f) { + 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->unk_28 = 0.0f; + skelAnime->transCurrentFrame = 0.0f; } - func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, skelAnime->unk_24, - 1.0f - (skelAnime->unk_28 / prevUnk28)); + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, 1.0f - (skelAnime->transCurrentFrame / prevUnk28)); return 0; } -#ifdef NON_MATCHING -// small stack alloc s32 func_800A4AD8(SkelAnime* skelAnime) { - s16 temp_a1; s16 temp_a2; + s16 temp_a1; f32 sp28; f32 phi_f2; f32 updateRate; - temp_a2 = (s16)(skelAnime->unk_28 * 16384.0f); - updateRate = R_UPDATE_RATE * 0.33333334f; - skelAnime->unk_28 -= skelAnime->unk_2C * updateRate; - if (skelAnime->unk_28 <= 0.0f) { + 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->unk_28 = 0.0f; + skelAnime->transCurrentFrame = 0.0f; } - temp_a1 = (s16)(skelAnime->unk_28 * 16384.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); @@ -1414,71 +1485,66 @@ s32 func_800A4AD8(SkelAnime* skelAnime) { } else { phi_f2 = 0.0f; } - func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, skelAnime->unk_24, - 1.0f - phi_f2); + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, 1.0f - phi_f2); return 0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4AD8.s") -#endif -#ifdef NON_MATCHING -// regalloc void func_800A4C58(SkelAnime* skelAnime) { - char pad[6]; - f32 temp_f0; + s32 t; + f32 updateRate; + char pad[4]; + Vec3s sp38[98]; f32 temp_f10; - Vec3s sp38[97]; - s32 temp_f8; f32 temp_f2; SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); - if (skelAnime->unk_01) { - temp_f8 = (s32)skelAnime->animCurrentFrame; - temp_f10 = temp_f8; - temp_f8++; + if (skelAnime->mode & 0x1) { + t = (s32)skelAnime->animCurrentFrame; + temp_f10 = t; temp_f2 = skelAnime->animCurrentFrame - temp_f10; - if (temp_f8 >= (s32)skelAnime->unk_14) { - temp_f8 = 0; + t++; + if (t >= (s32)skelAnime->totalFrames) { + t = 0; } - SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, temp_f8, skelAnime->limbCount, sp38); - func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, temp_f2); + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, t, skelAnime->limbCount, sp38); + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, + temp_f2); } - if (skelAnime->unk_28 != 0) { - skelAnime->unk_28 -= skelAnime->unk_2C * (R_UPDATE_RATE * 0.33333334f); - temp_f0 = skelAnime->unk_28; - if (temp_f0 <= 0.0f) { - skelAnime->unk_28 = 0.0f; + 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; } - func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, skelAnime->unk_24, - skelAnime->unk_28); + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, skelAnime->transCurrentFrame); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4C58.s") -#endif s32 func_800A4D9C(SkelAnime* skelAnime) { - f32 updateRate = R_UPDATE_RATE * 0.33333334f; + f32 updateRate = R_UPDATE_RATE * (1.0f / 3.0f); skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; if (skelAnime->animCurrentFrame < 0.0f) { - skelAnime->animCurrentFrame += skelAnime->unk_14; - } else if (skelAnime->unk_14 <= skelAnime->animCurrentFrame) { - skelAnime->animCurrentFrame -= skelAnime->unk_14; + 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 * 0.33333334f; + f32 updateRate = R_UPDATE_RATE * (1.0f / 3.0f); skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; - if (skelAnime->animCurrentFrame < skelAnime->unk_0C) { - skelAnime->animCurrentFrame = (skelAnime->animCurrentFrame - skelAnime->unk_0C) + skelAnime->animFrameCount; + 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->unk_0C; + skelAnime->animCurrentFrame = + (skelAnime->animCurrentFrame - skelAnime->animFrameCount) + skelAnime->initialFrame; } func_800A4C58(skelAnime); @@ -1486,9 +1552,9 @@ s32 func_800A4E38(SkelAnime* skelAnime) { } s32 func_800A4EE0(SkelAnime* skelAnime) { - f32 temp_f14; + f32 updateRate; - temp_f14 = R_UPDATE_RATE * 0.33333334f; + updateRate = R_UPDATE_RATE * (1.0f / 3.0f); if (skelAnime->animCurrentFrame == skelAnime->animFrameCount) { SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, @@ -1496,15 +1562,15 @@ s32 func_800A4EE0(SkelAnime* skelAnime) { func_800A4C58(skelAnime); return 1; } - skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * temp_f14; + 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->unk_14; + skelAnime->animCurrentFrame += skelAnime->totalFrames; } else { - if (skelAnime->unk_14 <= skelAnime->animCurrentFrame) { - skelAnime->animCurrentFrame -= skelAnime->unk_14; + if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; } } } @@ -1512,14 +1578,14 @@ s32 func_800A4EE0(SkelAnime* skelAnime) { return 0; } -void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, - f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2) { - skelAnime->unk_01 = unk1; +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->unk_24, skelAnime->actorDrawTbl); + SkelAnime_CopyVec3s(skelAnime, skelAnime->transitionDrawTbl, skelAnime->actorDrawTbl); transitionRate = -transitionRate; } else { if (unk2 != 0) { @@ -1528,83 +1594,78 @@ void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animat } else { skelAnime->animUpdate = &func_800A4A20; } - SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->unk_24); + SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->transitionDrawTbl); } - skelAnime->unk_28 = 1.0f; - skelAnime->unk_2C = 1.0f / transitionRate; + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; } else { func_800A49B0(skelAnime); SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->actorDrawTbl); - skelAnime->unk_28 = 0.0f; + skelAnime->transCurrentFrame = 0.0f; } skelAnime->animCurrentSeg = animationSeg; - skelAnime->unk_0C = frame; + skelAnime->initialFrame = frame; skelAnime->animFrameCount = frameCount; - skelAnime->unk_14 = func_800A1FC8(&animationSeg->genericHeader); - if (skelAnime->unk_01 >= 4) { + skelAnime->totalFrames = SkelAnime_GetTotalFrames(&animationSeg->genericHeader); + if (skelAnime->mode >= 4) { skelAnime->animCurrentFrame = 0.0f; } else { skelAnime->animCurrentFrame = frame; - if (skelAnime->unk_01 < 2) { - skelAnime->animFrameCount = skelAnime->unk_14 - 1.0f; + if (skelAnime->mode < 2) { + skelAnime->animFrameCount = skelAnime->totalFrames - 1.0f; } } skelAnime->animPlaybackSpeed = playbackSpeed; } -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, - f32 frameCount, u8 unk1, f32 transitionRate) { - SkelAnime_ChangeAnimationImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, unk1, transitionRate, 0); +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 func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationSeg) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); +void SkelAnime_ChangeAnimDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, + 0.0f); } -void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), - 2, transitionRate); +void SkelAnime_ChangeAnimTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, + transitionRate); } -void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, - SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); +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_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationSeg) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 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_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, 0.0f, 0, transitionRate); +void SkelAnime_ChangeAnimTransitionRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0.0f, 0.0f, 0, transitionRate); } -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { - SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, - SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); +void SkelAnime_ChangeAnimPlaybackRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, playbackSpeed, 0.0f, + SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } -void func_800A53DC(SkelAnime* skelAnime) { - skelAnime->unk_01 = 2; - skelAnime->animFrameCount = skelAnime->unk_14; +void SkelAnime_AnimSetStop(SkelAnime* skelAnime) { + skelAnime->mode = 2; + skelAnime->animFrameCount = skelAnime->totalFrames; func_800A49B0(skelAnime); } -#ifdef NON_MATCHING -// regalloc -void func_800A5408(SkelAnime* skelAnime) { - f32 frameCount = skelAnime->animFrameCount; +void SkelAnime_AnimReverse(SkelAnime* skelAnime) { + f32 initialFrame = skelAnime->initialFrame; - skelAnime->animFrameCount = skelAnime->unk_0C; + skelAnime->initialFrame = skelAnime->animFrameCount; skelAnime->animPlaybackSpeed = -skelAnime->animPlaybackSpeed; - skelAnime->unk_0C = frameCount; + skelAnime->animFrameCount = initialFrame; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5408.s") -#endif void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index) { s32 i; @@ -1624,48 +1685,53 @@ void func_800A5490(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* arg3) { } } +/* + * 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->unk_35 & 0x10) { + 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->unk_38; - z = skelAnime->unk_3C; - sin = Math_Sins(skelAnime->unk_36); - cos = Math_Coss(skelAnime->unk_36); + 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->unk_36 = angle; - skelAnime->unk_38 = skelAnime->actorDrawTbl->x; - skelAnime->actorDrawTbl->x = skelAnime->unk_3E; - skelAnime->unk_3C = skelAnime->actorDrawTbl->z; - skelAnime->actorDrawTbl->z = skelAnime->unk_42; - if (skelAnime->unk_35 & 2) { - if (skelAnime->unk_35 & 0x10) { + 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->unk_3A; + pos->y = skelAnime->actorDrawTbl->y - skelAnime->prevFramePos.y; } - skelAnime->unk_3A = skelAnime->actorDrawTbl->y; - skelAnime->actorDrawTbl->y = skelAnime->unk_40; + skelAnime->prevFramePos.y = skelAnime->actorDrawTbl->y; + skelAnime->actorDrawTbl->y = skelAnime->unk_3E.y; } else { pos->y = 0.0f; - skelAnime->unk_3A = skelAnime->actorDrawTbl->y; + skelAnime->prevFramePos.y = skelAnime->actorDrawTbl->y; } - skelAnime->unk_35 &= ~0x10; + skelAnime->flags &= ~ANIM_FLAG_UPDATEY; } s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1) { @@ -1679,8 +1745,8 @@ void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx) { osSyncPrintf("now_joint あきまへん！！\n"); // now_joint Akimane! ! } - if (skelAnime->unk_24 != NULL) { - ZeldaArena_FreeDebug(skelAnime->unk_24, "../z_skelanime.c", 3731); + if (skelAnime->transitionDrawTbl != NULL) { + ZeldaArena_FreeDebug(skelAnime->transitionDrawTbl, "../z_skelanime.c", 3731); } else { osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint Akimane !!" } diff --git a/src/code/z_view.c b/src/code/z_view.c index defbbb8cfb..18336b98a2 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,62 +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/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 391c1798e6..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,4 +1,11 @@ +/* + * File: z_arrow_fire.c + * Overlay: ovl_Arrow_Fire + * Description: Fire Arrow actor. Spawned by and attached to a normal arrow. + */ + #include "z_arrow_fire.h" +#include "../ovl_En_Arrow/z_en_arrow.h" #define ROOM 0x00 #define FLAGS 0x02000010 @@ -8,7 +15,12 @@ void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx); -/* +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, @@ -21,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 abafd70da0..345d7409ed 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -6,7 +6,13 @@ 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..8c125d1d3c --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c @@ -0,0 +1,192 @@ +#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(Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), + 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 c13d3f928f..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,4 +1,11 @@ +/* + * File: z_arrow_ice.c + * Overlay: ovl_Arrow_Ice + * Description: Ice Arrow actor. Spawned by and attached to a normal arrow. + */ + #include "z_arrow_ice.h" +#include "../ovl_En_Arrow/z_en_arrow.h" #define ROOM 0x00 #define FLAGS 0x02000010 @@ -8,7 +15,12 @@ void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx); -/* +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, @@ -21,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 25f6f108d8..7a15734797 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -6,7 +6,13 @@ 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..664e9d3e4b --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c @@ -0,0 +1,192 @@ +#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(Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), + 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 508ac29251..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,4 +1,11 @@ +/* + * File: z_arrow_light.c + * Overlay: ovl_Arrow_Light + * Description: Light Arrow actor. Spawned by and attached to a normal arrow. + */ + #include "z_arrow_light.h" +#include "../ovl_En_Arrow/z_en_arrow.h" #define ROOM 0x00 #define FLAGS 0x02000010 @@ -8,7 +15,12 @@ void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx); -/* +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, @@ -21,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 8f4e5946b4..11b0b7ac1f 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -6,7 +6,13 @@ 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..57612a4530 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c @@ -0,0 +1,192 @@ +#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(Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), + 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_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index bd6bcb48b7..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 @@ -532,7 +532,7 @@ static void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE 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) { 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 f3c3d96280..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 @@ -126,14 +126,14 @@ static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx) static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); } diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 109a489427..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 @@ -100,25 +100,25 @@ void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx) { void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) { s32 pad; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 8, - Draw_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, - globalCtx->gameplayFrames * -3 & 127, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, + globalCtx->gameplayFrames * -3 & 127, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 9, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0, - globalCtx->gameplayFrames & 127, 32, 32)); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); } 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 2db03c4685..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 @@ -55,8 +55,8 @@ static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, segmentAddr[index]); + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); } else { - Draw_DListOpa(globalCtx, segmentAddr[index]); + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } 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 3264890c58..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 @@ -114,12 +114,12 @@ static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if ((thisx->flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, dlists[thisx->params]); + Gfx_DrawDListXlu(globalCtx, dlists[thisx->params]); } else { - Draw_DListOpa(globalCtx, dlists[thisx->params]); + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); } if (thisx->params == 0) { - Draw_DListXlu(globalCtx, &D_06001250); + Gfx_DrawDListXlu(globalCtx, &D_06001250); } } 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 d12f16076a..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 @@ -146,5 +146,5 @@ static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) } static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600B630); + Gfx_DrawDListOpa(globalCtx, &D_0600B630); } 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 fa1fda2c1e..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 @@ -136,5 +136,5 @@ static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) { } static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600A7E0); + Gfx_DrawDListOpa(globalCtx, &D_0600A7E0); } 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 8e5e1323d8..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 @@ -131,5 +131,5 @@ static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalC } static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600C0A0); + Gfx_DrawDListOpa(globalCtx, &D_0600C0A0); } 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 a9894f43d2..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 @@ -111,10 +111,10 @@ static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { 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); } } @@ -131,5 +131,5 @@ static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) { } static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600F000); + Gfx_DrawDListOpa(globalCtx, &D_0600F000); } 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 42bb7979c3..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 @@ -63,5 +63,5 @@ static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { } static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_060038D0); + 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 475dbe9ff4..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 @@ -53,8 +53,8 @@ static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, segmentAddr[index]); + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); } else { - Draw_DListOpa(globalCtx, segmentAddr[index]); + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } 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 02693ebae5..1d59fcd809 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -97,10 +97,10 @@ 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); + 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) { @@ -115,5 +115,5 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { 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_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index a2fc2c41d5..ad13f0c331 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -75,12 +75,12 @@ static void BgPushbox_Update(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); 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_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index ccb41bd0ce..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 @@ -76,8 +76,8 @@ static void Update(ActorSpot00Break* this, GlobalContext* globalCtx) { static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx) { if (this->actor.params == 1) { - Draw_DListOpa(globalCtx, &D_06000980); + Gfx_DrawDListOpa(globalCtx, &D_06000980); } else { - Draw_DListOpa(globalCtx, &D_06000440); + Gfx_DrawDListOpa(globalCtx, &D_06000440); } } 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 682e091ae6..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 @@ -84,14 +84,14 @@ static void BgSpot01Fusya_Update(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_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 6520fe9764..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 @@ -75,14 +75,14 @@ extern u32 D_06003B20; 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_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 6155326378..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,14 +1,25 @@ +/* + * 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 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); + +extern Gfx* D_060012C0; +extern Gfx* D_06000918; -/* const ActorInit Bg_Spot05_Soko_InitVars = { ACTOR_BG_SPOT05_SOKO, ACTORTYPE_PROP, @@ -21,17 +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 b54c3899b9..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 @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 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_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 9ac414e844..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 @@ -167,18 +167,18 @@ static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx) { static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; GraphicsContext* gfxCtx; - Gfx* gfxArr[3]; + Gfx* dispRefs[3]; - Draw_DListOpa(globalCtx, dlists[thisx->params]); + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); if (thisx->params == 3) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); } } 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 f8a190be0b..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 @@ -115,10 +115,10 @@ static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { 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 = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, -0x3CB0); - func_80092E70(var, 3, 0, 0, 0); - func_80092DF0(var, 0xC); + 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); @@ -143,5 +143,5 @@ static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx) { } static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06001080); + Gfx_DrawDListOpa(globalCtx, &D_06001080); } 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 4ce75c6d2f..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,14 +1,26 @@ +/* + * File: z_bg_spot12_saku.c + * Overlay: Bg_Spot12_Saku + * Description: + */ + #include "z_bg_spot12_saku.h" #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); + +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, @@ -21,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 8b748fa09e..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 @@ -5,8 +5,9 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 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_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 52a6f59441..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 @@ -58,20 +58,12 @@ 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)) { + 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) { Actor* thisx = &this->dyna.actor; @@ -86,18 +78,12 @@ 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; + 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) { DECR(this->unk_17C); @@ -106,14 +92,14 @@ void BgSpot15Saku_Update(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 abd85de7b4..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 @@ -7,8 +7,7 @@ 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_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 05cb5e107e..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 @@ -75,5 +75,5 @@ static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) { } static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &DL_SPOT18_FUTA2); + Gfx_DrawDListOpa(globalCtx, &DL_SPOT18_FUTA2); } 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 d87c2f1362..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 @@ -168,7 +168,7 @@ static ColliderCylinderInit colliderInit = { 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x000A, 0x0046, 0x0000, }; -static SubActor98Init subActor98Init = { +static Sub98Init4 sub98Init = { 0x0A, 0x0023, 0x0064, @@ -202,7 +202,7 @@ static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { ActorCollider_AllocCylinder(globalCtx, collision); ActorCollider_InitCylinder(globalCtx, collision, thisx, &colliderInit); ActorCollider_Cylinder_Update(thisx, collision); - func_80061ED4(&thisx->sub_98, 0, &subActor98Init); + func_80061ED4(&thisx->sub_98, 0, &sub98Init); } static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { @@ -278,20 +278,20 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { s32 pad[4]; GameState* state; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; state = &globalCtx->state; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727); + 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, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); } 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 1a6a7350a4..9e0118502b 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -68,5 +68,5 @@ static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) { } static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06001220); + Gfx_DrawDListOpa(globalCtx, &D_06001220); } 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 7d9e0fbb96..d10c9ea57d 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -122,18 +122,18 @@ static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx; GraphicsContext* tempgfxCtx; // oddly needs this to match - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; tempgfxCtx = globalCtx->state.gfxCtx; gfxCtx = tempgfxCtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_bg_zg.c", 311); + 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); - func_800C6B54(gfxArr, gfxCtx, "../z_bg_zg.c", 320); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 320); } static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) { 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 9bb0c4b88a..e4f632a9c6 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -72,9 +72,9 @@ static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) { static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 181); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 181); func_80093D18(gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), @@ -82,16 +82,16 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { gSPDisplayList(gfxCtx->polyOpa.p++, dlist); gSPPopMatrix(gfxCtx->polyOpa.p++, G_MTX_MODELVIEW); - func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 188); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 188); } static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { s32 pad[2]; s32 objBankIndex = this->objBankIndex; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 204); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 204); gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment); @@ -99,7 +99,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { // Necessary to match if (!globalCtx) {} - func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 212); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 212); } static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { 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 6d4055165d..a340b09921 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -248,8 +248,8 @@ void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) { void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) { AnimationHeader* animation = &D_060029A8; if (arg2 != 0) { - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&animation->genericHeader), 0, -8.0f); + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&animation->genericHeader), 0, -8.0f); this->action = 5; this->unk_19C = 0.0f; } @@ -321,8 +321,8 @@ void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, NULL, NULL, 0); - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, - SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 2, + 0.0f); this->action = 0; } @@ -336,9 +336,9 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { void* srcSegment8 = D_8097D440[temp]; void* srcSegment9 = &D_0600E680; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); @@ -347,7 +347,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); } void DemoGo_Draw(DemoGo* this, GlobalContext* globalCtx) { 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 1baa96137f..369943aca9 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -166,12 +166,12 @@ static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) { static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx** dList = &D_05001390; // required for stack placement? - Gfx* gfxArr[3]; + Gfx* dispRefs[3]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 440); + 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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); } 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 f683d0281e..3ac1e13ac5 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -6,7 +6,10 @@ 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_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index ea4c3a6803..984bd07a21 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -92,7 +92,7 @@ void func_809C1CAC(EnBird* this, s16 params) { AnimationHeader* anim = &D_0600006C; this->unk_198 = Math_Rand_S16Offset(5, 0x23); - SkelAnime_ChangeAnimation(&this->skelAnime, anim, playbackSpeed, 0.0f, frameCount, 0, 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, anim, playbackSpeed, 0.0f, frameCount, 0, 0.0f); EnBird_SetNewUpdate(this, func_809C1D60); } 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 6bc88ee3a8..0104711d11 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -282,10 +282,10 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { 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); @@ -303,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_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 0fc7a20478..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,3 +1,9 @@ +/* + * 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 @@ -35,17 +41,7 @@ static ColliderCylinderInit cylinderInit = { 0x0010, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, }; -// There are multiple versions of sub98 init structs -// Keeping these local until z_collision_check is decompiled -typedef struct { - /* 0x00 */ u8 health; - /* 0x02 */ s16 unk_10; - /* 0x04 */ s16 unk_12; - /* 0x06 */ u16 unk_14; - /* 0x08 */ u8 mass; -} sub98Init; - -static sub98Init sub98Data = { +static Sub98Init5 sub98Data = { 0x00, // health 0x0000, // unk_10 0x0000, // unk_12 @@ -469,11 +465,10 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { s32 pad; Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } }; GraphicsContext* gfxCtx; - s32 pad2[2]; - Gfx* gfxArr[2]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); func_80093D18(globalCtx->state.gfxCtx); gDPPipeSync(gfxCtx->polyOpa.p++); @@ -482,5 +477,5 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, EnDog_Callback1, EnDog_Callback2, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); } 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 f73a427c87..2c843f87eb 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -55,7 +55,7 @@ void EnDs_Init(EnDs* this, GlobalContext* globalCtx) { 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); - func_800A51E8(&this->skelAnime, &D_0600039C); + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600039C); this->actor.sub_98.mass = 0xFF; 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 e1705ecd52..45a877126c 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 @@ -113,11 +113,11 @@ 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)) { @@ -134,5 +134,5 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) { 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_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 237a145155..e0e30d1932 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -109,5 +109,5 @@ static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { } static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000B70); + Gfx_DrawDListOpa(globalCtx, &D_06000B70); } 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 373ea40116..ad8c86e93c 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -136,9 +136,9 @@ static void EnNutsball_Update(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); @@ -147,5 +147,5 @@ static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { 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_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index ba72f83411..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 @@ -85,5 +85,5 @@ static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { } static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000380); + Gfx_DrawDListOpa(globalCtx, &D_06000380); } 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 fcbebee7b3..8b0829275d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -232,7 +232,7 @@ static void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 playbackSpeed = -1.0f; } - SkelAnime_ChangeAnimation(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); + SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); } static void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { @@ -306,8 +306,7 @@ static void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != 0) { csCmdActorAction = globalCtx->csCtx.actorActions[3]; if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, - 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); this->action = 4; } } @@ -471,9 +470,9 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { UNK_PTR addr = D_80AF410C[temp]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + 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)); @@ -484,7 +483,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, NULL, gfxCtx->polyXlu.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); } static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { @@ -789,9 +788,9 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { UNK_PTR addr = D_80AF410C[temp]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + 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)); @@ -801,7 +800,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); } static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { 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 a765f6fb83..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 @@ -59,17 +59,17 @@ static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) { 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_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 1b5e59514a..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,13 +1,20 @@ +/* + * File: z_en_tana.c + * Overlay: ovl_En_Tana + * Description: Shop Shelves + */ + #include "z_en_tana.h" #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 = { ACTOR_EN_TANA, ACTORTYPE_PROP, @@ -20,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_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 818b254344..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,15 +1,10 @@ -#include -#include -#include "z_en_tk.h" +/* + * File: z_en_tk.c + * Overlay: ovl_En_Tk + * Description: Dampe NPC from "Dampe's Heart-Pounding Gravedigging Tour" + */ -typedef struct { - /* 0x0000 */ u8 health; /* SubActorStruct98.health */ - /* 0x0002 */ s16 h_2; /* SubActorStruct98.unk_10 */ - /* 0x0004 */ s16 h_4; /* SubActorStruct98.unk_12 */ - /* 0x0006 */ s16 h_6; /* SubActorStruct98.unk_14 */ - /* 0x0008 */ u8 mass; /* SubActorStruct98.mass */ - /* 0x000A */ -} EnTk_SubActorStruct98Init; +#include "z_en_tk.h" #define ROOM 0x00 #define FLAGS 0x00000009 @@ -110,15 +105,15 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { s16 i; s16 alpha; s16 imageIdx; - Gfx* pgdl[4]; + Gfx* dispRefs[4]; /* - * This assignment always occurs before a call to func_800C6AC4 which + * 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 func_800C6B54 most likely. + * is present only for debug builds. Same for Graph_CloseDisps most likely. */ gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); gfxSetup = 0; @@ -135,7 +130,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(this->eff); i++) { if (eff->active != 0) { if (gfxSetup == 0) { - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 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; @@ -159,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { eff++; } - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); } s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { @@ -181,15 +176,14 @@ static ColliderCylinderInit D_80B1D508 = { 0x00, 0x00, 0x01, 0x00, 0x001E, 0x0034, 0x0000, 0x0000, 0x0000, 0x0000, }; -static EnTk_SubActorStruct98Init D_80B1D534 = { +static Sub98Init5 D_80B1D534 = { 0x00, 0x0000, 0x0000, 0x0000, 0xFF, }; void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06002F84; - SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, - -10.f); + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); this->actionCountdown = Math_Rand_S16Offset(60, 60); this->actor.speedXZ = 0.f; @@ -198,8 +192,7 @@ void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { void EnTk_WalkAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06001FA8; - SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, - -10.f); + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); this->actionCountdown = Math_Rand_S16Offset(240, 240); } @@ -207,8 +200,7 @@ void EnTk_WalkAnim(EnTk* this, GlobalContext* globalCtx) { void EnTk_DigAnim(EnTk* this, GlobalContext* globalCtx) { AnimationHeader* anim = &D_06001144; - SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06001144.genericHeader), 0, - -10.f); + 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; @@ -509,8 +501,8 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { 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_ChangeAnimation(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), - 0, 0.f); + 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); @@ -702,14 +694,14 @@ void EnTk_Update(EnTk* this, GlobalContext* globalCtx) { void func_80B1D200(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* pgdl[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0); - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); + 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) { @@ -756,14 +748,14 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { EnTk* thisAgain = this; GraphicsContext* gfxCtx; - Gfx* pgdl[4]; + Gfx* dispRefs[4]; Matrix_Push(); EnTkEff_Draw(thisAgain, globalCtx); Matrix_Pull(); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294); func_80093D18(globalCtx->state.gfxCtx); @@ -772,5 +764,5 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl, thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor); - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); } 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 7a782fd492..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 @@ -291,5 +291,5 @@ void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx) { } void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, D_05017870); + Gfx_DrawDListOpa(globalCtx, D_05017870); } 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 b59658505b..1ba1683859 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -38,5 +38,5 @@ static void Destroy(ActorEnVase* this, GlobalContext* globalCtx) { } static void Draw(ActorEnVase* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &DL_VASE); + Gfx_DrawDListOpa(globalCtx, &DL_VASE); } 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 48f1cae778..b17544c460 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -57,7 +57,12 @@ static ColliderCylinderInit colCylinderInit = { 0x00, 0x01, 0x01, 0x00, 0x001E, 0x0028, 0x0000, 0x0000, 0x0000, 0x0000, }; -static SubActor98Init subActor98Init = { 0x04, 0x001E, 0x0028, 0x96 }; +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 }, @@ -96,7 +101,7 @@ static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { 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; @@ -136,8 +141,8 @@ 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; @@ -152,8 +157,8 @@ 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); @@ -161,18 +166,18 @@ static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_StandStart(EnWallmas* this) { - func_800A51E8(&this->skelAnime, &D_0600A054); + 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); + 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); + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009244); this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling; this->actor.speedXZ = 0.0f; } @@ -183,14 +188,14 @@ static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { 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); + 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 { @@ -204,7 +209,7 @@ static void EnWallmas_TakeDamageStart(EnWallmas* this) { } static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { - func_800A51E8(&this->skelAnime, &D_06000EA4); + 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; @@ -223,7 +228,7 @@ static void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) { - func_800A5240(&this->skelAnime, &D_06009520, -5.0f); + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06009520, -5.0f); this->timer = -0x1e; this->actionFunc = (ActorFunc)&EnWallmas_TakePlayer; this->actor.speedXZ = 0.0f; @@ -246,7 +251,7 @@ static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this) { } static void EnWallmas_StunBegin(EnWallmas* this) { - SkelAnime_ChangeAnimation(&this->skelAnime, &D_060019CC, 1.5f, 0, 20.0f, 2, -3.0f); + 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) { @@ -557,7 +562,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { MtxF mf; GraphicsContext* gfxCtx; f32 xzScale; - Gfx* gfx[3]; + Gfx* dispRefs[3]; if ((this->actor.floorPoly == NULL) || ((this->timer >= 0x51) && (this->actionFunc != (ActorFunc)&EnWallmas_Stun))) { @@ -565,7 +570,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { } // clang-format off - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); // clang-format on func_80094044(globalCtx->state.gfxCtx); @@ -586,7 +591,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { 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 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -605,12 +610,12 @@ static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { GraphicsContext* gfxCtx; - Gfx* gfx[4]; + Gfx* dispRefs[4]; 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); @@ -621,7 +626,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi 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); } } 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 54dfaf2bc5..b333a5bfa3 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -132,5 +132,5 @@ static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { } static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_060009E0); + Gfx_DrawDListOpa(globalCtx, &D_060009E0); } 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 38099bca4e..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,3 +1,9 @@ +/* + * File: z_obj_comb.c + * Overlay: ovl_Obj_Comb + * Description: Beehive + */ + #include "z_obj_comb.h" #define ROOM 0x00 @@ -8,7 +14,11 @@ void ObjComb_Destroy(ObjComb* this, GlobalContext* globalCtx); void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx); void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx); -/* +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, @@ -21,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 650ad1e261..fcd17464c8 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -6,7 +6,14 @@ 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_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 32da650c2c..da113c4e32 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -121,5 +121,5 @@ static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) { } static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000180); + Gfx_DrawDListOpa(globalCtx, &D_06000180); } 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 416b45a2e7..61113886a6 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -26,7 +26,7 @@ static void Opening_Update(OpeningContext* this) { func_80803C5C(this); } -static void Opening_Destroy(OpeningContext* this) { +void Opening_Destroy(OpeningContext* this) { } void Opening_Init(OpeningContext* this) { diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index e417cbbd25..a6f58ef054 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -75,9 +75,9 @@ void Title_Draw(TitleContext* this) { Vec3f v2; char pad2[0x8]; GraphicsContext* gfxCtx = this->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 395); + Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 395); v3.x = 69; v3.y = 69; @@ -124,17 +124,17 @@ void Title_Draw(TitleContext* this) { sTitleRotY += 300; - func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 483); + Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 483); } void Title_Update(TitleContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; u32 pad; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; u32 pad2; Gfx* gfx[2]; - func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 494); + Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 494); gSPSegment(gfxCtx->polyOpa.p++, 0, NULL); gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment); @@ -154,7 +154,7 @@ void Title_Update(TitleContext* this) { SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); } - func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 541); + Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 541); } void Title_Destroy(TitleContext* this) { 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/undefined_syms.txt b/undefined_syms.txt index d4e050db8d..4052d6ada8 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -156,6 +156,10 @@ D_06008010 = 0x06008010; 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; @@ -467,4 +471,12 @@ link_animetion_segment = 0x07000000; // z_en_ds D_06004768 = 0x06004768; -D_0600039C = 0x0600039C; \ No newline at end of file +D_0600039C = 0x0600039C; + +// z_bg_spot05_soko +D_06000918 = 0x06000918; +D_060012C0 = 0x060012C0; + +// z_obj_comb +D_050095B0 = 0x050095B0; +D_05009940 = 0x05009940;