diff --git a/Dockerfile b/Dockerfile index 56a5fa12ed..8d979fc8fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get update && \ unzip \ clang-tidy \ clang-format \ - nano + nano \ + vbindiff RUN wget \ https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \ @@ -24,5 +25,7 @@ RUN wget \ RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein RUN python3 -m pip install --upgrade attrs pycparser +ENV LANG C.UTF-8 + RUN mkdir /oot WORKDIR /oot diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s deleted file mode 100644 index 9f0ce582a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel EnZl2_Destroy -/* 00000 80B4E990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B4E998 0C0295BC */ jal SkelAnime_Free -/* 0000C 80B4E99C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 80B4E9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80B4E9A8 03E00008 */ jr $ra -/* 0001C 80B4E9AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s deleted file mode 100644 index 8e10ad5f9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_80B52B78 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel EnZl2_Draw -/* 03E1C 80B527AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03E20 80B527B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E24 80B527B4 8C8201A0 */ lw $v0, 0x01A0($a0) ## 000001A0 -/* 03E28 80B527B8 04400008 */ bltz $v0, .L80B527DC -/* 03E2C 80B527BC 28410003 */ slti $at, $v0, 0x0003 -/* 03E30 80B527C0 10200006 */ beq $at, $zero, .L80B527DC -/* 03E34 80B527C4 00027080 */ sll $t6, $v0, 2 -/* 03E38 80B527C8 3C0380B5 */ lui $v1, %hi(D_80B528D4) ## $v1 = 80B50000 -/* 03E3C 80B527CC 006E1821 */ addu $v1, $v1, $t6 -/* 03E40 80B527D0 8C6328D4 */ lw $v1, %lo(D_80B528D4)($v1) -/* 03E44 80B527D4 14600006 */ bne $v1, $zero, .L80B527F0 -/* 03E48 80B527D8 00000000 */ nop -.L80B527DC: -/* 03E4C 80B527DC 3C0480B5 */ lui $a0, %hi(D_80B52B78) ## $a0 = 80B50000 -/* 03E50 80B527E0 0C00084C */ jal osSyncPrintf - -/* 03E54 80B527E4 24842B78 */ addiu $a0, $a0, %lo(D_80B52B78) ## $a0 = 80B52B78 -/* 03E58 80B527E8 10000004 */ beq $zero, $zero, .L80B527FC -/* 03E5C 80B527EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B527F0: -/* 03E60 80B527F0 0060F809 */ jalr $ra, $v1 -/* 03E64 80B527F4 00000000 */ nop -/* 03E68 80B527F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B527FC: -/* 03E6C 80B527FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E70 80B52800 03E00008 */ jr $ra -/* 03E74 80B52804 00000000 */ nop -/* 03E78 80B52808 00000000 */ nop -/* 03E7C 80B5280C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s deleted file mode 100644 index 6d575a922d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel EnZl2_Init -/* 03910 80B522A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) -/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) -/* 03920 80B522B0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 03924 80B522B4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 03928 80B522B8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) -/* 03930 80B522C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 03934 80B522C4 0C00AC78 */ jal ActorShape_Init - -/* 03938 80B522C8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) -/* 03940 80B522D0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 03944 80B522D4 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 -/* 03948 80B522D8 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) -/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) -/* 03960 80B522F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03964 80B522F4 0C0291BE */ jal SkelAnime_InitSV -/* 03968 80B522F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) -/* 03970 80B52300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03974 80B52304 85E2001C */ lh $v0, 0x001C($t7) ## 0000001C -/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 -/* 0397C 80B5230C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 -/* 03984 80B52314 00000000 */ nop -/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C -/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B52320: -/* 03990 80B52320 0C03DC98 */ jal func_800F7260 -/* 03994 80B52324 2404006F */ addiu $a0, $zero, 0x006F ## $a0 = 0000006F -/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C -/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B52330: -/* 039A0 80B52330 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) -/* 039A4 80B52334 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) -/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B5233C: -/* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 039B0 80B52340 03E00008 */ jr $ra -/* 039B4 80B52344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_PostLimbDraw.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s rename to asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_PostLimbDraw.s index b5dedaabe1..dea1b16c5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_PostLimbDraw.s @@ -10,7 +10,7 @@ glabel D_80B52BD4 .float 1.2 .text -glabel func_80B4FB74 +glabel EnZl2_PostLimbDraw /* 011E4 80B4FB74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011E8 80B4FB78 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s deleted file mode 100644 index cd0c6e3489..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80B52ABC - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel EnZl2_Update -/* 038B4 80B52244 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 038B8 80B52248 AFBF0014 */ sw $ra, 0x0014($sp) -/* 038BC 80B5224C 8C82019C */ lw $v0, 0x019C($a0) ## 0000019C -/* 038C0 80B52250 04400008 */ bltz $v0, .L80B52274 -/* 038C4 80B52254 28410024 */ slti $at, $v0, 0x0024 -/* 038C8 80B52258 10200006 */ beq $at, $zero, .L80B52274 -/* 038CC 80B5225C 00027080 */ sll $t6, $v0, 2 -/* 038D0 80B52260 3C0380B5 */ lui $v1, %hi(D_80B52840) ## $v1 = 80B50000 -/* 038D4 80B52264 006E1821 */ addu $v1, $v1, $t6 -/* 038D8 80B52268 8C632840 */ lw $v1, %lo(D_80B52840)($v1) -/* 038DC 80B5226C 14600006 */ bne $v1, $zero, .L80B52288 -/* 038E0 80B52270 00000000 */ nop -.L80B52274: -/* 038E4 80B52274 3C0480B5 */ lui $a0, %hi(D_80B52ABC) ## $a0 = 80B50000 -/* 038E8 80B52278 0C00084C */ jal osSyncPrintf - -/* 038EC 80B5227C 24842ABC */ addiu $a0, $a0, %lo(D_80B52ABC) ## $a0 = 80B52ABC -/* 038F0 80B52280 10000004 */ beq $zero, $zero, .L80B52294 -/* 038F4 80B52284 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52288: -/* 038F8 80B52288 0060F809 */ jalr $ra, $v1 -/* 038FC 80B5228C 00000000 */ nop -/* 03900 80B52290 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52294: -/* 03904 80B52294 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03908 80B52298 03E00008 */ jr $ra -/* 0390C 80B5229C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s deleted file mode 100644 index d0a1173b03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B4E9B0 -/* 00020 80B4E9B0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00024 80B4E9B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 80B4E9B8 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 80B4E9BC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 80B4E9C0 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 80B4E9C4 15C00003 */ bne $t6, $zero, .L80B4E9D4 -/* 00038 80B4E9C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 80B4E9CC 10000005 */ beq $zero, $zero, .L80B4E9E4 -/* 00040 80B4E9D0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L80B4E9D4: -/* 00044 80B4E9D4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 80B4E9D8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 80B4E9DC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 80B4E9E0 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L80B4E9E4: -/* 00054 80B4E9E4 14400008 */ bne $v0, $zero, .L80B4EA08 -/* 00058 80B4E9E8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 80B4E9EC 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 80B4E9F0 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80B4E9F4 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 80B4E9F8 AFA60040 */ sw $a2, 0x0040($sp) -/* 0006C 80B4E9FC 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 80B4EA00 8FA60040 */ lw $a2, 0x0040($sp) -/* 00074 80B4EA04 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80B4EA08: -/* 00078 80B4EA08 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 80B4EA0C 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 80B4EA10 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 80B4EA14 84440000 */ lh $a0, 0x0000($v0) ## 00000190 -/* 00088 80B4EA18 28810003 */ slti $at, $a0, 0x0003 -/* 0008C 80B4EA1C 54200004 */ bnel $at, $zero, .L80B4EA30 -/* 00090 80B4EA20 A4C40194 */ sh $a0, 0x0194($a2) ## 00000194 -/* 00094 80B4EA24 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 80B4EA28 84440000 */ lh $a0, 0x0000($v0) ## 00000190 -/* 0009C 80B4EA2C A4C40194 */ sh $a0, 0x0194($a2) ## 00000194 -.L80B4EA30: -/* 000A0 80B4EA30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000A4 80B4EA34 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000A8 80B4EA38 03E00008 */ jr $ra -/* 000AC 80B4EA3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s deleted file mode 100644 index 1147590861..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B4EA40 -/* 000B0 80B4EA40 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 000B4 80B4EA44 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 000B8 80B4EA48 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 000BC 80B4EA4C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 000C0 80B4EA50 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 000C4 80B4EA54 4606203C */ c.lt.s $f4, $f6 -/* 000C8 80B4EA58 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 000CC 80B4EA5C 45020005 */ bc1fl .L80B4EA74 -/* 000D0 80B4EA60 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -/* 000D4 80B4EA64 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 000D8 80B4EA68 10000019 */ beq $zero, $zero, .L80B4EAD0 -/* 000DC 80B4EA6C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 000E0 80B4EA70 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -.L80B4EA74: -/* 000E4 80B4EA74 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 000E8 80B4EA78 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 000EC 80B4EA7C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 000F0 80B4EA80 4608003C */ c.lt.s $f0, $f8 -/* 000F4 80B4EA84 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 000F8 80B4EA88 45020004 */ bc1fl .L80B4EA9C -/* 000FC 80B4EA8C 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 00100 80B4EA90 1000000F */ beq $zero, $zero, .L80B4EAD0 -/* 00104 80B4EA94 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00108 80B4EA98 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -.L80B4EA9C: -/* 0010C 80B4EA9C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00110 80B4EAA0 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00114 80B4EAA4 460A003C */ c.lt.s $f0, $f10 -/* 00118 80B4EAA8 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 0011C 80B4EAAC 45020005 */ bc1fl .L80B4EAC4 -/* 00120 80B4EAB0 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -/* 00124 80B4EAB4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00128 80B4EAB8 10000005 */ beq $zero, $zero, .L80B4EAD0 -/* 0012C 80B4EABC A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 00130 80B4EAC0 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -.L80B4EAC4: -/* 00134 80B4EAC4 84590000 */ lh $t9, 0x0000($v0) ## 00000190 -/* 00138 80B4EAC8 03E00008 */ jr $ra -/* 0013C 80B4EACC A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -.L80B4EAD0: -/* 00140 80B4EAD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00144 80B4EAD4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00148 80B4EAD8 C4700000 */ lwc1 $f16, 0x0000($v1) ## 0000027C -/* 0014C 80B4EADC 46128100 */ add.s $f4, $f16, $f18 -/* 00150 80B4EAE0 E4640000 */ swc1 $f4, 0x0000($v1) ## 0000027C -/* 00154 80B4EAE4 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00158 80B4EAE8 A4880194 */ sh $t0, 0x0194($a0) ## 00000194 -/* 0015C 80B4EAEC 03E00008 */ jr $ra -/* 00160 80B4EAF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s deleted file mode 100644 index c6a48010b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B4EAF4 -/* 00164 80B4EAF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00168 80B4EAF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0016C 80B4EAFC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00170 80B4EB00 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00174 80B4EB04 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 00178 80B4EB08 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 0017C 80B4EB0C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00180 80B4EB10 4606203C */ c.lt.s $f4, $f6 -/* 00184 80B4EB14 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00188 80B4EB18 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 0018C 80B4EB1C 45020005 */ bc1fl .L80B4EB34 -/* 00190 80B4EB20 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -/* 00194 80B4EB24 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00198 80B4EB28 10000018 */ beq $zero, $zero, .L80B4EB8C -/* 0019C 80B4EB2C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 001A0 80B4EB30 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -.L80B4EB34: -/* 001A4 80B4EB34 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 001A8 80B4EB38 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 001AC 80B4EB3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 001B0 80B4EB40 4608003C */ c.lt.s $f0, $f8 -/* 001B4 80B4EB44 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 001B8 80B4EB48 45020004 */ bc1fl .L80B4EB5C -/* 001BC 80B4EB4C 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -/* 001C0 80B4EB50 1000000E */ beq $zero, $zero, .L80B4EB8C -/* 001C4 80B4EB54 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 001C8 80B4EB58 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -.L80B4EB5C: -/* 001CC 80B4EB5C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 001D0 80B4EB60 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 001D4 80B4EB64 460A003C */ c.lt.s $f0, $f10 -/* 001D8 80B4EB68 00000000 */ nop -/* 001DC 80B4EB6C 45000003 */ bc1f .L80B4EB7C -/* 001E0 80B4EB70 00000000 */ nop -/* 001E4 80B4EB74 10000005 */ beq $zero, $zero, .L80B4EB8C -/* 001E8 80B4EB78 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -.L80B4EB7C: -/* 001EC 80B4EB7C 0C2D3A6C */ jal func_80B4E9B0 -/* 001F0 80B4EB80 00000000 */ nop -/* 001F4 80B4EB84 10000009 */ beq $zero, $zero, .L80B4EBAC -/* 001F8 80B4EB88 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4EB8C: -/* 001FC 80B4EB8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00200 80B4EB90 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00204 80B4EB94 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00208 80B4EB98 46128100 */ add.s $f4, $f16, $f18 -/* 0020C 80B4EB9C E4640000 */ swc1 $f4, 0x0000($v1) ## 00000000 -/* 00210 80B4EBA0 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 00214 80B4EBA4 A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -/* 00218 80B4EBA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4EBAC: -/* 0021C 80B4EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00220 80B4EBB0 03E00008 */ jr $ra -/* 00224 80B4EBB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s deleted file mode 100644 index f05c43dc30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B4EBB8 -/* 00228 80B4EBB8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0022C 80B4EBBC 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00230 80B4EBC0 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 00234 80B4EBC4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00238 80B4EBC8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0023C 80B4EBCC 4606203C */ c.lt.s $f4, $f6 -/* 00240 80B4EBD0 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 00244 80B4EBD4 45020005 */ bc1fl .L80B4EBEC -/* 00248 80B4EBD8 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -/* 0024C 80B4EBDC A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00250 80B4EBE0 10000010 */ beq $zero, $zero, .L80B4EC24 -/* 00254 80B4EBE4 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 00258 80B4EBE8 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -.L80B4EBEC: -/* 0025C 80B4EBEC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 00260 80B4EBF0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00264 80B4EBF4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00268 80B4EBF8 460A403C */ c.lt.s $f8, $f10 -/* 0026C 80B4EBFC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00270 80B4EC00 45020005 */ bc1fl .L80B4EC18 -/* 00274 80B4EC04 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 00278 80B4EC08 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 0027C 80B4EC0C 10000005 */ beq $zero, $zero, .L80B4EC24 -/* 00280 80B4EC10 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00284 80B4EC14 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -.L80B4EC18: -/* 00288 80B4EC18 84580000 */ lh $t8, 0x0000($v0) ## 00000190 -/* 0028C 80B4EC1C 03E00008 */ jr $ra -/* 00290 80B4EC20 A4980194 */ sh $t8, 0x0194($a0) ## 00000194 -.L80B4EC24: -/* 00294 80B4EC24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00298 80B4EC28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0029C 80B4EC2C C4700000 */ lwc1 $f16, 0x0000($v1) ## 0000027C -/* 002A0 80B4EC30 46128100 */ add.s $f4, $f16, $f18 -/* 002A4 80B4EC34 E4640000 */ swc1 $f4, 0x0000($v1) ## 0000027C -/* 002A8 80B4EC38 84590000 */ lh $t9, 0x0000($v0) ## 00000190 -/* 002AC 80B4EC3C A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -/* 002B0 80B4EC40 03E00008 */ jr $ra -/* 002B4 80B4EC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s deleted file mode 100644 index e2b558bd65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80B4EC48 -/* 002B8 80B4EC48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002BC 80B4EC4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 80B4EC50 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002C4 80B4EC54 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 002C8 80B4EC58 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 002CC 80B4EC5C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 002D0 80B4EC60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 002D4 80B4EC64 4606203C */ c.lt.s $f4, $f6 -/* 002D8 80B4EC68 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 002DC 80B4EC6C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 002E0 80B4EC70 45020005 */ bc1fl .L80B4EC88 -/* 002E4 80B4EC74 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -/* 002E8 80B4EC78 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 002EC 80B4EC7C 1000000F */ beq $zero, $zero, .L80B4ECBC -/* 002F0 80B4EC80 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 002F4 80B4EC84 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -.L80B4EC88: -/* 002F8 80B4EC88 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 002FC 80B4EC8C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00300 80B4EC90 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00304 80B4EC94 460A403C */ c.lt.s $f8, $f10 -/* 00308 80B4EC98 00000000 */ nop -/* 0030C 80B4EC9C 45000003 */ bc1f .L80B4ECAC -/* 00310 80B4ECA0 00000000 */ nop -/* 00314 80B4ECA4 10000005 */ beq $zero, $zero, .L80B4ECBC -/* 00318 80B4ECA8 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -.L80B4ECAC: -/* 0031C 80B4ECAC 0C2D3A6C */ jal func_80B4E9B0 -/* 00320 80B4ECB0 00000000 */ nop -/* 00324 80B4ECB4 10000009 */ beq $zero, $zero, .L80B4ECDC -/* 00328 80B4ECB8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4ECBC: -/* 0032C 80B4ECBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00330 80B4ECC0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00334 80B4ECC4 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00338 80B4ECC8 46128100 */ add.s $f4, $f16, $f18 -/* 0033C 80B4ECCC E4640000 */ swc1 $f4, 0x0000($v1) ## 00000000 -/* 00340 80B4ECD0 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 00344 80B4ECD4 A4980194 */ sh $t8, 0x0194($a0) ## 00000194 -/* 00348 80B4ECD8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4ECDC: -/* 0034C 80B4ECDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80B4ECE0 03E00008 */ jr $ra -/* 00354 80B4ECE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s deleted file mode 100644 index 71c307e492..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80B4ECE8 -/* 00358 80B4ECE8 AFA50004 */ sw $a1, 0x0004($sp) -/* 0035C 80B4ECEC 00052C00 */ sll $a1, $a1, 16 -/* 00360 80B4ECF0 00052C03 */ sra $a1, $a1, 16 -/* 00364 80B4ECF4 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 -/* 00368 80B4ECF8 848E0190 */ lh $t6, 0x0190($a0) ## 00000190 -/* 0036C 80B4ECFC 03E00008 */ jr $ra -/* 00370 80B4ED00 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s deleted file mode 100644 index 8845818c44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B4ED04 -/* 00374 80B4ED04 AFA50004 */ sw $a1, 0x0004($sp) -/* 00378 80B4ED08 00052C00 */ sll $a1, $a1, 16 -/* 0037C 80B4ED0C 00052C03 */ sra $a1, $a1, 16 -/* 00380 80B4ED10 03E00008 */ jr $ra -/* 00384 80B4ED14 A4850194 */ sh $a1, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s deleted file mode 100644 index 267d007586..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B4ED18 -/* 00388 80B4ED18 AFA50004 */ sw $a1, 0x0004($sp) -/* 0038C 80B4ED1C 00052C00 */ sll $a1, $a1, 16 -/* 00390 80B4ED20 00052C03 */ sra $a1, $a1, 16 -/* 00394 80B4ED24 03E00008 */ jr $ra -/* 00398 80B4ED28 A4850198 */ sh $a1, 0x0198($a0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s deleted file mode 100644 index 9402ed3f92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B4ED2C -/* 0039C 80B4ED2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003A0 80B4ED30 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 003A4 80B4ED34 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 003A8 80B4ED38 AFA50024 */ sw $a1, 0x0024($sp) -/* 003AC 80B4ED3C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 003B0 80B4ED40 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B4 80B4ED44 AFA40020 */ sw $a0, 0x0020($sp) -/* 003B8 80B4ED48 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 003BC 80B4ED4C 44070000 */ mfc1 $a3, $f0 -/* 003C0 80B4ED50 AFAE0014 */ sw $t6, 0x0014($sp) -/* 003C4 80B4ED54 8FA40024 */ lw $a0, 0x0024($sp) -/* 003C8 80B4ED58 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 003CC 80B4ED5C 0C00B92D */ jal func_8002E4B4 -/* 003D0 80B4ED60 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 003D4 80B4ED64 8FBF001C */ lw $ra, 0x001C($sp) -/* 003D8 80B4ED68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003DC 80B4ED6C 03E00008 */ jr $ra -/* 003E0 80B4ED70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s deleted file mode 100644 index 8f13c75ca5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4ED74 -/* 003E4 80B4ED74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E8 80B4ED78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003EC 80B4ED7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 003F0 80B4ED80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80B4ED84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003F8 80B4ED88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003FC 80B4ED8C 03E00008 */ jr $ra -/* 00400 80B4ED90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s deleted file mode 100644 index 7840fd6cb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B4ED94 -/* 00404 80B4ED94 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00408 80B4ED98 00057880 */ sll $t7, $a1, 2 -/* 0040C 80B4ED9C 008FC021 */ addu $t8, $a0, $t7 -/* 00410 80B4EDA0 11C00003 */ beq $t6, $zero, .L80B4EDB0 -/* 00414 80B4EDA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00418 80B4EDA8 03E00008 */ jr $ra -/* 0041C 80B4EDAC 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80B4EDB0: -/* 00420 80B4EDB0 03E00008 */ jr $ra -/* 00424 80B4EDB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s deleted file mode 100644 index 3cf56f0452..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B4EDB8 -/* 00428 80B4EDB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0042C 80B4EDBC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00430 80B4EDC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00434 80B4EDC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00438 80B4EDC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0043C 80B4EDCC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00440 80B4EDD0 0C2D3B65 */ jal func_80B4ED94 -/* 00444 80B4EDD4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00448 80B4EDD8 10400013 */ beq $v0, $zero, .L80B4EE28 -/* 0044C 80B4EDDC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00450 80B4EDE0 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00454 80B4EDE4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00458 80B4EDE8 00000000 */ nop -/* 0045C 80B4EDEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00460 80B4EDF0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00464 80B4EDF4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00468 80B4EDF8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0046C 80B4EDFC 00000000 */ nop -/* 00470 80B4EE00 468042A0 */ cvt.s.w $f10, $f8 -/* 00474 80B4EE04 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00478 80B4EE08 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0047C 80B4EE0C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00480 80B4EE10 00000000 */ nop -/* 00484 80B4EE14 468084A0 */ cvt.s.w $f18, $f16 -/* 00488 80B4EE18 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0048C 80B4EE1C 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00490 80B4EE20 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00494 80B4EE24 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80B4EE28: -/* 00498 80B4EE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0049C 80B4EE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A0 80B4EE30 03E00008 */ jr $ra -/* 004A4 80B4EE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s deleted file mode 100644 index a4d0b8b664..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80B4EE38 -/* 004A8 80B4EE38 AFA50004 */ sw $a1, 0x0004($sp) -/* 004AC 80B4EE3C 8C8E024C */ lw $t6, 0x024C($a0) ## 0000024C -/* 004B0 80B4EE40 00052C00 */ sll $a1, $a1, 16 -/* 004B4 80B4EE44 00052C03 */ sra $a1, $a1, 16 -/* 004B8 80B4EE48 11C00043 */ beq $t6, $zero, .L80B4EF58 -/* 004BC 80B4EE4C 00065040 */ sll $t2, $a2, 1 -/* 004C0 80B4EE50 00067840 */ sll $t7, $a2, 1 -/* 004C4 80B4EE54 008F4021 */ addu $t0, $a0, $t7 -/* 004C8 80B4EE58 8519020C */ lh $t9, 0x020C($t0) ## 0000020C -/* 004CC 80B4EE5C 851801DC */ lh $t8, 0x01DC($t0) ## 000001DC -/* 004D0 80B4EE60 850901AC */ lh $t1, 0x01AC($t0) ## 000001AC -/* 004D4 80B4EE64 00B93823 */ subu $a3, $a1, $t9 -/* 004D8 80B4EE68 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 004DC 80B4EE6C 34018001 */ ori $at, $zero, 0x8001 ## $at = 00008001 -/* 004E0 80B4EE70 03051821 */ addu $v1, $t8, $a1 -/* 004E4 80B4EE74 46802020 */ cvt.s.w $f0, $f4 -/* 004E8 80B4EE78 00031C00 */ sll $v1, $v1, 16 -/* 004EC 80B4EE7C 00031C03 */ sra $v1, $v1, 16 -/* 004F0 80B4EE80 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 -/* 004F4 80B4EE84 46000005 */ abs.s $f0, $f0 -/* 004F8 80B4EE88 4600018D */ trunc.w.s $f6, $f0 -/* 004FC 80B4EE8C 440B3000 */ mfc1 $t3, $f6 -/* 00500 80B4EE90 00000000 */ nop -/* 00504 80B4EE94 0161082A */ slt $at, $t3, $at -/* 00508 80B4EE98 14200007 */ bne $at, $zero, .L80B4EEB8 -/* 0050C 80B4EE9C 00000000 */ nop -/* 00510 80B4EEA0 18A00004 */ blez $a1, .L80B4EEB4 -/* 00514 80B4EEA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00518 80B4EEA8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0051C 80B4EEAC 10000002 */ beq $zero, $zero, .L80B4EEB8 -/* 00520 80B4EEB0 00E13821 */ addu $a3, $a3, $at -.L80B4EEB4: -/* 00524 80B4EEB4 00E13821 */ addu $a3, $a3, $at -.L80B4EEB8: -/* 00528 80B4EEB8 10E00006 */ beq $a3, $zero, .L80B4EED4 -/* 0052C 80B4EEBC 00E26023 */ subu $t4, $a3, $v0 -/* 00530 80B4EEC0 05810003 */ bgez $t4, .L80B4EED0 -/* 00534 80B4EEC4 000C6903 */ sra $t5, $t4, 4 -/* 00538 80B4EEC8 2581000F */ addiu $at, $t4, 0x000F ## $at = 0000000F -/* 0053C 80B4EECC 00016903 */ sra $t5, $at, 4 -.L80B4EED0: -/* 00540 80B4EED0 004D1021 */ addu $v0, $v0, $t5 -.L80B4EED4: -/* 00544 80B4EED4 10400006 */ beq $v0, $zero, .L80B4EEF0 -/* 00548 80B4EED8 00653823 */ subu $a3, $v1, $a1 -/* 0054C 80B4EEDC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00550 80B4EEE0 0041001A */ div $zero, $v0, $at -/* 00554 80B4EEE4 00007012 */ mflo $t6 -/* 00558 80B4EEE8 004E1023 */ subu $v0, $v0, $t6 -/* 0055C 80B4EEEC 00000000 */ nop -.L80B4EEF0: -/* 00560 80B4EEF0 00073C00 */ sll $a3, $a3, 16 -/* 00564 80B4EEF4 00073C03 */ sra $a3, $a3, 16 -/* 00568 80B4EEF8 10E00005 */ beq $a3, $zero, .L80B4EF10 -/* 0056C 80B4EEFC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00570 80B4EF00 00E1001A */ div $zero, $a3, $at -/* 00574 80B4EF04 00007812 */ mflo $t7 -/* 00578 80B4EF08 004F1023 */ subu $v0, $v0, $t7 -/* 0057C 80B4EF0C 00000000 */ nop -.L80B4EF10: -/* 00580 80B4EF10 01220019 */ multu $t1, $v0 -/* 00584 80B4EF14 00621821 */ addu $v1, $v1, $v0 -/* 00588 80B4EF18 00653823 */ subu $a3, $v1, $a1 -/* 0058C 80B4EF1C 00073C00 */ sll $a3, $a3, 16 -/* 00590 80B4EF20 00073C03 */ sra $a3, $a3, 16 -/* 00594 80B4EF24 28E1FF9D */ slti $at, $a3, 0xFF9D -/* 00598 80B4EF28 0000C012 */ mflo $t8 -/* 0059C 80B4EF2C 5F000008 */ bgtzl $t8, .L80B4EF50 -/* 005A0 80B4EF30 0065C823 */ subu $t9, $v1, $a1 -/* 005A4 80B4EF34 14200005 */ bne $at, $zero, .L80B4EF4C -/* 005A8 80B4EF38 28E10064 */ slti $at, $a3, 0x0064 -/* 005AC 80B4EF3C 50200004 */ beql $at, $zero, .L80B4EF50 -/* 005B0 80B4EF40 0065C823 */ subu $t9, $v1, $a1 -/* 005B4 80B4EF44 00A01825 */ or $v1, $a1, $zero ## $v1 = 00000000 -/* 005B8 80B4EF48 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4EF4C: -/* 005BC 80B4EF4C 0065C823 */ subu $t9, $v1, $a1 -.L80B4EF50: -/* 005C0 80B4EF50 A50201AC */ sh $v0, 0x01AC($t0) ## 000001AC -/* 005C4 80B4EF54 A51901DC */ sh $t9, 0x01DC($t0) ## 000001DC -.L80B4EF58: -/* 005C8 80B4EF58 008A5821 */ addu $t3, $a0, $t2 -/* 005CC 80B4EF5C 03E00008 */ jr $ra -/* 005D0 80B4EF60 A565020C */ sh $a1, 0x020C($t3) ## 0000020C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s deleted file mode 100644 index 037c4cde1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s +++ /dev/null @@ -1,211 +0,0 @@ -.late_rodata -glabel D_80B52BB0 - .word 0x455AC000 - -.text -glabel func_80B4EF64 -/* 005D4 80B4EF64 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 005D8 80B4EF68 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005DC 80B4EF6C 14C80004 */ bne $a2, $t0, .L80B4EF80 -/* 005E0 80B4EF70 AFA50004 */ sw $a1, 0x0004($sp) -/* 005E4 80B4EF74 24043A98 */ addiu $a0, $zero, 0x3A98 ## $a0 = 00003A98 -/* 005E8 80B4EF78 1000001C */ beq $zero, $zero, .L80B4EFEC -/* 005EC 80B4EF7C 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -.L80B4EF80: -/* 005F0 80B4EF80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 005F4 80B4EF84 14C10003 */ bne $a2, $at, .L80B4EF94 -/* 005F8 80B4EF88 240432C8 */ addiu $a0, $zero, 0x32C8 ## $a0 = 000032C8 -/* 005FC 80B4EF8C 10000017 */ beq $zero, $zero, .L80B4EFEC -/* 00600 80B4EF90 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -.L80B4EF94: -/* 00604 80B4EF94 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00608 80B4EF98 14C10003 */ bne $a2, $at, .L80B4EFA8 -/* 0060C 80B4EF9C 24042EE0 */ addiu $a0, $zero, 0x2EE0 ## $a0 = 00002EE0 -/* 00610 80B4EFA0 10000012 */ beq $zero, $zero, .L80B4EFEC -/* 00614 80B4EFA4 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -.L80B4EFA8: -/* 00618 80B4EFA8 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0061C 80B4EFAC 14C10003 */ bne $a2, $at, .L80B4EFBC -/* 00620 80B4EFB0 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00624 80B4EFB4 1000000D */ beq $zero, $zero, .L80B4EFEC -/* 00628 80B4EFB8 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -.L80B4EFBC: -/* 0062C 80B4EFBC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00630 80B4EFC0 14C10003 */ bne $a2, $at, .L80B4EFD0 -/* 00634 80B4EFC4 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00638 80B4EFC8 10000008 */ beq $zero, $zero, .L80B4EFEC -/* 0063C 80B4EFCC 2409000C */ addiu $t1, $zero, 0x000C ## $t1 = 0000000C -.L80B4EFD0: -/* 00640 80B4EFD0 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 00644 80B4EFD4 14C10004 */ bne $a2, $at, .L80B4EFE8 -/* 00648 80B4EFD8 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 0064C 80B4EFDC 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00650 80B4EFE0 10000002 */ beq $zero, $zero, .L80B4EFEC -/* 00654 80B4EFE4 2409000F */ addiu $t1, $zero, 0x000F ## $t1 = 0000000F -.L80B4EFE8: -/* 00658 80B4EFE8 24090012 */ addiu $t1, $zero, 0x0012 ## $t1 = 00000012 -.L80B4EFEC: -/* 0065C 80B4EFEC 8CEE024C */ lw $t6, 0x024C($a3) ## 0000024C -/* 00660 80B4EFF0 00067840 */ sll $t7, $a2, 1 -/* 00664 80B4EFF4 00EF2821 */ addu $a1, $a3, $t7 -/* 00668 80B4EFF8 11C00088 */ beq $t6, $zero, .L80B4F21C -/* 0066C 80B4EFFC 87B90006 */ lh $t9, 0x0006($sp) -/* 00670 80B4F000 84AD020C */ lh $t5, 0x020C($a1) ## 0000020C -/* 00674 80B4F004 84B801DC */ lh $t8, 0x01DC($a1) ## 000001DC -/* 00678 80B4F008 84AC01AC */ lh $t4, 0x01AC($a1) ## 000001AC -/* 0067C 80B4F00C 032D5023 */ subu $t2, $t9, $t5 -/* 00680 80B4F010 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00684 80B4F014 03191821 */ addu $v1, $t8, $t9 -/* 00688 80B4F018 34018001 */ ori $at, $zero, 0x8001 ## $at = 00008001 -/* 0068C 80B4F01C 46802020 */ cvt.s.w $f0, $f4 -/* 00690 80B4F020 00031C00 */ sll $v1, $v1, 16 -/* 00694 80B4F024 0009C040 */ sll $t8, $t1, 1 -/* 00698 80B4F028 00031C03 */ sra $v1, $v1, 16 -/* 0069C 80B4F02C 00F86821 */ addu $t5, $a3, $t8 -/* 006A0 80B4F030 01801025 */ or $v0, $t4, $zero ## $v0 = 00000000 -/* 006A4 80B4F034 46000005 */ abs.s $f0, $f0 -/* 006A8 80B4F038 4600018D */ trunc.w.s $f6, $f0 -/* 006AC 80B4F03C 440F3000 */ mfc1 $t7, $f6 -/* 006B0 80B4F040 00000000 */ nop -/* 006B4 80B4F044 01E1082A */ slt $at, $t7, $at -/* 006B8 80B4F048 14200007 */ bne $at, $zero, .L80B4F068 -/* 006BC 80B4F04C 00000000 */ nop -/* 006C0 80B4F050 1B200004 */ blez $t9, .L80B4F064 -/* 006C4 80B4F054 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006C8 80B4F058 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 006CC 80B4F05C 10000002 */ beq $zero, $zero, .L80B4F068 -/* 006D0 80B4F060 01415021 */ addu $t2, $t2, $at -.L80B4F064: -/* 006D4 80B4F064 01415021 */ addu $t2, $t2, $at -.L80B4F068: -/* 006D8 80B4F068 0520000A */ bltz $t1, .L80B4F094 -/* 006DC 80B4F06C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 006E0 80B4F070 85AB01AC */ lh $t3, 0x01AC($t5) ## 000001AC -/* 006E4 80B4F074 05600003 */ bltz $t3, .L80B4F084 -/* 006E8 80B4F078 000B4823 */ subu $t1, $zero, $t3 -/* 006EC 80B4F07C 10000001 */ beq $zero, $zero, .L80B4F084 -/* 006F0 80B4F080 01604825 */ or $t1, $t3, $zero ## $t1 = 00000000 -.L80B4F084: -/* 006F4 80B4F084 0121001A */ div $zero, $t1, $at -/* 006F8 80B4F088 00007012 */ mflo $t6 -/* 006FC 80B4F08C 014E5021 */ addu $t2, $t2, $t6 -/* 00700 80B4F090 00000000 */ nop -.L80B4F094: -/* 00704 80B4F094 11400007 */ beq $t2, $zero, .L80B4F0B4 -/* 00708 80B4F098 00644823 */ subu $t1, $v1, $a0 -/* 0070C 80B4F09C 01427823 */ subu $t7, $t2, $v0 -/* 00710 80B4F0A0 05E10003 */ bgez $t7, .L80B4F0B0 -/* 00714 80B4F0A4 000FC903 */ sra $t9, $t7, 4 -/* 00718 80B4F0A8 25E1000F */ addiu $at, $t7, 0x000F ## $at = 0000000F -/* 0071C 80B4F0AC 0001C903 */ sra $t9, $at, 4 -.L80B4F0B0: -/* 00720 80B4F0B0 00591021 */ addu $v0, $v0, $t9 -.L80B4F0B4: -/* 00724 80B4F0B4 10400006 */ beq $v0, $zero, .L80B4F0D0 -/* 00728 80B4F0B8 00094C00 */ sll $t1, $t1, 16 -/* 0072C 80B4F0BC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00730 80B4F0C0 0041001A */ div $zero, $v0, $at -/* 00734 80B4F0C4 0000C012 */ mflo $t8 -/* 00738 80B4F0C8 00581023 */ subu $v0, $v0, $t8 -/* 0073C 80B4F0CC 00000000 */ nop -.L80B4F0D0: -/* 00740 80B4F0D0 00094C03 */ sra $t1, $t1, 16 -/* 00744 80B4F0D4 11200005 */ beq $t1, $zero, .L80B4F0EC -/* 00748 80B4F0D8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0074C 80B4F0DC 0121001A */ div $zero, $t1, $at -/* 00750 80B4F0E0 00006812 */ mflo $t5 -/* 00754 80B4F0E4 004D1023 */ subu $v0, $v0, $t5 -/* 00758 80B4F0E8 00000000 */ nop -.L80B4F0EC: -/* 0075C 80B4F0EC 01820019 */ multu $t4, $v0 -/* 00760 80B4F0F0 00621821 */ addu $v1, $v1, $v0 -/* 00764 80B4F0F4 00644823 */ subu $t1, $v1, $a0 -/* 00768 80B4F0F8 00094C00 */ sll $t1, $t1, 16 -/* 0076C 80B4F0FC 00094C03 */ sra $t1, $t1, 16 -/* 00770 80B4F100 2921FF9D */ slti $at, $t1, 0xFF9D -/* 00774 80B4F104 00007012 */ mflo $t6 -/* 00778 80B4F108 1DC00007 */ bgtz $t6, .L80B4F128 -/* 0077C 80B4F10C 00000000 */ nop -/* 00780 80B4F110 14200005 */ bne $at, $zero, .L80B4F128 -/* 00784 80B4F114 29210064 */ slti $at, $t1, 0x0064 -/* 00788 80B4F118 10200003 */ beq $at, $zero, .L80B4F128 -/* 0078C 80B4F11C 00000000 */ nop -/* 00790 80B4F120 00801825 */ or $v1, $a0, $zero ## $v1 = 00004000 -/* 00794 80B4F124 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4F128: -/* 00798 80B4F128 54C80039 */ bnel $a2, $t0, .L80B4F210 -/* 0079C 80B4F12C A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 007A0 80B4F130 8CE8019C */ lw $t0, 0x019C($a3) ## 0000019C -/* 007A4 80B4F134 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 007A8 80B4F138 11010002 */ beq $t0, $at, .L80B4F144 -/* 007AC 80B4F13C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 007B0 80B4F140 15010015 */ bne $t0, $at, .L80B4F198 -.L80B4F144: -/* 007B4 80B4F144 3C0180B5 */ lui $at, %hi(D_80B52BB0) ## $at = 80B50000 -/* 007B8 80B4F148 C4E00164 */ lwc1 $f0, 0x0164($a3) ## 00000164 -/* 007BC 80B4F14C C4282BB0 */ lwc1 $f8, %lo(D_80B52BB0)($at) -/* 007C0 80B4F150 C4E20278 */ lwc1 $f2, 0x0278($a3) ## 00000278 -/* 007C4 80B4F154 46004282 */ mul.s $f10, $f8, $f0 -/* 007C8 80B4F158 46025403 */ div.s $f16, $f10, $f2 -/* 007CC 80B4F15C 4600848D */ trunc.w.s $f18, $f16 -/* 007D0 80B4F160 44199000 */ mfc1 $t9, $f18 -/* 007D4 80B4F164 00000000 */ nop -/* 007D8 80B4F168 03244021 */ addu $t0, $t9, $a0 -/* 007DC 80B4F16C 0103082A */ slt $at, $t0, $v1 -/* 007E0 80B4F170 54200027 */ bnel $at, $zero, .L80B4F210 -/* 007E4 80B4F174 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 007E8 80B4F178 01001825 */ or $v1, $t0, $zero ## $v1 = 00000002 -/* 007EC 80B4F17C 04410002 */ bgez $v0, .L80B4F188 -/* 007F0 80B4F180 00400821 */ addu $at, $v0, $zero -/* 007F4 80B4F184 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F188: -/* 007F8 80B4F188 00011043 */ sra $v0, $at, 1 -/* 007FC 80B4F18C 00021023 */ subu $v0, $zero, $v0 -/* 00800 80B4F190 1000001F */ beq $zero, $zero, .L80B4F210 -/* 00804 80B4F194 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -.L80B4F198: -/* 00808 80B4F198 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0080C 80B4F19C 11010003 */ beq $t0, $at, .L80B4F1AC -/* 00810 80B4F1A0 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 00814 80B4F1A4 5501000E */ bnel $t0, $at, .L80B4F1E0 -/* 00818 80B4F1A8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -.L80B4F1AC: -/* 0081C 80B4F1AC 24880DAC */ addiu $t0, $a0, 0x0DAC ## $t0 = 00004DAC -/* 00820 80B4F1B0 0103082A */ slt $at, $t0, $v1 -/* 00824 80B4F1B4 54200016 */ bnel $at, $zero, .L80B4F210 -/* 00828 80B4F1B8 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 0082C 80B4F1BC 01001825 */ or $v1, $t0, $zero ## $v1 = 00004DAC -/* 00830 80B4F1C0 04410002 */ bgez $v0, .L80B4F1CC -/* 00834 80B4F1C4 00400821 */ addu $at, $v0, $zero -/* 00838 80B4F1C8 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F1CC: -/* 0083C 80B4F1CC 00011043 */ sra $v0, $at, 1 -/* 00840 80B4F1D0 00021023 */ subu $v0, $zero, $v0 -/* 00844 80B4F1D4 1000000E */ beq $zero, $zero, .L80B4F210 -/* 00848 80B4F1D8 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 0084C 80B4F1DC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -.L80B4F1E0: -/* 00850 80B4F1E0 1501000A */ bne $t0, $at, .L80B4F20C -/* 00854 80B4F1E4 2488FC18 */ addiu $t0, $a0, 0xFC18 ## $t0 = 00003C18 -/* 00858 80B4F1E8 0103082A */ slt $at, $t0, $v1 -/* 0085C 80B4F1EC 54200008 */ bnel $at, $zero, .L80B4F210 -/* 00860 80B4F1F0 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 00864 80B4F1F4 01001825 */ or $v1, $t0, $zero ## $v1 = 00003C18 -/* 00868 80B4F1F8 04410002 */ bgez $v0, .L80B4F204 -/* 0086C 80B4F1FC 00400821 */ addu $at, $v0, $zero -/* 00870 80B4F200 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F204: -/* 00874 80B4F204 00011043 */ sra $v0, $at, 1 -/* 00878 80B4F208 00021023 */ subu $v0, $zero, $v0 -.L80B4F20C: -/* 0087C 80B4F20C A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -.L80B4F210: -/* 00880 80B4F210 87B80006 */ lh $t8, 0x0006($sp) -/* 00884 80B4F214 00786823 */ subu $t5, $v1, $t8 -/* 00888 80B4F218 A4AD01DC */ sh $t5, 0x01DC($a1) ## 000001DC -.L80B4F21C: -/* 0088C 80B4F21C 87AE0006 */ lh $t6, 0x0006($sp) -/* 00890 80B4F220 00067840 */ sll $t7, $a2, 1 -/* 00894 80B4F224 00EFC821 */ addu $t9, $a3, $t7 -/* 00898 80B4F228 03E00008 */ jr $ra -/* 0089C 80B4F22C A72E020C */ sh $t6, 0x020C($t9) ## 0000020C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s deleted file mode 100644 index d50d896f04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ /dev/null @@ -1,510 +0,0 @@ -.rdata -glabel D_80B52900 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52910 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52920 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52930 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52940 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52950 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52960 - .asciz "../z_en_zl2.c" - .balign 4 - -.late_rodata -glabel D_80B52BB4 - .word 0xC47EC000 -glabel D_80B52BB8 - .word 0x43E98000 -glabel D_80B52BBC - .word 0x43848000 -glabel D_80B52BC0 - .word 0xC3D58000 -glabel D_80B52BC4 - .word 0x43E98000 -glabel D_80B52BC8 - .word 0x43848000 -glabel D_80B52BCC - .word 0xC3D58000 - -.text -glabel func_80B4F45C -/* 00ACC 80B4F45C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00AD0 80B4F460 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) -/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) -/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 -/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) -/* 00AE8 80B4F478 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 -/* 00AEC 80B4F47C 0C031A73 */ jal Graph_Alloc - -/* 00AF0 80B4F480 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) -/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) -/* 00AFC 80B4F48C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00B00 80B4F490 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00B04 80B4F494 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 00B08 80B4F498 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 -/* 00B0C 80B4F49C ACAF0000 */ sw $t7, 0x0000($a1) ## 00000000 -/* 00B10 80B4F4A0 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push -/* 00B18 80B4F4A8 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) -/* 00B20 80B4F4B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B24 80B4F4B4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 -/* 00B28 80B4F4B8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate -/* 00B30 80B4F4C0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) -/* 00B38 80B4F4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B3C 80B4F4CC 84440000 */ lh $a0, 0x0000($v0) ## 00000000 -/* 00B40 80B4F4D0 84450002 */ lh $a1, 0x0002($v0) ## 00000002 -/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateRPY -/* 00B48 80B4F4D8 84460004 */ lh $a2, 0x0004($v0) ## 00000004 -/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push -/* 00B50 80B4F4E0 00000000 */ nop -/* 00B54 80B4F4E4 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 -/* 00B58 80B4F4E8 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 -/* 00B5C 80B4F4EC 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 -/* 00B60 80B4F4F0 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 -/* 00B64 80B4F4F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate -/* 00B6C 80B4F4FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B70 80B4F500 0C034236 */ jal Matrix_Get -/* 00B74 80B4F504 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00B78 80B4F508 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00B7C 80B4F50C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00B80 80B4F510 0C034833 */ jal func_800D20CC -/* 00B84 80B4F514 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 -/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 -/* 00B94 80B4F524 00000000 */ nop -/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) -/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) -/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 -/* 00BA4 80B4F534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) -/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 -/* 00BB4 80B4F544 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) -/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 -/* 00BC4 80B4F554 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80B4F558: -/* 00BC8 80B4F558 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00BCC 80B4F55C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) -/* 00BD4 80B4F564 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00BD8 80B4F568 84591492 */ lh $t9, 0x1492($v0) ## 80161492 -/* 00BDC 80B4F56C 844A1494 */ lh $t2, 0x1494($v0) ## 80161494 -/* 00BE0 80B4F570 844C1496 */ lh $t4, 0x1496($v0) ## 80161496 -/* 00BE4 80B4F574 846D01E0 */ lh $t5, 0x01E0($v1) ## 000001E0 -/* 00BE8 80B4F578 846B01DE */ lh $t3, 0x01DE($v1) ## 000001DE -/* 00BEC 80B4F57C 846901DC */ lh $t1, 0x01DC($v1) ## 000001DC -/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 -/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 -/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 -/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 -/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 -/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 -/* 00C08 80B4F598 246301DC */ addiu $v1, $v1, 0x01DC ## $v1 = 000001DC -/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) -/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 -/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 -/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateRPY -/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 -/* 00C20 80B4F5B0 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 -/* 00C24 80B4F5B4 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 -/* 00C28 80B4F5B8 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 00C2C 80B4F5BC 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 00C30 80B4F5C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate -/* 00C38 80B4F5C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00C3C 80B4F5CC 3C0580B5 */ lui $a1, %hi(D_80B52900) ## $a1 = 80B50000 -/* 00C40 80B4F5D0 24A52900 */ addiu $a1, $a1, %lo(D_80B52900) ## $a1 = 80B52900 -/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) -/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx -/* 00C4C 80B4F5DC 24060420 */ addiu $a2, $zero, 0x0420 ## $a2 = 00000420 -/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get -/* 00C54 80B4F5E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00C58 80B4F5E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00C5C 80B4F5EC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC -/* 00C64 80B4F5F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 -/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) -/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 -/* 00C74 80B4F604 00000000 */ nop -/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) -/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 -/* 00C84 80B4F614 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) -/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 -/* 00C94 80B4F624 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80B4F628: -/* 00C98 80B4F628 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00CA0 80B4F630 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00CA4 80B4F634 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00CA8 80B4F638 846F0006 */ lh $t7, 0x0006($v1) ## 00000006 -/* 00CAC 80B4F63C 84790008 */ lh $t9, 0x0008($v1) ## 00000008 -/* 00CB0 80B4F640 846A000A */ lh $t2, 0x000A($v1) ## 0000000A -/* 00CB4 80B4F644 844E1498 */ lh $t6, 0x1498($v0) ## 80161498 -/* 00CB8 80B4F648 8458149A */ lh $t8, 0x149A($v0) ## 8016149A -/* 00CBC 80B4F64C 8449149C */ lh $t1, 0x149C($v0) ## 8016149C -/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 -/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 -/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 -/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 -/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 -/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 -/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 -/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 -/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateRPY -/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 -/* 00CE8 80B4F678 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 -/* 00CEC 80B4F67C 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 -/* 00CF0 80B4F680 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 00CF4 80B4F684 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 00CF8 80B4F688 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate -/* 00D00 80B4F690 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) -/* 00D08 80B4F698 3C0580B5 */ lui $a1, %hi(D_80B52910) ## $a1 = 80B50000 -/* 00D0C 80B4F69C 24A52910 */ addiu $a1, $a1, %lo(D_80B52910) ## $a1 = 80B52910 -/* 00D10 80B4F6A0 2406044C */ addiu $a2, $zero, 0x044C ## $a2 = 0000044C -/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx -/* 00D18 80B4F6A8 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get -/* 00D20 80B4F6B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00D24 80B4F6B4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00D28 80B4F6B8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC -/* 00D30 80B4F6C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 -/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) -/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 -/* 00D40 80B4F6D0 00000000 */ nop -/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) -/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 -/* 00D50 80B4F6E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) -/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 -/* 00D60 80B4F6F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -.L80B4F6F4: -/* 00D64 80B4F6F4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) -/* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00D70 80B4F700 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D74 80B4F704 846C000C */ lh $t4, 0x000C($v1) ## 0000000C -/* 00D78 80B4F708 846E000E */ lh $t6, 0x000E($v1) ## 0000000E -/* 00D7C 80B4F70C 84780010 */ lh $t8, 0x0010($v1) ## 00000010 -/* 00D80 80B4F710 844B149E */ lh $t3, 0x149E($v0) ## 8016149E -/* 00D84 80B4F714 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 -/* 00D88 80B4F718 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 -/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 -/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 -/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 -/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 -/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 -/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 -/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 -/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateRPY -/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 -/* 00DB4 80B4F744 3C0180B5 */ lui $at, %hi(D_80B52BB4) ## $at = 80B50000 -/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) -/* 00DBC 80B4F74C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 00DC0 80B4F750 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 -/* 00DC4 80B4F754 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate -/* 00DCC 80B4F75C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) -/* 00DD4 80B4F764 3C0580B5 */ lui $a1, %hi(D_80B52920) ## $a1 = 80B50000 -/* 00DD8 80B4F768 24A52920 */ addiu $a1, $a1, %lo(D_80B52920) ## $a1 = 80B52920 -/* 00DDC 80B4F76C 24060460 */ addiu $a2, $zero, 0x0460 ## $a2 = 00000460 -/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx -/* 00DE4 80B4F774 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull -/* 00DEC 80B4F77C 00000000 */ nop -/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push -/* 00DF4 80B4F784 00000000 */ nop -/* 00DF8 80B4F788 3C0180B5 */ lui $at, %hi(D_80B52BB8) ## $at = 80B50000 -/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) -/* 00E00 80B4F790 3C0180B5 */ lui $at, %hi(D_80B52BBC) ## $at = 80B50000 -/* 00E04 80B4F794 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 -/* 00E08 80B4F798 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) -/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate -/* 00E14 80B4F7A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get -/* 00E1C 80B4F7AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00E20 80B4F7B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00E24 80B4F7B4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC -/* 00E2C 80B4F7BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 -/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) -/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 -/* 00E3C 80B4F7CC 00000000 */ nop -/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) -/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 -/* 00E4C 80B4F7DC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) -/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 -/* 00E5C 80B4F7EC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) -/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 -/* 00E6C 80B4F7FC 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -.L80B4F800: -/* 00E70 80B4F800 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) -/* 00E78 80B4F808 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00E7C 80B4F80C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E80 80B4F810 84690012 */ lh $t1, 0x0012($v1) ## 00000012 -/* 00E84 80B4F814 846B0014 */ lh $t3, 0x0014($v1) ## 00000014 -/* 00E88 80B4F818 846D0016 */ lh $t5, 0x0016($v1) ## 00000016 -/* 00E8C 80B4F81C 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 -/* 00E90 80B4F820 844A14A6 */ lh $t2, 0x14A6($v0) ## 801614A6 -/* 00E94 80B4F824 844C14A8 */ lh $t4, 0x14A8($v0) ## 801614A8 -/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 -/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 -/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 -/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 -/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 -/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 -/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 -/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateRPY -/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 -/* 00EC0 80B4F850 3C0180B5 */ lui $at, %hi(D_80B52BC0) ## $at = 80B50000 -/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) -/* 00EC8 80B4F858 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00ECC 80B4F85C 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 00ED0 80B4F860 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate -/* 00ED8 80B4F868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) -/* 00EE0 80B4F870 3C0580B5 */ lui $a1, %hi(D_80B52930) ## $a1 = 80B50000 -/* 00EE4 80B4F874 24A52930 */ addiu $a1, $a1, %lo(D_80B52930) ## $a1 = 80B52930 -/* 00EE8 80B4F878 24060479 */ addiu $a2, $zero, 0x0479 ## $a2 = 00000479 -/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx -/* 00EF0 80B4F880 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get -/* 00EF8 80B4F888 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00EFC 80B4F88C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00F00 80B4F890 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00F04 80B4F894 0C034833 */ jal func_800D20CC -/* 00F08 80B4F898 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 -/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) -/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC -/* 00F18 80B4F8A8 00000000 */ nop -/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) -/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 -/* 00F28 80B4F8B8 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) -/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 -/* 00F38 80B4F8C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) -/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 -/* 00F48 80B4F8D8 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -.L80B4F8DC: -/* 00F4C 80B4F8DC 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) -/* 00F54 80B4F8E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00F58 80B4F8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F5C 80B4F8EC 846F0018 */ lh $t7, 0x0018($v1) ## 00000018 -/* 00F60 80B4F8F0 8479001A */ lh $t9, 0x001A($v1) ## 0000001A -/* 00F64 80B4F8F4 846A001C */ lh $t2, 0x001C($v1) ## 0000001C -/* 00F68 80B4F8F8 844E14AA */ lh $t6, 0x14AA($v0) ## 801614AA -/* 00F6C 80B4F8FC 845814AC */ lh $t8, 0x14AC($v0) ## 801614AC -/* 00F70 80B4F900 844914AE */ lh $t1, 0x14AE($v0) ## 801614AE -/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 -/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 -/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 -/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 -/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 -/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 -/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 -/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 -/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateRPY -/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 -/* 00F9C 80B4F92C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 00FA0 80B4F930 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 00FA4 80B4F934 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 00FA8 80B4F938 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 00FAC 80B4F93C 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate -/* 00FB4 80B4F944 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) -/* 00FBC 80B4F94C 3C0580B5 */ lui $a1, %hi(D_80B52940) ## $a1 = 80B50000 -/* 00FC0 80B4F950 24A52940 */ addiu $a1, $a1, %lo(D_80B52940) ## $a1 = 80B52940 -/* 00FC4 80B4F954 2406048C */ addiu $a2, $zero, 0x048C ## $a2 = 0000048C -/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx -/* 00FCC 80B4F95C 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull -/* 00FD4 80B4F964 00000000 */ nop -/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push -/* 00FDC 80B4F96C 00000000 */ nop -/* 00FE0 80B4F970 3C0180B5 */ lui $at, %hi(D_80B52BC4) ## $at = 80B50000 -/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) -/* 00FE8 80B4F978 3C0180B5 */ lui $at, %hi(D_80B52BC8) ## $at = 80B50000 -/* 00FEC 80B4F97C 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 -/* 00FF0 80B4F980 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) -/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate -/* 00FFC 80B4F98C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01000 80B4F990 0C034236 */ jal Matrix_Get -/* 01004 80B4F994 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 01008 80B4F998 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 0100C 80B4F99C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC -/* 01014 80B4F9A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 -/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) -/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 -/* 01024 80B4F9B4 00000000 */ nop -/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) -/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 -/* 01034 80B4F9C4 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) -/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 -/* 01044 80B4F9D4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) -/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 -/* 01054 80B4F9E4 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 -.L80B4F9E8: -/* 01058 80B4F9E8 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) -/* 01060 80B4F9F0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01064 80B4F9F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01068 80B4F9F8 846C001E */ lh $t4, 0x001E($v1) ## 0000001E -/* 0106C 80B4F9FC 846E0020 */ lh $t6, 0x0020($v1) ## 00000020 -/* 01070 80B4FA00 84780022 */ lh $t8, 0x0022($v1) ## 00000022 -/* 01074 80B4FA04 844B14B0 */ lh $t3, 0x14B0($v0) ## 801614B0 -/* 01078 80B4FA08 844D14B2 */ lh $t5, 0x14B2($v0) ## 801614B2 -/* 0107C 80B4FA0C 844F14B4 */ lh $t7, 0x14B4($v0) ## 801614B4 -/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 -/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 -/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 -/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 -/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 -/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 -/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 -/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 -/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateRPY -/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 -/* 010A8 80B4FA38 3C0180B5 */ lui $at, %hi(D_80B52BCC) ## $at = 80B50000 -/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) -/* 010B0 80B4FA40 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 010B4 80B4FA44 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 010B8 80B4FA48 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate -/* 010C0 80B4FA50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) -/* 010C8 80B4FA58 3C0580B5 */ lui $a1, %hi(D_80B52950) ## $a1 = 80B50000 -/* 010CC 80B4FA5C 24A52950 */ addiu $a1, $a1, %lo(D_80B52950) ## $a1 = 80B52950 -/* 010D0 80B4FA60 240604A5 */ addiu $a2, $zero, 0x04A5 ## $a2 = 000004A5 -/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx -/* 010D8 80B4FA68 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get -/* 010E0 80B4FA70 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 010E4 80B4FA74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 010E8 80B4FA78 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC -/* 010F0 80B4FA80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 -/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) -/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 -/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) -/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) -/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 -/* 0110C 80B4FA9C 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) -/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 -/* 0111C 80B4FAAC 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) -/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 -/* 0112C 80B4FABC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -.L80B4FAC0: -/* 01130 80B4FAC0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01134 80B4FAC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) -/* 0113C 80B4FACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01140 80B4FAD0 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 -/* 01144 80B4FAD4 844B14B8 */ lh $t3, 0x14B8($v0) ## 801614B8 -/* 01148 80B4FAD8 844D14BA */ lh $t5, 0x14BA($v0) ## 801614BA -/* 0114C 80B4FADC 852A0024 */ lh $t2, 0x0024($t1) ## 00000024 -/* 01150 80B4FAE0 852C0026 */ lh $t4, 0x0026($t1) ## 00000026 -/* 01154 80B4FAE4 852E0028 */ lh $t6, 0x0028($t1) ## 00000028 -/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 -/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 -/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 -/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 -/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 -/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 -/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 -/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 -/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateRPY -/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 -/* 01180 80B4FB10 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 01184 80B4FB14 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 01188 80B4FB18 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 0118C 80B4FB1C 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 01190 80B4FB20 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate -/* 01198 80B4FB28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) -/* 011A0 80B4FB30 3C0580B5 */ lui $a1, %hi(D_80B52960) ## $a1 = 80B50000 -/* 011A4 80B4FB34 24A52960 */ addiu $a1, $a1, %lo(D_80B52960) ## $a1 = 80B52960 -/* 011A8 80B4FB38 240604B8 */ addiu $a2, $zero, 0x04B8 ## $a2 = 000004B8 -/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx -/* 011B0 80B4FB40 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull -/* 011B8 80B4FB48 00000000 */ nop -/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull -/* 011C0 80B4FB50 00000000 */ nop -/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) -/* 011C8 80B4FB58 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 011CC 80B4FB5C AF0F024C */ sw $t7, 0x024C($t8) ## 0000024C -.L80B4FB60: -/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011D4 80B4FB64 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 011D8 80B4FB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011DC 80B4FB6C 03E00008 */ jr $ra -/* 011E0 80B4FB70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s deleted file mode 100644 index 77d09739ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B4FCCC -/* 0133C 80B4FCCC 8C820274 */ lw $v0, 0x0274($a0) ## 00000274 -/* 01340 80B4FCD0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01344 80B4FCD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01348 80B4FCD8 00027100 */ sll $t6, $v0, 4 -/* 0134C 80B4FCDC 01C27021 */ addu $t6, $t6, $v0 -/* 01350 80B4FCE0 000E7080 */ sll $t6, $t6, 2 -/* 01354 80B4FCE4 00AE7821 */ addu $t7, $a1, $t6 -/* 01358 80B4FCE8 030FC021 */ addu $t8, $t8, $t7 -/* 0135C 80B4FCEC 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 -/* 01360 80B4FCF0 0301C821 */ addu $t9, $t8, $at -/* 01364 80B4FCF4 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 01368 80B4FCF8 03E00008 */ jr $ra -/* 0136C 80B4FCFC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) 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 deleted file mode 100644 index 0cd5e9bd8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s +++ /dev/null @@ -1,41 +0,0 @@ -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) -/* 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 -/* 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 -.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 -.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_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 -/* 013FC 80B4FD8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s deleted file mode 100644 index 8b22547d26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B4FD90 -/* 01400 80B4FD90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01404 80B4FD94 AFA50024 */ sw $a1, 0x0024($sp) -/* 01408 80B4FD98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0140C 80B4FD9C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01410 80B4FDA0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01414 80B4FDA4 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 01418 80B4FDA8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0141C 80B4FDAC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01420 80B4FDB0 0C2D3F40 */ jal func_80B4FD00 -/* 01424 80B4FDB4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01428 80B4FDB8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0142C 80B4FDBC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01430 80B4FDC0 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01434 80B4FDC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01438 80B4FDC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0143C 80B4FDCC 03E00008 */ jr $ra -/* 01440 80B4FDD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s deleted file mode 100644 index d46d24b723..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4FDD4 -/* 01444 80B4FDD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01448 80B4FDD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0144C 80B4FDDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01450 80B4FDE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01454 80B4FDE4 0C0295B2 */ jal func_800A56C8 -/* 01458 80B4FDE8 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 0145C 80B4FDEC 10400004 */ beq $v0, $zero, .L80B4FE00 -/* 01460 80B4FDF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01464 80B4FDF4 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01468 80B4FDF8 0C01E245 */ jal func_80078914 -/* 0146C 80B4FDFC 24050802 */ addiu $a1, $zero, 0x0802 ## $a1 = 00000802 -.L80B4FE00: -/* 01470 80B4FE00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01474 80B4FE04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01478 80B4FE08 03E00008 */ jr $ra -/* 0147C 80B4FE0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s deleted file mode 100644 index 7562fedbeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4FE10 -/* 01480 80B4FE10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01484 80B4FE14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01488 80B4FE18 94821D74 */ lhu $v0, 0x1D74($a0) ## 00001D74 -/* 0148C 80B4FE1C 2841033E */ slti $at, $v0, 0x033E -/* 01490 80B4FE20 14200005 */ bne $at, $zero, .L80B4FE38 -/* 01494 80B4FE24 28410439 */ slti $at, $v0, 0x0439 -/* 01498 80B4FE28 50200004 */ beql $at, $zero, .L80B4FE3C -/* 0149C 80B4FE2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014A0 80B4FE30 0C01E233 */ jal func_800788CC -/* 014A4 80B4FE34 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -.L80B4FE38: -/* 014A8 80B4FE38 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4FE3C: -/* 014AC 80B4FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014B0 80B4FE40 03E00008 */ jr $ra -/* 014B4 80B4FE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s deleted file mode 100644 index 932383f40a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE48 -/* 014B8 80B4FE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014BC 80B4FE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 014C0 80B4FE50 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 014C4 80B4FE54 0C01E245 */ jal func_80078914 -/* 014C8 80B4FE58 24052086 */ addiu $a1, $zero, 0x2086 ## $a1 = 00002086 -/* 014CC 80B4FE5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014D0 80B4FE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014D4 80B4FE64 03E00008 */ jr $ra -/* 014D8 80B4FE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s deleted file mode 100644 index 9640eb038c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE6C -/* 014DC 80B4FE6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014E0 80B4FE70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014E4 80B4FE74 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 014E8 80B4FE78 0C01E245 */ jal func_80078914 -/* 014EC 80B4FE7C 240539C7 */ addiu $a1, $zero, 0x39C7 ## $a1 = 000039C7 -/* 014F0 80B4FE80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014F4 80B4FE84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014F8 80B4FE88 03E00008 */ jr $ra -/* 014FC 80B4FE8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s deleted file mode 100644 index 884947d12f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE90 -/* 01500 80B4FE90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01504 80B4FE94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01508 80B4FE98 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 0150C 80B4FE9C 0C01E245 */ jal func_80078914 -/* 01510 80B4FEA0 24056878 */ addiu $a1, $zero, 0x6878 ## $a1 = 00006878 -/* 01514 80B4FEA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01518 80B4FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0151C 80B4FEAC 03E00008 */ jr $ra -/* 01520 80B4FEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s deleted file mode 100644 index a2bbf05739..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FEB4 -/* 01524 80B4FEB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01528 80B4FEB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0152C 80B4FEBC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01530 80B4FEC0 0C01E245 */ jal func_80078914 -/* 01534 80B4FEC4 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -/* 01538 80B4FEC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0153C 80B4FECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01540 80B4FED0 03E00008 */ jr $ra -/* 01544 80B4FED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s deleted file mode 100644 index 745d0a8411..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FED8 -/* 01548 80B4FED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0154C 80B4FEDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01550 80B4FEE0 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01554 80B4FEE4 0C01E245 */ jal func_80078914 -/* 01558 80B4FEE8 24056875 */ addiu $a1, $zero, 0x6875 ## $a1 = 00006875 -/* 0155C 80B4FEEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01560 80B4FEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01564 80B4FEF4 03E00008 */ jr $ra -/* 01568 80B4FEF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s deleted file mode 100644 index ed3be04138..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B4FEFC -/* 0156C 80B4FEFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01570 80B4FF00 AFBF002C */ sw $ra, 0x002C($sp) -/* 01574 80B4FF04 AFA40030 */ sw $a0, 0x0030($sp) -/* 01578 80B4FF08 8C8F0244 */ lw $t7, 0x0244($a0) ## 00000244 -/* 0157C 80B4FF0C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01580 80B4FF10 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01584 80B4FF14 15E00017 */ bne $t7, $zero, .L80B4FF74 -/* 01588 80B4FF18 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 0158C 80B4FF1C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01590 80B4FF20 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 01594 80B4FF24 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01598 80B4FF28 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0159C 80B4FF2C C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 015A0 80B4FF30 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 015A4 80B4FF34 44070000 */ mfc1 $a3, $f0 -/* 015A8 80B4FF38 46062080 */ add.s $f2, $f4, $f6 -/* 015AC 80B4FF3C AFA50034 */ sw $a1, 0x0034($sp) -/* 015B0 80B4FF40 AFB80024 */ sw $t8, 0x0024($sp) -/* 015B4 80B4FF44 AFA00020 */ sw $zero, 0x0020($sp) -/* 015B8 80B4FF48 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 015BC 80B4FF4C AFA0001C */ sw $zero, 0x001C($sp) -/* 015C0 80B4FF50 AFA00018 */ sw $zero, 0x0018($sp) -/* 015C4 80B4FF54 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 015C8 80B4FF58 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 015CC 80B4FF5C 8FA40034 */ lw $a0, 0x0034($sp) -/* 015D0 80B4FF60 0C021344 */ jal Item_Give -/* 015D4 80B4FF64 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 -/* 015D8 80B4FF68 8FA80030 */ lw $t0, 0x0030($sp) -/* 015DC 80B4FF6C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015E0 80B4FF70 AD190244 */ sw $t9, 0x0244($t0) ## 00000244 -.L80B4FF74: -/* 015E4 80B4FF74 8FBF002C */ lw $ra, 0x002C($sp) -/* 015E8 80B4FF78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 015EC 80B4FF7C 03E00008 */ jr $ra -/* 015F0 80B4FF80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s deleted file mode 100644 index a181216d15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B4FF84 -/* 015F4 80B4FF84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 015F8 80B4FF88 AFBF0034 */ sw $ra, 0x0034($sp) -/* 015FC 80B4FF8C AFB00030 */ sw $s0, 0x0030($sp) -/* 01600 80B4FF90 8C8E0250 */ lw $t6, 0x0250($a0) ## 00000250 -/* 01604 80B4FF94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01608 80B4FF98 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 0160C 80B4FF9C 15C0000F */ bne $t6, $zero, .L80B4FFDC -/* 01610 80B4FFA0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 01614 80B4FFA4 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01618 80B4FFA8 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 0161C 80B4FFAC C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 01620 80B4FFB0 44070000 */ mfc1 $a3, $f0 -/* 01624 80B4FFB4 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01628 80B4FFB8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0162C 80B4FFBC AFA0001C */ sw $zero, 0x001C($sp) -/* 01630 80B4FFC0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01634 80B4FFC4 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01638 80B4FFC8 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0163C 80B4FFCC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01640 80B4FFD0 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 01644 80B4FFD4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01648 80B4FFD8 AE180250 */ sw $t8, 0x0250($s0) ## 00000250 -.L80B4FFDC: -/* 0164C 80B4FFDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01650 80B4FFE0 8FB00030 */ lw $s0, 0x0030($sp) -/* 01654 80B4FFE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01658 80B4FFE8 03E00008 */ jr $ra -/* 0165C 80B4FFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s deleted file mode 100644 index 03da27eda2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B4FFF0 -/* 01660 80B4FFF0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01664 80B4FFF4 AFBF003C */ sw $ra, 0x003C($sp) -/* 01668 80B4FFF8 AFB00038 */ sw $s0, 0x0038($sp) -/* 0166C 80B4FFFC 8C8E0248 */ lw $t6, 0x0248($a0) ## 00000248 -/* 01670 80B50000 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01674 80B50004 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01678 80B50008 15C0001B */ bne $t6, $zero, .L80B50078 -/* 0167C 80B5000C 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01680 80B50010 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01684 80B50014 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01688 80B50018 44814000 */ mtc1 $at, $f8 ## $f8 = -26.00 -/* 0168C 80B5001C 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 01690 80B50020 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 01694 80B50024 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01698 80B50028 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0169C 80B5002C C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 016A0 80B50030 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 016A4 80B50034 468021A0 */ cvt.s.w $f6, $f4 -/* 016A8 80B50038 24194000 */ addiu $t9, $zero, 0x4000 ## $t9 = 00004000 -/* 016AC 80B5003C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 016B0 80B50040 AFA80028 */ sw $t0, 0x0028($sp) -/* 016B4 80B50044 AFB90020 */ sw $t9, 0x0020($sp) -/* 016B8 80B50048 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016BC 80B5004C 46083280 */ add.s $f10, $f6, $f8 -/* 016C0 80B50050 AFA00024 */ sw $zero, 0x0024($sp) -/* 016C4 80B50054 AFA0001C */ sw $zero, 0x001C($sp) -/* 016C8 80B50058 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 016CC 80B5005C 46105080 */ add.s $f2, $f10, $f16 -/* 016D0 80B50060 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 016D4 80B50064 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 016D8 80B50068 0C00C916 */ jal Actor_SpawnAttached - -/* 016DC 80B5006C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 016E0 80B50070 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 016E4 80B50074 AE090248 */ sw $t1, 0x0248($s0) ## 00000248 -.L80B50078: -/* 016E8 80B50078 8FBF003C */ lw $ra, 0x003C($sp) -/* 016EC 80B5007C 8FB00038 */ lw $s0, 0x0038($sp) -/* 016F0 80B50080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016F4 80B50084 03E00008 */ jr $ra -/* 016F8 80B50088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s deleted file mode 100644 index 5c3fa412d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B5008C -/* 016FC 80B5008C 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 01700 80B50090 10400011 */ beq $v0, $zero, .L80B500D8 -/* 01704 80B50094 00000000 */ nop -/* 01708 80B50098 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0170C 80B5009C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01710 80B500A0 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01714 80B500A4 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 01718 80B500A8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0171C 80B500AC 44815000 */ mtc1 $at, $f10 ## $f10 = -26.00 -/* 01720 80B500B0 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 -/* 01724 80B500B4 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 01728 80B500B8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0172C 80B500BC 00000000 */ nop -/* 01730 80B500C0 46803220 */ cvt.s.w $f8, $f6 -/* 01734 80B500C4 460A4400 */ add.s $f16, $f8, $f10 -/* 01738 80B500C8 46128100 */ add.s $f4, $f16, $f18 -/* 0173C 80B500CC E4440028 */ swc1 $f4, 0x0028($v0) ## 00000028 -/* 01740 80B500D0 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 01744 80B500D4 E446002C */ swc1 $f6, 0x002C($v0) ## 0000002C -.L80B500D8: -/* 01748 80B500D8 03E00008 */ jr $ra -/* 0174C 80B500DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s deleted file mode 100644 index 396e9239e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80B500E0 -/* 01750 80B500E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01754 80B500E4 AFA40040 */ sw $a0, 0x0040($sp) -/* 01758 80B500E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0175C 80B500EC AFA50044 */ sw $a1, 0x0044($sp) -/* 01760 80B500F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01764 80B500F4 0C2D3B65 */ jal func_80B4ED94 -/* 01768 80B500F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0176C 80B500FC 1040002D */ beq $v0, $zero, .L80B501B4 -/* 01770 80B50100 8FAE0044 */ lw $t6, 0x0044($sp) -/* 01774 80B50104 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 01778 80B50108 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 0177C 80B5010C 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 01780 80B50110 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 01784 80B50114 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01788 80B50118 AFA2003C */ sw $v0, 0x003C($sp) -/* 0178C 80B5011C 0C01BE6F */ jal func_8006F9BC -/* 01790 80B50120 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01794 80B50124 8FA3003C */ lw $v1, 0x003C($sp) -/* 01798 80B50128 8FA20040 */ lw $v0, 0x0040($sp) -/* 0179C 80B5012C 8C790010 */ lw $t9, 0x0010($v1) ## 00000010 -/* 017A0 80B50130 8C78000C */ lw $t8, 0x000C($v1) ## 0000000C -/* 017A4 80B50134 8C690018 */ lw $t1, 0x0018($v1) ## 00000018 -/* 017A8 80B50138 8C680014 */ lw $t0, 0x0014($v1) ## 00000014 -/* 017AC 80B5013C 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 017B0 80B50140 8C6B0020 */ lw $t3, 0x0020($v1) ## 00000020 -/* 017B4 80B50144 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 017B8 80B50148 8C6A001C */ lw $t2, 0x001C($v1) ## 0000001C -/* 017BC 80B5014C 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 017C0 80B50150 46803320 */ cvt.s.w $f12, $f6 -/* 017C4 80B50154 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 017C8 80B50158 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 017CC 80B5015C 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 017D0 80B50160 468020A0 */ cvt.s.w $f2, $f4 -/* 017D4 80B50164 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 017D8 80B50168 46805420 */ cvt.s.w $f16, $f10 -/* 017DC 80B5016C 468043A0 */ cvt.s.w $f14, $f8 -/* 017E0 80B50170 46803220 */ cvt.s.w $f8, $f6 -/* 017E4 80B50174 468024A0 */ cvt.s.w $f18, $f4 -/* 017E8 80B50178 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 017EC 80B5017C 46028281 */ sub.s $f10, $f16, $f2 -/* 017F0 80B50180 460C9201 */ sub.s $f8, $f18, $f12 -/* 017F4 80B50184 46005102 */ mul.s $f4, $f10, $f0 -/* 017F8 80B50188 00000000 */ nop -/* 017FC 80B5018C 46004282 */ mul.s $f10, $f8, $f0 -/* 01800 80B50190 46022180 */ add.s $f6, $f4, $f2 -/* 01804 80B50194 460C5100 */ add.s $f4, $f10, $f12 -/* 01808 80B50198 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 0180C 80B5019C E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 01810 80B501A0 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01814 80B501A4 460E3201 */ sub.s $f8, $f6, $f14 -/* 01818 80B501A8 46004282 */ mul.s $f10, $f8, $f0 -/* 0181C 80B501AC 460E5100 */ add.s $f4, $f10, $f14 -/* 01820 80B501B0 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -.L80B501B4: -/* 01824 80B501B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01828 80B501B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0182C 80B501BC 03E00008 */ jr $ra -/* 01830 80B501C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s deleted file mode 100644 index fa6a340d30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B501C4 -/* 01834 80B501C4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 01838 80B501C8 10400005 */ beq $v0, $zero, .L80B501E0 -/* 0183C 80B501CC 00000000 */ nop -/* 01840 80B501D0 44852000 */ mtc1 $a1, $f4 ## $f4 = 0.00 -/* 01844 80B501D4 00000000 */ nop -/* 01848 80B501D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0184C 80B501DC E44601A8 */ swc1 $f6, 0x01A8($v0) ## 000001A8 -.L80B501E0: -/* 01850 80B501E0 03E00008 */ jr $ra -/* 01854 80B501E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s deleted file mode 100644 index 81b0a62a02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B501E8 -/* 01858 80B501E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0185C 80B501EC AFA40018 */ sw $a0, 0x0018($sp) -/* 01860 80B501F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01864 80B501F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01868 80B501F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0186C 80B501FC 0C2D3B65 */ jal func_80B4ED94 -/* 01870 80B50200 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01874 80B50204 10400012 */ beq $v0, $zero, .L80B50250 -/* 01878 80B50208 8FAE001C */ lw $t6, 0x001C($sp) -/* 0187C 80B5020C 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 01880 80B50210 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 01884 80B50214 0C01BE4F */ jal func_8006F93C -/* 01888 80B50218 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 0188C 80B5021C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01890 80B50220 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01894 80B50224 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01898 80B50228 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 -/* 0189C 80B5022C 46002181 */ sub.s $f6, $f4, $f0 -/* 018A0 80B50230 8FA40018 */ lw $a0, 0x0018($sp) -/* 018A4 80B50234 46083282 */ mul.s $f10, $f6, $f8 -/* 018A8 80B50238 4600540D */ trunc.w.s $f16, $f10 -/* 018AC 80B5023C 44058000 */ mfc1 $a1, $f16 -/* 018B0 80B50240 00000000 */ nop -/* 018B4 80B50244 AC8501A8 */ sw $a1, 0x01A8($a0) ## 000001A8 -/* 018B8 80B50248 0C2D4071 */ jal func_80B501C4 -/* 018BC 80B5024C A08500C8 */ sb $a1, 0x00C8($a0) ## 000000C8 -.L80B50250: -/* 018C0 80B50250 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018C4 80B50254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 80B50258 03E00008 */ jr $ra -/* 018CC 80B5025C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s deleted file mode 100644 index fe75500b54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B50260 -/* 018D0 80B50260 AFA50004 */ sw $a1, 0x0004($sp) -/* 018D4 80B50264 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 018D8 80B50268 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 018DC 80B5026C AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 018E0 80B50270 03E00008 */ jr $ra -/* 018E4 80B50274 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s deleted file mode 100644 index d31c7ca080..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B50278 -/* 018E8 80B50278 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018EC 80B5027C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 018F0 80B50280 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018F4 80B50284 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 018F8 80B50288 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018FC 80B5028C 0C2D3B65 */ jal func_80B4ED94 -/* 01900 80B50290 AFA60018 */ sw $a2, 0x0018($sp) -/* 01904 80B50294 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 01908 80B50298 8FA60018 */ lw $a2, 0x0018($sp) -/* 0190C 80B5029C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01910 80B502A0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 01914 80B502A4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01918 80B502A8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0191C 80B502AC 468021A0 */ cvt.s.w $f6, $f4 -/* 01920 80B502B0 E4C60024 */ swc1 $f6, 0x0024($a2) ## 00000024 -/* 01924 80B502B4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 01928 80B502B8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0192C 80B502BC 00000000 */ nop -/* 01930 80B502C0 468042A0 */ cvt.s.w $f10, $f8 -/* 01934 80B502C4 E4CA0028 */ swc1 $f10, 0x0028($a2) ## 00000028 -/* 01938 80B502C8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0193C 80B502CC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 01940 80B502D0 00000000 */ nop -/* 01944 80B502D4 468084A0 */ cvt.s.w $f18, $f16 -/* 01948 80B502D8 E4D2002C */ swc1 $f18, 0x002C($a2) ## 0000002C -/* 0194C 80B502DC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 01950 80B502E0 A0D900C8 */ sb $t9, 0x00C8($a2) ## 000000C8 -/* 01954 80B502E4 ACC8019C */ sw $t0, 0x019C($a2) ## 0000019C -/* 01958 80B502E8 ACC901A0 */ sw $t1, 0x01A0($a2) ## 000001A0 -/* 0195C 80B502EC A4C300B6 */ sh $v1, 0x00B6($a2) ## 000000B6 -/* 01960 80B502F0 A4C30032 */ sh $v1, 0x0032($a2) ## 00000032 -/* 01964 80B502F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01968 80B502F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0196C 80B502FC 03E00008 */ jr $ra -/* 01970 80B50300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s deleted file mode 100644 index 223b0243e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s +++ /dev/null @@ -1,60 +0,0 @@ -.late_rodata -glabel D_80B52BD8 - .word 0x4622F983 - -.text -glabel func_80B50304 -/* 01974 80B50304 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01978 80B50308 AFB00020 */ sw $s0, 0x0020($sp) -/* 0197C 80B5030C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01980 80B50310 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01984 80B50314 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01988 80B50318 0C2D3B65 */ jal func_80B4ED94 -/* 0198C 80B5031C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01990 80B50320 8C4E0018 */ lw $t6, 0x0018($v0) ## 00000018 -/* 01994 80B50324 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 01998 80B50328 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0199C 80B5032C 24A503BC */ addiu $a1, $a1, 0x03BC ## $a1 = 060003BC -/* 019A0 80B50330 01CFC023 */ subu $t8, $t6, $t7 -/* 019A4 80B50334 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 019A8 80B50338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019AC 80B5033C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 019B0 80B50340 468021A0 */ cvt.s.w $f6, $f4 -/* 019B4 80B50344 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 019B8 80B50348 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 019BC 80B5034C 8C480014 */ lw $t0, 0x0014($v0) ## 00000014 -/* 019C0 80B50350 8C590020 */ lw $t9, 0x0020($v0) ## 00000020 -/* 019C4 80B50354 AFA00010 */ sw $zero, 0x0010($sp) -/* 019C8 80B50358 03284823 */ subu $t1, $t9, $t0 -/* 019CC 80B5035C 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 019D0 80B50360 00000000 */ nop -/* 019D4 80B50364 468042A0 */ cvt.s.w $f10, $f8 -/* 019D8 80B50368 0C2D3F40 */ jal func_80B4FD00 -/* 019DC 80B5036C E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 019E0 80B50370 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 019E4 80B50374 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 019E8 80B50378 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 019EC 80B5037C AE0A019C */ sw $t2, 0x019C($s0) ## 0000019C -/* 019F0 80B50380 AE0B01A0 */ sw $t3, 0x01A0($s0) ## 000001A0 -/* 019F4 80B50384 260300B4 */ addiu $v1, $s0, 0x00B4 ## $v1 = 000000B4 -/* 019F8 80B50388 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 019FC 80B5038C E610023C */ swc1 $f16, 0x023C($s0) ## 0000023C -/* 01A00 80B50390 A06C0014 */ sb $t4, 0x0014($v1) ## 000000C8 -/* 01A04 80B50394 AFA30028 */ sw $v1, 0x0028($sp) -/* 01A08 80B50398 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 01A0C 80B5039C 0C03F494 */ jal Math_atan2f -/* 01A10 80B503A0 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 01A14 80B503A4 3C0180B5 */ lui $at, %hi(D_80B52BD8) ## $at = 80B50000 -/* 01A18 80B503A8 C4322BD8 */ lwc1 $f18, %lo(D_80B52BD8)($at) -/* 01A1C 80B503AC 8FA30028 */ lw $v1, 0x0028($sp) -/* 01A20 80B503B0 46120102 */ mul.s $f4, $f0, $f18 -/* 01A24 80B503B4 4600218D */ trunc.w.s $f6, $f4 -/* 01A28 80B503B8 44023000 */ mfc1 $v0, $f6 -/* 01A2C 80B503BC 00000000 */ nop -/* 01A30 80B503C0 A4620002 */ sh $v0, 0x0002($v1) ## 00000002 -/* 01A34 80B503C4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01A38 80B503C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01A3C 80B503CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01A40 80B503D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01A44 80B503D4 03E00008 */ jr $ra -/* 01A48 80B503D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s deleted file mode 100644 index ba3de96989..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B503DC -/* 01A4C 80B503DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A50 80B503E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A54 80B503E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A58 80B503E8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01A5C 80B503EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A60 80B503F0 0C2D3B65 */ jal func_80B4ED94 -/* 01A64 80B503F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A68 80B503F8 10400008 */ beq $v0, $zero, .L80B5041C -/* 01A6C 80B503FC 8FAE001C */ lw $t6, 0x001C($sp) -/* 01A70 80B50400 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 01A74 80B50404 94580004 */ lhu $t8, 0x0004($v0) ## 00000004 -/* 01A78 80B50408 8FA80018 */ lw $t0, 0x0018($sp) -/* 01A7C 80B5040C 01F8082A */ slt $at, $t7, $t8 -/* 01A80 80B50410 14200002 */ bne $at, $zero, .L80B5041C -/* 01A84 80B50414 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 01A88 80B50418 AD19019C */ sw $t9, 0x019C($t0) ## 0000019C -.L80B5041C: -/* 01A8C 80B5041C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A90 80B50420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A94 80B50424 03E00008 */ jr $ra -/* 01A98 80B50428 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s deleted file mode 100644 index cb6a6fd0a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B5042C -/* 01A9C 80B5042C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AA0 80B50430 AFA50024 */ sw $a1, 0x0024($sp) -/* 01AA4 80B50434 AFBF001C */ sw $ra, 0x001C($sp) -/* 01AA8 80B50438 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01AAC 80B5043C 24A522D0 */ addiu $a1, $a1, 0x22D0 ## $a1 = 060022D0 -/* 01AB0 80B50440 AFA00010 */ sw $zero, 0x0010($sp) -/* 01AB4 80B50444 AFA40020 */ sw $a0, 0x0020($sp) -/* 01AB8 80B50448 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01ABC 80B5044C 0C2D3F40 */ jal func_80B4FD00 -/* 01AC0 80B50450 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01AC4 80B50454 8FA40020 */ lw $a0, 0x0020($sp) -/* 01AC8 80B50458 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01ACC 80B5045C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01AD0 80B50460 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01AD4 80B50464 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01AD8 80B50468 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01ADC 80B5046C AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01AE0 80B50470 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01AE4 80B50474 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 01AE8 80B50478 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AEC 80B5047C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01AF0 80B50480 03E00008 */ jr $ra -/* 01AF4 80B50484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s deleted file mode 100644 index 99f071263e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B50488 -/* 01AF8 80B50488 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AFC 80B5048C 10A0000D */ beq $a1, $zero, .L80B504C4 -/* 01B00 80B50490 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B04 80B50494 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B08 80B50498 24A52750 */ addiu $a1, $a1, 0x2750 ## $a1 = 06002750 -/* 01B0C 80B5049C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01B10 80B504A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01B14 80B504A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01B18 80B504A8 0C2D3F40 */ jal func_80B4FD00 -/* 01B1C 80B504AC AFA40020 */ sw $a0, 0x0020($sp) -/* 01B20 80B504B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B24 80B504B4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01B28 80B504B8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B2C 80B504BC AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01B30 80B504C0 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -.L80B504C4: -/* 01B34 80B504C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B38 80B504C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B3C 80B504CC 03E00008 */ jr $ra -/* 01B40 80B504D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s deleted file mode 100644 index 88b99bd50c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B504D4 -/* 01B44 80B504D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B48 80B504D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01B4C 80B504DC AFBF001C */ sw $ra, 0x001C($sp) -/* 01B50 80B504E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B54 80B504E4 24A5325C */ addiu $a1, $a1, 0x325C ## $a1 = 0600325C -/* 01B58 80B504E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01B5C 80B504EC AFA40020 */ sw $a0, 0x0020($sp) -/* 01B60 80B504F0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01B64 80B504F4 0C2D3F40 */ jal func_80B4FD00 -/* 01B68 80B504F8 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01B6C 80B504FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B70 80B50500 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01B74 80B50504 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01B78 80B50508 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B7C 80B5050C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01B80 80B50510 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01B84 80B50514 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01B88 80B50518 0C2D3B46 */ jal func_80B4ED18 -/* 01B8C 80B5051C E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 01B90 80B50520 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B94 80B50524 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01B98 80B50528 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01B9C 80B5052C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01BA0 80B50530 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BA4 80B50534 03E00008 */ jr $ra -/* 01BA8 80B50538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s deleted file mode 100644 index 058f01ede7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5053C -/* 01BAC 80B5053C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01BB0 80B50540 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BB4 80B50544 10A0000A */ beq $a1, $zero, .L80B50570 -/* 01BB8 80B50548 AFA40020 */ sw $a0, 0x0020($sp) -/* 01BBC 80B5054C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01BC0 80B50550 24A53538 */ addiu $a1, $a1, 0x3538 ## $a1 = 06003538 -/* 01BC4 80B50554 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01BC8 80B50558 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BCC 80B5055C 0C2D3F40 */ jal func_80B4FD00 -/* 01BD0 80B50560 AFA00010 */ sw $zero, 0x0010($sp) -/* 01BD4 80B50564 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01BD8 80B50568 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01BDC 80B5056C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50570: -/* 01BE0 80B50570 8FBF001C */ lw $ra, 0x001C($sp) -/* 01BE4 80B50574 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BE8 80B50578 03E00008 */ jr $ra -/* 01BEC 80B5057C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s deleted file mode 100644 index d7f99a47b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50580 -/* 01BF0 80B50580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01BF4 80B50584 AFA50024 */ sw $a1, 0x0024($sp) -/* 01BF8 80B50588 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BFC 80B5058C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C00 80B50590 24A50A50 */ addiu $a1, $a1, 0x0A50 ## $a1 = 06000A50 -/* 01C04 80B50594 AFA00010 */ sw $zero, 0x0010($sp) -/* 01C08 80B50598 AFA40020 */ sw $a0, 0x0020($sp) -/* 01C0C 80B5059C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01C10 80B505A0 0C2D3F40 */ jal func_80B4FD00 -/* 01C14 80B505A4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01C18 80B505A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01C1C 80B505AC 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 01C20 80B505B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01C24 80B505B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01C28 80B505B8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01C2C 80B505BC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01C30 80B505C0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01C34 80B505C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C38 80B505C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C3C 80B505CC 03E00008 */ jr $ra -/* 01C40 80B505D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s deleted file mode 100644 index 90855d5e91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B505D4 -/* 01C44 80B505D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01C48 80B505D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 01C4C 80B505DC 10A0000A */ beq $a1, $zero, .L80B50608 -/* 01C50 80B505E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01C54 80B505E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C58 80B505E8 24A50EB0 */ addiu $a1, $a1, 0x0EB0 ## $a1 = 06000EB0 -/* 01C5C 80B505EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C60 80B505F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01C64 80B505F4 0C2D3F40 */ jal func_80B4FD00 -/* 01C68 80B505F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01C6C 80B505FC 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01C70 80B50600 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01C74 80B50604 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50608: -/* 01C78 80B50608 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C7C 80B5060C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C80 80B50610 03E00008 */ jr $ra -/* 01C84 80B50614 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s deleted file mode 100644 index 3dd0cc050e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B50618 -/* 01C88 80B50618 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C8C 80B5061C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C90 80B50620 0C2D3FBF */ jal func_80B4FEFC -/* 01C94 80B50624 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C98 80B50628 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01C9C 80B5062C 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 01CA0 80B50630 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01CA4 80B50634 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CA8 80B50638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CAC 80B5063C 03E00008 */ jr $ra -/* 01CB0 80B50640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s deleted file mode 100644 index a4b5e04e7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B50644 -/* 01CB4 80B50644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01CB8 80B50648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CBC 80B5064C 0C2D3FE1 */ jal func_80B4FF84 -/* 01CC0 80B50650 AFA40018 */ sw $a0, 0x0018($sp) -/* 01CC4 80B50654 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01CC8 80B50658 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01CCC 80B5065C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01CD0 80B50660 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CD4 80B50664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CD8 80B50668 03E00008 */ jr $ra -/* 01CDC 80B5066C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s deleted file mode 100644 index f888f08f18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50670 -/* 01CE0 80B50670 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CE4 80B50674 AFA50024 */ sw $a1, 0x0024($sp) -/* 01CE8 80B50678 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CEC 80B5067C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01CF0 80B50680 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 01CF4 80B50684 AFA00010 */ sw $zero, 0x0010($sp) -/* 01CF8 80B50688 AFA40020 */ sw $a0, 0x0020($sp) -/* 01CFC 80B5068C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D00 80B50690 0C2D3F40 */ jal func_80B4FD00 -/* 01D04 80B50694 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01D08 80B50698 8FA40020 */ lw $a0, 0x0020($sp) -/* 01D0C 80B5069C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 01D10 80B506A0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01D14 80B506A4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01D18 80B506A8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01D1C 80B506AC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01D20 80B506B0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01D24 80B506B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D28 80B506B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D2C 80B506BC 03E00008 */ jr $ra -/* 01D30 80B506C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s deleted file mode 100644 index 6854e9dfed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B506C4 -/* 01D34 80B506C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D38 80B506C8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01D3C 80B506CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D40 80B506D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01D44 80B506D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D48 80B506D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D4C 80B506DC 24A5AAD4 */ addiu $a1, $a1, 0xAAD4 ## $a1 = 0600AAD4 -/* 01D50 80B506E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01D54 80B506E4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D58 80B506E8 0C2D3F40 */ jal func_80B4FD00 -/* 01D5C 80B506EC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01D60 80B506F0 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01D64 80B506F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01D68 80B506F8 AE0E019C */ sw $t6, 0x019C($s0) ## 0000019C -/* 01D6C 80B506FC AE0F01A0 */ sw $t7, 0x01A0($s0) ## 000001A0 -/* 01D70 80B50700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D74 80B50704 0C2D3B3A */ jal func_80B4ECE8 -/* 01D78 80B50708 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01D7C 80B5070C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D80 80B50710 0C2D3B46 */ jal func_80B4ED18 -/* 01D84 80B50714 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01D88 80B50718 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01D8C 80B5071C A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 01D90 80B50720 0C2D3FA4 */ jal func_80B4FE90 -/* 01D94 80B50724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D98 80B50728 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D9C 80B5072C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01DA0 80B50730 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01DA4 80B50734 03E00008 */ jr $ra -/* 01DA8 80B50738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s deleted file mode 100644 index fd065fca4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5073C -/* 01DAC 80B5073C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DB0 80B50740 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DB4 80B50744 10A0000A */ beq $a1, $zero, .L80B50770 -/* 01DB8 80B50748 AFA40020 */ sw $a0, 0x0020($sp) -/* 01DBC 80B5074C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DC0 80B50750 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 01DC4 80B50754 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DC8 80B50758 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01DCC 80B5075C 0C2D3F40 */ jal func_80B4FD00 -/* 01DD0 80B50760 AFA00010 */ sw $zero, 0x0010($sp) -/* 01DD4 80B50764 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01DD8 80B50768 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01DDC 80B5076C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50770: -/* 01DE0 80B50770 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DE4 80B50774 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01DE8 80B50778 03E00008 */ jr $ra -/* 01DEC 80B5077C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s deleted file mode 100644 index ce31fc01ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B50780 -/* 01DF0 80B50780 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DF4 80B50784 AFA50024 */ sw $a1, 0x0024($sp) -/* 01DF8 80B50788 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DFC 80B5078C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01E00 80B50790 24A51670 */ addiu $a1, $a1, 0x1670 ## $a1 = 06001670 -/* 01E04 80B50794 AFA00010 */ sw $zero, 0x0010($sp) -/* 01E08 80B50798 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E0C 80B5079C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E10 80B507A0 0C2D3F40 */ jal func_80B4FD00 -/* 01E14 80B507A4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01E18 80B507A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E1C 80B507AC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01E20 80B507B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01E24 80B507B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01E28 80B507B8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01E2C 80B507BC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01E30 80B507C0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01E34 80B507C4 0C2D3FFC */ jal func_80B4FFF0 -/* 01E38 80B507C8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E3C 80B507CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E40 80B507D0 0C2D3B3A */ jal func_80B4ECE8 -/* 01E44 80B507D4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01E48 80B507D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E4C 80B507DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E50 80B507E0 03E00008 */ jr $ra -/* 01E54 80B507E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s deleted file mode 100644 index d5412d43c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B507E8 -/* 01E58 80B507E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E5C 80B507EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01E60 80B507F0 10A0000A */ beq $a1, $zero, .L80B5081C -/* 01E64 80B507F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E68 80B507F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01E6C 80B507FC 24A51B48 */ addiu $a1, $a1, 0x1B48 ## $a1 = 06001B48 -/* 01E70 80B50800 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01E74 80B50804 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E78 80B50808 0C2D3F40 */ jal func_80B4FD00 -/* 01E7C 80B5080C AFA00010 */ sw $zero, 0x0010($sp) -/* 01E80 80B50810 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01E84 80B50814 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 01E88 80B50818 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B5081C: -/* 01E8C 80B5081C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E90 80B50820 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E94 80B50824 03E00008 */ jr $ra -/* 01E98 80B50828 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s deleted file mode 100644 index 71cb2b60b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B5082C -/* 01E9C 80B5082C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EA0 80B50830 AFA50024 */ sw $a1, 0x0024($sp) -/* 01EA4 80B50834 AFBF001C */ sw $ra, 0x001C($sp) -/* 01EA8 80B50838 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01EAC 80B5083C 24A52B14 */ addiu $a1, $a1, 0x2B14 ## $a1 = 06002B14 -/* 01EB0 80B50840 AFA00010 */ sw $zero, 0x0010($sp) -/* 01EB4 80B50844 AFA40020 */ sw $a0, 0x0020($sp) -/* 01EB8 80B50848 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01EBC 80B5084C 0C2D3F40 */ jal func_80B4FD00 -/* 01EC0 80B50850 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01EC4 80B50854 8FA40020 */ lw $a0, 0x0020($sp) -/* 01EC8 80B50858 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01ECC 80B5085C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01ED0 80B50860 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01ED4 80B50864 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01ED8 80B50868 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01EDC 80B5086C A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01EE0 80B50870 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EE4 80B50874 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EE8 80B50878 03E00008 */ jr $ra -/* 01EEC 80B5087C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s deleted file mode 100644 index adb975fcab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50880 -/* 01EF0 80B50880 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EF4 80B50884 10A0000C */ beq $a1, $zero, .L80B508B8 -/* 01EF8 80B50888 AFBF001C */ sw $ra, 0x001C($sp) -/* 01EFC 80B5088C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F00 80B50890 24A52F30 */ addiu $a1, $a1, 0x2F30 ## $a1 = 06002F30 -/* 01F04 80B50894 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01F08 80B50898 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01F0C 80B5089C AFA00010 */ sw $zero, 0x0010($sp) -/* 01F10 80B508A0 0C2D3F40 */ jal func_80B4FD00 -/* 01F14 80B508A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F18 80B508A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F1C 80B508AC 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 01F20 80B508B0 0C2D3FAD */ jal func_80B4FEB4 -/* 01F24 80B508B4 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -.L80B508B8: -/* 01F28 80B508B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F2C 80B508BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F30 80B508C0 03E00008 */ jr $ra -/* 01F34 80B508C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s deleted file mode 100644 index e59a363ee8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B508C8 -/* 01F38 80B508C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F3C 80B508CC AFA50024 */ sw $a1, 0x0024($sp) -/* 01F40 80B508D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F44 80B508D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F48 80B508D8 24A51010 */ addiu $a1, $a1, 0x1010 ## $a1 = 06001010 -/* 01F4C 80B508DC AFA00010 */ sw $zero, 0x0010($sp) -/* 01F50 80B508E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F54 80B508E4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01F58 80B508E8 0C2D3F40 */ jal func_80B4FD00 -/* 01F5C 80B508EC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01F60 80B508F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F64 80B508F4 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 01F68 80B508F8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01F6C 80B508FC 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 01F70 80B50900 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01F74 80B50904 0C2D3B3A */ jal func_80B4ECE8 -/* 01F78 80B50908 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01F7C 80B5090C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F80 80B50910 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01F84 80B50914 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01F88 80B50918 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F8C 80B5091C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F90 80B50920 03E00008 */ jr $ra -/* 01F94 80B50924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s deleted file mode 100644 index 63db6d21dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50928 -/* 01F98 80B50928 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F9C 80B5092C 10A0000C */ beq $a1, $zero, .L80B50960 -/* 01FA0 80B50930 AFBF001C */ sw $ra, 0x001C($sp) -/* 01FA4 80B50934 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01FA8 80B50938 24A513A0 */ addiu $a1, $a1, 0x13A0 ## $a1 = 060013A0 -/* 01FAC 80B5093C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01FB0 80B50940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01FB4 80B50944 AFA00010 */ sw $zero, 0x0010($sp) -/* 01FB8 80B50948 0C2D3F40 */ jal func_80B4FD00 -/* 01FBC 80B5094C AFA40020 */ sw $a0, 0x0020($sp) -/* 01FC0 80B50950 8FA40020 */ lw $a0, 0x0020($sp) -/* 01FC4 80B50954 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 01FC8 80B50958 0C2D3FB6 */ jal func_80B4FED8 -/* 01FCC 80B5095C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -.L80B50960: -/* 01FD0 80B50960 8FBF001C */ lw $ra, 0x001C($sp) -/* 01FD4 80B50964 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01FD8 80B50968 03E00008 */ jr $ra -/* 01FDC 80B5096C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s deleted file mode 100644 index 5c1a1076a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B50970 -/* 01FE0 80B50970 AFA50004 */ sw $a1, 0x0004($sp) -/* 01FE4 80B50974 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 01FE8 80B50978 03E00008 */ jr $ra -/* 01FEC 80B5097C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s deleted file mode 100644 index c10fbb11ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B50980 -/* 01FF0 80B50980 AFA50004 */ sw $a1, 0x0004($sp) -/* 01FF4 80B50984 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 01FF8 80B50988 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01FFC 80B5098C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02000 80B50990 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02004 80B50994 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02008 80B50998 03E00008 */ jr $ra -/* 0200C 80B5099C AC9801A8 */ sw $t8, 0x01A8($a0) ## 000001A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s deleted file mode 100644 index 9ab2b5adde..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B509A0 -/* 02010 80B509A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02014 80B509A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02018 80B509A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0201C 80B509AC AFA5001C */ sw $a1, 0x001C($sp) -/* 02020 80B509B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02024 80B509B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02028 80B509B8 0C2D3B65 */ jal func_80B4ED94 -/* 0202C 80B509BC AFA60018 */ sw $a2, 0x0018($sp) -/* 02030 80B509C0 1040000C */ beq $v0, $zero, .L80B509F4 -/* 02034 80B509C4 8FA60018 */ lw $a2, 0x0018($sp) -/* 02038 80B509C8 8FAE001C */ lw $t6, 0x001C($sp) -/* 0203C 80B509CC 94580004 */ lhu $t8, 0x0004($v0) ## 00000004 -/* 02040 80B509D0 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 -/* 02044 80B509D4 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02048 80B509D8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0204C 80B509DC 01F8082A */ slt $at, $t7, $t8 -/* 02050 80B509E0 54200005 */ bnel $at, $zero, .L80B509F8 -/* 02054 80B509E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02058 80B509E8 ACD9019C */ sw $t9, 0x019C($a2) ## 0000019C -/* 0205C 80B509EC 0C2D3F9B */ jal func_80B4FE6C -/* 02060 80B509F0 ACC001A0 */ sw $zero, 0x01A0($a2) ## 000001A0 -.L80B509F4: -/* 02064 80B509F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B509F8: -/* 02068 80B509F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0206C 80B509FC 03E00008 */ jr $ra -/* 02070 80B50A00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s deleted file mode 100644 index e39df4cda1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_80B52980 - .asciz "En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B52BDC -.word L80B50A6C -.word L80B50A80 -.word L80B50A94 -.word L80B50AA8 -.word L80B50ABC -.word L80B50AD0 -.word L80B50AE4 -.word L80B50AF8 -.word L80B50B0C -.word L80B50B20 -.word L80B50B34 -.word L80B50B48 -.word L80B50B5C -.word L80B50B70 -.word L80B50B84 - -.text -glabel func_80B50A04 -/* 02074 80B50A04 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02078 80B50A08 AFB00018 */ sw $s0, 0x0018($sp) -/* 0207C 80B50A0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02080 80B50A10 AFBF001C */ sw $ra, 0x001C($sp) -/* 02084 80B50A14 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02088 80B50A18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0208C 80B50A1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02090 80B50A20 0C2D3B65 */ jal func_80B4ED94 -/* 02094 80B50A24 AFA6002C */ sw $a2, 0x002C($sp) -/* 02098 80B50A28 1040005F */ beq $v0, $zero, .L80B50BA8 -/* 0209C 80B50A2C 8FA6002C */ lw $a2, 0x002C($sp) -/* 020A0 80B50A30 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 020A4 80B50A34 AFAE0020 */ sw $t6, 0x0020($sp) -/* 020A8 80B50A38 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 020AC 80B50A3C 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 020B0 80B50A40 2F01000F */ sltiu $at, $t8, 0x000F -/* 020B4 80B50A44 51C30059 */ beql $t6, $v1, .L80B50BAC -/* 020B8 80B50A48 8FBF001C */ lw $ra, 0x001C($sp) -/* 020BC 80B50A4C 10200052 */ beq $at, $zero, .L80B50B98 -/* 020C0 80B50A50 3C0480B5 */ lui $a0, %hi(D_80B52980) ## $a0 = 80B50000 -/* 020C4 80B50A54 0018C080 */ sll $t8, $t8, 2 -/* 020C8 80B50A58 3C0180B5 */ lui $at, %hi(jtbl_80B52BDC) ## $at = 80B50000 -/* 020CC 80B50A5C 00380821 */ addu $at, $at, $t8 -/* 020D0 80B50A60 8C382BDC */ lw $t8, %lo(jtbl_80B52BDC)($at) -/* 020D4 80B50A64 03000008 */ jr $t8 -/* 020D8 80B50A68 00000000 */ nop -glabel L80B50A6C -/* 020DC 80B50A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020E0 80B50A70 0C2D4098 */ jal func_80B50260 -/* 020E4 80B50A74 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 020E8 80B50A78 1000004A */ beq $zero, $zero, .L80B50BA4 -/* 020EC 80B50A7C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50A80 -/* 020F0 80B50A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020F4 80B50A84 0C2D409E */ jal func_80B50278 -/* 020F8 80B50A88 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 020FC 80B50A8C 10000045 */ beq $zero, $zero, .L80B50BA4 -/* 02100 80B50A90 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50A94 -/* 02104 80B50A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02108 80B50A98 0C2D40C1 */ jal func_80B50304 -/* 0210C 80B50A9C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02110 80B50AA0 10000040 */ beq $zero, $zero, .L80B50BA4 -/* 02114 80B50AA4 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AA8 -/* 02118 80B50AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0211C 80B50AAC 0C2D410B */ jal func_80B5042C -/* 02120 80B50AB0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02124 80B50AB4 1000003B */ beq $zero, $zero, .L80B50BA4 -/* 02128 80B50AB8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50ABC -/* 0212C 80B50ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02130 80B50AC0 0C2D4135 */ jal func_80B504D4 -/* 02134 80B50AC4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02138 80B50AC8 10000036 */ beq $zero, $zero, .L80B50BA4 -/* 0213C 80B50ACC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AD0 -/* 02140 80B50AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02144 80B50AD4 0C2D4160 */ jal func_80B50580 -/* 02148 80B50AD8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0214C 80B50ADC 10000031 */ beq $zero, $zero, .L80B50BA4 -/* 02150 80B50AE0 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AE4 -/* 02154 80B50AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02158 80B50AE8 0C2D4186 */ jal func_80B50618 -/* 0215C 80B50AEC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02160 80B50AF0 1000002C */ beq $zero, $zero, .L80B50BA4 -/* 02164 80B50AF4 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AF8 -/* 02168 80B50AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0216C 80B50AFC 0C2D419C */ jal func_80B50670 -/* 02170 80B50B00 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02174 80B50B04 10000027 */ beq $zero, $zero, .L80B50BA4 -/* 02178 80B50B08 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B0C -/* 0217C 80B50B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02180 80B50B10 0C2D41B1 */ jal func_80B506C4 -/* 02184 80B50B14 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02188 80B50B18 10000022 */ beq $zero, $zero, .L80B50BA4 -/* 0218C 80B50B1C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B20 -/* 02190 80B50B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02194 80B50B24 0C2D41E0 */ jal func_80B50780 -/* 02198 80B50B28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0219C 80B50B2C 1000001D */ beq $zero, $zero, .L80B50BA4 -/* 021A0 80B50B30 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B34 -/* 021A4 80B50B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021A8 80B50B38 0C2D420B */ jal func_80B5082C -/* 021AC 80B50B3C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021B0 80B50B40 10000018 */ beq $zero, $zero, .L80B50BA4 -/* 021B4 80B50B44 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B48 -/* 021B8 80B50B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021BC 80B50B4C 0C2D4232 */ jal func_80B508C8 -/* 021C0 80B50B50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021C4 80B50B54 10000013 */ beq $zero, $zero, .L80B50BA4 -/* 021C8 80B50B58 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B5C -/* 021CC 80B50B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D0 80B50B60 0C2D425C */ jal func_80B50970 -/* 021D4 80B50B64 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021D8 80B50B68 1000000E */ beq $zero, $zero, .L80B50BA4 -/* 021DC 80B50B6C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B70 -/* 021E0 80B50B70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E4 80B50B74 0C2D4260 */ jal func_80B50980 -/* 021E8 80B50B78 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021EC 80B50B7C 10000009 */ beq $zero, $zero, .L80B50BA4 -/* 021F0 80B50B80 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B84 -/* 021F4 80B50B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 80B50B88 0C2D4191 */ jal func_80B50644 -/* 021FC 80B50B8C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02200 80B50B90 10000004 */ beq $zero, $zero, .L80B50BA4 -/* 02204 80B50B94 8FB90020 */ lw $t9, 0x0020($sp) -.L80B50B98: -/* 02208 80B50B98 0C00084C */ jal osSyncPrintf - -/* 0220C 80B50B9C 24842980 */ addiu $a0, $a0, %lo(D_80B52980) ## $a0 = 00002980 -/* 02210 80B50BA0 8FB90020 */ lw $t9, 0x0020($sp) -.L80B50BA4: -/* 02214 80B50BA4 AE190240 */ sw $t9, 0x0240($s0) ## 00000240 -.L80B50BA8: -/* 02218 80B50BA8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B50BAC: -/* 0221C 80B50BAC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02220 80B50BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02224 80B50BB4 03E00008 */ jr $ra -/* 02228 80B50BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s deleted file mode 100644 index a6b7bf0524..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B50BBC -/* 0222C 80B50BBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02230 80B50BC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02234 80B50BC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02238 80B50BC8 0C2D3F33 */ jal func_80B4FCCC -/* 0223C 80B50BCC AFA5001C */ sw $a1, 0x001C($sp) -/* 02240 80B50BD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02244 80B50BD4 0C2D4281 */ jal func_80B50A04 -/* 02248 80B50BD8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0224C 80B50BDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02250 80B50BE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02254 80B50BE4 03E00008 */ jr $ra -/* 02258 80B50BE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s deleted file mode 100644 index 0b4acd2b33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50BEC -/* 0225C 80B50BEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02260 80B50BF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02264 80B50BF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02268 80B50BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0226C 80B50BFC 0C2D3F33 */ jal func_80B4FCCC -/* 02270 80B50C00 AFA50024 */ sw $a1, 0x0024($sp) -/* 02274 80B50C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02278 80B50C08 0C2D3B4B */ jal func_80B4ED2C -/* 0227C 80B50C0C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02280 80B50C10 0C2D3A6C */ jal func_80B4E9B0 -/* 02284 80B50C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80B50C18 0C2D3B5D */ jal func_80B4ED74 -/* 0228C 80B50C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02290 80B50C20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02294 80B50C24 0C2D4281 */ jal func_80B50A04 -/* 02298 80B50C28 8FA50024 */ lw $a1, 0x0024($sp) -/* 0229C 80B50C2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 022A0 80B50C30 8FB00018 */ lw $s0, 0x0018($sp) -/* 022A4 80B50C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022A8 80B50C38 03E00008 */ jr $ra -/* 022AC 80B50C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s deleted file mode 100644 index b1b72eace3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B50C40 -/* 022B0 80B50C40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022B4 80B50C44 AFBF001C */ sw $ra, 0x001C($sp) -/* 022B8 80B50C48 AFB00018 */ sw $s0, 0x0018($sp) -/* 022BC 80B50C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022C0 80B50C50 0C2D3F33 */ jal func_80B4FCCC -/* 022C4 80B50C54 AFA50024 */ sw $a1, 0x0024($sp) -/* 022C8 80B50C58 0C2D3F75 */ jal func_80B4FDD4 -/* 022CC 80B50C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022D0 80B50C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022D4 80B50C64 0C2D3B4B */ jal func_80B4ED2C -/* 022D8 80B50C68 8FA50024 */ lw $a1, 0x0024($sp) -/* 022DC 80B50C6C 0C2D3A6C */ jal func_80B4E9B0 -/* 022E0 80B50C70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022E4 80B50C74 0C2D3B5D */ jal func_80B4ED74 -/* 022E8 80B50C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022EC 80B50C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F0 80B50C80 0C2D4038 */ jal func_80B500E0 -/* 022F4 80B50C84 8FA50024 */ lw $a1, 0x0024($sp) -/* 022F8 80B50C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022FC 80B50C8C 0C2D40F7 */ jal func_80B503DC -/* 02300 80B50C90 8FA50024 */ lw $a1, 0x0024($sp) -/* 02304 80B50C94 8FBF001C */ lw $ra, 0x001C($sp) -/* 02308 80B50C98 8FB00018 */ lw $s0, 0x0018($sp) -/* 0230C 80B50C9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02310 80B50CA0 03E00008 */ jr $ra -/* 02314 80B50CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s deleted file mode 100644 index b725c7c482..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50CA8 -/* 02318 80B50CA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0231C 80B50CAC AFBF001C */ sw $ra, 0x001C($sp) -/* 02320 80B50CB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02324 80B50CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02328 80B50CB8 0C2D3F33 */ jal func_80B4FCCC -/* 0232C 80B50CBC AFA50024 */ sw $a1, 0x0024($sp) -/* 02330 80B50CC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02334 80B50CC4 0C2D3B4B */ jal func_80B4ED2C -/* 02338 80B50CC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0233C 80B50CCC 0C2D3A6C */ jal func_80B4E9B0 -/* 02340 80B50CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02344 80B50CD4 0C2D3B5D */ jal func_80B4ED74 -/* 02348 80B50CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0234C 80B50CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02350 80B50CE0 0C2D4281 */ jal func_80B50A04 -/* 02354 80B50CE4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02358 80B50CE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0235C 80B50CEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02360 80B50CF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02364 80B50CF4 03E00008 */ jr $ra -/* 02368 80B50CF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s deleted file mode 100644 index 44230c0259..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50CFC -/* 0236C 80B50CFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02370 80B50D00 AFBF001C */ sw $ra, 0x001C($sp) -/* 02374 80B50D04 AFB00018 */ sw $s0, 0x0018($sp) -/* 02378 80B50D08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0237C 80B50D0C 0C2D3F33 */ jal func_80B4FCCC -/* 02380 80B50D10 AFA50024 */ sw $a1, 0x0024($sp) -/* 02384 80B50D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02388 80B50D18 0C2D3B4B */ jal func_80B4ED2C -/* 0238C 80B50D1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02390 80B50D20 0C2D3A90 */ jal func_80B4EA40 -/* 02394 80B50D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02398 80B50D28 0C2D3B5D */ jal func_80B4ED74 -/* 0239C 80B50D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A0 80B50D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A4 80B50D34 0C2D4122 */ jal func_80B50488 -/* 023A8 80B50D38 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 023AC 80B50D3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 023B0 80B50D40 8FB00018 */ lw $s0, 0x0018($sp) -/* 023B4 80B50D44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023B8 80B50D48 03E00008 */ jr $ra -/* 023BC 80B50D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s deleted file mode 100644 index b42b854064..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B50D50 -/* 023C0 80B50D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 023C4 80B50D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 023C8 80B50D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 023CC 80B50D5C 0C2D3F33 */ jal func_80B4FCCC -/* 023D0 80B50D60 AFA5001C */ sw $a1, 0x001C($sp) -/* 023D4 80B50D64 8FA40018 */ lw $a0, 0x0018($sp) -/* 023D8 80B50D68 0C2D3B4B */ jal func_80B4ED2C -/* 023DC 80B50D6C 8FA5001C */ lw $a1, 0x001C($sp) -/* 023E0 80B50D70 0C2D3B5D */ jal func_80B4ED74 -/* 023E4 80B50D74 8FA40018 */ lw $a0, 0x0018($sp) -/* 023E8 80B50D78 8FA40018 */ lw $a0, 0x0018($sp) -/* 023EC 80B50D7C 0C2D4281 */ jal func_80B50A04 -/* 023F0 80B50D80 8FA5001C */ lw $a1, 0x001C($sp) -/* 023F4 80B50D84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023F8 80B50D88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023FC 80B50D8C 03E00008 */ jr $ra -/* 02400 80B50D90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s deleted file mode 100644 index 6e54f61a0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50D94 -/* 02404 80B50D94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02408 80B50D98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0240C 80B50D9C AFB00018 */ sw $s0, 0x0018($sp) -/* 02410 80B50DA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02414 80B50DA4 0C2D3F33 */ jal func_80B4FCCC -/* 02418 80B50DA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0241C 80B50DAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02420 80B50DB0 0C2D3B4B */ jal func_80B4ED2C -/* 02424 80B50DB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02428 80B50DB8 0C2D3ABD */ jal func_80B4EAF4 -/* 0242C 80B50DBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02430 80B50DC0 0C2D3B5D */ jal func_80B4ED74 -/* 02434 80B50DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02438 80B50DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0243C 80B50DCC 0C2D414F */ jal func_80B5053C -/* 02440 80B50DD0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02444 80B50DD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02448 80B50DD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0244C 80B50DDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02450 80B50DE0 03E00008 */ jr $ra -/* 02454 80B50DE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s deleted file mode 100644 index 8b27e664e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50DE8 -/* 02458 80B50DE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0245C 80B50DEC AFBF001C */ sw $ra, 0x001C($sp) -/* 02460 80B50DF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02464 80B50DF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02468 80B50DF8 0C2D3F33 */ jal func_80B4FCCC -/* 0246C 80B50DFC AFA50024 */ sw $a1, 0x0024($sp) -/* 02470 80B50E00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02474 80B50E04 0C2D3B4B */ jal func_80B4ED2C -/* 02478 80B50E08 8FA50024 */ lw $a1, 0x0024($sp) -/* 0247C 80B50E0C 0C2D3A6C */ jal func_80B4E9B0 -/* 02480 80B50E10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02484 80B50E14 0C2D3B5D */ jal func_80B4ED74 -/* 02488 80B50E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0248C 80B50E1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02490 80B50E20 0C2D4281 */ jal func_80B50A04 -/* 02494 80B50E24 8FA50024 */ lw $a1, 0x0024($sp) -/* 02498 80B50E28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0249C 80B50E2C 8FB00018 */ lw $s0, 0x0018($sp) -/* 024A0 80B50E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024A4 80B50E34 03E00008 */ jr $ra -/* 024A8 80B50E38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s deleted file mode 100644 index fa24de328b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50E3C -/* 024AC 80B50E3C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024B0 80B50E40 AFBF001C */ sw $ra, 0x001C($sp) -/* 024B4 80B50E44 AFB00018 */ sw $s0, 0x0018($sp) -/* 024B8 80B50E48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 024BC 80B50E4C 0C2D3F33 */ jal func_80B4FCCC -/* 024C0 80B50E50 AFA50024 */ sw $a1, 0x0024($sp) -/* 024C4 80B50E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C8 80B50E58 0C2D3B4B */ jal func_80B4ED2C -/* 024CC 80B50E5C 8FA50024 */ lw $a1, 0x0024($sp) -/* 024D0 80B50E60 0C2D3A6C */ jal func_80B4E9B0 -/* 024D4 80B50E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024D8 80B50E68 0C2D3B5D */ jal func_80B4ED74 -/* 024DC 80B50E6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024E0 80B50E70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024E4 80B50E74 0C2D4175 */ jal func_80B505D4 -/* 024E8 80B50E78 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 024EC 80B50E7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 024F0 80B50E80 8FB00018 */ lw $s0, 0x0018($sp) -/* 024F4 80B50E84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024F8 80B50E88 03E00008 */ jr $ra -/* 024FC 80B50E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s deleted file mode 100644 index 4ad0835bf5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50E90 -/* 02500 80B50E90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02504 80B50E94 AFBF001C */ sw $ra, 0x001C($sp) -/* 02508 80B50E98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0250C 80B50E9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02510 80B50EA0 0C2D3F33 */ jal func_80B4FCCC -/* 02514 80B50EA4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02518 80B50EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0251C 80B50EAC 0C2D3B4B */ jal func_80B4ED2C -/* 02520 80B50EB0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02524 80B50EB4 0C2D3A6C */ jal func_80B4E9B0 -/* 02528 80B50EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0252C 80B50EBC 0C2D3B5D */ jal func_80B4ED74 -/* 02530 80B50EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02534 80B50EC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02538 80B50EC8 0C2D4281 */ jal func_80B50A04 -/* 0253C 80B50ECC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02540 80B50ED0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02544 80B50ED4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02548 80B50ED8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0254C 80B50EDC 03E00008 */ jr $ra -/* 02550 80B50EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s deleted file mode 100644 index d94fa009c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50EE4 -/* 02554 80B50EE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02558 80B50EE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0255C 80B50EEC AFB00018 */ sw $s0, 0x0018($sp) -/* 02560 80B50EF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02564 80B50EF4 0C2D3F33 */ jal func_80B4FCCC -/* 02568 80B50EF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0256C 80B50EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02570 80B50F00 0C2D3B4B */ jal func_80B4ED2C -/* 02574 80B50F04 8FA50024 */ lw $a1, 0x0024($sp) -/* 02578 80B50F08 0C2D3A6C */ jal func_80B4E9B0 -/* 0257C 80B50F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02580 80B50F10 0C2D3B5D */ jal func_80B4ED74 -/* 02584 80B50F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02588 80B50F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0258C 80B50F1C 0C2D4281 */ jal func_80B50A04 -/* 02590 80B50F20 8FA50024 */ lw $a1, 0x0024($sp) -/* 02594 80B50F24 8FBF001C */ lw $ra, 0x001C($sp) -/* 02598 80B50F28 8FB00018 */ lw $s0, 0x0018($sp) -/* 0259C 80B50F2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025A0 80B50F30 03E00008 */ jr $ra -/* 025A4 80B50F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s deleted file mode 100644 index 7b4801bd75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50F38 -/* 025A8 80B50F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 025AC 80B50F3C AFBF001C */ sw $ra, 0x001C($sp) -/* 025B0 80B50F40 AFB00018 */ sw $s0, 0x0018($sp) -/* 025B4 80B50F44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025B8 80B50F48 0C2D3F33 */ jal func_80B4FCCC -/* 025BC 80B50F4C AFA50024 */ sw $a1, 0x0024($sp) -/* 025C0 80B50F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025C4 80B50F54 0C2D3B4B */ jal func_80B4ED2C -/* 025C8 80B50F58 8FA50024 */ lw $a1, 0x0024($sp) -/* 025CC 80B50F5C 0C2D3A6C */ jal func_80B4E9B0 -/* 025D0 80B50F60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025D4 80B50F64 0C2D3B5D */ jal func_80B4ED74 -/* 025D8 80B50F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025DC 80B50F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025E0 80B50F70 0C2D4281 */ jal func_80B50A04 -/* 025E4 80B50F74 8FA50024 */ lw $a1, 0x0024($sp) -/* 025E8 80B50F78 8FBF001C */ lw $ra, 0x001C($sp) -/* 025EC 80B50F7C 8FB00018 */ lw $s0, 0x0018($sp) -/* 025F0 80B50F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025F4 80B50F84 03E00008 */ jr $ra -/* 025F8 80B50F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s deleted file mode 100644 index f7f574d4ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B50F8C -/* 025FC 80B50F8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02600 80B50F90 AFBF001C */ sw $ra, 0x001C($sp) -/* 02604 80B50F94 AFB00018 */ sw $s0, 0x0018($sp) -/* 02608 80B50F98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0260C 80B50F9C 0C2D3F33 */ jal func_80B4FCCC -/* 02610 80B50FA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02614 80B50FA4 0C2D3F84 */ jal func_80B4FE10 -/* 02618 80B50FA8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0261C 80B50FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02620 80B50FB0 0C2D3B4B */ jal func_80B4ED2C -/* 02624 80B50FB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02628 80B50FB8 0C2D3A6C */ jal func_80B4E9B0 -/* 0262C 80B50FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02630 80B50FC0 0C2D3B5D */ jal func_80B4ED74 -/* 02634 80B50FC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02638 80B50FC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0263C 80B50FCC 0C2D4281 */ jal func_80B50A04 -/* 02640 80B50FD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02644 80B50FD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02648 80B50FD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0264C 80B50FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02650 80B50FE0 03E00008 */ jr $ra -/* 02654 80B50FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s deleted file mode 100644 index caf9ae8af3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50FE8 -/* 02658 80B50FE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0265C 80B50FEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02660 80B50FF0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02664 80B50FF4 0C2D3F33 */ jal func_80B4FCCC -/* 02668 80B50FF8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0266C 80B50FFC 0C2D3F84 */ jal func_80B4FE10 -/* 02670 80B51000 8FA4001C */ lw $a0, 0x001C($sp) -/* 02674 80B51004 8FA40018 */ lw $a0, 0x0018($sp) -/* 02678 80B51008 0C2D3B4B */ jal func_80B4ED2C -/* 0267C 80B5100C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02680 80B51010 0C2D3B5D */ jal func_80B4ED74 -/* 02684 80B51014 8FA40018 */ lw $a0, 0x0018($sp) -/* 02688 80B51018 8FA40018 */ lw $a0, 0x0018($sp) -/* 0268C 80B5101C 0C2D41CF */ jal func_80B5073C -/* 02690 80B51020 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02694 80B51024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02698 80B51028 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0269C 80B5102C 03E00008 */ jr $ra -/* 026A0 80B51030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s deleted file mode 100644 index f27f40fd08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51034 -/* 026A4 80B51034 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026A8 80B51038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026AC 80B5103C AFA40018 */ sw $a0, 0x0018($sp) -/* 026B0 80B51040 0C2D3F33 */ jal func_80B4FCCC -/* 026B4 80B51044 AFA5001C */ sw $a1, 0x001C($sp) -/* 026B8 80B51048 0C2D3F84 */ jal func_80B4FE10 -/* 026BC 80B5104C 8FA4001C */ lw $a0, 0x001C($sp) -/* 026C0 80B51050 8FA40018 */ lw $a0, 0x0018($sp) -/* 026C4 80B51054 0C2D3B4B */ jal func_80B4ED2C -/* 026C8 80B51058 8FA5001C */ lw $a1, 0x001C($sp) -/* 026CC 80B5105C 0C2D3B5D */ jal func_80B4ED74 -/* 026D0 80B51060 8FA40018 */ lw $a0, 0x0018($sp) -/* 026D4 80B51064 8FA40018 */ lw $a0, 0x0018($sp) -/* 026D8 80B51068 0C2D4281 */ jal func_80B50A04 -/* 026DC 80B5106C 8FA5001C */ lw $a1, 0x001C($sp) -/* 026E0 80B51070 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026E4 80B51074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026E8 80B51078 03E00008 */ jr $ra -/* 026EC 80B5107C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s deleted file mode 100644 index afef6176ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51080 -/* 026F0 80B51080 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026F4 80B51084 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026F8 80B51088 AFA40018 */ sw $a0, 0x0018($sp) -/* 026FC 80B5108C 0C2D3F33 */ jal func_80B4FCCC -/* 02700 80B51090 AFA5001C */ sw $a1, 0x001C($sp) -/* 02704 80B51094 0C2D3F84 */ jal func_80B4FE10 -/* 02708 80B51098 8FA4001C */ lw $a0, 0x001C($sp) -/* 0270C 80B5109C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02710 80B510A0 0C2D3B4B */ jal func_80B4ED2C -/* 02714 80B510A4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02718 80B510A8 0C2D3B5D */ jal func_80B4ED74 -/* 0271C 80B510AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02720 80B510B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02724 80B510B4 0C2D41FA */ jal func_80B507E8 -/* 02728 80B510B8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0272C 80B510BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02730 80B510C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02734 80B510C4 03E00008 */ jr $ra -/* 02738 80B510C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s deleted file mode 100644 index 624d586786..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B510CC -/* 0273C 80B510CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02740 80B510D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02744 80B510D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02748 80B510D8 0C2D3F33 */ jal func_80B4FCCC -/* 0274C 80B510DC AFA5001C */ sw $a1, 0x001C($sp) -/* 02750 80B510E0 0C2D3F84 */ jal func_80B4FE10 -/* 02754 80B510E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 02758 80B510E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0275C 80B510EC 0C2D3B4B */ jal func_80B4ED2C -/* 02760 80B510F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02764 80B510F4 0C2D3B5D */ jal func_80B4ED74 -/* 02768 80B510F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0276C 80B510FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02770 80B51100 0C2D4281 */ jal func_80B50A04 -/* 02774 80B51104 8FA5001C */ lw $a1, 0x001C($sp) -/* 02778 80B51108 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0277C 80B5110C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02780 80B51110 03E00008 */ jr $ra -/* 02784 80B51114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s deleted file mode 100644 index e535cfa3c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51118 -/* 02788 80B51118 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0278C 80B5111C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02790 80B51120 AFA40018 */ sw $a0, 0x0018($sp) -/* 02794 80B51124 0C2D3F33 */ jal func_80B4FCCC -/* 02798 80B51128 AFA5001C */ sw $a1, 0x001C($sp) -/* 0279C 80B5112C 0C2D3F84 */ jal func_80B4FE10 -/* 027A0 80B51130 8FA4001C */ lw $a0, 0x001C($sp) -/* 027A4 80B51134 8FA40018 */ lw $a0, 0x0018($sp) -/* 027A8 80B51138 0C2D3B4B */ jal func_80B4ED2C -/* 027AC 80B5113C 8FA5001C */ lw $a1, 0x001C($sp) -/* 027B0 80B51140 0C2D3B5D */ jal func_80B4ED74 -/* 027B4 80B51144 8FA40018 */ lw $a0, 0x0018($sp) -/* 027B8 80B51148 8FA40018 */ lw $a0, 0x0018($sp) -/* 027BC 80B5114C 0C2D4220 */ jal func_80B50880 -/* 027C0 80B51150 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 027C4 80B51154 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027C8 80B51158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027CC 80B5115C 03E00008 */ jr $ra -/* 027D0 80B51160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s deleted file mode 100644 index 7d4ea9c25f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51164 -/* 027D4 80B51164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027D8 80B51168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027DC 80B5116C AFA40018 */ sw $a0, 0x0018($sp) -/* 027E0 80B51170 0C2D3F33 */ jal func_80B4FCCC -/* 027E4 80B51174 AFA5001C */ sw $a1, 0x001C($sp) -/* 027E8 80B51178 0C2D3F84 */ jal func_80B4FE10 -/* 027EC 80B5117C 8FA4001C */ lw $a0, 0x001C($sp) -/* 027F0 80B51180 8FA40018 */ lw $a0, 0x0018($sp) -/* 027F4 80B51184 0C2D3B4B */ jal func_80B4ED2C -/* 027F8 80B51188 8FA5001C */ lw $a1, 0x001C($sp) -/* 027FC 80B5118C 0C2D3B5D */ jal func_80B4ED74 -/* 02800 80B51190 8FA40018 */ lw $a0, 0x0018($sp) -/* 02804 80B51194 8FA40018 */ lw $a0, 0x0018($sp) -/* 02808 80B51198 0C2D4281 */ jal func_80B50A04 -/* 0280C 80B5119C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02810 80B511A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02814 80B511A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02818 80B511A8 03E00008 */ jr $ra -/* 0281C 80B511AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s deleted file mode 100644 index af39bc5b7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B511B0 -/* 02820 80B511B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02824 80B511B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02828 80B511B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0282C 80B511BC 0C2D3F33 */ jal func_80B4FCCC -/* 02830 80B511C0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02834 80B511C4 0C2D3F84 */ jal func_80B4FE10 -/* 02838 80B511C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0283C 80B511CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02840 80B511D0 0C2D3B4B */ jal func_80B4ED2C -/* 02844 80B511D4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02848 80B511D8 0C2D3B5D */ jal func_80B4ED74 -/* 0284C 80B511DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02850 80B511E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02854 80B511E4 0C2D424A */ jal func_80B50928 -/* 02858 80B511E8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0285C 80B511EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02860 80B511F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02864 80B511F4 03E00008 */ jr $ra -/* 02868 80B511F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s deleted file mode 100644 index fdc4735a75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B511FC -/* 0286C 80B511FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02870 80B51200 AFBF001C */ sw $ra, 0x001C($sp) -/* 02874 80B51204 AFB00018 */ sw $s0, 0x0018($sp) -/* 02878 80B51208 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0287C 80B5120C 0C2D3F33 */ jal func_80B4FCCC -/* 02880 80B51210 AFA50024 */ sw $a1, 0x0024($sp) -/* 02884 80B51214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02888 80B51218 0C2D3B4B */ jal func_80B4ED2C -/* 0288C 80B5121C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02890 80B51220 0C2D3B5D */ jal func_80B4ED74 -/* 02894 80B51224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02898 80B51228 0C2D4023 */ jal func_80B5008C -/* 0289C 80B5122C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A0 80B51230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A4 80B51234 0C2D4281 */ jal func_80B50A04 -/* 028A8 80B51238 8FA50024 */ lw $a1, 0x0024($sp) -/* 028AC 80B5123C 8FBF001C */ lw $ra, 0x001C($sp) -/* 028B0 80B51240 8FB00018 */ lw $s0, 0x0018($sp) -/* 028B4 80B51244 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 028B8 80B51248 03E00008 */ jr $ra -/* 028BC 80B5124C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s deleted file mode 100644 index 98006fae20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B51250 -/* 028C0 80B51250 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 028C4 80B51254 AFBF001C */ sw $ra, 0x001C($sp) -/* 028C8 80B51258 AFB00018 */ sw $s0, 0x0018($sp) -/* 028CC 80B5125C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 028D0 80B51260 0C2D3F33 */ jal func_80B4FCCC -/* 028D4 80B51264 AFA50024 */ sw $a1, 0x0024($sp) -/* 028D8 80B51268 0C2D3F92 */ jal func_80B4FE48 -/* 028DC 80B5126C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E0 80B51270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E4 80B51274 0C2D3B4B */ jal func_80B4ED2C -/* 028E8 80B51278 8FA50024 */ lw $a1, 0x0024($sp) -/* 028EC 80B5127C 0C2D3B5D */ jal func_80B4ED74 -/* 028F0 80B51280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F4 80B51284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 80B51288 0C2D4038 */ jal func_80B500E0 -/* 028FC 80B5128C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02900 80B51290 0C2D4023 */ jal func_80B5008C -/* 02904 80B51294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02908 80B51298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80B5129C 0C2D4281 */ jal func_80B50A04 -/* 02910 80B512A0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02914 80B512A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02918 80B512A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0291C 80B512AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02920 80B512B0 03E00008 */ jr $ra -/* 02924 80B512B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s deleted file mode 100644 index 3f031c20a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B512B8 -/* 02928 80B512B8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0292C 80B512BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02930 80B512C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02934 80B512C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02938 80B512C8 0C2D3F33 */ jal func_80B4FCCC -/* 0293C 80B512CC AFA50024 */ sw $a1, 0x0024($sp) -/* 02940 80B512D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02944 80B512D4 0C2D3B4B */ jal func_80B4ED2C -/* 02948 80B512D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0294C 80B512DC 0C2D3B5D */ jal func_80B4ED74 -/* 02950 80B512E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02954 80B512E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02958 80B512E8 0C2D407A */ jal func_80B501E8 -/* 0295C 80B512EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02960 80B512F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02964 80B512F4 0C2D4268 */ jal func_80B509A0 -/* 02968 80B512F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0296C 80B512FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02970 80B51300 8FB00018 */ lw $s0, 0x0018($sp) -/* 02974 80B51304 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02978 80B51308 03E00008 */ jr $ra -/* 0297C 80B5130C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s deleted file mode 100644 index 0706b81f75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B51310 -/* 02980 80B51310 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02984 80B51314 AFA40018 */ sw $a0, 0x0018($sp) -/* 02988 80B51318 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0298C 80B5131C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02990 80B51320 0C2D3B65 */ jal func_80B4ED94 -/* 02994 80B51324 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02998 80B51328 14400008 */ bne $v0, $zero, .L80B5134C -/* 0299C 80B5132C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 029A0 80B51330 8DC4011C */ lw $a0, 0x011C($t6) ## 0000011C -/* 029A4 80B51334 10800003 */ beq $a0, $zero, .L80B51344 -/* 029A8 80B51338 00000000 */ nop -/* 029AC 80B5133C 0C00B55C */ jal Actor_Kill - -/* 029B0 80B51340 00000000 */ nop -.L80B51344: -/* 029B4 80B51344 0C00B55C */ jal Actor_Kill - -/* 029B8 80B51348 8FA40018 */ lw $a0, 0x0018($sp) -.L80B5134C: -/* 029BC 80B5134C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029C0 80B51350 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029C4 80B51354 03E00008 */ jr $ra -/* 029C8 80B51358 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s deleted file mode 100644 index 548d3c9290..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B5135C -/* 029CC 80B5135C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 029D0 80B51360 AFA50024 */ sw $a1, 0x0024($sp) -/* 029D4 80B51364 AFBF001C */ sw $ra, 0x001C($sp) -/* 029D8 80B51368 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 029DC 80B5136C 24A5A15C */ addiu $a1, $a1, 0xA15C ## $a1 = 0600A15C -/* 029E0 80B51370 AFA00010 */ sw $zero, 0x0010($sp) -/* 029E4 80B51374 AFA40020 */ sw $a0, 0x0020($sp) -/* 029E8 80B51378 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029EC 80B5137C 0C2D3F40 */ jal func_80B4FD00 -/* 029F0 80B51380 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 029F4 80B51384 8FA40020 */ lw $a0, 0x0020($sp) -/* 029F8 80B51388 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 029FC 80B5138C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02A00 80B51390 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02A04 80B51394 AC8F0254 */ sw $t7, 0x0254($a0) ## 00000254 -/* 02A08 80B51398 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A0C 80B5139C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02A10 80B513A0 03E00008 */ jr $ra -/* 02A14 80B513A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s deleted file mode 100644 index eebd9fce1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B513A8 -/* 02A18 80B513A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02A1C 80B513AC AFBF002C */ sw $ra, 0x002C($sp) -/* 02A20 80B513B0 AFA40030 */ sw $a0, 0x0030($sp) -/* 02A24 80B513B4 8C8F0250 */ lw $t7, 0x0250($a0) ## 00000250 -/* 02A28 80B513B8 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 02A2C 80B513BC 55E00013 */ bnel $t7, $zero, .L80B5140C -/* 02A30 80B513C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A34 80B513C4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 02A38 80B513C8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 02A3C 80B513CC 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 02A40 80B513D0 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 02A44 80B513D4 C4420028 */ lwc1 $f2, 0x0028($v0) ## 00000028 -/* 02A48 80B513D8 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 02A4C 80B513DC 44070000 */ mfc1 $a3, $f0 -/* 02A50 80B513E0 AFB80024 */ sw $t8, 0x0024($sp) -/* 02A54 80B513E4 AFA00020 */ sw $zero, 0x0020($sp) -/* 02A58 80B513E8 AFA0001C */ sw $zero, 0x001C($sp) -/* 02A5C 80B513EC AFA00018 */ sw $zero, 0x0018($sp) -/* 02A60 80B513F0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02A64 80B513F4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 02A68 80B513F8 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 02A6C 80B513FC 8FA80030 */ lw $t0, 0x0030($sp) -/* 02A70 80B51400 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02A74 80B51404 AD190250 */ sw $t9, 0x0250($t0) ## 00000250 -/* 02A78 80B51408 8FBF002C */ lw $ra, 0x002C($sp) -.L80B5140C: -/* 02A7C 80B5140C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02A80 80B51410 03E00008 */ jr $ra -/* 02A84 80B51414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s deleted file mode 100644 index d8d30da7e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B51418 -/* 02A88 80B51418 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A8C 80B5141C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A90 80B51420 AFA5001C */ sw $a1, 0x001C($sp) -/* 02A94 80B51424 0C2D3A6C */ jal func_80B4E9B0 -/* 02A98 80B51428 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A9C 80B5142C 8FAE001C */ lw $t6, 0x001C($sp) -/* 02AA0 80B51430 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AA4 80B51434 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02AA8 80B51438 29E101AF */ slti $at, $t7, 0x01AF -/* 02AAC 80B5143C 10200005 */ beq $at, $zero, .L80B51454 -/* 02AB0 80B51440 00000000 */ nop -/* 02AB4 80B51444 0C2D3B46 */ jal func_80B4ED18 -/* 02AB8 80B51448 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02ABC 80B5144C 10000004 */ beq $zero, $zero, .L80B51460 -/* 02AC0 80B51450 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51454: -/* 02AC4 80B51454 0C2D3B46 */ jal func_80B4ED18 -/* 02AC8 80B51458 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02ACC 80B5145C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51460: -/* 02AD0 80B51460 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AD4 80B51464 03E00008 */ jr $ra -/* 02AD8 80B51468 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s deleted file mode 100644 index 7ac0136fb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B5146C -/* 02ADC 80B5146C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AE0 80B51470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AE4 80B51474 AFA40018 */ sw $a0, 0x0018($sp) -/* 02AE8 80B51478 0C2D3A90 */ jal func_80B4EA40 -/* 02AEC 80B5147C AFA5001C */ sw $a1, 0x001C($sp) -/* 02AF0 80B51480 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AF4 80B51484 0C2D3B46 */ jal func_80B4ED18 -/* 02AF8 80B51488 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02AFC 80B5148C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B00 80B51490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B04 80B51494 03E00008 */ jr $ra -/* 02B08 80B51498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s deleted file mode 100644 index debbbb4e8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B5149C -/* 02B0C 80B5149C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B10 80B514A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B14 80B514A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B18 80B514A8 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 02B1C 80B514AC 29C103DC */ slti $at, $t6, 0x03DC -/* 02B20 80B514B0 10200008 */ beq $at, $zero, .L80B514D4 -/* 02B24 80B514B4 00000000 */ nop -/* 02B28 80B514B8 0C2D3B3A */ jal func_80B4ECE8 -/* 02B2C 80B514BC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 02B30 80B514C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B34 80B514C4 0C2D3B41 */ jal func_80B4ED04 -/* 02B38 80B514C8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 02B3C 80B514CC 10000004 */ beq $zero, $zero, .L80B514E0 -/* 02B40 80B514D0 8FA40018 */ lw $a0, 0x0018($sp) -.L80B514D4: -/* 02B44 80B514D4 0C2D3A6C */ jal func_80B4E9B0 -/* 02B48 80B514D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B4C 80B514DC 8FA40018 */ lw $a0, 0x0018($sp) -.L80B514E0: -/* 02B50 80B514E0 0C2D3B46 */ jal func_80B4ED18 -/* 02B54 80B514E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02B58 80B514E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B5C 80B514EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B60 80B514F0 03E00008 */ jr $ra -/* 02B64 80B514F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s deleted file mode 100644 index 29336daaef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B514F8 -/* 02B68 80B514F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B6C 80B514FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B70 80B51500 AFA5001C */ sw $a1, 0x001C($sp) -/* 02B74 80B51504 0C2D3A6C */ jal func_80B4E9B0 -/* 02B78 80B51508 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B7C 80B5150C 8FAE001C */ lw $t6, 0x001C($sp) -/* 02B80 80B51510 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B84 80B51514 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02B88 80B51518 29E104A6 */ slti $at, $t7, 0x04A6 -/* 02B8C 80B5151C 10200005 */ beq $at, $zero, .L80B51534 -/* 02B90 80B51520 00000000 */ nop -/* 02B94 80B51524 0C2D3B46 */ jal func_80B4ED18 -/* 02B98 80B51528 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02B9C 80B5152C 10000004 */ beq $zero, $zero, .L80B51540 -/* 02BA0 80B51530 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51534: -/* 02BA4 80B51534 0C2D3B46 */ jal func_80B4ED18 -/* 02BA8 80B51538 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02BAC 80B5153C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51540: -/* 02BB0 80B51540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BB4 80B51544 03E00008 */ jr $ra -/* 02BB8 80B51548 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s deleted file mode 100644 index b92ad57f49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B5154C -/* 02BBC 80B5154C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BC0 80B51550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BC4 80B51554 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 02BC8 80B51558 51C00006 */ beql $t6, $zero, .L80B51574 -/* 02BCC 80B5155C 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -/* 02BD0 80B51560 0C2D3A6C */ jal func_80B4E9B0 -/* 02BD4 80B51564 00000000 */ nop -/* 02BD8 80B51568 10000013 */ beq $zero, $zero, .L80B515B8 -/* 02BDC 80B5156C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02BE0 80B51570 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -.L80B51574: -/* 02BE4 80B51574 29E105F0 */ slti $at, $t7, 0x05F0 -/* 02BE8 80B51578 50200006 */ beql $at, $zero, .L80B51594 -/* 02BEC 80B5157C 94B81D74 */ lhu $t8, 0x1D74($a1) ## 00001D74 -/* 02BF0 80B51580 0C2D3AEE */ jal func_80B4EBB8 -/* 02BF4 80B51584 00000000 */ nop -/* 02BF8 80B51588 1000000B */ beq $zero, $zero, .L80B515B8 -/* 02BFC 80B5158C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C00 80B51590 94B81D74 */ lhu $t8, 0x1D74($a1) ## 00001D74 -.L80B51594: -/* 02C04 80B51594 240105F0 */ addiu $at, $zero, 0x05F0 ## $at = 000005F0 -/* 02C08 80B51598 17010004 */ bne $t8, $at, .L80B515AC -/* 02C0C 80B5159C 00000000 */ nop -/* 02C10 80B515A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02C14 80B515A4 10000003 */ beq $zero, $zero, .L80B515B4 -/* 02C18 80B515A8 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -.L80B515AC: -/* 02C1C 80B515AC 0C2D3B12 */ jal func_80B4EC48 -/* 02C20 80B515B0 00000000 */ nop -.L80B515B4: -/* 02C24 80B515B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B515B8: -/* 02C28 80B515B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C2C 80B515BC 03E00008 */ jr $ra -/* 02C30 80B515C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s deleted file mode 100644 index bfa029a20e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B515C4 -/* 02C34 80B515C4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 02C38 80B515C8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02C3C 80B515CC AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 02C40 80B515D0 03E00008 */ jr $ra -/* 02C44 80B515D4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s deleted file mode 100644 index ebfe783c1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B515D8 -/* 02C48 80B515D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02C4C 80B515DC AFA50024 */ sw $a1, 0x0024($sp) -/* 02C50 80B515E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C54 80B515E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02C58 80B515E8 24A5A15C */ addiu $a1, $a1, 0xA15C ## $a1 = 0600A15C -/* 02C5C 80B515EC AFA00010 */ sw $zero, 0x0010($sp) -/* 02C60 80B515F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 02C64 80B515F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C68 80B515F8 0C2D3F40 */ jal func_80B4FD00 -/* 02C6C 80B515FC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02C70 80B51600 8FA40020 */ lw $a0, 0x0020($sp) -/* 02C74 80B51604 8FA50024 */ lw $a1, 0x0024($sp) -/* 02C78 80B51608 0C2D3B6E */ jal func_80B4EDB8 -/* 02C7C 80B5160C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C80 80B51610 8FA40020 */ lw $a0, 0x0020($sp) -/* 02C84 80B51614 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02C88 80B51618 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 02C8C 80B5161C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02C90 80B51620 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02C94 80B51624 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02C98 80B51628 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02C9C 80B5162C A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02CA0 80B51630 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02CA4 80B51634 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CA8 80B51638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02CAC 80B5163C 03E00008 */ jr $ra -/* 02CB0 80B51640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s deleted file mode 100644 index f115ad9dd0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B51644 -/* 02CB4 80B51644 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CB8 80B51648 10A00007 */ beq $a1, $zero, .L80B51668 -/* 02CBC 80B5164C AFBF001C */ sw $ra, 0x001C($sp) -/* 02CC0 80B51650 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02CC4 80B51654 24A587B8 */ addiu $a1, $a1, 0x87B8 ## $a1 = 060087B8 -/* 02CC8 80B51658 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02CCC 80B5165C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02CD0 80B51660 0C2D3F40 */ jal func_80B4FD00 -/* 02CD4 80B51664 AFA00010 */ sw $zero, 0x0010($sp) -.L80B51668: -/* 02CD8 80B51668 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CDC 80B5166C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02CE0 80B51670 03E00008 */ jr $ra -/* 02CE4 80B51674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s deleted file mode 100644 index e1da3006e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51678 -/* 02CE8 80B51678 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CEC 80B5167C AFBF001C */ sw $ra, 0x001C($sp) -/* 02CF0 80B51680 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02CF4 80B51684 24A57D0C */ addiu $a1, $a1, 0x7D0C ## $a1 = 06007D0C -/* 02CF8 80B51688 AFA00010 */ sw $zero, 0x0010($sp) -/* 02CFC 80B5168C AFA40020 */ sw $a0, 0x0020($sp) -/* 02D00 80B51690 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02D04 80B51694 0C2D3F40 */ jal func_80B4FD00 -/* 02D08 80B51698 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D0C 80B5169C 8FA40020 */ lw $a0, 0x0020($sp) -/* 02D10 80B516A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02D14 80B516A4 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 02D18 80B516A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02D1C 80B516AC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02D20 80B516B0 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02D24 80B516B4 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02D28 80B516B8 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02D2C 80B516BC E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02D30 80B516C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D34 80B516C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D38 80B516C8 03E00008 */ jr $ra -/* 02D3C 80B516CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s deleted file mode 100644 index b713f9bf79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B516D0 -/* 02D40 80B516D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D44 80B516D4 10A00007 */ beq $a1, $zero, .L80B516F4 -/* 02D48 80B516D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D4C 80B516DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D50 80B516E0 24A59AD4 */ addiu $a1, $a1, 0x9AD4 ## $a1 = 06009AD4 -/* 02D54 80B516E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02D58 80B516E8 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D5C 80B516EC 0C2D3F40 */ jal func_80B4FD00 -/* 02D60 80B516F0 AFA00010 */ sw $zero, 0x0010($sp) -.L80B516F4: -/* 02D64 80B516F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D68 80B516F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D6C 80B516FC 03E00008 */ jr $ra -/* 02D70 80B51700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s deleted file mode 100644 index 0e7a168c65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51704 -/* 02D74 80B51704 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D78 80B51708 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D7C 80B5170C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D80 80B51710 24A590D8 */ addiu $a1, $a1, 0x90D8 ## $a1 = 060090D8 -/* 02D84 80B51714 AFA00010 */ sw $zero, 0x0010($sp) -/* 02D88 80B51718 AFA40020 */ sw $a0, 0x0020($sp) -/* 02D8C 80B5171C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02D90 80B51720 0C2D3F40 */ jal func_80B4FD00 -/* 02D94 80B51724 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D98 80B51728 8FA40020 */ lw $a0, 0x0020($sp) -/* 02D9C 80B5172C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02DA0 80B51730 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 02DA4 80B51734 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02DA8 80B51738 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02DAC 80B5173C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02DB0 80B51740 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02DB4 80B51744 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02DB8 80B51748 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02DBC 80B5174C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DC0 80B51750 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DC4 80B51754 03E00008 */ jr $ra -/* 02DC8 80B51758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s deleted file mode 100644 index 667aa4e43a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B5175C -/* 02DCC 80B5175C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02DD0 80B51760 10A00007 */ beq $a1, $zero, .L80B51780 -/* 02DD4 80B51764 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DD8 80B51768 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02DDC 80B5176C 24A56778 */ addiu $a1, $a1, 0x6778 ## $a1 = 06006778 -/* 02DE0 80B51770 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02DE4 80B51774 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02DE8 80B51778 0C2D3F40 */ jal func_80B4FD00 -/* 02DEC 80B5177C AFA00010 */ sw $zero, 0x0010($sp) -.L80B51780: -/* 02DF0 80B51780 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DF4 80B51784 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DF8 80B51788 03E00008 */ jr $ra -/* 02DFC 80B5178C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s deleted file mode 100644 index 23ee19e622..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B51790 -/* 02E00 80B51790 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E04 80B51794 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E08 80B51798 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E0C 80B5179C 24A55F40 */ addiu $a1, $a1, 0x5F40 ## $a1 = 06005F40 -/* 02E10 80B517A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02E14 80B517A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02E18 80B517A8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02E1C 80B517AC 0C2D3F40 */ jal func_80B4FD00 -/* 02E20 80B517B0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02E24 80B517B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02E28 80B517B8 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D -/* 02E2C 80B517BC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E30 80B517C0 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02E34 80B517C4 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02E38 80B517C8 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02E3C 80B517CC A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02E40 80B517D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E44 80B517D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E48 80B517D8 03E00008 */ jr $ra -/* 02E4C 80B517DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s deleted file mode 100644 index 00d77216db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B517E0 -/* 02E50 80B517E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E54 80B517E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E58 80B517E8 10A0000A */ beq $a1, $zero, .L80B51814 -/* 02E5C 80B517EC AFA40020 */ sw $a0, 0x0020($sp) -/* 02E60 80B517F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E64 80B517F4 24A52750 */ addiu $a1, $a1, 0x2750 ## $a1 = 06002750 -/* 02E68 80B517F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E6C 80B517FC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02E70 80B51800 0C2D3F40 */ jal func_80B4FD00 -/* 02E74 80B51804 AFA00010 */ sw $zero, 0x0010($sp) -/* 02E78 80B51808 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02E7C 80B5180C 240E001F */ addiu $t6, $zero, 0x001F ## $t6 = 0000001F -/* 02E80 80B51810 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B51814: -/* 02E84 80B51814 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E88 80B51818 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E8C 80B5181C 03E00008 */ jr $ra -/* 02E90 80B51820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s deleted file mode 100644 index e0cde027e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51824 -/* 02E94 80B51824 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E98 80B51828 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E9C 80B5182C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02EA0 80B51830 24A522D0 */ addiu $a1, $a1, 0x22D0 ## $a1 = 060022D0 -/* 02EA4 80B51834 AFA00010 */ sw $zero, 0x0010($sp) -/* 02EA8 80B51838 AFA40020 */ sw $a0, 0x0020($sp) -/* 02EAC 80B5183C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02EB0 80B51840 0C2D3F40 */ jal func_80B4FD00 -/* 02EB4 80B51844 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02EB8 80B51848 8FA40020 */ lw $a0, 0x0020($sp) -/* 02EBC 80B5184C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02EC0 80B51850 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 02EC4 80B51854 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02EC8 80B51858 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02ECC 80B5185C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02ED0 80B51860 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02ED4 80B51864 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02ED8 80B51868 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02EDC 80B5186C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02EE0 80B51870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02EE4 80B51874 03E00008 */ jr $ra -/* 02EE8 80B51878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s deleted file mode 100644 index 22eb3b5453..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5187C -/* 02EEC 80B5187C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02EF0 80B51880 AFBF001C */ sw $ra, 0x001C($sp) -/* 02EF4 80B51884 10A0000A */ beq $a1, $zero, .L80B518B0 -/* 02EF8 80B51888 AFA40020 */ sw $a0, 0x0020($sp) -/* 02EFC 80B5188C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02F00 80B51890 24A5A79C */ addiu $a1, $a1, 0xA79C ## $a1 = 0600A79C -/* 02F04 80B51894 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02F08 80B51898 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02F0C 80B5189C 0C2D3F40 */ jal func_80B4FD00 -/* 02F10 80B518A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02F14 80B518A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F18 80B518A8 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02F1C 80B518AC E5C4027C */ swc1 $f4, 0x027C($t6) ## 0000027C -.L80B518B0: -/* 02F20 80B518B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F24 80B518B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02F28 80B518B8 03E00008 */ jr $ra -/* 02F2C 80B518BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s deleted file mode 100644 index d07ccd721f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B518C0 -/* 02F30 80B518C0 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 02F34 80B518C4 24424900 */ addiu $v0, $v0, 0x4900 ## $v0 = 06004900 -/* 02F38 80B518C8 00027100 */ sll $t6, $v0, 4 -/* 02F3C 80B518CC 000E7F02 */ srl $t7, $t6, 28 -/* 02F40 80B518D0 000FC080 */ sll $t8, $t7, 2 -/* 02F44 80B518D4 3C198016 */ lui $t9, %hi(gSegments) -/* 02F48 80B518D8 0338C821 */ addu $t9, $t9, $t8 -/* 02F4C 80B518DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02F50 80B518E0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 02F54 80B518E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02F58 80B518E8 00414024 */ and $t0, $v0, $at -/* 02F5C 80B518EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02F60 80B518F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02F64 80B518F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02F68 80B518F8 03282821 */ addu $a1, $t9, $t0 -/* 02F6C 80B518FC 00A12821 */ addu $a1, $a1, $at -/* 02F70 80B51900 AFA00010 */ sw $zero, 0x0010($sp) -/* 02F74 80B51904 AFA40020 */ sw $a0, 0x0020($sp) -/* 02F78 80B51908 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02F7C 80B5190C 0C2D3F40 */ jal func_80B4FD00 -/* 02F80 80B51910 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02F84 80B51914 8FA40020 */ lw $a0, 0x0020($sp) -/* 02F88 80B51918 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F8C 80B5191C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 02F90 80B51920 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02F94 80B51924 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 02F98 80B51928 AC89019C */ sw $t1, 0x019C($a0) ## 0000019C -/* 02F9C 80B5192C AC8A01A0 */ sw $t2, 0x01A0($a0) ## 000001A0 -/* 02FA0 80B51930 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -/* 02FA4 80B51934 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02FA8 80B51938 8FBF001C */ lw $ra, 0x001C($sp) -/* 02FAC 80B5193C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02FB0 80B51940 03E00008 */ jr $ra -/* 02FB4 80B51944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s deleted file mode 100644 index 2fe3759a8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_80B529B8 - .asciz "En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B52C18 -.word L80B519AC -.word L80B519BC -.word L80B51A34 -.word L80B51A00 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B519D0 -.word L80B519E0 -.word L80B519F0 -.word L80B51A34 -.word L80B51A10 -.word L80B51A20 -.word 0x00000000 - -.text -glabel func_80B51948 -/* 02FB8 80B51948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02FBC 80B5194C AFB00018 */ sw $s0, 0x0018($sp) -/* 02FC0 80B51950 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FC4 80B51954 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FC8 80B51958 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02FCC 80B5195C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02FD0 80B51960 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02FD4 80B51964 0C2D3B65 */ jal func_80B4ED94 -/* 02FD8 80B51968 AFA6002C */ sw $a2, 0x002C($sp) -/* 02FDC 80B5196C 10400036 */ beq $v0, $zero, .L80B51A48 -/* 02FE0 80B51970 8FA6002C */ lw $a2, 0x002C($sp) -/* 02FE4 80B51974 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 02FE8 80B51978 AFAE0020 */ sw $t6, 0x0020($sp) -/* 02FEC 80B5197C 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 02FF0 80B51980 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 02FF4 80B51984 2F010015 */ sltiu $at, $t8, 0x0015 -/* 02FF8 80B51988 51C30030 */ beql $t6, $v1, .L80B51A4C -/* 02FFC 80B5198C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03000 80B51990 10200028 */ beq $at, $zero, .L80B51A34 -/* 03004 80B51994 0018C080 */ sll $t8, $t8, 2 -/* 03008 80B51998 3C0180B5 */ lui $at, %hi(jtbl_80B52C18) ## $at = 80B50000 -/* 0300C 80B5199C 00380821 */ addu $at, $at, $t8 -/* 03010 80B519A0 8C382C18 */ lw $t8, %lo(jtbl_80B52C18)($at) -/* 03014 80B519A4 03000008 */ jr $t8 -/* 03018 80B519A8 00000000 */ nop -glabel L80B519AC -/* 0301C 80B519AC 0C2D4571 */ jal func_80B515C4 -/* 03020 80B519B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03024 80B519B4 10000023 */ beq $zero, $zero, .L80B51A44 -/* 03028 80B519B8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519BC -/* 0302C 80B519BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03030 80B519C0 0C2D4576 */ jal func_80B515D8 -/* 03034 80B519C4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 03038 80B519C8 1000001E */ beq $zero, $zero, .L80B51A44 -/* 0303C 80B519CC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519D0 -/* 03040 80B519D0 0C2D459E */ jal func_80B51678 -/* 03044 80B519D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03048 80B519D8 1000001A */ beq $zero, $zero, .L80B51A44 -/* 0304C 80B519DC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519E0 -/* 03050 80B519E0 0C2D45C1 */ jal func_80B51704 -/* 03054 80B519E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03058 80B519E8 10000016 */ beq $zero, $zero, .L80B51A44 -/* 0305C 80B519EC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519F0 -/* 03060 80B519F0 0C2D45E4 */ jal func_80B51790 -/* 03064 80B519F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03068 80B519F8 10000012 */ beq $zero, $zero, .L80B51A44 -/* 0306C 80B519FC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A00 -/* 03070 80B51A00 0C2D4609 */ jal func_80B51824 -/* 03074 80B51A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03078 80B51A08 1000000E */ beq $zero, $zero, .L80B51A44 -/* 0307C 80B51A0C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A10 -/* 03080 80B51A10 0C2D4630 */ jal func_80B518C0 -/* 03084 80B51A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03088 80B51A18 1000000A */ beq $zero, $zero, .L80B51A44 -/* 0308C 80B51A1C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A20 -/* 03090 80B51A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03094 80B51A24 0C2D44EA */ jal func_80B513A8 -/* 03098 80B51A28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0309C 80B51A2C 10000005 */ beq $zero, $zero, .L80B51A44 -/* 030A0 80B51A30 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A34 -.L80B51A34: -/* 030A4 80B51A34 3C0480B5 */ lui $a0, %hi(D_80B529B8) ## $a0 = 80B50000 -/* 030A8 80B51A38 0C00084C */ jal osSyncPrintf - -/* 030AC 80B51A3C 248429B8 */ addiu $a0, $a0, %lo(D_80B529B8) ## $a0 = 80B529B8 -/* 030B0 80B51A40 8FB90020 */ lw $t9, 0x0020($sp) -.L80B51A44: -/* 030B4 80B51A44 AE190240 */ sw $t9, 0x0240($s0) ## 00000240 -.L80B51A48: -/* 030B8 80B51A48 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51A4C: -/* 030BC 80B51A4C 8FB00018 */ lw $s0, 0x0018($sp) -/* 030C0 80B51A50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 030C4 80B51A54 03E00008 */ jr $ra -/* 030C8 80B51A58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s deleted file mode 100644 index a8e85ef507..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B51A5C -/* 030CC 80B51A5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030D0 80B51A60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030D4 80B51A64 AFA40018 */ sw $a0, 0x0018($sp) -/* 030D8 80B51A68 0C2D3F33 */ jal func_80B4FCCC -/* 030DC 80B51A6C AFA5001C */ sw $a1, 0x001C($sp) -/* 030E0 80B51A70 8FA40018 */ lw $a0, 0x0018($sp) -/* 030E4 80B51A74 0C2D4652 */ jal func_80B51948 -/* 030E8 80B51A78 8FA5001C */ lw $a1, 0x001C($sp) -/* 030EC 80B51A7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 030F0 80B51A80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 030F4 80B51A84 03E00008 */ jr $ra -/* 030F8 80B51A88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s deleted file mode 100644 index 304b12aa0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51A8C -/* 030FC 80B51A8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03100 80B51A90 AFBF001C */ sw $ra, 0x001C($sp) -/* 03104 80B51A94 AFB00018 */ sw $s0, 0x0018($sp) -/* 03108 80B51A98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0310C 80B51A9C 0C2D3F33 */ jal func_80B4FCCC -/* 03110 80B51AA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03114 80B51AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03118 80B51AA8 0C2D3B4B */ jal func_80B4ED2C -/* 0311C 80B51AAC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03120 80B51AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03124 80B51AB4 0C2D4506 */ jal func_80B51418 -/* 03128 80B51AB8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0312C 80B51ABC 0C2D3B5D */ jal func_80B4ED74 -/* 03130 80B51AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03134 80B51AC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03138 80B51AC8 0C2D4652 */ jal func_80B51948 -/* 0313C 80B51ACC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03140 80B51AD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03144 80B51AD4 8FB00018 */ lw $s0, 0x0018($sp) -/* 03148 80B51AD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0314C 80B51ADC 03E00008 */ jr $ra -/* 03150 80B51AE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s deleted file mode 100644 index dce3b12baa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B51AE4 -/* 03154 80B51AE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03158 80B51AE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0315C 80B51AEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03160 80B51AF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03164 80B51AF4 0C2D3F33 */ jal func_80B4FCCC -/* 03168 80B51AF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0316C 80B51AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03170 80B51B00 0C2D3B4B */ jal func_80B4ED2C -/* 03174 80B51B04 8FA50024 */ lw $a1, 0x0024($sp) -/* 03178 80B51B08 0C2D3A6C */ jal func_80B4E9B0 -/* 0317C 80B51B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03180 80B51B10 0C2D3B5D */ jal func_80B4ED74 -/* 03184 80B51B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03188 80B51B18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0318C 80B51B1C 0C2D4591 */ jal func_80B51644 -/* 03190 80B51B20 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03194 80B51B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03198 80B51B28 0C2D4652 */ jal func_80B51948 -/* 0319C 80B51B2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 031A0 80B51B30 8FBF001C */ lw $ra, 0x001C($sp) -/* 031A4 80B51B34 8FB00018 */ lw $s0, 0x0018($sp) -/* 031A8 80B51B38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 031AC 80B51B3C 03E00008 */ jr $ra -/* 031B0 80B51B40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s deleted file mode 100644 index 4de7c1700f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51B44 -/* 031B4 80B51B44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 031B8 80B51B48 AFBF001C */ sw $ra, 0x001C($sp) -/* 031BC 80B51B4C AFB00018 */ sw $s0, 0x0018($sp) -/* 031C0 80B51B50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031C4 80B51B54 0C2D3F33 */ jal func_80B4FCCC -/* 031C8 80B51B58 AFA50024 */ sw $a1, 0x0024($sp) -/* 031CC 80B51B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031D0 80B51B60 0C2D3B4B */ jal func_80B4ED2C -/* 031D4 80B51B64 8FA50024 */ lw $a1, 0x0024($sp) -/* 031D8 80B51B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031DC 80B51B6C 0C2D4527 */ jal func_80B5149C -/* 031E0 80B51B70 8FA50024 */ lw $a1, 0x0024($sp) -/* 031E4 80B51B74 0C2D3B5D */ jal func_80B4ED74 -/* 031E8 80B51B78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031EC 80B51B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031F0 80B51B80 0C2D45B4 */ jal func_80B516D0 -/* 031F4 80B51B84 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 031F8 80B51B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031FC 80B51B8C 0C2D4652 */ jal func_80B51948 -/* 03200 80B51B90 8FA50024 */ lw $a1, 0x0024($sp) -/* 03204 80B51B94 8FBF001C */ lw $ra, 0x001C($sp) -/* 03208 80B51B98 8FB00018 */ lw $s0, 0x0018($sp) -/* 0320C 80B51B9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03210 80B51BA0 03E00008 */ jr $ra -/* 03214 80B51BA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s deleted file mode 100644 index 57a5fb1f1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51BA8 -/* 03218 80B51BA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0321C 80B51BAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03220 80B51BB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03224 80B51BB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03228 80B51BB8 0C2D3F33 */ jal func_80B4FCCC -/* 0322C 80B51BBC AFA50024 */ sw $a1, 0x0024($sp) -/* 03230 80B51BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03234 80B51BC4 0C2D3B4B */ jal func_80B4ED2C -/* 03238 80B51BC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0323C 80B51BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03240 80B51BD0 0C2D453E */ jal func_80B514F8 -/* 03244 80B51BD4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03248 80B51BD8 0C2D3B5D */ jal func_80B4ED74 -/* 0324C 80B51BDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03250 80B51BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03254 80B51BE4 0C2D45D7 */ jal func_80B5175C -/* 03258 80B51BE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0325C 80B51BEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03260 80B51BF0 0C2D4652 */ jal func_80B51948 -/* 03264 80B51BF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03268 80B51BF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0326C 80B51BFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03270 80B51C00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03274 80B51C04 03E00008 */ jr $ra -/* 03278 80B51C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s deleted file mode 100644 index 6d08d09ecc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51C0C -/* 0327C 80B51C0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03280 80B51C10 AFBF001C */ sw $ra, 0x001C($sp) -/* 03284 80B51C14 AFB00018 */ sw $s0, 0x0018($sp) -/* 03288 80B51C18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0328C 80B51C1C 0C2D3F33 */ jal func_80B4FCCC -/* 03290 80B51C20 AFA50024 */ sw $a1, 0x0024($sp) -/* 03294 80B51C24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03298 80B51C28 0C2D3B4B */ jal func_80B4ED2C -/* 0329C 80B51C2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 032A0 80B51C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032A4 80B51C34 0C2D451B */ jal func_80B5146C -/* 032A8 80B51C38 8FA50024 */ lw $a1, 0x0024($sp) -/* 032AC 80B51C3C 0C2D3B5D */ jal func_80B4ED74 -/* 032B0 80B51C40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B4 80B51C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B8 80B51C48 0C2D45F8 */ jal func_80B517E0 -/* 032BC 80B51C4C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 032C0 80B51C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 032C4 80B51C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 032C8 80B51C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 032CC 80B51C5C 03E00008 */ jr $ra -/* 032D0 80B51C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s deleted file mode 100644 index 59f3255102..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B51C64 -/* 032D4 80B51C64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032D8 80B51C68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 032DC 80B51C6C AFA40018 */ sw $a0, 0x0018($sp) -/* 032E0 80B51C70 0C2D3F33 */ jal func_80B4FCCC -/* 032E4 80B51C74 AFA5001C */ sw $a1, 0x001C($sp) -/* 032E8 80B51C78 8FA40018 */ lw $a0, 0x0018($sp) -/* 032EC 80B51C7C 0C2D3B4B */ jal func_80B4ED2C -/* 032F0 80B51C80 8FA5001C */ lw $a1, 0x001C($sp) -/* 032F4 80B51C84 0C2D3B5D */ jal func_80B4ED74 -/* 032F8 80B51C88 8FA40018 */ lw $a0, 0x0018($sp) -/* 032FC 80B51C8C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03300 80B51C90 0C2D4652 */ jal func_80B51948 -/* 03304 80B51C94 8FA5001C */ lw $a1, 0x001C($sp) -/* 03308 80B51C98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0330C 80B51C9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03310 80B51CA0 03E00008 */ jr $ra -/* 03314 80B51CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s deleted file mode 100644 index 2c502f3f44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51CA8 -/* 03318 80B51CA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0331C 80B51CAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03320 80B51CB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03324 80B51CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03328 80B51CB8 0C2D3F33 */ jal func_80B4FCCC -/* 0332C 80B51CBC AFA50024 */ sw $a1, 0x0024($sp) -/* 03330 80B51CC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80B51CC4 0C2D3B4B */ jal func_80B4ED2C -/* 03338 80B51CC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0333C 80B51CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03340 80B51CD0 0C2D4553 */ jal func_80B5154C -/* 03344 80B51CD4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03348 80B51CD8 0C2D3B5D */ jal func_80B4ED74 -/* 0334C 80B51CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03350 80B51CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03354 80B51CE4 0C2D461F */ jal func_80B5187C -/* 03358 80B51CE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0335C 80B51CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03360 80B51CF0 0C2D4652 */ jal func_80B51948 -/* 03364 80B51CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03368 80B51CF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0336C 80B51CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03370 80B51D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03374 80B51D04 03E00008 */ jr $ra -/* 03378 80B51D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s deleted file mode 100644 index 7dfa2d7d3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B51D0C -/* 0337C 80B51D0C AFA50004 */ sw $a1, 0x0004($sp) -/* 03380 80B51D10 240E0021 */ addiu $t6, $zero, 0x0021 ## $t6 = 00000021 -/* 03384 80B51D14 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 03388 80B51D18 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 0338C 80B51D1C 03E00008 */ jr $ra -/* 03390 80B51D20 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s deleted file mode 100644 index f50778a80a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B51D24 -/* 03394 80B51D24 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03398 80B51D28 AFB00018 */ sw $s0, 0x0018($sp) -/* 0339C 80B51D2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 033A0 80B51D30 AFBF001C */ sw $ra, 0x001C($sp) -/* 033A4 80B51D34 AFA5003C */ sw $a1, 0x003C($sp) -/* 033A8 80B51D38 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 80B51D3C AFA40020 */ sw $a0, 0x0020($sp) -/* 033B0 80B51D40 0C0295B2 */ jal func_800A56C8 -/* 033B4 80B51D44 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 033B8 80B51D48 14400005 */ bne $v0, $zero, .L80B51D60 -/* 033BC 80B51D4C 8FA40020 */ lw $a0, 0x0020($sp) -/* 033C0 80B51D50 0C0295B2 */ jal func_800A56C8 -/* 033C4 80B51D54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 033C8 80B51D58 5040000E */ beql $v0, $zero, .L80B51D94 -/* 033CC 80B51D5C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51D60: -/* 033D0 80B51D60 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 033D4 80B51D64 8FA4003C */ lw $a0, 0x003C($sp) -/* 033D8 80B51D68 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 033DC 80B51D6C 11E00008 */ beq $t7, $zero, .L80B51D90 -/* 033E0 80B51D70 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 033E4 80B51D74 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 033E8 80B51D78 0C0107CD */ jal func_80041F34 -/* 033EC 80B51D7C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 033F0 80B51D80 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 033F4 80B51D84 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 033F8 80B51D88 0C01E245 */ jal func_80078914 -/* 033FC 80B51D8C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80B51D90: -/* 03400 80B51D90 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51D94: -/* 03404 80B51D94 8FB00018 */ lw $s0, 0x0018($sp) -/* 03408 80B51D98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0340C 80B51D9C 03E00008 */ jr $ra -/* 03410 80B51DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s deleted file mode 100644 index 817331cb88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80B51DA4 -/* 03414 80B51DA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03418 80B51DA8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0341C 80B51DAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03420 80B51DB0 AFA50044 */ sw $a1, 0x0044($sp) -/* 03424 80B51DB4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03428 80B51DB8 0C2D3B65 */ jal func_80B4ED94 -/* 0342C 80B51DBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03430 80B51DC0 10400035 */ beq $v0, $zero, .L80B51E98 -/* 03434 80B51DC4 8FAE0044 */ lw $t6, 0x0044($sp) -/* 03438 80B51DC8 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 0343C 80B51DCC 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 03440 80B51DD0 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 03444 80B51DD4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 03448 80B51DD8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0344C 80B51DDC AFA2003C */ sw $v0, 0x003C($sp) -/* 03450 80B51DE0 0C01BE6F */ jal func_8006F9BC -/* 03454 80B51DE4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03458 80B51DE8 8FA3003C */ lw $v1, 0x003C($sp) -/* 0345C 80B51DEC 8FA40040 */ lw $a0, 0x0040($sp) -/* 03460 80B51DF0 8C790010 */ lw $t9, 0x0010($v1) ## 00000010 -/* 03464 80B51DF4 8C78000C */ lw $t8, 0x000C($v1) ## 0000000C -/* 03468 80B51DF8 8C690018 */ lw $t1, 0x0018($v1) ## 00000018 -/* 0346C 80B51DFC 8C680014 */ lw $t0, 0x0014($v1) ## 00000014 -/* 03470 80B51E00 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 03474 80B51E04 8C6B0020 */ lw $t3, 0x0020($v1) ## 00000020 -/* 03478 80B51E08 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0347C 80B51E0C 8C6A001C */ lw $t2, 0x001C($v1) ## 0000001C -/* 03480 80B51E10 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 03484 80B51E14 46803320 */ cvt.s.w $f12, $f6 -/* 03488 80B51E18 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 0348C 80B51E1C 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 03490 80B51E20 24820024 */ addiu $v0, $a0, 0x0024 ## $v0 = 00000024 -/* 03494 80B51E24 468020A0 */ cvt.s.w $f2, $f4 -/* 03498 80B51E28 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 0349C 80B51E2C 46805420 */ cvt.s.w $f16, $f10 -/* 034A0 80B51E30 468043A0 */ cvt.s.w $f14, $f8 -/* 034A4 80B51E34 46803220 */ cvt.s.w $f8, $f6 -/* 034A8 80B51E38 468024A0 */ cvt.s.w $f18, $f4 -/* 034AC 80B51E3C E7A80020 */ swc1 $f8, 0x0020($sp) -/* 034B0 80B51E40 46028281 */ sub.s $f10, $f16, $f2 -/* 034B4 80B51E44 460C9201 */ sub.s $f8, $f18, $f12 -/* 034B8 80B51E48 46005102 */ mul.s $f4, $f10, $f0 -/* 034BC 80B51E4C 00000000 */ nop -/* 034C0 80B51E50 46004282 */ mul.s $f10, $f8, $f0 -/* 034C4 80B51E54 46022180 */ add.s $f6, $f4, $f2 -/* 034C8 80B51E58 460C5100 */ add.s $f4, $f10, $f12 -/* 034CC 80B51E5C E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 034D0 80B51E60 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 034D4 80B51E64 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 034D8 80B51E68 460E3201 */ sub.s $f8, $f6, $f14 -/* 034DC 80B51E6C 46004282 */ mul.s $f10, $f8, $f0 -/* 034E0 80B51E70 460E5100 */ add.s $f4, $f10, $f14 -/* 034E4 80B51E74 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -/* 034E8 80B51E78 8FAD0044 */ lw $t5, 0x0044($sp) -/* 034EC 80B51E7C 946C0004 */ lhu $t4, 0x0004($v1) ## 00000004 -/* 034F0 80B51E80 95AE1D74 */ lhu $t6, 0x1D74($t5) ## 00001D74 -/* 034F4 80B51E84 018E082A */ slt $at, $t4, $t6 -/* 034F8 80B51E88 10200003 */ beq $at, $zero, .L80B51E98 -/* 034FC 80B51E8C 00000000 */ nop -/* 03500 80B51E90 0C00B55C */ jal Actor_Kill - -/* 03504 80B51E94 00000000 */ nop -.L80B51E98: -/* 03508 80B51E98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0350C 80B51E9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03510 80B51EA0 03E00008 */ jr $ra -/* 03514 80B51EA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s deleted file mode 100644 index a97e922589..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B51EA8 -/* 03518 80B51EA8 240E0021 */ addiu $t6, $zero, 0x0021 ## $t6 = 00000021 -/* 0351C 80B51EAC AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 03520 80B51EB0 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 03524 80B51EB4 03E00008 */ jr $ra -/* 03528 80B51EB8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s deleted file mode 100644 index fef81bd43b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B51EBC -/* 0352C 80B51EBC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03530 80B51EC0 AFB00020 */ sw $s0, 0x0020($sp) -/* 03534 80B51EC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03538 80B51EC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0353C 80B51ECC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03540 80B51ED0 0C2D3B65 */ jal func_80B4ED94 -/* 03544 80B51ED4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03548 80B51ED8 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 0354C 80B51EDC 260800B4 */ addiu $t0, $s0, 0x00B4 ## $t0 = 000000B4 -/* 03550 80B51EE0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03554 80B51EE4 A5030002 */ sh $v1, 0x0002($t0) ## 000000B6 -/* 03558 80B51EE8 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -/* 0355C 80B51EEC AFA80028 */ sw $t0, 0x0028($sp) -/* 03560 80B51EF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 03564 80B51EF4 24A5B224 */ addiu $a1, $a1, 0xB224 ## $a1 = 0600B224 -/* 03568 80B51EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0356C 80B51EFC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03570 80B51F00 0C2D3F40 */ jal func_80B4FD00 -/* 03574 80B51F04 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03578 80B51F08 8FA80028 */ lw $t0, 0x0028($sp) -/* 0357C 80B51F0C 240E0022 */ addiu $t6, $zero, 0x0022 ## $t6 = 00000022 -/* 03580 80B51F10 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03584 80B51F14 AE0E019C */ sw $t6, 0x019C($s0) ## 0000019C -/* 03588 80B51F18 AE0F01A0 */ sw $t7, 0x01A0($s0) ## 000001A0 -/* 0358C 80B51F1C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03590 80B51F20 A1180014 */ sb $t8, 0x0014($t0) ## 00000014 -/* 03594 80B51F24 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03598 80B51F28 8FB00020 */ lw $s0, 0x0020($sp) -/* 0359C 80B51F2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 035A0 80B51F30 03E00008 */ jr $ra -/* 035A4 80B51F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s deleted file mode 100644 index b9f03b14da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B51F38 -/* 035A8 80B51F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 035AC 80B51F3C AFA40020 */ sw $a0, 0x0020($sp) -/* 035B0 80B51F40 AFBF001C */ sw $ra, 0x001C($sp) -/* 035B4 80B51F44 AFA50024 */ sw $a1, 0x0024($sp) -/* 035B8 80B51F48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 035BC 80B51F4C 0C2D3B65 */ jal func_80B4ED94 -/* 035C0 80B51F50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 035C4 80B51F54 10400010 */ beq $v0, $zero, .L80B51F98 -/* 035C8 80B51F58 8FAF0024 */ lw $t7, 0x0024($sp) -/* 035CC 80B51F5C 95F81D74 */ lhu $t8, 0x1D74($t7) ## 00001D74 -/* 035D0 80B51F60 944E0004 */ lhu $t6, 0x0004($v0) ## 00000004 -/* 035D4 80B51F64 8FA40020 */ lw $a0, 0x0020($sp) -/* 035D8 80B51F68 2719FFF8 */ addiu $t9, $t8, 0xFFF8 ## $t9 = FFFFFFF8 -/* 035DC 80B51F6C 032E082A */ slt $at, $t9, $t6 -/* 035E0 80B51F70 14200009 */ bne $at, $zero, .L80B51F98 -/* 035E4 80B51F74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 035E8 80B51F78 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 035EC 80B51F7C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 035F0 80B51F80 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 035F4 80B51F84 0C2D3F40 */ jal func_80B4FD00 -/* 035F8 80B51F88 AFA00010 */ sw $zero, 0x0010($sp) -/* 035FC 80B51F8C 8FA90020 */ lw $t1, 0x0020($sp) -/* 03600 80B51F90 24080023 */ addiu $t0, $zero, 0x0023 ## $t0 = 00000023 -/* 03604 80B51F94 AD28019C */ sw $t0, 0x019C($t1) ## 0000019C -.L80B51F98: -/* 03608 80B51F98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0360C 80B51F9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03610 80B51FA0 03E00008 */ jr $ra -/* 03614 80B51FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s deleted file mode 100644 index aa1c2096f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s +++ /dev/null @@ -1,63 +0,0 @@ -.rdata -glabel D_80B529F4 - .asciz "En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B51FA8 -/* 03618 80B51FA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0361C 80B51FAC AFB00018 */ sw $s0, 0x0018($sp) -/* 03620 80B51FB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03624 80B51FB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03628 80B51FB8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0362C 80B51FBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03630 80B51FC0 0C2D3B65 */ jal func_80B4ED94 -/* 03634 80B51FC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03638 80B51FC8 50400023 */ beql $v0, $zero, .L80B52058 -/* 0363C 80B51FCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03640 80B51FD0 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 03644 80B51FD4 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 03648 80B51FD8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0364C 80B51FDC 50C3001E */ beql $a2, $v1, .L80B52058 -/* 03650 80B51FE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03654 80B51FE4 10C10009 */ beq $a2, $at, .L80B5200C -/* 03658 80B51FE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0365C 80B51FEC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03660 80B51FF0 10C1000A */ beq $a2, $at, .L80B5201C -/* 03664 80B51FF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03668 80B51FF8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 0366C 80B51FFC 10C1000C */ beq $a2, $at, .L80B52030 -/* 03670 80B52000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03674 80B52004 1000000E */ beq $zero, $zero, .L80B52040 -/* 03678 80B52008 3C0480B5 */ lui $a0, %hi(D_80B529F4) ## $a0 = 80B50000 -.L80B5200C: -/* 0367C 80B5200C 0C2D47AA */ jal func_80B51EA8 -/* 03680 80B52010 AFA60020 */ sw $a2, 0x0020($sp) -/* 03684 80B52014 1000000E */ beq $zero, $zero, .L80B52050 -/* 03688 80B52018 8FA60020 */ lw $a2, 0x0020($sp) -.L80B5201C: -/* 0368C 80B5201C 8FA5002C */ lw $a1, 0x002C($sp) -/* 03690 80B52020 0C2D47AF */ jal func_80B51EBC -/* 03694 80B52024 AFA60020 */ sw $a2, 0x0020($sp) -/* 03698 80B52028 10000009 */ beq $zero, $zero, .L80B52050 -/* 0369C 80B5202C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52030: -/* 036A0 80B52030 0C00B55C */ jal Actor_Kill - -/* 036A4 80B52034 AFA60020 */ sw $a2, 0x0020($sp) -/* 036A8 80B52038 10000005 */ beq $zero, $zero, .L80B52050 -/* 036AC 80B5203C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52040: -/* 036B0 80B52040 248429F4 */ addiu $a0, $a0, %lo(D_80B529F4) ## $a0 = 000029F4 -/* 036B4 80B52044 0C00084C */ jal osSyncPrintf - -/* 036B8 80B52048 AFA60020 */ sw $a2, 0x0020($sp) -/* 036BC 80B5204C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52050: -/* 036C0 80B52050 AE060240 */ sw $a2, 0x0240($s0) ## 00000240 -/* 036C4 80B52054 8FBF001C */ lw $ra, 0x001C($sp) -.L80B52058: -/* 036C8 80B52058 8FB00018 */ lw $s0, 0x0018($sp) -/* 036CC 80B5205C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 036D0 80B52060 03E00008 */ jr $ra -/* 036D4 80B52064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s deleted file mode 100644 index be383933c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B52068 -/* 036D8 80B52068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036DC 80B5206C AFBF0014 */ sw $ra, 0x0014($sp) -/* 036E0 80B52070 AFA40018 */ sw $a0, 0x0018($sp) -/* 036E4 80B52074 0C2D3F33 */ jal func_80B4FCCC -/* 036E8 80B52078 AFA5001C */ sw $a1, 0x001C($sp) -/* 036EC 80B5207C 8FA40018 */ lw $a0, 0x0018($sp) -/* 036F0 80B52080 0C2D47EA */ jal func_80B51FA8 -/* 036F4 80B52084 8FA5001C */ lw $a1, 0x001C($sp) -/* 036F8 80B52088 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036FC 80B5208C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03700 80B52090 03E00008 */ jr $ra -/* 03704 80B52094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s deleted file mode 100644 index 7db9bfeac9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B52098 -/* 03708 80B52098 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0370C 80B5209C AFBF001C */ sw $ra, 0x001C($sp) -/* 03710 80B520A0 AFB10018 */ sw $s1, 0x0018($sp) -/* 03714 80B520A4 AFB00014 */ sw $s0, 0x0014($sp) -/* 03718 80B520A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0371C 80B520AC 0C2D3F33 */ jal func_80B4FCCC -/* 03720 80B520B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03724 80B520B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03728 80B520B8 0C2D3B4B */ jal func_80B4ED2C -/* 0372C 80B520BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03730 80B520C0 0C2D3A6C */ jal func_80B4E9B0 -/* 03734 80B520C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03738 80B520C8 0C2D3B5D */ jal func_80B4ED74 -/* 0373C 80B520CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03740 80B520D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03744 80B520D4 0C2D4749 */ jal func_80B51D24 -/* 03748 80B520D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0374C 80B520DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03750 80B520E0 0C2D47CE */ jal func_80B51F38 -/* 03754 80B520E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03758 80B520E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0375C 80B520EC 0C2D4769 */ jal func_80B51DA4 -/* 03760 80B520F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03764 80B520F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03768 80B520F8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0376C 80B520FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 03770 80B52100 03E00008 */ jr $ra -/* 03774 80B52104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s deleted file mode 100644 index eaefd8afda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B52108 -/* 03778 80B52108 AFA40000 */ sw $a0, 0x0000($sp) -/* 0377C 80B5210C 03E00008 */ jr $ra -/* 03780 80B52110 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s deleted file mode 100644 index bcb044bd5e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s +++ /dev/null @@ -1,48 +0,0 @@ -.rdata -glabel D_80B52A30 - .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B52114 -/* 03784 80B52114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03788 80B52118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0378C 80B5211C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 03790 80B52120 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03794 80B52124 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03798 80B52128 1040000F */ beq $v0, $zero, .L80B52168 -/* 0379C 80B5212C 00000000 */ nop -/* 037A0 80B52130 10410005 */ beq $v0, $at, .L80B52148 -/* 037A4 80B52134 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 037A8 80B52138 10410007 */ beq $v0, $at, .L80B52158 -/* 037AC 80B5213C 3C0480B5 */ lui $a0, %hi(D_80B52A30) ## $a0 = 80B50000 -/* 037B0 80B52140 1000000D */ beq $zero, $zero, .L80B52178 -/* 037B4 80B52144 24842A30 */ addiu $a0, $a0, %lo(D_80B52A30) ## $a0 = 80B52A30 -.L80B52148: -/* 037B8 80B52148 0C2D44D7 */ jal func_80B5135C -/* 037BC 80B5214C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037C0 80B52150 10000010 */ beq $zero, $zero, .L80B52194 -/* 037C4 80B52154 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52158: -/* 037C8 80B52158 0C2D4743 */ jal func_80B51D0C -/* 037CC 80B5215C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037D0 80B52160 1000000C */ beq $zero, $zero, .L80B52194 -/* 037D4 80B52164 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52168: -/* 037D8 80B52168 0C2D3F64 */ jal func_80B4FD90 -/* 037DC 80B5216C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037E0 80B52170 10000008 */ beq $zero, $zero, .L80B52194 -/* 037E4 80B52174 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52178: -/* 037E8 80B52178 AFA5001C */ sw $a1, 0x001C($sp) -/* 037EC 80B5217C 0C00084C */ jal osSyncPrintf - -/* 037F0 80B52180 AFA60018 */ sw $a2, 0x0018($sp) -/* 037F4 80B52184 8FA5001C */ lw $a1, 0x001C($sp) -/* 037F8 80B52188 0C2D3F64 */ jal func_80B4FD90 -/* 037FC 80B5218C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03800 80B52190 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52194: -/* 03804 80B52194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03808 80B52198 03E00008 */ jr $ra -/* 0380C 80B5219C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s deleted file mode 100644 index 389b6ad17b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s +++ /dev/null @@ -1,55 +0,0 @@ -.rdata -glabel D_80B52A74 - .asciz "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B521A0 -/* 03810 80B521A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03814 80B521A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03818 80B521A8 AFA40030 */ sw $a0, 0x0030($sp) -/* 0381C 80B521AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 03820 80B521B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03824 80B521B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 03828 80B521B8 00A12021 */ addu $a0, $a1, $at -/* 0382C 80B521BC AFA4001C */ sw $a0, 0x001C($sp) -/* 03830 80B521C0 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 03834 80B521C4 2405014E */ addiu $a1, $zero, 0x014E ## $a1 = 0000014E -/* 03838 80B521C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0383C 80B521CC 04410006 */ bgez $v0, .L80B521E8 -/* 03840 80B521D0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 03844 80B521D4 3C0480B5 */ lui $a0, %hi(D_80B52A74) ## $a0 = 80B50000 -/* 03848 80B521D8 0C00084C */ jal osSyncPrintf - -/* 0384C 80B521DC 24842A74 */ addiu $a0, $a0, %lo(D_80B52A74) ## $a0 = 80B52A74 -/* 03850 80B521E0 10000015 */ beq $zero, $zero, .L80B52238 -/* 03854 80B521E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B521E8: -/* 03858 80B521E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0385C 80B521EC 0C026062 */ jal Object_IsLoaded - -/* 03860 80B521F0 AFA60024 */ sw $a2, 0x0024($sp) -/* 03864 80B521F4 1040000F */ beq $v0, $zero, .L80B52234 -/* 03868 80B521F8 8FA60024 */ lw $a2, 0x0024($sp) -/* 0386C 80B521FC 8FA40030 */ lw $a0, 0x0030($sp) -/* 03870 80B52200 AC860274 */ sw $a2, 0x0274($a0) ## 00000274 -/* 03874 80B52204 0C2D3F33 */ jal func_80B4FCCC -/* 03878 80B52208 8FA50034 */ lw $a1, 0x0034($sp) -/* 0387C 80B5220C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03880 80B52210 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03884 80B52214 248422D0 */ addiu $a0, $a0, 0x22D0 ## $a0 = 060022D0 -/* 03888 80B52218 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0388C 80B5221C 8FAE0030 */ lw $t6, 0x0030($sp) -/* 03890 80B52220 468021A0 */ cvt.s.w $f6, $f4 -/* 03894 80B52224 E5C60278 */ swc1 $f6, 0x0278($t6) ## 00000278 -/* 03898 80B52228 8FA50034 */ lw $a1, 0x0034($sp) -/* 0389C 80B5222C 0C2D4845 */ jal func_80B52114 -/* 038A0 80B52230 8FA40030 */ lw $a0, 0x0030($sp) -.L80B52234: -/* 038A4 80B52234 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52238: -/* 038A8 80B52238 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 038AC 80B5223C 03E00008 */ jr $ra -/* 038B0 80B52240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s deleted file mode 100644 index d80262deba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s +++ /dev/null @@ -1,40 +0,0 @@ -.rdata -glabel D_80B52AF8 - .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B52348 -/* 039B8 80B52348 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 039BC 80B5234C 8FAE003C */ lw $t6, 0x003C($sp) -/* 039C0 80B52350 AFBF0024 */ sw $ra, 0x0024($sp) -/* 039C4 80B52354 8DC20264 */ lw $v0, 0x0264($t6) ## 00000264 -/* 039C8 80B52358 04400009 */ bltz $v0, .L80B52380 -/* 039CC 80B5235C 00000000 */ nop -/* 039D0 80B52360 1C400007 */ bgtz $v0, .L80B52380 -/* 039D4 80B52364 00027880 */ sll $t7, $v0, 2 -/* 039D8 80B52368 3C0380B5 */ lui $v1, %hi(D_80B528D0) ## $v1 = 80B50000 -/* 039DC 80B5236C 006F1821 */ addu $v1, $v1, $t7 -/* 039E0 80B52370 8C6328D0 */ lw $v1, %lo(D_80B528D0)($v1) -/* 039E4 80B52374 8FB80038 */ lw $t8, 0x0038($sp) -/* 039E8 80B52378 54600007 */ bnel $v1, $zero, .L80B52398 -/* 039EC 80B5237C 8FB9003C */ lw $t9, 0x003C($sp) -.L80B52380: -/* 039F0 80B52380 3C0480B5 */ lui $a0, %hi(D_80B52AF8) ## $a0 = 80B50000 -/* 039F4 80B52384 0C00084C */ jal osSyncPrintf - -/* 039F8 80B52388 24842AF8 */ addiu $a0, $a0, %lo(D_80B52AF8) ## $a0 = 80B52AF8 -/* 039FC 80B5238C 10000007 */ beq $zero, $zero, .L80B523AC -/* 03A00 80B52390 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03A04 80B52394 8FB9003C */ lw $t9, 0x003C($sp) -.L80B52398: -/* 03A08 80B52398 8FA80040 */ lw $t0, 0x0040($sp) -/* 03A0C 80B5239C AFB80010 */ sw $t8, 0x0010($sp) -/* 03A10 80B523A0 AFB90014 */ sw $t9, 0x0014($sp) -/* 03A14 80B523A4 0060F809 */ jalr $ra, $v1 -/* 03A18 80B523A8 AFA80018 */ sw $t0, 0x0018($sp) -.L80B523AC: -/* 03A1C 80B523AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03A20 80B523B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03A24 80B523B4 03E00008 */ jr $ra -/* 03A28 80B523B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s deleted file mode 100644 index e22870c90b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B523BC -/* 03A2C 80B523BC AFA40000 */ sw $a0, 0x0000($sp) -/* 03A30 80B523C0 03E00008 */ jr $ra -/* 03A34 80B523C4 AFA50004 */ sw $a1, 0x0004($sp) 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 deleted file mode 100644 index 10a531b875..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ /dev/null @@ -1,142 +0,0 @@ -.rdata -glabel D_80B52B38 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B48 - .asciz "../z_en_zl2.c" - .balign 4 - -.text -glabel func_80B523C8 -/* 03A38 80B523C8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) -/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) -/* 03A4C 80B523DC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 03A50 80B523E0 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 03A54 80B523E4 3C0980B5 */ lui $t1, %hi(D_80B52810) ## $t1 = 80B50000 -/* 03A58 80B523E8 25292810 */ addiu $t1, $t1, %lo(D_80B52810) ## $t1 = 80B52810 -/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 -/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 -/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 -/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 -/* 03A6C 80B523FC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03A70 80B52400 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 03A74 80B52404 3C0D80B5 */ lui $t5, %hi(D_80B52834) ## $t5 = 80B50000 -/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) -/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) -/* 03A80 80B52410 84880198 */ lh $t0, 0x0198($a0) ## 00000198 -/* 03A84 80B52414 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 03A88 80B52418 3C0680B5 */ lui $a2, %hi(D_80B52B38) ## $a2 = 80B50000 -/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 -/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 -/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) -/* 03A98 80B52428 24C62B38 */ addiu $a2, $a2, %lo(D_80B52B38) ## $a2 = 80B52B38 -/* 03A9C 80B5242C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) -/* 03AA4 80B52434 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03AA8 80B52438 24070657 */ addiu $a3, $zero, 0x0657 ## $a3 = 00000657 -/* 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 -/* 03ABC 80B5244C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) -/* 03AC4 80B52454 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03AC8 80B52458 3C048016 */ lui $a0, %hi(gSegments) -/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 -/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 -/* 03AD4 80B52464 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03AD8 80B52468 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03ADC 80B5246C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 03AE0 80B52470 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 -/* 03AE8 80B52478 24846FA8 */ addiu $a0, %lo(gSegments) -/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 -/* 03AF0 80B52480 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03AF4 80B52484 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 03AF8 80B52488 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 03AFC 80B5248C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 -/* 03B04 80B52494 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 -/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 -/* 03B10 80B524A0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) -/* 03B18 80B524A8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B1C 80B524AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 -/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 -/* 03B28 80B524B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03B2C 80B524BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 -/* 03B34 80B524C4 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 -/* 03B3C 80B524CC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03B40 80B524D0 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 -/* 03B48 80B524D8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 -/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 -/* 03B54 80B524E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) -/* 03B5C 80B524EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B60 80B524F0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 -/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 -/* 03B6C 80B524FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03B70 80B52500 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 -/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 -/* 03B7C 80B5250C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03B80 80B52510 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 -/* 03B88 80B52518 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 -/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 -/* 03B94 80B52524 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03B98 80B52528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B9C 80B5252C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 03BA0 80B52530 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 03BA4 80B52534 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 03BA8 80B52538 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 03BAC 80B5253C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03BB0 80B52540 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 03BB4 80B52544 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03BB8 80B52548 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03BBC 80B5254C 354A002C */ ori $t2, $t2, 0x002C ## $t2 = DB06002C -/* 03BC0 80B52550 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03BC4 80B52554 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03BC8 80B52558 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 03BCC 80B5255C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03BD0 80B52560 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03BD4 80B52564 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 03BD8 80B52568 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 03BDC 80B5256C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 03BE0 80B52570 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03BE4 80B52574 3C0D80B5 */ lui $t5, %hi(func_80B4FB74) ## $t5 = 80B50000 -/* 03BE8 80B52578 3C0C80B5 */ lui $t4, %hi(func_80B52348) ## $t4 = 80B50000 -/* 03BEC 80B5257C 258C2348 */ addiu $t4, $t4, %lo(func_80B52348) ## $t4 = 80B52348 -/* 03BF0 80B52580 25ADFB74 */ addiu $t5, $t5, %lo(func_80B4FB74) ## $t5 = 80B4FB74 -/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) -/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) -/* 03C00 80B52590 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) -/* 03C08 80B52598 0C0289CF */ jal SkelAnime_DrawSV2 -/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) -/* 03C10 80B525A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) -/* 03C18 80B525A8 3C0680B5 */ lui $a2, %hi(D_80B52B48) ## $a2 = 80B50000 -/* 03C1C 80B525AC 24C62B48 */ addiu $a2, $a2, %lo(D_80B52B48) ## $a2 = 80B52B48 -/* 03C20 80B525B0 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03C24 80B525B4 24070670 */ addiu $a3, $zero, 0x0670 ## $a3 = 00000670 -/* 03C28 80B525B8 0C031AD5 */ jal Graph_CloseDisps -/* 03C2C 80B525BC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) -/* 03C3C 80B525CC 03E00008 */ jr $ra -/* 03C40 80B525D0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s deleted file mode 100644 index 427588f708..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ /dev/null @@ -1,129 +0,0 @@ -.rdata -glabel D_80B52B58 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B68 - .asciz "../z_en_zl2.c" - .balign 4 - -.text -glabel func_80B525D4 -/* 03C44 80B525D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) -/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) -/* 03C58 80B525E8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 03C5C 80B525EC 3C0F80B5 */ lui $t7, %hi(D_80B52810) ## $t7 = 80B50000 -/* 03C60 80B525F0 3C1980B5 */ lui $t9, %hi(D_80B52834) ## $t9 = 80B50000 -/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 -/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 -/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) -/* 03C70 80B52600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 03C74 80B52604 3C0680B5 */ lui $a2, %hi(D_80B52B58) ## $a2 = 80B50000 -/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) -/* 03C7C 80B5260C 84830198 */ lh $v1, 0x0198($a0) ## 00000198 -/* 03C80 80B52610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 03C84 80B52614 24C62B58 */ addiu $a2, $a2, %lo(D_80B52B58) ## $a2 = 80B52B58 -/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 -/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 -/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) -/* 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 Graph_OpenDisps -/* 03CA4 80B52634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) -/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 -/* 03CB0 80B52640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) -/* 03CB8 80B52648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03CBC 80B5264C 3C078016 */ lui $a3, %hi(gSegments) -/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 -/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 -/* 03CC8 80B52658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03CCC 80B5265C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03CD0 80B52660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03CD4 80B52664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 -/* 03CDC 80B5266C 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 -/* 03CE4 80B52674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03CE8 80B52678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 03CEC 80B5267C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 03CF0 80B52680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 -/* 03CF8 80B52688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 -/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 -/* 03D04 80B52694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03D08 80B52698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D0C 80B5269C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03D10 80B526A0 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 03D14 80B526A4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03D18 80B526A8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03D1C 80B526AC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03D20 80B526B0 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 03D24 80B526B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03D28 80B526B8 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 -/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 -/* 03D34 80B526C4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) -/* 03D3C 80B526CC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 -/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 -/* 03D48 80B526D8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03D4C 80B526DC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 -/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 -/* 03D58 80B526E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03D5C 80B526EC 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 -/* 03D64 80B526F4 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 -/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 -/* 03D70 80B52700 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 03D74 80B52704 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D78 80B52708 3C198011 */ lui $t9, %hi(D_80116280) -/* 03D7C 80B5270C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 03D80 80B52710 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03D84 80B52714 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 03D88 80B52718 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03D8C 80B5271C 8E2D01A8 */ lw $t5, 0x01A8($s1) ## 000001A8 -/* 03D90 80B52720 3718002C */ ori $t8, $t8, 0x002C ## $t8 = DB06002C -/* 03D94 80B52724 27396280 */ addiu $t9, %lo(D_80116280) -/* 03D98 80B52728 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 -/* 03D9C 80B5272C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03DA0 80B52730 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03DA4 80B52734 3C0A80B5 */ lui $t2, %hi(func_80B52348) ## $t2 = 80B50000 -/* 03DA8 80B52738 254A2348 */ addiu $t2, $t2, %lo(func_80B52348) ## $t2 = 80B52348 -/* 03DAC 80B5273C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03DB0 80B52740 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 03DB4 80B52744 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03DB8 80B52748 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03DBC 80B5274C 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 03DC0 80B52750 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 03DC4 80B52754 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 03DC8 80B52758 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) -/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03DD8 80B52768 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) -/* 03DE0 80B52770 0C0289CF */ jal SkelAnime_DrawSV2 -/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) -/* 03DE8 80B52778 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) -/* 03DF0 80B52780 3C0680B5 */ lui $a2, %hi(D_80B52B68) ## $a2 = 80B50000 -/* 03DF4 80B52784 24C62B68 */ addiu $a2, $a2, %lo(D_80B52B68) ## $a2 = 80B52B68 -/* 03DF8 80B52788 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 03DFC 80B5278C 2407069C */ addiu $a3, $zero, 0x069C ## $a3 = 0000069C -/* 03E00 80B52790 0C031AD5 */ jal Graph_CloseDisps -/* 03E04 80B52794 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) -/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 03E14 80B527A4 03E00008 */ jr $ra -/* 03E18 80B527A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/data/overlays/actors/z_en_zl2.data.s b/data/overlays/actors/z_en_zl2.data.s deleted file mode 100644 index 10da87e82f..0000000000 --- a/data/overlays/actors/z_en_zl2.data.s +++ /dev/null @@ -1,65 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80B52810 - .word 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148 -glabel D_80B52834 - .word 0x06003508, 0x06005548, 0x06005948 -glabel D_80B52840 - .word func_80B521A0 -.word func_80B50BBC -.word func_80B50BEC -.word func_80B50C40 -.word func_80B50CA8 -.word func_80B50CFC -.word func_80B50D50 -.word func_80B50D94 -.word func_80B50DE8 -.word func_80B50E3C -.word func_80B50E90 -.word func_80B50EE4 -.word func_80B50F38 -.word func_80B50F8C -.word func_80B50FE8 -.word func_80B51034 -.word func_80B51080 -.word func_80B510CC -.word func_80B51118 -.word func_80B51164 -.word func_80B511B0 -.word func_80B511FC -.word func_80B51250 -.word func_80B512B8 -.word func_80B51310 -.word func_80B51A5C -.word func_80B51A8C -.word func_80B51AE4 -.word func_80B51B44 -.word func_80B51BA8 -.word func_80B51C0C -.word func_80B51C64 -.word func_80B51CA8 -.word func_80B52068 -.word func_80B52098 -.word func_80B52108 -glabel D_80B528D0 - .word func_80B4F45C -glabel D_80B528D4 - .word func_80B523BC -.word func_80B523C8 -.word func_80B525D4 -glabel En_Zl2_InitVars - .word 0x004D0400, 0x00000010, 0x00600000, 0x00000280 -.word EnZl2_Init -.word EnZl2_Destroy -.word EnZl2_Update -.word EnZl2_Draw - diff --git a/include/functions.h b/include/functions.h index cd096c8281..2cee6732ba 100644 --- a/include/functions.h +++ b/include/functions.h @@ -592,7 +592,7 @@ struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041DB8(?); // ? func_80041EC8(?); // ? func_80041F10(?); -// ? func_80041F34(?); +u16 func_80041F34(CollisionContext*, CollisionPoly*, u8); // ? func_80042048(?); // ? func_80042108(?); s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, UNK_PTR); diff --git a/spec b/spec index 8aa3049fe3..fc819f54d3 100644 --- a/spec +++ b/spec @@ -3496,8 +3496,11 @@ endseg beginseg name "ovl_En_Zl2" include "build/src/overlays/actors/ovl_En_Zl2/z_en_zl2.o" - include "build/data/overlays/actors/z_en_zl2.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Zl2/ovl_En_Zl2_reloc.o" +#else include "build/data/overlays/actors/z_en_zl2.reloc.o" +#endif endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 85ab507f06..172f755eea 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1702,7 +1702,7 @@ void func_8002F850(GlobalContext* globalCtx, Actor* actor) { sfxId = NA_SE_PL_WALK_WATER1; } } else { - sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource, actor); + sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource); } func_80078914(&actor->projectedPos, NA_SE_EV_BOMB_BOUND); diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index d58e88a42d..17dd2fb42a 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -8,7 +8,9 @@ struct DoorWarp1; typedef struct DoorWarp1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA0]; + /* 0x014C */ char unk_14C[0x5C]; + /* 0x01A8 */ f32 unk_1A8; + /* 0x01AC */ char unk_1AC[0x40]; /* 0x01EC */ s32 unk_1EC; } DoorWarp1; // size = 0x01F0 diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 6e3375bd66..d376fd13a9 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -5,6 +5,9 @@ */ #include "z_en_zl2.h" +#include + +#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #define FLAGS 0x00000010 @@ -15,7 +18,78 @@ void EnZl2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnZl2_Update(Actor* thisx, GlobalContext* globalCtx); void EnZl2_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx); + +void func_80B50BBC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50C40(EnZl2* this, GlobalContext* globalCtx); +void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50D50(EnZl2* this, GlobalContext* globalCtx); +void func_80B50D94(EnZl2* this, GlobalContext* globalCtx); +void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx); +void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx); +void func_80B50E90(EnZl2* this, GlobalContext* globalCtx); +void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx); +void func_80B50F38(EnZl2* this, GlobalContext* globalCtx); +void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx); +void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51034(EnZl2* this, GlobalContext* globalCtx); +void func_80B51080(EnZl2* this, GlobalContext* globalCtx); +void func_80B510CC(EnZl2* this, GlobalContext* globalCtx); +void func_80B51118(EnZl2* this, GlobalContext* globalCtx); +void func_80B51164(EnZl2* this, GlobalContext* globalCtx); +void func_80B511B0(EnZl2* this, GlobalContext* globalCtx); +void func_80B511FC(EnZl2* this, GlobalContext* globalCtx); +void func_80B51250(EnZl2* this, GlobalContext* globalCtx); +void func_80B512B8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51310(EnZl2* this, GlobalContext* globalCtx); +void func_80B51A5C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx); +void func_80B51B44(EnZl2* this, GlobalContext* globalCtx); +void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51C64(EnZl2* this, GlobalContext* globalCtx); +void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B52068(EnZl2* this, GlobalContext* globalCtx); +void func_80B52098(EnZl2* this, GlobalContext* globalCtx); +void func_80B52108(EnZl2* this, GlobalContext* globalCtx); +void func_80B521A0(EnZl2* this, GlobalContext* globalCtx); +void func_80B523BC(EnZl2* this, GlobalContext* globalCtx); +void func_80B523C8(EnZl2* this, GlobalContext* globalCtx); +void func_80B525D4(EnZl2* this, GlobalContext* globalCtx); + +UNK_TYPE D_80B52810[] = { + 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148, +}; + +UNK_TYPE D_80B52834[] = { + 0x06003508, + 0x06005548, + 0x06005948, +}; + +static EnZl2ActionFunc sActionFuncs[] = { + func_80B521A0, func_80B50BBC, func_80B50BEC, func_80B50C40, func_80B50CA8, func_80B50CFC, + func_80B50D50, func_80B50D94, func_80B50DE8, func_80B50E3C, func_80B50E90, func_80B50EE4, + func_80B50F38, func_80B50F8C, func_80B50FE8, func_80B51034, func_80B51080, func_80B510CC, + func_80B51118, func_80B51164, func_80B511B0, func_80B511FC, func_80B51250, func_80B512B8, + func_80B51310, func_80B51A5C, func_80B51A8C, func_80B51AE4, func_80B51B44, func_80B51BA8, + func_80B51C0C, func_80B51C64, func_80B51CA8, func_80B52068, func_80B52098, func_80B52108, +}; + +static EnZl2PreLimbDrawFunc sOverrideLimbDrawFuncs[] = { + func_80B4F45C, +}; + +static EnZl2DrawFunc sDrawFuncs[] = { + func_80B523BC, + func_80B523C8, + func_80B525D4, +}; + const ActorInit En_Zl2_InitVars = { ACTOR_EN_ZL2, ACTORTYPE_NPC, @@ -27,265 +101,1644 @@ const ActorInit En_Zl2_InitVars = { (ActorFunc)EnZl2_Update, (ActorFunc)EnZl2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s") +extern AnimationHeader D_0600325C; +extern AnimationHeader D_060003BC; +extern AnimationHeader D_06000A50; +extern AnimationHeader D_06000EB0; +extern AnimationHeader D_06001010; +extern AnimationHeader D_060013A0; +extern AnimationHeader D_06001670; +extern AnimationHeader D_06001B48; +extern AnimationHeader D_060022D0; +extern AnimationHeader D_06002750; +extern AnimationHeader D_06002B14; +extern AnimationHeader D_06002F30; +extern AnimationHeader D_06003538; +extern AnimationHeader D_06004900; +extern AnimationHeader D_06005F40; +extern AnimationHeader D_06006778; +extern AnimationHeader D_06007D0C; +extern AnimationHeader D_060087B8; +extern AnimationHeader D_060090D8; +extern AnimationHeader D_06009AD4; +extern AnimationHeader D_0600A15C; +extern AnimationHeader D_0600A79C; +extern AnimationHeader D_0600AAD4; +extern AnimationHeader D_0600AFE0; +extern AnimationHeader D_0600B224; +extern AnimationHeader D_0600B5FC; +extern Gfx D_0600BAE8[]; +extern SkeletonHeader D_06010D70; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s") +void EnZl2_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s") + SkelAnime_Free(&this->skelAnime, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s") +void func_80B4E9B0(EnZl2* this) { + s32 pad[4]; + s16* unk_194 = &this->unk_194; + s16* unk_192 = &this->unk_192; + s16* unk_190 = &this->unk_190; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s") + if (DECR(*unk_192) == 0) { + *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + } + *unk_190 = *unk_192; + if (*unk_190 >= 3) { + *unk_190 = 0; + } + *unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s") +void func_80B4EA40(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s") + if (*unk_27C < 3.0f) { + *unk_190 = 0; + } else if (*unk_27C < 6.0f) { + *unk_190 = 1; + } else if (*unk_27C < 9.0f) { + *unk_190 = 2; + } else { + *unk_190 = 5; + this->unk_194 = *unk_190; + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s") +void func_80B4EAF4(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s") + if (*unk_27C < 2.0f) { + *unk_190 = 5; + } else if (*unk_27C < 4.0f) { + *unk_190 = 2; + } else if (*unk_27C < 6.0f) { + *unk_190 = 1; + } else { + func_80B4E9B0(this); + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s") +void func_80B4EBB8(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s") + if (*unk_27C < 2.0f) { + *unk_190 = 0; + } else if (*unk_27C < 4.0f) { + *unk_190 = 1; + } else { + *unk_190 = 2; + this->unk_194 = *unk_190; + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s") +void func_80B4EC48(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s") + if (*unk_27C < 2.0f) { + *unk_190 = 2; + } else if (*unk_27C < 4.0f) { + *unk_190 = 1; + } else { + func_80B4E9B0(this); + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s") +void func_80B4ECE8(EnZl2* this, s16 arg1) { + this->unk_190 = arg1; + this->unk_194 = this->unk_190; +} +void func_80B4ED04(EnZl2* this, s16 arg1) { + this->unk_194 = arg1; +} + +void func_80B4ED18(EnZl2* this, s16 arg1) { + this->unk_198 = arg1; +} + +void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 EnZl2_FrameUpdateMatrix(EnZl2* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* EnZl2_GetNpcAction(GlobalContext* globalCtx, s32 idx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[idx]; + } + return NULL; +} + +void func_80B4EDB8(EnZl2* this, GlobalContext* globalCtx, s32 arg2) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, arg2); + + if (npcAction != NULL) { + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void func_80B4EE38(EnZl2* this, s16 arg1, s32 arg2) { + s32 phi_a3; + s32 temp_v1; + s32 phi_v0 = arg2; + + if (this->unk_24C != 0) { + temp_v1 = (s16)(arg1 + this->unk_1DC[phi_v0]); + phi_a3 = arg1 - this->unk_20C[phi_v0]; + phi_v0 = this->unk_1AC[phi_v0]; + + if ((s32)fabsf((f32)phi_a3) >= 0x8001) { + if (arg1 > 0) { + phi_a3 -= 0x10000; + } else { + phi_a3 += 0x10000; + } + } + if (phi_a3 != 0) { + phi_v0 += (phi_a3 - phi_v0) / 16; + } + if (phi_v0 != 0) { + phi_v0 -= (phi_v0 / 10); + } + if ((s16)(temp_v1 - arg1) != 0) { + phi_v0 -= ((s16)(temp_v1 - arg1) / 50); + } + temp_v1 += phi_v0; + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - arg1) >= -0x63) && + ((s16)(temp_v1 - arg1) < 0x64)) { + temp_v1 = arg1; + phi_v0 = 0; + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = temp_v1 - arg1; + } + this->unk_20C[arg2] = arg1; +} + +void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) { + s32 temp_t0 = arg2; + s32 temp_t2; + s32 temp_v1; + s32 phi_t1; + s32 phi_v0; + s32 phi_a0; + u32 zero; + f32 animCurrentFrame; + f32 unk_278; + + if (temp_t0 == 2) { + phi_a0 = 0x3A98; + phi_t1 = 0; + } else if (temp_t0 == 5) { + phi_a0 = 0x32C8; + phi_t1 = 3; + } else if (temp_t0 == 8) { + phi_a0 = 0x2EE0; + phi_t1 = 6; + } else if (temp_t0 == 11) { + phi_a0 = 0x4000; + phi_t1 = 9; + } else if (temp_t0 == 14) { + phi_a0 = 0x4000; + phi_t1 = 12; + } else if (temp_t0 == 17) { + phi_a0 = 0x4000; + phi_t1 = 15; + } else { + phi_a0 = 0x4000; + phi_t1 = 18; + } + + if (this->unk_24C != 0) { + phi_v0 = this->unk_1DC[temp_t0] + arg1; + temp_v1 = (s16)(phi_v0 & 0xFFFF); + temp_t2 = arg1 - this->unk_20C[temp_t0]; + phi_v0 = this->unk_1AC[temp_t0]; + + if ((s32)fabsf((f32)temp_t2) >= 0x8001) { + if (arg1 > 0) { + temp_t2 -= 0x10000; + } else { + temp_t2 += 0x10000; + } + } + if (phi_t1 >= 0) { + temp_t2 += (ABS(this->unk_1AC[phi_t1]) / 3); + } + if (temp_t2 != 0) { + phi_v0 += ((temp_t2 - phi_v0) / 16); + } + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + if ((s16)(temp_v1 - phi_a0) != 0) { + phi_v0 -= (s16)(temp_v1 - phi_a0) / 50; + } + temp_v1 += phi_v0; + + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - phi_a0) >= -0x63) && + ((s16)(temp_v1 - phi_a0) < 0x64)) { + temp_v1 = phi_a0; + phi_v0 = 0; + } + + zero = 0; + if (arg2 == 2) { + if ((this->action == 5) || (this->action == 30)) { + animCurrentFrame = this->skelAnime.animCurrentFrame; + unk_278 = this->unk_278; + temp_t0 = (s32)((3500.0f * animCurrentFrame) / unk_278) + phi_a0; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } else if ((this->action == 6) || (this->action == 31)) { + temp_t0 = phi_a0 + 0xDAC; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } else if (this->action == 20) { + temp_t0 = phi_a0 - 0x3E8; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = temp_v1 - arg1; + } + this->unk_20C[arg2] = arg1; +} + +#ifdef NON_MATCHING +// Some missing ABS instructions near the bottom of the section on lines 454-461 +void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { + s32 temp_v1; + s32 temp_t0; + s32 temp_t2; + s32 temp_t3; + s32 phi_v0; + s32 temp_1AC; + s32 index1AC; + s32 phi_t5; + + if (this->unk_24C != 0) { + temp_v1 = this->unk_1DC[arg2] - arg1; + temp_t0 = (s16)temp_v1; + temp_t2 = temp_t0; + temp_t3 = this->unk_1AC[arg2]; + phi_v0 = temp_t3; + temp_1AC = phi_v0; + temp_t3 = arg1 - this->unk_20C[arg2]; + + if (arg2 == 1) { + index1AC = 0; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 4) { + index1AC = 3; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 7) { + index1AC = 6; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 10) { + index1AC = 9; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else if (arg2 == 13) { + index1AC = 12; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else if (arg2 == 16) { + index1AC = 15; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else { + index1AC = 18; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } + + if ((s32)fabsf((f32)temp_t3) >= 0x8001) { + if (arg1 > 0) { + temp_t3 -= 0x10000; + } else { + temp_t3 += 0x10000; + } + } + if (index1AC >= 0) { + temp_t3 += phi_t5 / 3; + } + + if (temp_t3 != 0) { + phi_v0 += (temp_t3 - temp_1AC) / 16; + } + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + if (temp_t0 != 0) { + phi_v0 -= temp_t0 / 50; + } + temp_v1 += phi_v0; + if (((temp_1AC * phi_v0) <= 0) && (temp_t2 >= -0x63) && (temp_t2 < 0x64)) { + temp_v1 = 0; + phi_v0 = 0; + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = arg1 + temp_v1; + } + this->unk_20C[arg2] = arg1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s") +#endif + +s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + s32 pad; + EnZl2* this = THIS; + Mtx* sp74; + MtxF sp34; + Vec3s sp2C; + s16 pad2; + s16* unk_1DC = this->unk_1DC; + + if (limbIndex == 0xE) { + sp74 = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 7); + gSPSegment((*gfx)++, 0x0C, sp74); + + Matrix_Push(); + Matrix_Translate(pos->x, pos->y, pos->z, MTXMODE_APPLY); + Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); + Matrix_Push(); + Matrix_Translate(362.0f, -133.0f, 0.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 0); + func_80B4F230(this, sp2C.x, 1); + func_80B4EF64(this, sp2C.z, 2); + } + Matrix_RotateRPY(unk_1DC[0] + kREG(31), unk_1DC[1] + kREG(32), unk_1DC[2] + kREG(33), MTXMODE_APPLY); + Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[0], "../z_en_zl2.c", 1056); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 3); + func_80B4F230(this, sp2C.x, 4); + } + Matrix_RotateRPY(unk_1DC[3] + kREG(34), unk_1DC[4] + kREG(35), unk_1DC[5] + kREG(36), MTXMODE_APPLY); + Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[1], "../z_en_zl2.c", 1100); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 6); + func_80B4F230(this, sp2C.x, 7); + } + Matrix_RotateRPY(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY); + Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 9); + func_80B4F230(this, sp2C.x, 10); + func_80B4EF64(this, sp2C.z, 11); + } + Matrix_RotateRPY(unk_1DC[9] + kREG(40), unk_1DC[10] + kREG(41), unk_1DC[11] + kREG(42), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[3], "../z_en_zl2.c", 1145); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 12); + func_80B4F230(this, sp2C.x, 13); + func_80B4EF64(this, sp2C.z, 14); + } + Matrix_RotateRPY(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 15); + func_80B4F230(this, sp2C.x, 16); + func_80B4EF64(this, sp2C.z, 17); + } + Matrix_RotateRPY(unk_1DC[15] + kREG(46), unk_1DC[16] + kREG(47), unk_1DC[17] + kREG(48), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[5], "../z_en_zl2.c", 1189); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 18); + func_80B4F230(this, sp2C.x, 19); + func_80B4EF64(this, sp2C.z, 20); + } + Matrix_RotateRPY(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208); + Matrix_Pull(); + Matrix_Pull(); + this->unk_24C = 1; + } + return 0; +} + +void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx); +#ifdef NON_MATCHING +// Stack issue in two instructions - made much better with the pad +void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + s32 pad[2]; + EnZl2* this = THIS; + Player* player; + + if (limbIndex == 10) { + if ((this->unk_254 != 0) && (globalCtx->csCtx.frames >= 900)) { + gSPDisplayList((*gfx)++, &D_0600BAE8); + } + + player = PLAYER; + Matrix_Push(); + if (player->unk_15D == 0xFF) { + Matrix_Put(&player->mf_A20); + Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY); + Matrix_RotateRPY(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY); + Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY); + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1253), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfx)++, &D_0600BAE8); + } + Matrix_Pull(); + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_PostLimbDraw.s") +#endif + +void func_80B4FCCC(EnZl2* this, GlobalContext* globalCtx) { + s32 unk_274 = this->unk_274; + + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[unk_274].segment); +} + +void func_80B4FD00(EnZl2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + fc = 0.0f; + unk0 = frameCount; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +void func_80B4FD90(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600B5FC, 0, 0.0f, 0); + this->action = 1; +} + +void func_80B4FDD4(EnZl2* this) { + if (func_800A56C8(&this->skelAnime, 14.0f)) { + func_80078914(&this->actor.projectedPos, 0x802); + } +} + +void func_80B4FE10(GlobalContext* globalCtx) { + if ((globalCtx->csCtx.frames >= 830) && (globalCtx->csCtx.frames < 1081)) { + func_800788CC(0x2098); + } +} + +void func_80B4FE48(EnZl2* this) { + func_80078914(&this->actor.projectedPos, 0x2086); +} + +void func_80B4FE6C(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH); +} + +void func_80B4FE90(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE); +} + +void func_80B4FEB4(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); +} + +void func_80B4FED8(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0); +} + +void EnZl2_GiveLightArrows(EnZl2* this, GlobalContext* globalCtx) { + Player* player; + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_244 == 0) { + player = PLAYER; + posX = player->actor.posRot.pos.x; + posY = player->actor.posRot.pos.y + 80.0f; + posZ = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0x17); + Item_Give(globalCtx, ITEM_ARROW_LIGHT); + this->unk_244 = 1; + } +} + +void func_80B4FF84(EnZl2* this, GlobalContext* globalCtx) { + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_250 == 0) { + posX = this->actor.posRot.pos.x; + posY = this->actor.posRot.pos.y; + posZ = this->actor.posRot.pos.z; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 4); + this->unk_250 = 1; + } +} + +void func_80B4FFF0(EnZl2* this, GlobalContext* globalCtx) { + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_248 == 0) { + posX = this->actor.posRot.pos.x; + posY = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + posZ = this->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, + 0x4000, 0, 3); + this->unk_248 = 1; + } +} + +void func_80B5008C(EnZl2* this) { + Actor* attachedB = this->actor.attachedB; + + if (attachedB != NULL) { + attachedB->posRot.pos.x = this->actor.posRot.pos.x; + attachedB->posRot.pos.y = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + attachedB->posRot.pos.z = this->actor.posRot.pos.z; + } +} + +void func_80B500E0(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + Vec3f* thisPos = &this->actor.posRot.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 someFloat; + + if (npcAction != NULL) { + someFloat = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 8, 8); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + thisPos->x = ((endX - startX) * someFloat) + startX; + thisPos->y = ((endY - startY) * someFloat) + startY; + thisPos->z = ((endZ - startZ) * someFloat) + startZ; + } +} + +void func_80B501C4(EnZl2* this, s32 arg1) { + if (this->actor.attachedB != NULL) { + ((DoorWarp1*)this->actor.attachedB)->unk_1A8 = arg1; + } +} + +void func_80B501E8(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + this->actor.shape.unk_14 = this->unk_1A8 = + (1.0f - func_8006F93C(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames)) * 255.0f; + func_80B501C4(this, this->unk_1A8); + } +} + +void func_80B50260(EnZl2* this, GlobalContext* globalCtx) { + this->action = 1; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B50278(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + this->actor.shape.unk_14 = 0xFF; + this->action = 2; + this->drawConfig = 1; +} + +void func_80B50304(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + ActorShape* actorShape = &this->actor.shape; + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + f32 actionXDelta; + f32 actionZDelta; + + actionXDelta = npcAction->endPos.x - npcAction->startPos.x; + actionZDelta = npcAction->endPos.z - npcAction->startPos.z; + func_80B4FD00(this, &D_060003BC, 0, -12.0f, 0); + this->action = 3; + this->drawConfig = 1; + this->unk_23C = 0.0f; + actorShape->unk_14 = 0xFF; + this->actor.posRot.rot.y = actorShape->rot.y = Math_atan2f(actionXDelta, actionZDelta) * 10430.3779296875f; +} + +void func_80B503DC(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if ((npcAction != NULL) && (globalCtx->csCtx.frames >= npcAction->endFrame)) { + this->action = 4; + } +} + +void func_80B5042C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_060022D0, 2, -8.0f, 0); + this->action = 5; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B50488(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002750, 0, 0.0f, 0); + this->action = 6; + this->drawConfig = 1; + } +} + +void func_80B504D4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600325C, 2, -8.0f, 0); + this->action = 7; + this->drawConfig = 1; + this->unk_27C = 0.0f; + func_80B4ED18(this, 1); + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B5053C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06003538, 0, 0.0f, 0); + this->action = 8; + } +} + +void func_80B50580(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06000A50, 2, -8.0f, 0); + this->action = 9; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B505D4(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06000EB0, 0, 0.0f, 0); + this->action = 10; + } +} + +void func_80B50618(EnZl2* this, GlobalContext* globalCtx) { + EnZl2_GiveLightArrows(this, globalCtx); + this->action = 11; +} + +void func_80B50644(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FF84(this, globalCtx); + this->action = 12; +} + +void func_80B50670(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600B5FC, 0, -8.0f, 0); + this->action = 13; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B506C4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600AAD4, 2, -8.0f, 0); + this->action = 14; + this->drawConfig = 1; + func_80B4ECE8(this, 4); + func_80B4ED18(this, 2); + this->actor.shape.unk_14 = 0xFF; + func_80B4FE90(this); +} + +void func_80B5073C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_0600AFE0, 0, 0.0f, 0); + this->action = 15; + } +} + +void func_80B50780(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06001670, 2, -8.0f, 0); + this->action = 16; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + func_80B4FFF0(this, globalCtx); + func_80B4ECE8(this, 3); +} + +void func_80B507E8(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06001B48, 0, 0.0f, 0); + this->action = 17; + } +} + +void func_80B5082C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06002B14, 2, -8.0f, 0); + this->action = 18; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B50880(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002F30, 0, 0.0f, 0); + this->action = 19; + func_80B4FEB4(this); + } +} + +void func_80B508C8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06001010, 2, -8.0f, 0); + this->action = 20; + this->drawConfig = 1; + func_80B4ECE8(this, 6); + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B50928(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_060013A0, 0, 0.0f, 0); + this->action = 21; + func_80B4FED8(this); + } +} + +void func_80B50970(EnZl2* this, GlobalContext* globalCtx) { + this->action = 22; +} + +void func_80B50980(EnZl2* this, GlobalContext* globalCtx) { + this->action = 23; + this->drawConfig = 2; + this->unk_1A8 = 0xFF; +} + +void func_80B509A0(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + if (globalCtx->csCtx.frames >= npcAction->endFrame) { + this->action = 24; + this->drawConfig = 0; + func_80B4FE6C(this); + } + } +} + +void func_80B50A04(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 newAction; + s32 unk_240; + + if (npcAction != NULL) { + newAction = npcAction->action; + unk_240 = this->unk_240; + if (newAction != unk_240) { + switch (newAction) { + case 1: + func_80B50260(this, globalCtx); + break; + case 2: + func_80B50278(this, globalCtx); + break; + case 3: + func_80B50304(this, globalCtx); + break; + case 4: + func_80B5042C(this, globalCtx); + break; + case 5: + func_80B504D4(this, globalCtx); + break; + case 6: + func_80B50580(this, globalCtx); + break; + case 7: + func_80B50618(this, globalCtx); + break; + case 8: + func_80B50670(this, globalCtx); + break; + case 9: + func_80B506C4(this, globalCtx); + break; + case 10: + func_80B50780(this, globalCtx); + break; + case 11: + func_80B5082C(this, globalCtx); + break; + case 12: + func_80B508C8(this, globalCtx); + break; + case 13: + func_80B50970(this, globalCtx); + break; + case 14: + func_80B50980(this, globalCtx); + break; + case 15: + func_80B50644(this, globalCtx); + break; + default: + osSyncPrintf("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_240 = newAction; + } + } +} + +void func_80B50BBC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B50A04(this, globalCtx); +} + +void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50C40(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FDD4(this); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B500E0(this, globalCtx); + func_80B503DC(this, globalCtx); +} + +void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4EA40(this); + func_80B50488(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50D50(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50D94(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4EAF4(this); + func_80B5053C(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + func_80B505D4(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50E90(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50F38(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5073C(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51034(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51080(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B507E8(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B510CC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51118(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B50880(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51164(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B511B0(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B50928(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B511FC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B5008C(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51250(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE48(this); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B500E0(this, globalCtx); + func_80B5008C(this); + func_80B50A04(this, globalCtx); +} + +void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B501E8(this, globalCtx); + func_80B509A0(this, globalCtx); +} + +void func_80B51310(EnZl2* this, GlobalContext* globalCtx) { + Actor* attachedB; + + if (EnZl2_GetNpcAction(globalCtx, 0) == NULL) { + attachedB = this->actor.attachedB; + if (attachedB != NULL) { + Actor_Kill(attachedB); + } + Actor_Kill(&this->actor); + } +} + +void func_80B5135C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600A15C, 0, 0.0f, 0); + this->action = 25; + this->unk_254 = 1; +} + +void func_80B513A8(EnZl2* this, GlobalContext* globalCtx) { + Player* player; + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_250 == 0) { + player = PLAYER; + posX = player->actor.posRot.pos.x; + posY = player->actor.posRot.pos.y; + posZ = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 7); + this->unk_250 = 1; + } +} + +void func_80B51418(EnZl2* this, GlobalContext* globalCtx) { + func_80B4E9B0(this); + if (globalCtx->csCtx.frames < 431) { + func_80B4ED18(this, 1); + } else { + func_80B4ED18(this, 0); + } +} + +void func_80B5146C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4EA40(this); + func_80B4ED18(this, 0); +} + +void func_80B5149C(EnZl2* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames < 988) { + func_80B4ECE8(this, 7); + func_80B4ED04(this, 8); + } else { + func_80B4E9B0(this); + } + func_80B4ED18(this, 0); +} + +void func_80B514F8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4E9B0(this); + if (globalCtx->csCtx.frames < 1190) { + func_80B4ED18(this, 1); + } else { + func_80B4ED18(this, 0); + } +} + +void func_80B5154C(EnZl2* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx; + + if (this->skelAnime.mode != 0) { + func_80B4E9B0(this); + } else { + csCtx = &globalCtx->csCtx; + if (csCtx->frames < 0x5F0) { + func_80B4EBB8(this); + } else if (csCtx->frames == 0x5F0) { + this->unk_27C = 0.0f; + } else { + func_80B4EC48(this); + } + } +} + +void func_80B515C4(EnZl2* this) { + this->action = 25; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B515D8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600A15C, 0, -8.0f, 0); + func_80B4EDB8(this, globalCtx, 0); + this->action = 26; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B51644(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_060087B8, 0, -8.0f, 0); + } +} + +void func_80B51678(EnZl2* this) { + func_80B4FD00(this, &D_06007D0C, 2, -8.0f, 0); + this->action = 27; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B516D0(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06009AD4, 0, -8.0f, 0); + } +} + +void func_80B51704(EnZl2* this) { + func_80B4FD00(this, &D_060090D8, 2, -8.0f, 0); + this->action = 28; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B5175C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06006778, 0, -8.0f, 0); + } +} + +void func_80B51790(EnZl2* this) { + func_80B4FD00(this, &D_06005F40, 2, -8.0f, 0); + this->action = 29; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B517E0(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002750, 0, -8.0f, 0); + this->action = 31; + } +} + +void func_80B51824(EnZl2* this) { + func_80B4FD00(this, &D_060022D0, 2, -8.0f, 0); + this->action = 30; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B5187C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_0600A79C, 0, -8.0f, 0); + this->unk_27C = 0.0f; + } +} + +void func_80B518C0(EnZl2* this) { + func_80B4FD00(this, SEGMENTED_TO_VIRTUAL(&D_06004900), 2, -8.0f, 0); + this->action = 32; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B51948(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 newAction; + s32 unk_240; + + if (npcAction != NULL) { + newAction = npcAction->action; + unk_240 = this->unk_240; + if (newAction != unk_240) { + switch (newAction) { + case 1: + func_80B515C4(this); + break; + case 2: + func_80B515D8(this, globalCtx); + break; + case 16: + func_80B51678(this); + break; + case 17: + func_80B51704(this); + break; + case 18: + func_80B51790(this); + break; + case 4: + func_80B51824(this); + break; + case 20: + func_80B518C0(this); + break; + case 21: + func_80B513A8(this, globalCtx); + break; + default: + osSyncPrintf("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_240 = newAction; + } + } +} + +void func_80B51A5C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B51948(this, globalCtx); +} + +void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B51418(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B51948(this, globalCtx); +} + +void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + func_80B51644(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51B44(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5149C(this, globalCtx); + func_80B516D0(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B514F8(this, globalCtx); + func_80B5175C(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5146C(this, globalCtx); + func_80B517E0(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51C64(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B51948(this, globalCtx); +} + +void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5154C(this, globalCtx); + func_80B5187C(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51D0C(EnZl2* this, GlobalContext* globalCtx) { + this->action = 33; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B51D24(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + u32 sfxId; + SkelAnime* skelAnime = &this->skelAnime; + + if ((func_800A56C8(skelAnime, 6.0f)) || (func_800A56C8(skelAnime, 0.0f))) { + if (this->actor.bgCheckFlags & 1) { + sfxId = 0x800; + sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + func_80078914(&this->actor.projectedPos, sfxId); + } + } +} + +void func_80B51DA4(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + Vec3f* thisPos = &this->actor.posRot.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 someFloat; + + if (npcAction != NULL) { + someFloat = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 0, 8); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + thisPos->x = ((endX - startX) * someFloat) + startX; + thisPos->y = ((endY - startY) * someFloat) + startY; + thisPos->z = ((endZ - startZ) * someFloat) + startZ; + if (npcAction->endFrame < globalCtx->csCtx.frames) { + Actor_Kill(&this->actor); + } + } +} + +void func_80B51EA8(EnZl2* this) { + this->action = 33; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B51EBC(EnZl2* this, GlobalContext* globalCtx) { + ActorShape* shape = &this->actor.shape; + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 pad[2]; + + this->actor.posRot.rot.y = shape->rot.y = npcAction->rot.y; + func_80B4FD00(this, &D_0600B224, 0, 0.0f, 0); + this->action = 34; + this->drawConfig = 1; + shape->unk_14 = 0xFF; +} + +void func_80B51F38(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + if (globalCtx->csCtx.frames - 8 >= npcAction->endFrame) { + func_80B4FD00(this, &D_0600B5FC, 0, -8.0f, 0); + this->action = 35; + } + } +} + +void func_80B51FA8(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 action; + s32 unk_240; + + if (npcAction != NULL) { + action = npcAction->action; + unk_240 = this->unk_240; + if (action != unk_240) { + switch (action) { + case 1: + func_80B51EA8(this); + break; + case 2: + func_80B51EBC(this, globalCtx); + break; + case 14: + Actor_Kill(&this->actor); + break; + default: + osSyncPrintf("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->unk_240 = action; + } + } +} + +void func_80B52068(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B51FA8(this, globalCtx); +} + +void func_80B52098(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B51D24(this, globalCtx); + func_80B51F38(this, globalCtx); + func_80B51DA4(this, globalCtx); +} + +void func_80B52108(EnZl2* this, GlobalContext* globalCtx) { +} + +void func_80B52114(EnZl2* this, GlobalContext* globalCtx) { + switch (this->actor.params) { + case 1: + func_80B5135C(this, globalCtx); + break; + case 4: + func_80B51D0C(this, globalCtx); + break; + case 0: + func_80B4FD90(this, globalCtx); + break; + default: + osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + func_80B4FD90(this, globalCtx); + } +} + +void func_80B521A0(EnZl2* this, GlobalContext* globalCtx) { + s32 pad; + ObjectContext* objectCtx = &globalCtx->objectCtx; + s32 bankIndex = Object_GetIndex(objectCtx, OBJECT_ZL2_ANIME1); + s32 pad2; + + if (bankIndex < 0) { + osSyncPrintf(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + return; + } + + if (Object_IsLoaded(objectCtx, bankIndex)) { + this->unk_274 = bankIndex; + func_80B4FCCC(this, globalCtx); + this->unk_278 = SkelAnime_GetFrameCount(&D_060022D0.genericHeader); + func_80B52114(this, globalCtx); + } +} + +void EnZl2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + + if (this->action < 0 || this->action >= 0x24 || sActionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void EnZl2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + ActorShape* actorShape = &thisx->shape; + s32 pad; + + ActorShape_Init(actorShape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + actorShape->unk_14 = 0; + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06010D70, NULL, NULL, NULL, 0); + + switch (thisx->params) { + case 1: + func_800F7260(0x6F); + break; + case 4: + gSaveContext.timer2State = 0; + break; + } +} + +s32 EnZl2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + EnZl2* this = THIS; + + if (this->overrideLimbDrawConfig < 0 || this->overrideLimbDrawConfig > 0 || + sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return 0; + } + return sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig](globalCtx, limbIndex, dList, pos, rot, thisx, gfx); +} + +void func_80B523BC(EnZl2* this, GlobalContext* globalCtx) { +} + +void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[3]; + s16 unk_190 = this->unk_190; + s16 unk_194 = this->unk_194; + u32 sp74 = D_80B52810[unk_190]; + u32 sp70 = D_80B52810[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + s16 unk_198 = this->unk_198; + u32 sp64 = D_80B52834[unk_198]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1623); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp74)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0B, &D_80116280[2]); + + gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, &this->actor, gfxCtx->polyOpa.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1648); +} + +void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + u32 sp78 = D_80B52810[unk_190]; + s16 unk_198 = this->unk_198; + SkelAnime* skelAnime = &this->skelAnime; + u32 sp6C = D_80B52834[unk_198]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1663); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_1A8); + gSPSegment(gfxCtx->polyXlu.p++, 0x0B, &D_80116280[0]); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl2_OverrideLimbDraw, NULL, &this->actor, gfxCtx->polyXlu.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1692); +} + +void EnZl2_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + + if ((this->drawConfig < 0) || (this->drawConfig >= 3) || (sDrawFuncs[this->drawConfig] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h index 3d689a5824..23a2f5eb23 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h @@ -6,9 +6,40 @@ struct EnZl2; +typedef void (*EnZl2ActionFunc)(struct EnZl2*, GlobalContext*); +typedef s32 (*EnZl2PreLimbDrawFunc)(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx, Gfx** gfx); +typedef void (*EnZl2DrawFunc)(struct EnZl2*, GlobalContext*); + typedef struct EnZl2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x134]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 unk_190; + /* 0x0192 */ s16 unk_192; + /* 0x0194 */ s16 unk_194; + /* 0x0196 */ char unk_196[0x2]; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ char unk_19A[0x2]; + /* 0x019C */ s32 action; + /* 0x01A0 */ s32 drawConfig; + /* 0x01A4 */ char unk_1A4[0x4]; + /* 0x01A8 */ s32 unk_1A8; + /* 0x01AC */ s16 unk_1AC[0x18]; // ??? + /* 0x01DC */ s16 unk_1DC[0x18]; // ??? + /* 0x020C */ s16 unk_20C[0x18]; // ??? + /* 0x023C */ f32 unk_23C; + /* 0x0240 */ s32 unk_240; + /* 0x0244 */ s32 unk_244; + /* 0x0248 */ s32 unk_248; + /* 0x024C */ s32 unk_24C; + /* 0x0250 */ s32 unk_250; + /* 0x0254 */ s32 unk_254; + /* 0x0258 */ char unk_258[0xC]; + /* 0x0264 */ s32 overrideLimbDrawConfig; + /* 0x0268 */ char unk_268[0xC]; + /* 0x0274 */ s32 unk_274; + /* 0x0278 */ f32 unk_278; + /* 0x027C */ f32 unk_27C; } EnZl2; // size = 0x0280 extern const ActorInit En_Zl2_InitVars; diff --git a/tools/m2ctx.py b/tools/m2ctx.py index e4e0af1a80..279209c709 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -55,7 +55,7 @@ def main(): output = import_c_file(c_file_path) - with open(os.path.join(root_dir, "ctx.c"), "w") as f: + with open(os.path.join(root_dir, "ctx.c"), "w", encoding="UTF-8") as f: f.write(output) diff --git a/undefined_syms.txt b/undefined_syms.txt index d1b56525f6..a7877a2182 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -390,6 +390,36 @@ D_0600BC90 = 0x0600BC90; D_0600BCA0 = 0x0600BCA0; D_0600BE40 = 0x0600BE40; +// z_en_zl2 +D_0600325C = 0x0600325C; +D_060003BC = 0x060003BC; +D_06000A50 = 0x06000A50; +D_06000EB0 = 0x06000EB0; +D_06001010 = 0x06001010; +D_060013A0 = 0x060013A0; +D_06001670 = 0x06001670; +D_06001B48 = 0x06001B48; +D_060022D0 = 0x060022D0; +D_06002750 = 0x06002750; +D_06002B14 = 0x06002B14; +D_06002F30 = 0x06002F30; +D_06003538 = 0x06003538; +D_06004900 = 0x06004900; +D_06005F40 = 0x06005F40; +D_06006778 = 0x06006778; +D_06007D0C = 0x06007D0C; +D_060087B8 = 0x060087B8; +D_060090D8 = 0x060090D8; +D_06009AD4 = 0x06009AD4; +D_0600A15C = 0x0600A15C; +D_0600A79C = 0x0600A79C; +D_0600AAD4 = 0x0600AAD4; +D_0600AFE0 = 0x0600AFE0; +D_0600B224 = 0x0600B224; +D_0600B5FC = 0x0600B5FC; +D_0600BAE8 = 0x0600BAE8; +D_06010D70 = 0x06010D70; + // z_arms_hook D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0;