diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2020-05-06 20:56:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 14:56:35 -0400 |
| commit | 5acc4e2f66b17c08b0194d3eecbb76e3fa58c7be (patch) | |
| tree | 46af11d693b2223128f8b83fd880f5454f61af5f | |
| parent | f7187808bcd39f1130ea017ce92c25bdaf6e62db (diff) | |
Fix some jump table labels being treated as separate functions (#120)
86 files changed, 1415 insertions, 1731 deletions
diff --git a/asm/non_matchings/code/z_message_PAL/func_801076CC.s b/asm/non_matchings/code/z_message_PAL/func_801076CC.s index 0959ed277..a02a82938 100644 --- a/asm/non_matchings/code/z_message_PAL/func_801076CC.s +++ b/asm/non_matchings/code/z_message_PAL/func_801076CC.s @@ -9,7 +9,6 @@ glabel func_801076CC /* B7E888 801076E8 8C2E4B28 */ lw $t6, %lo(jtbl_80154B28)($at) /* B7E88C 801076EC 01C00008 */ jr $t6 /* B7E890 801076F0 00000000 */ nop - glabel L801076F4 /* B7E894 801076F4 248F7FFF */ addiu $t7, $a0, 0x7fff /* B7E898 801076F8 91EF62FE */ lbu $t7, 0x62fe($t7) @@ -30,5 +29,164 @@ glabel L801076F4 /* B7E8D0 80107730 A42263DF */ sh $v0, 0x63df($at) /* B7E8D4 80107734 03E00008 */ jr $ra /* B7E8D8 80107738 A42263E1 */ sh $v0, 0x63e1($at) - +glabel L8010773C +/* B7E8DC 8010773C 24997FFF */ addiu $t9, $a0, 0x7fff +/* B7E8E0 80107740 933962FE */ lbu $t9, 0x62fe($t9) +/* B7E8E4 80107744 24010001 */ li $at, 1 +/* B7E8E8 80107748 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B7E8EC 8010774C 1721000E */ bne $t9, $at, .L80107788 +/* B7E8F0 80107750 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 +/* B7E8F4 80107754 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B7E8F8 80107758 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 +/* B7E8FC 8010775C 8C480000 */ lw $t0, ($v0) +/* B7E900 80107760 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E904 80107764 85090F56 */ lh $t1, 0xf56($t0) +/* B7E908 80107768 A42963DD */ sh $t1, 0x63dd($at) +/* B7E90C 8010776C 8C4A0000 */ lw $t2, ($v0) +/* B7E910 80107770 854B0F58 */ lh $t3, 0xf58($t2) +/* B7E914 80107774 A42B63DF */ sh $t3, 0x63df($at) +/* B7E918 80107778 8C4C0000 */ lw $t4, ($v0) +/* B7E91C 8010777C 858D0F5A */ lh $t5, 0xf5a($t4) +/* B7E920 80107780 03E00008 */ jr $ra +/* B7E924 80107784 A42D63E1 */ sh $t5, 0x63e1($at) +.L80107788: +/* B7E928 80107788 8C4E0000 */ lw $t6, ($v0) +/* B7E92C 8010778C 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E930 80107790 85CF0F5C */ lh $t7, 0xf5c($t6) +/* B7E934 80107794 A42F63DD */ sh $t7, 0x63dd($at) +/* B7E938 80107798 8C580000 */ lw $t8, ($v0) +/* B7E93C 8010779C 87190F5E */ lh $t9, 0xf5e($t8) +/* B7E940 801077A0 A43963DF */ sh $t9, 0x63df($at) +/* B7E944 801077A4 8C480000 */ lw $t0, ($v0) +/* B7E948 801077A8 85090F60 */ lh $t1, 0xf60($t0) +/* B7E94C 801077AC 03E00008 */ jr $ra +/* B7E950 801077B0 A42963E1 */ sh $t1, 0x63e1($at) +glabel L801077B4 +/* B7E954 801077B4 248A7FFF */ addiu $t2, $a0, 0x7fff +/* B7E958 801077B8 914A62FE */ lbu $t2, 0x62fe($t2) +/* B7E95C 801077BC 24010001 */ li $at, 1 +/* B7E960 801077C0 240500FF */ li $a1, 255 +/* B7E964 801077C4 15410009 */ bne $t2, $at, .L801077EC +/* B7E968 801077C8 240D0050 */ li $t5, 80 +/* B7E96C 801077CC 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E970 801077D0 240500FF */ li $a1, 255 +/* B7E974 801077D4 240B0050 */ li $t3, 80 +/* B7E978 801077D8 240C006E */ li $t4, 110 +/* B7E97C 801077DC A42B63DD */ sh $t3, 0x63dd($at) +/* B7E980 801077E0 A42C63DF */ sh $t4, 0x63df($at) +/* B7E984 801077E4 03E00008 */ jr $ra +/* B7E988 801077E8 A42563E1 */ sh $a1, 0x63e1($at) +.L801077EC: +/* B7E98C 801077EC 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E990 801077F0 240E005A */ li $t6, 90 +/* B7E994 801077F4 A42D63DD */ sh $t5, 0x63dd($at) +/* B7E998 801077F8 A42E63DF */ sh $t6, 0x63df($at) +/* B7E99C 801077FC 03E00008 */ jr $ra +/* B7E9A0 80107800 A42563E1 */ sh $a1, 0x63e1($at) +glabel L80107804 +/* B7E9A4 80107804 24827FFF */ addiu $v0, $a0, 0x7fff +/* B7E9A8 80107808 904262FE */ lbu $v0, 0x62fe($v0) +/* B7E9AC 8010780C 24010001 */ li $at, 1 +/* B7E9B0 80107810 240500FF */ li $a1, 255 +/* B7E9B4 80107814 14410007 */ bne $v0, $at, .L80107834 +/* B7E9B8 80107818 240F005A */ li $t7, 90 +/* B7E9BC 8010781C 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E9C0 80107820 241800B4 */ li $t8, 180 +/* B7E9C4 80107824 A42F63DD */ sh $t7, 0x63dd($at) +/* B7E9C8 80107828 A43863DF */ sh $t8, 0x63df($at) +/* B7E9CC 8010782C 03E00008 */ jr $ra +/* B7E9D0 80107830 A42563E1 */ sh $a1, 0x63e1($at) +.L80107834: +/* B7E9D4 80107834 24010005 */ li $at, 5 +/* B7E9D8 80107838 14410009 */ bne $v0, $at, .L80107860 +/* B7E9DC 8010783C 240500FF */ li $a1, 255 +/* B7E9E0 80107840 24817FFF */ addiu $at, $a0, 0x7fff +/* B7E9E4 80107844 24190050 */ li $t9, 80 +/* B7E9E8 80107848 24080096 */ li $t0, 150 +/* B7E9EC 8010784C 240900B4 */ li $t1, 180 +/* B7E9F0 80107850 A43963DD */ sh $t9, 0x63dd($at) +/* B7E9F4 80107854 A42863DF */ sh $t0, 0x63df($at) +/* B7E9F8 80107858 03E00008 */ jr $ra +/* B7E9FC 8010785C A42963E1 */ sh $t1, 0x63e1($at) +.L80107860: +/* B7EA00 80107860 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EA04 80107864 240A0064 */ li $t2, 100 +/* B7EA08 80107868 240B00B4 */ li $t3, 180 +/* B7EA0C 8010786C A42A63DD */ sh $t2, 0x63dd($at) +/* B7EA10 80107870 A42B63DF */ sh $t3, 0x63df($at) +/* B7EA14 80107874 03E00008 */ jr $ra +/* B7EA18 80107878 A42563E1 */ sh $a1, 0x63e1($at) +glabel L8010787C +/* B7EA1C 8010787C 248C7FFF */ addiu $t4, $a0, 0x7fff +/* B7EA20 80107880 918C62FE */ lbu $t4, 0x62fe($t4) +/* B7EA24 80107884 24010001 */ li $at, 1 +/* B7EA28 80107888 240500FF */ li $a1, 255 +/* B7EA2C 8010788C 15810009 */ bne $t4, $at, .L801078B4 +/* B7EA30 80107890 240F0096 */ li $t7, 150 +/* B7EA34 80107894 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EA38 80107898 240500FF */ li $a1, 255 +/* B7EA3C 8010789C 240D00D2 */ li $t5, 210 +/* B7EA40 801078A0 240E0064 */ li $t6, 100 +/* B7EA44 801078A4 A42D63DD */ sh $t5, 0x63dd($at) +/* B7EA48 801078A8 A42E63DF */ sh $t6, 0x63df($at) +/* B7EA4C 801078AC 03E00008 */ jr $ra +/* B7EA50 801078B0 A42563E1 */ sh $a1, 0x63e1($at) +.L801078B4: +/* B7EA54 801078B4 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EA58 801078B8 241800B4 */ li $t8, 180 +/* B7EA5C 801078BC A42563DD */ sh $a1, 0x63dd($at) +/* B7EA60 801078C0 A42F63DF */ sh $t7, 0x63df($at) +/* B7EA64 801078C4 03E00008 */ jr $ra +/* B7EA68 801078C8 A43863E1 */ sh $t8, 0x63e1($at) +glabel L801078CC +/* B7EA6C 801078CC 24997FFF */ addiu $t9, $a0, 0x7fff +/* B7EA70 801078D0 933962FE */ lbu $t9, 0x62fe($t9) +/* B7EA74 801078D4 24010001 */ li $at, 1 +/* B7EA78 801078D8 240500FF */ li $a1, 255 +/* B7EA7C 801078DC 17210008 */ bne $t9, $at, .L80107900 +/* B7EA80 801078E0 240900E1 */ li $t1, 225 +/* B7EA84 801078E4 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EA88 801078E8 240500FF */ li $a1, 255 +/* B7EA8C 801078EC 2408001E */ li $t0, 30 +/* B7EA90 801078F0 A42563DD */ sh $a1, 0x63dd($at) +/* B7EA94 801078F4 A42563DF */ sh $a1, 0x63df($at) +/* B7EA98 801078F8 03E00008 */ jr $ra +/* B7EA9C 801078FC A42863E1 */ sh $t0, 0x63e1($at) +.L80107900: +/* B7EAA0 80107900 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EAA4 80107904 240A0032 */ li $t2, 50 +/* B7EAA8 80107908 A42963DD */ sh $t1, 0x63dd($at) +/* B7EAAC 8010790C A42563DF */ sh $a1, 0x63df($at) +/* B7EAB0 80107910 03E00008 */ jr $ra +/* B7EAB4 80107914 A42A63E1 */ sh $t2, 0x63e1($at) +glabel L80107918 +/* B7EAB8 80107918 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EABC 8010791C A42063E1 */ sh $zero, 0x63e1($at) +/* B7EAC0 80107920 24837FFF */ addiu $v1, $a0, 0x7fff +/* B7EAC4 80107924 846363E1 */ lh $v1, 0x63e1($v1) +/* B7EAC8 80107928 A42363DF */ sh $v1, 0x63df($at) +/* B7EACC 8010792C 03E00008 */ jr $ra +/* B7EAD0 80107930 A42363DD */ sh $v1, 0x63dd($at) +.L80107934: +glabel L80107934 +/* B7EAD4 80107934 34018000 */ li $at, 32768 +/* B7EAD8 80107938 00811021 */ addu $v0, $a0, $at +/* B7EADC 8010793C 904B62FD */ lbu $t3, 0x62fd($v0) +/* B7EAE0 80107940 24010005 */ li $at, 5 +/* B7EAE4 80107944 240500FF */ li $a1, 255 +/* B7EAE8 80107948 15610006 */ bne $t3, $at, .L80107964 +/* B7EAEC 8010794C 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EAF0 80107950 A42063E1 */ sh $zero, 0x63e1($at) +/* B7EAF4 80107954 844363E0 */ lh $v1, 0x63e0($v0) +/* B7EAF8 80107958 A42363DF */ sh $v1, 0x63df($at) +/* B7EAFC 8010795C 03E00008 */ jr $ra +/* B7EB00 80107960 A42363DD */ sh $v1, 0x63dd($at) +.L80107964: +/* B7EB04 80107964 24817FFF */ addiu $at, $a0, 0x7fff +/* B7EB08 80107968 A42563E1 */ sh $a1, 0x63e1($at) +/* B7EB0C 8010796C 844363E0 */ lh $v1, 0x63e0($v0) +/* B7EB10 80107970 A42363DF */ sh $v1, 0x63df($at) +/* B7EB14 80107974 A42363DD */ sh $v1, 0x63dd($at) +/* B7EB18 80107978 03E00008 */ jr $ra +/* B7EB1C 8010797C 00000000 */ nop diff --git a/asm/non_matchings/code/z_message_PAL/func_8010773C.s b/asm/non_matchings/code/z_message_PAL/func_8010773C.s deleted file mode 100644 index 3bf5363df..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_8010773C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8010773C -/* B7E8DC 8010773C 24997FFF */ addiu $t9, $a0, 0x7fff -/* B7E8E0 80107740 933962FE */ lbu $t9, 0x62fe($t9) -/* B7E8E4 80107744 24010001 */ li $at, 1 -/* B7E8E8 80107748 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B7E8EC 8010774C 1721000E */ bne $t9, $at, .L80107788 -/* B7E8F0 80107750 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B7E8F4 80107754 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B7E8F8 80107758 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B7E8FC 8010775C 8C480000 */ lw $t0, ($v0) -/* B7E900 80107760 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E904 80107764 85090F56 */ lh $t1, 0xf56($t0) -/* B7E908 80107768 A42963DD */ sh $t1, 0x63dd($at) -/* B7E90C 8010776C 8C4A0000 */ lw $t2, ($v0) -/* B7E910 80107770 854B0F58 */ lh $t3, 0xf58($t2) -/* B7E914 80107774 A42B63DF */ sh $t3, 0x63df($at) -/* B7E918 80107778 8C4C0000 */ lw $t4, ($v0) -/* B7E91C 8010777C 858D0F5A */ lh $t5, 0xf5a($t4) -/* B7E920 80107780 03E00008 */ jr $ra -/* B7E924 80107784 A42D63E1 */ sh $t5, 0x63e1($at) -.L80107788: -/* B7E928 80107788 8C4E0000 */ lw $t6, ($v0) -/* B7E92C 8010778C 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E930 80107790 85CF0F5C */ lh $t7, 0xf5c($t6) -/* B7E934 80107794 A42F63DD */ sh $t7, 0x63dd($at) -/* B7E938 80107798 8C580000 */ lw $t8, ($v0) -/* B7E93C 8010779C 87190F5E */ lh $t9, 0xf5e($t8) -/* B7E940 801077A0 A43963DF */ sh $t9, 0x63df($at) -/* B7E944 801077A4 8C480000 */ lw $t0, ($v0) -/* B7E948 801077A8 85090F60 */ lh $t1, 0xf60($t0) -/* B7E94C 801077AC 03E00008 */ jr $ra -/* B7E950 801077B0 A42963E1 */ sh $t1, 0x63e1($at) - diff --git a/asm/non_matchings/code/z_message_PAL/func_801077B4.s b/asm/non_matchings/code/z_message_PAL/func_801077B4.s deleted file mode 100644 index 6a70e667e..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_801077B4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_801077B4 -/* B7E954 801077B4 248A7FFF */ addiu $t2, $a0, 0x7fff -/* B7E958 801077B8 914A62FE */ lbu $t2, 0x62fe($t2) -/* B7E95C 801077BC 24010001 */ li $at, 1 -/* B7E960 801077C0 240500FF */ li $a1, 255 -/* B7E964 801077C4 15410009 */ bne $t2, $at, .L801077EC -/* B7E968 801077C8 240D0050 */ li $t5, 80 -/* B7E96C 801077CC 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E970 801077D0 240500FF */ li $a1, 255 -/* B7E974 801077D4 240B0050 */ li $t3, 80 -/* B7E978 801077D8 240C006E */ li $t4, 110 -/* B7E97C 801077DC A42B63DD */ sh $t3, 0x63dd($at) -/* B7E980 801077E0 A42C63DF */ sh $t4, 0x63df($at) -/* B7E984 801077E4 03E00008 */ jr $ra -/* B7E988 801077E8 A42563E1 */ sh $a1, 0x63e1($at) -.L801077EC: -/* B7E98C 801077EC 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E990 801077F0 240E005A */ li $t6, 90 -/* B7E994 801077F4 A42D63DD */ sh $t5, 0x63dd($at) -/* B7E998 801077F8 A42E63DF */ sh $t6, 0x63df($at) -/* B7E99C 801077FC 03E00008 */ jr $ra -/* B7E9A0 80107800 A42563E1 */ sh $a1, 0x63e1($at) - diff --git a/asm/non_matchings/code/z_message_PAL/func_80107804.s b/asm/non_matchings/code/z_message_PAL/func_80107804.s deleted file mode 100644 index b191eba1a..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_80107804.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80107804 -/* B7E9A4 80107804 24827FFF */ addiu $v0, $a0, 0x7fff -/* B7E9A8 80107808 904262FE */ lbu $v0, 0x62fe($v0) -/* B7E9AC 8010780C 24010001 */ li $at, 1 -/* B7E9B0 80107810 240500FF */ li $a1, 255 -/* B7E9B4 80107814 14410007 */ bne $v0, $at, .L80107834 -/* B7E9B8 80107818 240F005A */ li $t7, 90 -/* B7E9BC 8010781C 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E9C0 80107820 241800B4 */ li $t8, 180 -/* B7E9C4 80107824 A42F63DD */ sh $t7, 0x63dd($at) -/* B7E9C8 80107828 A43863DF */ sh $t8, 0x63df($at) -/* B7E9CC 8010782C 03E00008 */ jr $ra -/* B7E9D0 80107830 A42563E1 */ sh $a1, 0x63e1($at) -.L80107834: -/* B7E9D4 80107834 24010005 */ li $at, 5 -/* B7E9D8 80107838 14410009 */ bne $v0, $at, .L80107860 -/* B7E9DC 8010783C 240500FF */ li $a1, 255 -/* B7E9E0 80107840 24817FFF */ addiu $at, $a0, 0x7fff -/* B7E9E4 80107844 24190050 */ li $t9, 80 -/* B7E9E8 80107848 24080096 */ li $t0, 150 -/* B7E9EC 8010784C 240900B4 */ li $t1, 180 -/* B7E9F0 80107850 A43963DD */ sh $t9, 0x63dd($at) -/* B7E9F4 80107854 A42863DF */ sh $t0, 0x63df($at) -/* B7E9F8 80107858 03E00008 */ jr $ra -/* B7E9FC 8010785C A42963E1 */ sh $t1, 0x63e1($at) -.L80107860: -/* B7EA00 80107860 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EA04 80107864 240A0064 */ li $t2, 100 -/* B7EA08 80107868 240B00B4 */ li $t3, 180 -/* B7EA0C 8010786C A42A63DD */ sh $t2, 0x63dd($at) -/* B7EA10 80107870 A42B63DF */ sh $t3, 0x63df($at) -/* B7EA14 80107874 03E00008 */ jr $ra -/* B7EA18 80107878 A42563E1 */ sh $a1, 0x63e1($at) - diff --git a/asm/non_matchings/code/z_message_PAL/func_8010787C.s b/asm/non_matchings/code/z_message_PAL/func_8010787C.s deleted file mode 100644 index 5188a795d..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_8010787C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8010787C -/* B7EA1C 8010787C 248C7FFF */ addiu $t4, $a0, 0x7fff -/* B7EA20 80107880 918C62FE */ lbu $t4, 0x62fe($t4) -/* B7EA24 80107884 24010001 */ li $at, 1 -/* B7EA28 80107888 240500FF */ li $a1, 255 -/* B7EA2C 8010788C 15810009 */ bne $t4, $at, .L801078B4 -/* B7EA30 80107890 240F0096 */ li $t7, 150 -/* B7EA34 80107894 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EA38 80107898 240500FF */ li $a1, 255 -/* B7EA3C 8010789C 240D00D2 */ li $t5, 210 -/* B7EA40 801078A0 240E0064 */ li $t6, 100 -/* B7EA44 801078A4 A42D63DD */ sh $t5, 0x63dd($at) -/* B7EA48 801078A8 A42E63DF */ sh $t6, 0x63df($at) -/* B7EA4C 801078AC 03E00008 */ jr $ra -/* B7EA50 801078B0 A42563E1 */ sh $a1, 0x63e1($at) -.L801078B4: -/* B7EA54 801078B4 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EA58 801078B8 241800B4 */ li $t8, 180 -/* B7EA5C 801078BC A42563DD */ sh $a1, 0x63dd($at) -/* B7EA60 801078C0 A42F63DF */ sh $t7, 0x63df($at) -/* B7EA64 801078C4 03E00008 */ jr $ra -/* B7EA68 801078C8 A43863E1 */ sh $t8, 0x63e1($at) - diff --git a/asm/non_matchings/code/z_message_PAL/func_801078CC.s b/asm/non_matchings/code/z_message_PAL/func_801078CC.s deleted file mode 100644 index c174810df..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_801078CC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_801078CC -/* B7EA6C 801078CC 24997FFF */ addiu $t9, $a0, 0x7fff -/* B7EA70 801078D0 933962FE */ lbu $t9, 0x62fe($t9) -/* B7EA74 801078D4 24010001 */ li $at, 1 -/* B7EA78 801078D8 240500FF */ li $a1, 255 -/* B7EA7C 801078DC 17210008 */ bne $t9, $at, .L80107900 -/* B7EA80 801078E0 240900E1 */ li $t1, 225 -/* B7EA84 801078E4 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EA88 801078E8 240500FF */ li $a1, 255 -/* B7EA8C 801078EC 2408001E */ li $t0, 30 -/* B7EA90 801078F0 A42563DD */ sh $a1, 0x63dd($at) -/* B7EA94 801078F4 A42563DF */ sh $a1, 0x63df($at) -/* B7EA98 801078F8 03E00008 */ jr $ra -/* B7EA9C 801078FC A42863E1 */ sh $t0, 0x63e1($at) -.L80107900: -/* B7EAA0 80107900 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EAA4 80107904 240A0032 */ li $t2, 50 -/* B7EAA8 80107908 A42963DD */ sh $t1, 0x63dd($at) -/* B7EAAC 8010790C A42563DF */ sh $a1, 0x63df($at) -/* B7EAB0 80107910 03E00008 */ jr $ra -/* B7EAB4 80107914 A42A63E1 */ sh $t2, 0x63e1($at) - diff --git a/asm/non_matchings/code/z_message_PAL/func_80107918.s b/asm/non_matchings/code/z_message_PAL/func_80107918.s deleted file mode 100644 index d7ace58c2..000000000 --- a/asm/non_matchings/code/z_message_PAL/func_80107918.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80107918 -/* B7EAB8 80107918 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EABC 8010791C A42063E1 */ sh $zero, 0x63e1($at) -/* B7EAC0 80107920 24837FFF */ addiu $v1, $a0, 0x7fff -/* B7EAC4 80107924 846363E1 */ lh $v1, 0x63e1($v1) -/* B7EAC8 80107928 A42363DF */ sh $v1, 0x63df($at) -/* B7EACC 8010792C 03E00008 */ jr $ra -/* B7EAD0 80107930 A42363DD */ sh $v1, 0x63dd($at) -.L80107934: -glabel L80107934 -/* B7EAD4 80107934 34018000 */ li $at, 32768 -/* B7EAD8 80107938 00811021 */ addu $v0, $a0, $at -/* B7EADC 8010793C 904B62FD */ lbu $t3, 0x62fd($v0) -/* B7EAE0 80107940 24010005 */ li $at, 5 -/* B7EAE4 80107944 240500FF */ li $a1, 255 -/* B7EAE8 80107948 15610006 */ bne $t3, $at, .L80107964 -/* B7EAEC 8010794C 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EAF0 80107950 A42063E1 */ sh $zero, 0x63e1($at) -/* B7EAF4 80107954 844363E0 */ lh $v1, 0x63e0($v0) -/* B7EAF8 80107958 A42363DF */ sh $v1, 0x63df($at) -/* B7EAFC 8010795C 03E00008 */ jr $ra -/* B7EB00 80107960 A42363DD */ sh $v1, 0x63dd($at) -.L80107964: -/* B7EB04 80107964 24817FFF */ addiu $at, $a0, 0x7fff -/* B7EB08 80107968 A42563E1 */ sh $a1, 0x63e1($at) -/* B7EB0C 8010796C 844363E0 */ lh $v1, 0x63e0($v0) -/* B7EB10 80107970 A42363DF */ sh $v1, 0x63df($at) -/* B7EB14 80107974 A42363DD */ sh $v1, 0x63dd($at) -/* B7EB18 80107978 03E00008 */ jr $ra -/* B7EB1C 8010797C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s index 0c63f454c..ec391fcbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s @@ -20,3 +20,140 @@ glabel L808DE760 /* 07F08 808DE778 00000000 */ nop /* 07F0C 808DE77C 03E00008 */ jr $ra /* 07F10 808DE780 ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 +glabel L808DE784 +/* 07F14 808DE784 8FA30010 */ lw $v1, 0x0010($sp) +/* 07F18 808DE788 8FA20014 */ lw $v0, 0x0014($sp) +/* 07F1C 808DE78C 84790002 */ lh $t9, 0x0002($v1) ## 00000002 +/* 07F20 808DE790 C444050C */ lwc1 $f4, 0x050C($v0) ## 0000050C +/* 07F24 808DE794 C4460514 */ lwc1 $f6, 0x0514($v0) ## 00000514 +/* 07F28 808DE798 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 +/* 07F2C 808DE79C 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 +/* 07F30 808DE7A0 46062200 */ add.s $f8, $f4, $f6 +/* 07F34 808DE7A4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 +/* 07F38 808DE7A8 46805420 */ cvt.s.w $f16, $f10 +/* 07F3C 808DE7AC 468032A0 */ cvt.s.w $f10, $f6 +/* 07F40 808DE7B0 46088480 */ add.s $f18, $f16, $f8 +/* 07F44 808DE7B4 4600910D */ trunc.w.s $f4, $f18 +/* 07F48 808DE7B8 44092000 */ mfc1 $t1, $f4 +/* 07F4C 808DE7BC 00000000 */ nop +/* 07F50 808DE7C0 A4690002 */ sh $t1, 0x0002($v1) ## 00000002 +/* 07F54 808DE7C4 C4500510 */ lwc1 $f16, 0x0510($v0) ## 00000510 +/* 07F58 808DE7C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 07F5C 808DE7CC 46105200 */ add.s $f8, $f10, $f16 +/* 07F60 808DE7D0 4600448D */ trunc.w.s $f18, $f8 +/* 07F64 808DE7D4 440C9000 */ mfc1 $t4, $f18 +/* 07F68 808DE7D8 03E00008 */ jr $ra +/* 07F6C 808DE7DC A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 +glabel L808DE7E0 +/* 07F70 808DE7E0 8FA20014 */ lw $v0, 0x0014($sp) +/* 07F74 808DE7E4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 +/* 07F78 808DE7E8 8FA30010 */ lw $v1, 0x0010($sp) +/* 07F7C 808DE7EC C4400510 */ lwc1 $f0, 0x0510($v0) ## 00000510 +/* 07F80 808DE7F0 4600203C */ c.lt.s $f4, $f0 +/* 07F84 808DE7F4 00000000 */ nop +/* 07F88 808DE7F8 45000061 */ bc1f .L808DE980 +/* 07F8C 808DE7FC 00000000 */ nop +/* 07F90 808DE800 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 +/* 07F94 808DE804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 07F98 808DE808 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 +/* 07F9C 808DE80C 00000000 */ nop +/* 07FA0 808DE810 468032A0 */ cvt.s.w $f10, $f6 +/* 07FA4 808DE814 46005400 */ add.s $f16, $f10, $f0 +/* 07FA8 808DE818 4600820D */ trunc.w.s $f8, $f16 +/* 07FAC 808DE81C 440F4000 */ mfc1 $t7, $f8 +/* 07FB0 808DE820 03E00008 */ jr $ra +/* 07FB4 808DE824 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 +glabel L808DE828 +/* 07FB8 808DE828 8FA30010 */ lw $v1, 0x0010($sp) +/* 07FBC 808DE82C 8FA20014 */ lw $v0, 0x0014($sp) +/* 07FC0 808DE830 84780002 */ lh $t8, 0x0002($v1) ## 00000002 +/* 07FC4 808DE834 C452050C */ lwc1 $f18, 0x050C($v0) ## 0000050C +/* 07FC8 808DE838 C4440514 */ lwc1 $f4, 0x0514($v0) ## 00000514 +/* 07FCC 808DE83C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 +/* 07FD0 808DE840 84690004 */ lh $t1, 0x0004($v1) ## 00000004 +/* 07FD4 808DE844 46049180 */ add.s $f6, $f18, $f4 +/* 07FD8 808DE848 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 +/* 07FDC 808DE84C 46805420 */ cvt.s.w $f16, $f10 +/* 07FE0 808DE850 468022A0 */ cvt.s.w $f10, $f4 +/* 07FE4 808DE854 46068200 */ add.s $f8, $f16, $f6 +/* 07FE8 808DE858 4600448D */ trunc.w.s $f18, $f8 +/* 07FEC 808DE85C 44089000 */ mfc1 $t0, $f18 +/* 07FF0 808DE860 00000000 */ nop +/* 07FF4 808DE864 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 +/* 07FF8 808DE868 C4500510 */ lwc1 $f16, 0x0510($v0) ## 00000510 +/* 07FFC 808DE86C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 08000 808DE870 46105180 */ add.s $f6, $f10, $f16 +/* 08004 808DE874 4600320D */ trunc.w.s $f8, $f6 +/* 08008 808DE878 440B4000 */ mfc1 $t3, $f8 +/* 0800C 808DE87C 03E00008 */ jr $ra +/* 08010 808DE880 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 +glabel L808DE884 +/* 08014 808DE884 8FA30010 */ lw $v1, 0x0010($sp) +/* 08018 808DE888 8FA20014 */ lw $v0, 0x0014($sp) +/* 0801C 808DE88C 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 +/* 08020 808DE890 C452050C */ lwc1 $f18, 0x050C($v0) ## 0000050C +/* 08024 808DE894 C4440514 */ lwc1 $f4, 0x0514($v0) ## 00000514 +/* 08028 808DE898 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 +/* 0802C 808DE89C 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 +/* 08030 808DE8A0 46049281 */ sub.s $f10, $f18, $f4 +/* 08034 808DE8A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 +/* 08038 808DE8A8 468081A0 */ cvt.s.w $f6, $f16 +/* 0803C 808DE8AC 46802420 */ cvt.s.w $f16, $f4 +/* 08040 808DE8B0 460A3200 */ add.s $f8, $f6, $f10 +/* 08044 808DE8B4 4600448D */ trunc.w.s $f18, $f8 +/* 08048 808DE8B8 440E9000 */ mfc1 $t6, $f18 +/* 0804C 808DE8BC 00000000 */ nop +/* 08050 808DE8C0 A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 +/* 08054 808DE8C4 C4460510 */ lwc1 $f6, 0x0510($v0) ## 00000510 +/* 08058 808DE8C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 0805C 808DE8CC 46068280 */ add.s $f10, $f16, $f6 +/* 08060 808DE8D0 4600520D */ trunc.w.s $f8, $f10 +/* 08064 808DE8D4 44194000 */ mfc1 $t9, $f8 +/* 08068 808DE8D8 03E00008 */ jr $ra +/* 0806C 808DE8DC A4790004 */ sh $t9, 0x0004($v1) ## 00000004 +glabel L808DE8E0 +/* 08070 808DE8E0 8FA20014 */ lw $v0, 0x0014($sp) +/* 08074 808DE8E4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 +/* 08078 808DE8E8 8FA30010 */ lw $v1, 0x0010($sp) +/* 0807C 808DE8EC C4400510 */ lwc1 $f0, 0x0510($v0) ## 00000510 +/* 08080 808DE8F0 4600903C */ c.lt.s $f18, $f0 +/* 08084 808DE8F4 00000000 */ nop +/* 08088 808DE8F8 45000021 */ bc1f .L808DE980 +/* 0808C 808DE8FC 00000000 */ nop +/* 08090 808DE900 84680004 */ lh $t0, 0x0004($v1) ## 00000004 +/* 08094 808DE904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 08098 808DE908 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 +/* 0809C 808DE90C 00000000 */ nop +/* 080A0 808DE910 46802420 */ cvt.s.w $f16, $f4 +/* 080A4 808DE914 46008180 */ add.s $f6, $f16, $f0 +/* 080A8 808DE918 4600328D */ trunc.w.s $f10, $f6 +/* 080AC 808DE91C 440A5000 */ mfc1 $t2, $f10 +/* 080B0 808DE920 03E00008 */ jr $ra +/* 080B4 808DE924 A46A0004 */ sh $t2, 0x0004($v1) ## 00000004 +glabel L808DE928 +/* 080B8 808DE928 8FA30010 */ lw $v1, 0x0010($sp) +/* 080BC 808DE92C 8FA20014 */ lw $v0, 0x0014($sp) +/* 080C0 808DE930 846B0002 */ lh $t3, 0x0002($v1) ## 00000002 +/* 080C4 808DE934 C448050C */ lwc1 $f8, 0x050C($v0) ## 0000050C +/* 080C8 808DE938 C4520514 */ lwc1 $f18, 0x0514($v0) ## 00000514 +/* 080CC 808DE93C 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 +/* 080D0 808DE940 846E0004 */ lh $t6, 0x0004($v1) ## 00000004 +/* 080D4 808DE944 46124101 */ sub.s $f4, $f8, $f18 +/* 080D8 808DE948 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 +/* 080DC 808DE94C 468081A0 */ cvt.s.w $f6, $f16 +/* 080E0 808DE950 46809420 */ cvt.s.w $f16, $f18 +/* 080E4 808DE954 46043280 */ add.s $f10, $f6, $f4 +/* 080E8 808DE958 4600520D */ trunc.w.s $f8, $f10 +/* 080EC 808DE95C 440D4000 */ mfc1 $t5, $f8 +/* 080F0 808DE960 00000000 */ nop +/* 080F4 808DE964 A46D0002 */ sh $t5, 0x0002($v1) ## 00000002 +/* 080F8 808DE968 C4460510 */ lwc1 $f6, 0x0510($v0) ## 00000510 +/* 080FC 808DE96C 46068100 */ add.s $f4, $f16, $f6 +/* 08100 808DE970 4600228D */ trunc.w.s $f10, $f4 +/* 08104 808DE974 44185000 */ mfc1 $t8, $f10 +/* 08108 808DE978 00000000 */ nop +/* 0810C 808DE97C A4780004 */ sh $t8, 0x0004($v1) ## 00000004 +glabel L808DE980 +.L808DE980: +/* 08110 808DE980 03E00008 */ jr $ra +/* 08114 808DE984 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s deleted file mode 100644 index 4ac2d4b8d..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808DE784 -/* 07F14 808DE784 8FA30010 */ lw $v1, 0x0010($sp) -/* 07F18 808DE788 8FA20014 */ lw $v0, 0x0014($sp) -/* 07F1C 808DE78C 84790002 */ lh $t9, 0x0002($v1) ## 00000002 -/* 07F20 808DE790 C444050C */ lwc1 $f4, 0x050C($v0) ## 0000050C -/* 07F24 808DE794 C4460514 */ lwc1 $f6, 0x0514($v0) ## 00000514 -/* 07F28 808DE798 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 07F2C 808DE79C 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 07F30 808DE7A0 46062200 */ add.s $f8, $f4, $f6 -/* 07F34 808DE7A4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 07F38 808DE7A8 46805420 */ cvt.s.w $f16, $f10 -/* 07F3C 808DE7AC 468032A0 */ cvt.s.w $f10, $f6 -/* 07F40 808DE7B0 46088480 */ add.s $f18, $f16, $f8 -/* 07F44 808DE7B4 4600910D */ trunc.w.s $f4, $f18 -/* 07F48 808DE7B8 44092000 */ mfc1 $t1, $f4 -/* 07F4C 808DE7BC 00000000 */ nop -/* 07F50 808DE7C0 A4690002 */ sh $t1, 0x0002($v1) ## 00000002 -/* 07F54 808DE7C4 C4500510 */ lwc1 $f16, 0x0510($v0) ## 00000510 -/* 07F58 808DE7C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 07F5C 808DE7CC 46105200 */ add.s $f8, $f10, $f16 -/* 07F60 808DE7D0 4600448D */ trunc.w.s $f18, $f8 -/* 07F64 808DE7D4 440C9000 */ mfc1 $t4, $f18 -/* 07F68 808DE7D8 03E00008 */ jr $ra -/* 07F6C 808DE7DC A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s deleted file mode 100644 index 0fc110665..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_808DE7E0 -/* 07F70 808DE7E0 8FA20014 */ lw $v0, 0x0014($sp) -/* 07F74 808DE7E4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 07F78 808DE7E8 8FA30010 */ lw $v1, 0x0010($sp) -/* 07F7C 808DE7EC C4400510 */ lwc1 $f0, 0x0510($v0) ## 00000510 -/* 07F80 808DE7F0 4600203C */ c.lt.s $f4, $f0 -/* 07F84 808DE7F4 00000000 */ nop -/* 07F88 808DE7F8 45000061 */ bc1f .L808DE980 -/* 07F8C 808DE7FC 00000000 */ nop -/* 07F90 808DE800 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 -/* 07F94 808DE804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 07F98 808DE808 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 07F9C 808DE80C 00000000 */ nop -/* 07FA0 808DE810 468032A0 */ cvt.s.w $f10, $f6 -/* 07FA4 808DE814 46005400 */ add.s $f16, $f10, $f0 -/* 07FA8 808DE818 4600820D */ trunc.w.s $f8, $f16 -/* 07FAC 808DE81C 440F4000 */ mfc1 $t7, $f8 -/* 07FB0 808DE820 03E00008 */ jr $ra -/* 07FB4 808DE824 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s deleted file mode 100644 index 7af5a2e70..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808DE828 -/* 07FB8 808DE828 8FA30010 */ lw $v1, 0x0010($sp) -/* 07FBC 808DE82C 8FA20014 */ lw $v0, 0x0014($sp) -/* 07FC0 808DE830 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 07FC4 808DE834 C452050C */ lwc1 $f18, 0x050C($v0) ## 0000050C -/* 07FC8 808DE838 C4440514 */ lwc1 $f4, 0x0514($v0) ## 00000514 -/* 07FCC 808DE83C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 07FD0 808DE840 84690004 */ lh $t1, 0x0004($v1) ## 00000004 -/* 07FD4 808DE844 46049180 */ add.s $f6, $f18, $f4 -/* 07FD8 808DE848 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 07FDC 808DE84C 46805420 */ cvt.s.w $f16, $f10 -/* 07FE0 808DE850 468022A0 */ cvt.s.w $f10, $f4 -/* 07FE4 808DE854 46068200 */ add.s $f8, $f16, $f6 -/* 07FE8 808DE858 4600448D */ trunc.w.s $f18, $f8 -/* 07FEC 808DE85C 44089000 */ mfc1 $t0, $f18 -/* 07FF0 808DE860 00000000 */ nop -/* 07FF4 808DE864 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 07FF8 808DE868 C4500510 */ lwc1 $f16, 0x0510($v0) ## 00000510 -/* 07FFC 808DE86C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08000 808DE870 46105180 */ add.s $f6, $f10, $f16 -/* 08004 808DE874 4600320D */ trunc.w.s $f8, $f6 -/* 08008 808DE878 440B4000 */ mfc1 $t3, $f8 -/* 0800C 808DE87C 03E00008 */ jr $ra -/* 08010 808DE880 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s deleted file mode 100644 index 66313b367..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808DE884 -/* 08014 808DE884 8FA30010 */ lw $v1, 0x0010($sp) -/* 08018 808DE888 8FA20014 */ lw $v0, 0x0014($sp) -/* 0801C 808DE88C 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 -/* 08020 808DE890 C452050C */ lwc1 $f18, 0x050C($v0) ## 0000050C -/* 08024 808DE894 C4440514 */ lwc1 $f4, 0x0514($v0) ## 00000514 -/* 08028 808DE898 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 0802C 808DE89C 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 -/* 08030 808DE8A0 46049281 */ sub.s $f10, $f18, $f4 -/* 08034 808DE8A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 08038 808DE8A8 468081A0 */ cvt.s.w $f6, $f16 -/* 0803C 808DE8AC 46802420 */ cvt.s.w $f16, $f4 -/* 08040 808DE8B0 460A3200 */ add.s $f8, $f6, $f10 -/* 08044 808DE8B4 4600448D */ trunc.w.s $f18, $f8 -/* 08048 808DE8B8 440E9000 */ mfc1 $t6, $f18 -/* 0804C 808DE8BC 00000000 */ nop -/* 08050 808DE8C0 A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 -/* 08054 808DE8C4 C4460510 */ lwc1 $f6, 0x0510($v0) ## 00000510 -/* 08058 808DE8C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0805C 808DE8CC 46068280 */ add.s $f10, $f16, $f6 -/* 08060 808DE8D0 4600520D */ trunc.w.s $f8, $f10 -/* 08064 808DE8D4 44194000 */ mfc1 $t9, $f8 -/* 08068 808DE8D8 03E00008 */ jr $ra -/* 0806C 808DE8DC A4790004 */ sh $t9, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s deleted file mode 100644 index 347e5bbd1..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_808DE8E0 -/* 08070 808DE8E0 8FA20014 */ lw $v0, 0x0014($sp) -/* 08074 808DE8E4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 08078 808DE8E8 8FA30010 */ lw $v1, 0x0010($sp) -/* 0807C 808DE8EC C4400510 */ lwc1 $f0, 0x0510($v0) ## 00000510 -/* 08080 808DE8F0 4600903C */ c.lt.s $f18, $f0 -/* 08084 808DE8F4 00000000 */ nop -/* 08088 808DE8F8 45000021 */ bc1f .L808DE980 -/* 0808C 808DE8FC 00000000 */ nop -/* 08090 808DE900 84680004 */ lh $t0, 0x0004($v1) ## 00000004 -/* 08094 808DE904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08098 808DE908 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 0809C 808DE90C 00000000 */ nop -/* 080A0 808DE910 46802420 */ cvt.s.w $f16, $f4 -/* 080A4 808DE914 46008180 */ add.s $f6, $f16, $f0 -/* 080A8 808DE918 4600328D */ trunc.w.s $f10, $f6 -/* 080AC 808DE91C 440A5000 */ mfc1 $t2, $f10 -/* 080B0 808DE920 03E00008 */ jr $ra -/* 080B4 808DE924 A46A0004 */ sh $t2, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s deleted file mode 100644 index c95829753..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808DE928 -/* 080B8 808DE928 8FA30010 */ lw $v1, 0x0010($sp) -/* 080BC 808DE92C 8FA20014 */ lw $v0, 0x0014($sp) -/* 080C0 808DE930 846B0002 */ lh $t3, 0x0002($v1) ## 00000002 -/* 080C4 808DE934 C448050C */ lwc1 $f8, 0x050C($v0) ## 0000050C -/* 080C8 808DE938 C4520514 */ lwc1 $f18, 0x0514($v0) ## 00000514 -/* 080CC 808DE93C 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 080D0 808DE940 846E0004 */ lh $t6, 0x0004($v1) ## 00000004 -/* 080D4 808DE944 46124101 */ sub.s $f4, $f8, $f18 -/* 080D8 808DE948 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 080DC 808DE94C 468081A0 */ cvt.s.w $f6, $f16 -/* 080E0 808DE950 46809420 */ cvt.s.w $f16, $f18 -/* 080E4 808DE954 46043280 */ add.s $f10, $f6, $f4 -/* 080E8 808DE958 4600520D */ trunc.w.s $f8, $f10 -/* 080EC 808DE95C 440D4000 */ mfc1 $t5, $f8 -/* 080F0 808DE960 00000000 */ nop -/* 080F4 808DE964 A46D0002 */ sh $t5, 0x0002($v1) ## 00000002 -/* 080F8 808DE968 C4460510 */ lwc1 $f6, 0x0510($v0) ## 00000510 -/* 080FC 808DE96C 46068100 */ add.s $f4, $f16, $f6 -/* 08100 808DE970 4600228D */ trunc.w.s $f10, $f4 -/* 08104 808DE974 44185000 */ mfc1 $t8, $f10 -/* 08108 808DE978 00000000 */ nop -/* 0810C 808DE97C A4780004 */ sh $t8, 0x0004($v1) ## 00000004 -glabel L808DE980 -.L808DE980: -/* 08110 808DE980 03E00008 */ jr $ra -/* 08114 808DE984 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s index be7af3a81..ed9208e73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s @@ -5,9 +5,9 @@ glabel func_809142E0 /* 03CAC 809142EC 102000E2 */ beq $at, $zero, .L80914678 /* 03CB0 809142F0 AFA7000C */ sw $a3, 0x000C($sp) /* 03CB4 809142F4 000E7080 */ sll $t6, $t6, 2 -/* 03CB8 809142F8 3C018091 */ lui $at, %hi(D_809154C4) ## $at = 80910000 +/* 03CB8 809142F8 3C018091 */ lui $at, %hi(jtbl_80A3F02C) ## $at = 80910000 /* 03CBC 809142FC 002E0821 */ addu $at, $at, $t6 -/* 03CC0 80914300 8C2E54C4 */ lw $t6, %lo(D_809154C4)($at) +/* 03CC0 80914300 8C2E54C4 */ lw $t6, %lo(jtbl_80A3F02C)($at) /* 03CC4 80914304 01C00008 */ jr $t6 /* 03CC8 80914308 00000000 */ nop glabel L8091430C @@ -46,3 +46,225 @@ glabel L8091430C /* 03D48 80914388 440F5000 */ mfc1 $t7, $f10 /* 03D4C 8091438C 03E00008 */ jr $ra /* 03D50 80914390 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 +glabel L80914394 +/* 03D54 80914394 8FA30010 */ lw $v1, 0x0010($sp) +/* 03D58 80914398 8FA20014 */ lw $v0, 0x0014($sp) +/* 03D5C 8091439C 84780002 */ lh $t8, 0x0002($v1) ## 00000002 +/* 03D60 809143A0 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03D64 809143A4 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03D68 809143A8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 +/* 03D6C 809143AC 84690004 */ lh $t1, 0x0004($v1) ## 00000004 +/* 03D70 809143B0 46128100 */ add.s $f4, $f16, $f18 +/* 03D74 809143B4 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 +/* 03D78 809143B8 46803220 */ cvt.s.w $f8, $f6 +/* 03D7C 809143BC 468091A0 */ cvt.s.w $f6, $f18 +/* 03D80 809143C0 46044280 */ add.s $f10, $f8, $f4 +/* 03D84 809143C4 4600540D */ trunc.w.s $f16, $f10 +/* 03D88 809143C8 44088000 */ mfc1 $t0, $f16 +/* 03D8C 809143CC 00000000 */ nop +/* 03D90 809143D0 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 +/* 03D94 809143D4 C44803CC */ lwc1 $f8, 0x03CC($v0) ## 000003CC +/* 03D98 809143D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03D9C 809143DC 46083100 */ add.s $f4, $f6, $f8 +/* 03DA0 809143E0 4600228D */ trunc.w.s $f10, $f4 +/* 03DA4 809143E4 440B5000 */ mfc1 $t3, $f10 +/* 03DA8 809143E8 03E00008 */ jr $ra +/* 03DAC 809143EC A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 +glabel L809143F0 +/* 03DB0 809143F0 8FA30010 */ lw $v1, 0x0010($sp) +/* 03DB4 809143F4 8FA20014 */ lw $v0, 0x0014($sp) +/* 03DB8 809143F8 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 +/* 03DBC 809143FC C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03DC0 80914400 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03DC4 80914404 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 +/* 03DC8 80914408 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 +/* 03DCC 8091440C 46128180 */ add.s $f6, $f16, $f18 +/* 03DD0 80914410 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 +/* 03DD4 80914414 46804120 */ cvt.s.w $f4, $f8 +/* 03DD8 80914418 46809220 */ cvt.s.w $f8, $f18 +/* 03DDC 8091441C 46062280 */ add.s $f10, $f4, $f6 +/* 03DE0 80914420 4600540D */ trunc.w.s $f16, $f10 +/* 03DE4 80914424 440E8000 */ mfc1 $t6, $f16 +/* 03DE8 80914428 00000000 */ nop +/* 03DEC 8091442C A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 +/* 03DF0 80914430 C44403CC */ lwc1 $f4, 0x03CC($v0) ## 000003CC +/* 03DF4 80914434 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03DF8 80914438 46044180 */ add.s $f6, $f8, $f4 +/* 03DFC 8091443C 4600328D */ trunc.w.s $f10, $f6 +/* 03E00 80914440 44195000 */ mfc1 $t9, $f10 +/* 03E04 80914444 03E00008 */ jr $ra +/* 03E08 80914448 A4790004 */ sh $t9, 0x0004($v1) ## 00000004 +glabel L8091444C +/* 03E0C 8091444C 8FA30010 */ lw $v1, 0x0010($sp) +/* 03E10 80914450 8FA20014 */ lw $v0, 0x0014($sp) +/* 03E14 80914454 84680002 */ lh $t0, 0x0002($v1) ## 00000002 +/* 03E18 80914458 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03E1C 8091445C C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03E20 80914460 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 +/* 03E24 80914464 846B0004 */ lh $t3, 0x0004($v1) ## 00000004 +/* 03E28 80914468 46128200 */ add.s $f8, $f16, $f18 +/* 03E2C 8091446C 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 +/* 03E30 80914470 468021A0 */ cvt.s.w $f6, $f4 +/* 03E34 80914474 46809120 */ cvt.s.w $f4, $f18 +/* 03E38 80914478 46083280 */ add.s $f10, $f6, $f8 +/* 03E3C 8091447C 4600540D */ trunc.w.s $f16, $f10 +/* 03E40 80914480 440A8000 */ mfc1 $t2, $f16 +/* 03E44 80914484 00000000 */ nop +/* 03E48 80914488 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 +/* 03E4C 8091448C C44603CC */ lwc1 $f6, 0x03CC($v0) ## 000003CC +/* 03E50 80914490 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03E54 80914494 46062200 */ add.s $f8, $f4, $f6 +/* 03E58 80914498 4600428D */ trunc.w.s $f10, $f8 +/* 03E5C 8091449C 440D5000 */ mfc1 $t5, $f10 +/* 03E60 809144A0 03E00008 */ jr $ra +/* 03E64 809144A4 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 +glabel L809144A8 +/* 03E68 809144A8 8FA30010 */ lw $v1, 0x0010($sp) +/* 03E6C 809144AC 8FA20014 */ lw $v0, 0x0014($sp) +/* 03E70 809144B0 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 +/* 03E74 809144B4 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03E78 809144B8 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03E7C 809144BC 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 +/* 03E80 809144C0 84790004 */ lh $t9, 0x0004($v1) ## 00000004 +/* 03E84 809144C4 46128101 */ sub.s $f4, $f16, $f18 +/* 03E88 809144C8 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 +/* 03E8C 809144CC 46803220 */ cvt.s.w $f8, $f6 +/* 03E90 809144D0 468091A0 */ cvt.s.w $f6, $f18 +/* 03E94 809144D4 46044280 */ add.s $f10, $f8, $f4 +/* 03E98 809144D8 4600540D */ trunc.w.s $f16, $f10 +/* 03E9C 809144DC 44188000 */ mfc1 $t8, $f16 +/* 03EA0 809144E0 00000000 */ nop +/* 03EA4 809144E4 A4780002 */ sh $t8, 0x0002($v1) ## 00000002 +/* 03EA8 809144E8 C44803CC */ lwc1 $f8, 0x03CC($v0) ## 000003CC +/* 03EAC 809144EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03EB0 809144F0 46083100 */ add.s $f4, $f6, $f8 +/* 03EB4 809144F4 4600228D */ trunc.w.s $f10, $f4 +/* 03EB8 809144F8 44095000 */ mfc1 $t1, $f10 +/* 03EBC 809144FC 03E00008 */ jr $ra +/* 03EC0 80914500 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 +glabel L80914504 +/* 03EC4 80914504 8FA30010 */ lw $v1, 0x0010($sp) +/* 03EC8 80914508 8FA20014 */ lw $v0, 0x0014($sp) +/* 03ECC 8091450C 846A0002 */ lh $t2, 0x0002($v1) ## 00000002 +/* 03ED0 80914510 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03ED4 80914514 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03ED8 80914518 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 +/* 03EDC 8091451C 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 +/* 03EE0 80914520 46128181 */ sub.s $f6, $f16, $f18 +/* 03EE4 80914524 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 +/* 03EE8 80914528 46804120 */ cvt.s.w $f4, $f8 +/* 03EEC 8091452C 46809220 */ cvt.s.w $f8, $f18 +/* 03EF0 80914530 46062280 */ add.s $f10, $f4, $f6 +/* 03EF4 80914534 4600540D */ trunc.w.s $f16, $f10 +/* 03EF8 80914538 440C8000 */ mfc1 $t4, $f16 +/* 03EFC 8091453C 00000000 */ nop +/* 03F00 80914540 A46C0002 */ sh $t4, 0x0002($v1) ## 00000002 +/* 03F04 80914544 C44403CC */ lwc1 $f4, 0x03CC($v0) ## 000003CC +/* 03F08 80914548 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03F0C 8091454C 46044180 */ add.s $f6, $f8, $f4 +/* 03F10 80914550 4600328D */ trunc.w.s $f10, $f6 +/* 03F14 80914554 440F5000 */ mfc1 $t7, $f10 +/* 03F18 80914558 03E00008 */ jr $ra +/* 03F1C 8091455C A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 +glabel L80914560 +/* 03F20 80914560 8FA30010 */ lw $v1, 0x0010($sp) +/* 03F24 80914564 8FA20014 */ lw $v0, 0x0014($sp) +/* 03F28 80914568 84780002 */ lh $t8, 0x0002($v1) ## 00000002 +/* 03F2C 8091456C C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 +/* 03F30 80914570 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 +/* 03F34 80914574 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 +/* 03F38 80914578 84690004 */ lh $t1, 0x0004($v1) ## 00000004 +/* 03F3C 8091457C 46128201 */ sub.s $f8, $f16, $f18 +/* 03F40 80914580 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 +/* 03F44 80914584 468021A0 */ cvt.s.w $f6, $f4 +/* 03F48 80914588 46809120 */ cvt.s.w $f4, $f18 +/* 03F4C 8091458C 46083280 */ add.s $f10, $f6, $f8 +/* 03F50 80914590 4600540D */ trunc.w.s $f16, $f10 +/* 03F54 80914594 44088000 */ mfc1 $t0, $f16 +/* 03F58 80914598 00000000 */ nop +/* 03F5C 8091459C A4680002 */ sh $t0, 0x0002($v1) ## 00000002 +/* 03F60 809145A0 C44603CC */ lwc1 $f6, 0x03CC($v0) ## 000003CC +/* 03F64 809145A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03F68 809145A8 46062200 */ add.s $f8, $f4, $f6 +/* 03F6C 809145AC 4600428D */ trunc.w.s $f10, $f8 +/* 03F70 809145B0 440B5000 */ mfc1 $t3, $f10 +/* 03F74 809145B4 03E00008 */ jr $ra +/* 03F78 809145B8 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 +glabel L809145BC +/* 03F7C 809145BC 8FA30010 */ lw $v1, 0x0010($sp) +/* 03F80 809145C0 8FA20014 */ lw $v0, 0x0014($sp) +/* 03F84 809145C4 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 +/* 03F88 809145C8 C44403D4 */ lwc1 $f4, 0x03D4($v0) ## 000003D4 +/* 03F8C 809145CC 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 +/* 03F90 809145D0 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 +/* 03F94 809145D4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 +/* 03F98 809145D8 468084A0 */ cvt.s.w $f18, $f16 +/* 03F9C 809145DC 46805420 */ cvt.s.w $f16, $f10 +/* 03FA0 809145E0 46049180 */ add.s $f6, $f18, $f4 +/* 03FA4 809145E4 4600320D */ trunc.w.s $f8, $f6 +/* 03FA8 809145E8 440E4000 */ mfc1 $t6, $f8 +/* 03FAC 809145EC 00000000 */ nop +/* 03FB0 809145F0 A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 +/* 03FB4 809145F4 C45203D8 */ lwc1 $f18, 0x03D8($v0) ## 000003D8 +/* 03FB8 809145F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 03FBC 809145FC 46128100 */ add.s $f4, $f16, $f18 +/* 03FC0 80914600 4600218D */ trunc.w.s $f6, $f4 +/* 03FC4 80914604 44193000 */ mfc1 $t9, $f6 +/* 03FC8 80914608 03E00008 */ jr $ra +/* 03FCC 8091460C A4790004 */ sh $t9, 0x0004($v1) ## 00000004 +glabel L80914610 +/* 03FD0 80914610 8FA30010 */ lw $v1, 0x0010($sp) +/* 03FD4 80914614 8FA20014 */ lw $v0, 0x0014($sp) +/* 03FD8 80914618 84680002 */ lh $t0, 0x0002($v1) ## 00000002 +/* 03FDC 8091461C C45003D4 */ lwc1 $f16, 0x03D4($v0) ## 000003D4 +/* 03FE0 80914620 846B0004 */ lh $t3, 0x0004($v1) ## 00000004 +/* 03FE4 80914624 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 +/* 03FE8 80914628 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 +/* 03FEC 8091462C 468042A0 */ cvt.s.w $f10, $f8 +/* 03FF0 80914630 46803220 */ cvt.s.w $f8, $f6 +/* 03FF4 80914634 46105480 */ add.s $f18, $f10, $f16 +/* 03FF8 80914638 4600910D */ trunc.w.s $f4, $f18 +/* 03FFC 8091463C 440A2000 */ mfc1 $t2, $f4 +/* 04000 80914640 00000000 */ nop +/* 04004 80914644 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 +/* 04008 80914648 C44A03D8 */ lwc1 $f10, 0x03D8($v0) ## 000003D8 +/* 0400C 8091464C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +/* 04010 80914650 460A4400 */ add.s $f16, $f8, $f10 +/* 04014 80914654 4600848D */ trunc.w.s $f18, $f16 +/* 04018 80914658 440D9000 */ mfc1 $t5, $f18 +/* 0401C 8091465C 03E00008 */ jr $ra +/* 04020 80914660 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 +glabel L80914664 +/* 04024 80914664 8FA20014 */ lw $v0, 0x0014($sp) +/* 04028 80914668 844E035E */ lh $t6, 0x035E($v0) ## 0000035E +/* 0402C 8091466C 51C00003 */ beql $t6, $zero, .L8091467C +/* 04030 80914670 8FA30010 */ lw $v1, 0x0010($sp) +/* 04034 80914674 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 +glabel L80914678 +.L80914678: +/* 04038 80914678 8FA30010 */ lw $v1, 0x0010($sp) +.L8091467C: +/* 0403C 8091467C 8FA20014 */ lw $v0, 0x0014($sp) +/* 04040 80914680 00057880 */ sll $t7, $a1, 2 +/* 04044 80914684 84780002 */ lh $t8, 0x0002($v1) ## 00000002 +/* 04048 80914688 004F2021 */ addu $a0, $v0, $t7 +/* 0404C 8091468C C4880454 */ lwc1 $f8, 0x0454($a0) ## 00000454 +/* 04050 80914690 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 +/* 04054 80914694 84690004 */ lh $t1, 0x0004($v1) ## 00000004 +/* 04058 80914698 468021A0 */ cvt.s.w $f6, $f4 +/* 0405C 8091469C 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 +/* 04060 809146A0 00000000 */ nop +/* 04064 809146A4 46809120 */ cvt.s.w $f4, $f18 +/* 04068 809146A8 46083280 */ add.s $f10, $f6, $f8 +/* 0406C 809146AC 4600540D */ trunc.w.s $f16, $f10 +/* 04070 809146B0 44088000 */ mfc1 $t0, $f16 +/* 04074 809146B4 00000000 */ nop +/* 04078 809146B8 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 +/* 0407C 809146BC C48603DC */ lwc1 $f6, 0x03DC($a0) ## 000003DC +/* 04080 809146C0 46062200 */ add.s $f8, $f4, $f6 +/* 04084 809146C4 4600428D */ trunc.w.s $f10, $f8 +/* 04088 809146C8 440B5000 */ mfc1 $t3, $f10 +/* 0408C 809146CC 00000000 */ nop +/* 04090 809146D0 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 +/* 04094 809146D4 03E00008 */ jr $ra +/* 04098 809146D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s deleted file mode 100644 index 9dcec9d63..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80914394 -/* 03D54 80914394 8FA30010 */ lw $v1, 0x0010($sp) -/* 03D58 80914398 8FA20014 */ lw $v0, 0x0014($sp) -/* 03D5C 8091439C 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 03D60 809143A0 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03D64 809143A4 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03D68 809143A8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 03D6C 809143AC 84690004 */ lh $t1, 0x0004($v1) ## 00000004 -/* 03D70 809143B0 46128100 */ add.s $f4, $f16, $f18 -/* 03D74 809143B4 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 03D78 809143B8 46803220 */ cvt.s.w $f8, $f6 -/* 03D7C 809143BC 468091A0 */ cvt.s.w $f6, $f18 -/* 03D80 809143C0 46044280 */ add.s $f10, $f8, $f4 -/* 03D84 809143C4 4600540D */ trunc.w.s $f16, $f10 -/* 03D88 809143C8 44088000 */ mfc1 $t0, $f16 -/* 03D8C 809143CC 00000000 */ nop -/* 03D90 809143D0 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 03D94 809143D4 C44803CC */ lwc1 $f8, 0x03CC($v0) ## 000003CC -/* 03D98 809143D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03D9C 809143DC 46083100 */ add.s $f4, $f6, $f8 -/* 03DA0 809143E0 4600228D */ trunc.w.s $f10, $f4 -/* 03DA4 809143E4 440B5000 */ mfc1 $t3, $f10 -/* 03DA8 809143E8 03E00008 */ jr $ra -/* 03DAC 809143EC A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s deleted file mode 100644 index f2dc7a657..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809143F0 -/* 03DB0 809143F0 8FA30010 */ lw $v1, 0x0010($sp) -/* 03DB4 809143F4 8FA20014 */ lw $v0, 0x0014($sp) -/* 03DB8 809143F8 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 -/* 03DBC 809143FC C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03DC0 80914400 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03DC4 80914404 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 03DC8 80914408 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 -/* 03DCC 8091440C 46128180 */ add.s $f6, $f16, $f18 -/* 03DD0 80914410 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 03DD4 80914414 46804120 */ cvt.s.w $f4, $f8 -/* 03DD8 80914418 46809220 */ cvt.s.w $f8, $f18 -/* 03DDC 8091441C 46062280 */ add.s $f10, $f4, $f6 -/* 03DE0 80914420 4600540D */ trunc.w.s $f16, $f10 -/* 03DE4 80914424 440E8000 */ mfc1 $t6, $f16 -/* 03DE8 80914428 00000000 */ nop -/* 03DEC 8091442C A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 -/* 03DF0 80914430 C44403CC */ lwc1 $f4, 0x03CC($v0) ## 000003CC -/* 03DF4 80914434 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03DF8 80914438 46044180 */ add.s $f6, $f8, $f4 -/* 03DFC 8091443C 4600328D */ trunc.w.s $f10, $f6 -/* 03E00 80914440 44195000 */ mfc1 $t9, $f10 -/* 03E04 80914444 03E00008 */ jr $ra -/* 03E08 80914448 A4790004 */ sh $t9, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s deleted file mode 100644 index 233987604..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8091444C -/* 03E0C 8091444C 8FA30010 */ lw $v1, 0x0010($sp) -/* 03E10 80914450 8FA20014 */ lw $v0, 0x0014($sp) -/* 03E14 80914454 84680002 */ lh $t0, 0x0002($v1) ## 00000002 -/* 03E18 80914458 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03E1C 8091445C C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03E20 80914460 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 03E24 80914464 846B0004 */ lh $t3, 0x0004($v1) ## 00000004 -/* 03E28 80914468 46128200 */ add.s $f8, $f16, $f18 -/* 03E2C 8091446C 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 03E30 80914470 468021A0 */ cvt.s.w $f6, $f4 -/* 03E34 80914474 46809120 */ cvt.s.w $f4, $f18 -/* 03E38 80914478 46083280 */ add.s $f10, $f6, $f8 -/* 03E3C 8091447C 4600540D */ trunc.w.s $f16, $f10 -/* 03E40 80914480 440A8000 */ mfc1 $t2, $f16 -/* 03E44 80914484 00000000 */ nop -/* 03E48 80914488 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 -/* 03E4C 8091448C C44603CC */ lwc1 $f6, 0x03CC($v0) ## 000003CC -/* 03E50 80914490 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03E54 80914494 46062200 */ add.s $f8, $f4, $f6 -/* 03E58 80914498 4600428D */ trunc.w.s $f10, $f8 -/* 03E5C 8091449C 440D5000 */ mfc1 $t5, $f10 -/* 03E60 809144A0 03E00008 */ jr $ra -/* 03E64 809144A4 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s deleted file mode 100644 index c084ae50c..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809144A8 -/* 03E68 809144A8 8FA30010 */ lw $v1, 0x0010($sp) -/* 03E6C 809144AC 8FA20014 */ lw $v0, 0x0014($sp) -/* 03E70 809144B0 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 03E74 809144B4 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03E78 809144B8 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03E7C 809144BC 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 03E80 809144C0 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 03E84 809144C4 46128101 */ sub.s $f4, $f16, $f18 -/* 03E88 809144C8 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 03E8C 809144CC 46803220 */ cvt.s.w $f8, $f6 -/* 03E90 809144D0 468091A0 */ cvt.s.w $f6, $f18 -/* 03E94 809144D4 46044280 */ add.s $f10, $f8, $f4 -/* 03E98 809144D8 4600540D */ trunc.w.s $f16, $f10 -/* 03E9C 809144DC 44188000 */ mfc1 $t8, $f16 -/* 03EA0 809144E0 00000000 */ nop -/* 03EA4 809144E4 A4780002 */ sh $t8, 0x0002($v1) ## 00000002 -/* 03EA8 809144E8 C44803CC */ lwc1 $f8, 0x03CC($v0) ## 000003CC -/* 03EAC 809144EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03EB0 809144F0 46083100 */ add.s $f4, $f6, $f8 -/* 03EB4 809144F4 4600228D */ trunc.w.s $f10, $f4 -/* 03EB8 809144F8 44095000 */ mfc1 $t1, $f10 -/* 03EBC 809144FC 03E00008 */ jr $ra -/* 03EC0 80914500 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s deleted file mode 100644 index f04c02630..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80914504 -/* 03EC4 80914504 8FA30010 */ lw $v1, 0x0010($sp) -/* 03EC8 80914508 8FA20014 */ lw $v0, 0x0014($sp) -/* 03ECC 8091450C 846A0002 */ lh $t2, 0x0002($v1) ## 00000002 -/* 03ED0 80914510 C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03ED4 80914514 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03ED8 80914518 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 03EDC 8091451C 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 -/* 03EE0 80914520 46128181 */ sub.s $f6, $f16, $f18 -/* 03EE4 80914524 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 03EE8 80914528 46804120 */ cvt.s.w $f4, $f8 -/* 03EEC 8091452C 46809220 */ cvt.s.w $f8, $f18 -/* 03EF0 80914530 46062280 */ add.s $f10, $f4, $f6 -/* 03EF4 80914534 4600540D */ trunc.w.s $f16, $f10 -/* 03EF8 80914538 440C8000 */ mfc1 $t4, $f16 -/* 03EFC 8091453C 00000000 */ nop -/* 03F00 80914540 A46C0002 */ sh $t4, 0x0002($v1) ## 00000002 -/* 03F04 80914544 C44403CC */ lwc1 $f4, 0x03CC($v0) ## 000003CC -/* 03F08 80914548 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03F0C 8091454C 46044180 */ add.s $f6, $f8, $f4 -/* 03F10 80914550 4600328D */ trunc.w.s $f10, $f6 -/* 03F14 80914554 440F5000 */ mfc1 $t7, $f10 -/* 03F18 80914558 03E00008 */ jr $ra -/* 03F1C 8091455C A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s deleted file mode 100644 index c1911affd..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80914560 -/* 03F20 80914560 8FA30010 */ lw $v1, 0x0010($sp) -/* 03F24 80914564 8FA20014 */ lw $v0, 0x0014($sp) -/* 03F28 80914568 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 03F2C 8091456C C45003C8 */ lwc1 $f16, 0x03C8($v0) ## 000003C8 -/* 03F30 80914570 C45203D0 */ lwc1 $f18, 0x03D0($v0) ## 000003D0 -/* 03F34 80914574 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 03F38 80914578 84690004 */ lh $t1, 0x0004($v1) ## 00000004 -/* 03F3C 8091457C 46128201 */ sub.s $f8, $f16, $f18 -/* 03F40 80914580 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 03F44 80914584 468021A0 */ cvt.s.w $f6, $f4 -/* 03F48 80914588 46809120 */ cvt.s.w $f4, $f18 -/* 03F4C 8091458C 46083280 */ add.s $f10, $f6, $f8 -/* 03F50 80914590 4600540D */ trunc.w.s $f16, $f10 -/* 03F54 80914594 44088000 */ mfc1 $t0, $f16 -/* 03F58 80914598 00000000 */ nop -/* 03F5C 8091459C A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 03F60 809145A0 C44603CC */ lwc1 $f6, 0x03CC($v0) ## 000003CC -/* 03F64 809145A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03F68 809145A8 46062200 */ add.s $f8, $f4, $f6 -/* 03F6C 809145AC 4600428D */ trunc.w.s $f10, $f8 -/* 03F70 809145B0 440B5000 */ mfc1 $t3, $f10 -/* 03F74 809145B4 03E00008 */ jr $ra -/* 03F78 809145B8 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s deleted file mode 100644 index d50de230d..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_809145BC -/* 03F7C 809145BC 8FA30010 */ lw $v1, 0x0010($sp) -/* 03F80 809145C0 8FA20014 */ lw $v0, 0x0014($sp) -/* 03F84 809145C4 846C0002 */ lh $t4, 0x0002($v1) ## 00000002 -/* 03F88 809145C8 C44403D4 */ lwc1 $f4, 0x03D4($v0) ## 000003D4 -/* 03F8C 809145CC 846F0004 */ lh $t7, 0x0004($v1) ## 00000004 -/* 03F90 809145D0 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 03F94 809145D4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 03F98 809145D8 468084A0 */ cvt.s.w $f18, $f16 -/* 03F9C 809145DC 46805420 */ cvt.s.w $f16, $f10 -/* 03FA0 809145E0 46049180 */ add.s $f6, $f18, $f4 -/* 03FA4 809145E4 4600320D */ trunc.w.s $f8, $f6 -/* 03FA8 809145E8 440E4000 */ mfc1 $t6, $f8 -/* 03FAC 809145EC 00000000 */ nop -/* 03FB0 809145F0 A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 -/* 03FB4 809145F4 C45203D8 */ lwc1 $f18, 0x03D8($v0) ## 000003D8 -/* 03FB8 809145F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03FBC 809145FC 46128100 */ add.s $f4, $f16, $f18 -/* 03FC0 80914600 4600218D */ trunc.w.s $f6, $f4 -/* 03FC4 80914604 44193000 */ mfc1 $t9, $f6 -/* 03FC8 80914608 03E00008 */ jr $ra -/* 03FCC 8091460C A4790004 */ sh $t9, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s deleted file mode 100644 index b8a04e329..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80914610 -/* 03FD0 80914610 8FA30010 */ lw $v1, 0x0010($sp) -/* 03FD4 80914614 8FA20014 */ lw $v0, 0x0014($sp) -/* 03FD8 80914618 84680002 */ lh $t0, 0x0002($v1) ## 00000002 -/* 03FDC 8091461C C45003D4 */ lwc1 $f16, 0x03D4($v0) ## 000003D4 -/* 03FE0 80914620 846B0004 */ lh $t3, 0x0004($v1) ## 00000004 -/* 03FE4 80914624 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 03FE8 80914628 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 03FEC 8091462C 468042A0 */ cvt.s.w $f10, $f8 -/* 03FF0 80914630 46803220 */ cvt.s.w $f8, $f6 -/* 03FF4 80914634 46105480 */ add.s $f18, $f10, $f16 -/* 03FF8 80914638 4600910D */ trunc.w.s $f4, $f18 -/* 03FFC 8091463C 440A2000 */ mfc1 $t2, $f4 -/* 04000 80914640 00000000 */ nop -/* 04004 80914644 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 -/* 04008 80914648 C44A03D8 */ lwc1 $f10, 0x03D8($v0) ## 000003D8 -/* 0400C 8091464C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04010 80914650 460A4400 */ add.s $f16, $f8, $f10 -/* 04014 80914654 4600848D */ trunc.w.s $f18, $f16 -/* 04018 80914658 440D9000 */ mfc1 $t5, $f18 -/* 0401C 8091465C 03E00008 */ jr $ra -/* 04020 80914660 A46D0004 */ sh $t5, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s index dd89ffeca..e69de29bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s @@ -1,34 +0,0 @@ -glabel func_80914664 -/* 04024 80914664 8FA20014 */ lw $v0, 0x0014($sp) -/* 04028 80914668 844E035E */ lh $t6, 0x035E($v0) ## 0000035E -/* 0402C 8091466C 51C00003 */ beql $t6, $zero, .L8091467C -/* 04030 80914670 8FA30010 */ lw $v1, 0x0010($sp) -/* 04034 80914674 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -glabel L80914678 -.L80914678: -/* 04038 80914678 8FA30010 */ lw $v1, 0x0010($sp) -.L8091467C: -/* 0403C 8091467C 8FA20014 */ lw $v0, 0x0014($sp) -/* 04040 80914680 00057880 */ sll $t7, $a1, 2 -/* 04044 80914684 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 04048 80914688 004F2021 */ addu $a0, $v0, $t7 -/* 0404C 8091468C C4880454 */ lwc1 $f8, 0x0454($a0) ## 00000454 -/* 04050 80914690 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 04054 80914694 84690004 */ lh $t1, 0x0004($v1) ## 00000004 -/* 04058 80914698 468021A0 */ cvt.s.w $f6, $f4 -/* 0405C 8091469C 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 04060 809146A0 00000000 */ nop -/* 04064 809146A4 46809120 */ cvt.s.w $f4, $f18 -/* 04068 809146A8 46083280 */ add.s $f10, $f6, $f8 -/* 0406C 809146AC 4600540D */ trunc.w.s $f16, $f10 -/* 04070 809146B0 44088000 */ mfc1 $t0, $f16 -/* 04074 809146B4 00000000 */ nop -/* 04078 809146B8 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 0407C 809146BC C48603DC */ lwc1 $f6, 0x03DC($a0) ## 000003DC -/* 04080 809146C0 46062200 */ add.s $f8, $f4, $f6 -/* 04084 809146C4 4600428D */ trunc.w.s $f10, $f8 -/* 04088 809146C8 440B5000 */ mfc1 $t3, $f10 -/* 0408C 809146CC 00000000 */ nop -/* 04090 809146D0 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 -/* 04094 809146D4 03E00008 */ jr $ra -/* 04098 809146D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s deleted file mode 100644 index 7e4e0bb7a..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s +++ /dev/null @@ -1,187 +0,0 @@ -glabel EnCow_Update -/* 00E1C 809DFC1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00E20 809DFC20 AFB00028 */ sw $s0, 0x0028($sp) -/* 00E24 809DFC24 AFBF002C */ sw $ra, 0x002C($sp) -/* 00E28 809DFC28 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00E2C 809DFC2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E30 809DFC30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E34 809DFC34 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00E38 809DFC38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00E3C 809DFC3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E40 809DFC40 00A12821 */ addu $a1, $a1, $at -/* 00E44 809DFC44 AFA50034 */ sw $a1, 0x0034($sp) -/* 00E48 809DFC48 AFA70054 */ sw $a3, 0x0054($sp) -/* 00E4C 809DFC4C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 00E50 809DFC50 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00E54 809DFC54 AFAE0040 */ sw $t6, 0x0040($sp) -/* 00E58 809DFC58 8FA40054 */ lw $a0, 0x0054($sp) -/* 00E5C 809DFC5C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00E60 809DFC60 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00E64 809DFC64 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 -/* 00E68 809DFC68 0C00B638 */ jal Actor_MoveForward - -/* 00E6C 809DFC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E70 809DFC70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E74 809DFC74 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00E78 809DFC78 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E7C 809DFC7C 44060000 */ mfc1 $a2, $f0 -/* 00E80 809DFC80 44070000 */ mfc1 $a3, $f0 -/* 00E84 809DFC84 8FA40054 */ lw $a0, 0x0054($sp) -/* 00E88 809DFC88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E8C 809DFC8C 0C00B92D */ jal func_8002E4B4 -/* 00E90 809DFC90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E94 809DFC94 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00E98 809DFC98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E9C 809DFC9C AFA40034 */ sw $a0, 0x0034($sp) -/* 00EA0 809DFCA0 5040002B */ beql $v0, $zero, .L809DFD50 -/* 00EA4 809DFCA4 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C -/* 00EA8 809DFCA8 8E1801EC */ lw $t8, 0x01EC($s0) ## 000001EC -/* 00EAC 809DFCAC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00EB0 809DFCB0 248401CC */ addiu $a0, $a0, 0x01CC ## $a0 = 060001CC -/* 00EB4 809DFCB4 14980016 */ bne $a0, $t8, .L809DFD10 -/* 00EB8 809DFCB8 240528DF */ addiu $a1, $zero, 0x28DF ## $a1 = 000028DF -/* 00EBC 809DFCBC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EC0 809DFCC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC4 809DFCC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00EC8 809DFCC8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00ECC 809DFCCC 24844264 */ addiu $a0, $a0, 0x4264 ## $a0 = 06004264 -/* 00ED0 809DFCD0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00ED4 809DFCD4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00ED8 809DFCD8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00EDC 809DFCDC 468021A0 */ cvt.s.w $f6, $f4 -/* 00EE0 809DFCE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00EE4 809DFCE4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00EE8 809DFCE8 44060000 */ mfc1 $a2, $f0 -/* 00EEC 809DFCEC AFB90014 */ sw $t9, 0x0014($sp) -/* 00EF0 809DFCF0 24A54264 */ addiu $a1, $a1, 0x4264 ## $a1 = 06004264 -/* 00EF4 809DFCF4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00EF8 809DFCF8 8FA40034 */ lw $a0, 0x0034($sp) -/* 00EFC 809DFCFC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F00 809DFD00 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00F04 809DFD04 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00F08 809DFD08 10000011 */ beq $zero, $zero, .L809DFD50 -/* 00F0C 809DFD0C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C -.L809DFD10: -/* 00F10 809DFD10 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00F14 809DFD14 00000000 */ nop -/* 00F18 809DFD18 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00F1C 809DFD1C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00F20 809DFD20 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00F24 809DFD24 468042A0 */ cvt.s.w $f10, $f8 -/* 00F28 809DFD28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F2C 809DFD2C 44060000 */ mfc1 $a2, $f0 -/* 00F30 809DFD30 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 00F34 809DFD34 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F38 809DFD38 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F3C 809DFD3C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00F40 809DFD40 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F44 809DFD44 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00F48 809DFD48 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00F4C 809DFD4C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C -.L809DFD50: -/* 00F50 809DFD50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F54 809DFD54 8FA50054 */ lw $a1, 0x0054($sp) -/* 00F58 809DFD58 0320F809 */ jalr $ra, $t9 -/* 00F5C 809DFD5C 00000000 */ nop -/* 00F60 809DFD60 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00F64 809DFD64 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00F68 809DFD68 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 00F6C 809DFD6C 8FA50040 */ lw $a1, 0x0040($sp) -/* 00F70 809DFD70 4612803C */ c.lt.s $f16, $f18 -/* 00F74 809DFD74 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00F78 809DFD78 45000033 */ bc1f .L809DFE48 -/* 00F7C 809DFD7C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00F80 809DFD80 AFA40034 */ sw $a0, 0x0034($sp) -/* 00F84 809DFD84 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00F88 809DFD88 AFA50030 */ sw $a1, 0x0030($sp) -/* 00F8C 809DFD8C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F90 809DFD90 04400005 */ bltz $v0, .L809DFDA8 -/* 00F94 809DFD94 8FA50030 */ lw $a1, 0x0030($sp) -/* 00F98 809DFD98 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00F9C 809DFD9C 00000000 */ nop -/* 00FA0 809DFDA0 10000004 */ beq $zero, $zero, .L809DFDB4 -/* 00FA4 809DFDA4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809DFDA8: -/* 00FA8 809DFDA8 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00FAC 809DFDAC 00000000 */ nop -/* 00FB0 809DFDB0 00021823 */ subu $v1, $zero, $v0 -.L809DFDB4: -/* 00FB4 809DFDB4 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 -/* 00FB8 809DFDB8 0061082A */ slt $at, $v1, $at -/* 00FBC 809DFDBC 10200022 */ beq $at, $zero, .L809DFE48 -/* 00FC0 809DFDC0 8FA50040 */ lw $a1, 0x0040($sp) -/* 00FC4 809DFDC4 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 00000038 -/* 00FC8 809DFDC8 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 00FCC 809DFDCC AFA50030 */ sw $a1, 0x0030($sp) -/* 00FD0 809DFDD0 0C01E027 */ jal Math_Vec3f_Pitch - -/* 00FD4 809DFDD4 AFA40034 */ sw $a0, 0x0034($sp) -/* 00FD8 809DFDD8 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FDC 809DFDDC 8FA50030 */ lw $a1, 0x0030($sp) -/* 00FE0 809DFDE0 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00FE4 809DFDE4 A7A20046 */ sh $v0, 0x0046($sp) -/* 00FE8 809DFDE8 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00FEC 809DFDEC 87A50046 */ lh $a1, 0x0046($sp) -/* 00FF0 809DFDF0 00481823 */ subu $v1, $v0, $t0 -/* 00FF4 809DFDF4 00031C00 */ sll $v1, $v1, 16 -/* 00FF8 809DFDF8 28A11001 */ slti $at, $a1, 0x1001 -/* 00FFC 809DFDFC 14200003 */ bne $at, $zero, .L809DFE0C -/* 01000 809DFE00 00031C03 */ sra $v1, $v1, 16 -/* 01004 809DFE04 10000005 */ beq $zero, $zero, .L809DFE1C -/* 01008 809DFE08 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -.L809DFE0C: -/* 0100C 809DFE0C 28A1F000 */ slti $at, $a1, 0xF000 -/* 01010 809DFE10 50200003 */ beql $at, $zero, .L809DFE20 -/* 01014 809DFE14 28612501 */ slti $at, $v1, 0x2501 -/* 01018 809DFE18 2405F000 */ addiu $a1, $zero, 0xF000 ## $a1 = FFFFF000 -.L809DFE1C: -/* 0101C 809DFE1C 28612501 */ slti $at, $v1, 0x2501 -.L809DFE20: -/* 01020 809DFE20 54200004 */ bnel $at, $zero, .L809DFE34 -/* 01024 809DFE24 2861DB00 */ slti $at, $v1, 0xDB00 -/* 01028 809DFE28 10000005 */ beq $zero, $zero, .L809DFE40 -/* 0102C 809DFE2C 24032500 */ addiu $v1, $zero, 0x2500 ## $v1 = 00002500 -/* 01030 809DFE30 2861DB00 */ slti $at, $v1, 0xDB00 -.L809DFE34: -/* 01034 809DFE34 10200002 */ beq $at, $zero, .L809DFE40 -/* 01038 809DFE38 00000000 */ nop -/* 0103C 809DFE3C 2403DB00 */ addiu $v1, $zero, 0xDB00 ## $v1 = FFFFDB00 -.L809DFE40: -/* 01040 809DFE40 10000003 */ beq $zero, $zero, .L809DFE50 -/* 01044 809DFE44 A7A30044 */ sh $v1, 0x0044($sp) -.L809DFE48: -/* 01048 809DFE48 A7A00044 */ sh $zero, 0x0044($sp) -/* 0104C 809DFE4C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L809DFE50: -/* 01050 809DFE50 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 01054 809DFE54 AFA90010 */ sw $t1, 0x0010($sp) -/* 01058 809DFE58 26040270 */ addiu $a0, $s0, 0x0270 ## $a0 = 00000270 -/* 0105C 809DFE5C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 01060 809DFE60 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01064 809DFE64 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 01068 809DFE68 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 0106C 809DFE6C AFAA0010 */ sw $t2, 0x0010($sp) -/* 01070 809DFE70 26040272 */ addiu $a0, $s0, 0x0272 ## $a0 = 00000272 -/* 01074 809DFE74 87A50044 */ lh $a1, 0x0044($sp) -/* 01078 809DFE78 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0107C 809DFE7C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01080 809DFE80 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 01084 809DFE84 8FBF002C */ lw $ra, 0x002C($sp) -/* 01088 809DFE88 8FB00028 */ lw $s0, 0x0028($sp) -/* 0108C 809DFE8C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01090 809DFE90 03E00008 */ jr $ra -/* 01094 809DFE94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s index ea7a1cc82..880f30d8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s @@ -29,3 +29,201 @@ glabel L80A01C60 /* 00070 80A01CA0 E48402B4 */ swc1 $f4, 0x02B4($a0) ## 000002B4 /* 00074 80A01CA4 03E00008 */ jr $ra /* 00078 80A01CA8 E48602B8 */ swc1 $f6, 0x02B8($a0) ## 000002B8 +glabel L80A01CAC +/* 0007C 80A01CAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 00080 80A01CB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 00084 80A01CB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 +/* 00088 80A01CB8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 +/* 0008C 80A01CBC 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 +/* 00090 80A01CC0 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 +/* 00094 80A01CC4 240A0200 */ addiu $t2, $zero, 0x0200 ## $t2 = 00000200 +/* 00098 80A01CC8 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 +/* 0009C 80A01CCC 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 +/* 000A0 80A01CD0 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE +/* 000A4 80A01CD4 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 +/* 000A8 80A01CD8 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 +/* 000AC 80A01CDC A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 +/* 000B0 80A01CE0 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 +/* 000B4 80A01CE4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +/* 000B8 80A01CE8 03E00008 */ jr $ra +/* 000BC 80A01CEC E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 +glabel L80A01CF0 +/* 000C0 80A01CF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 000C4 80A01CF4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 000C8 80A01CF8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 +/* 000CC 80A01CFC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 +/* 000D0 80A01D00 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 +/* 000D4 80A01D04 3C0E80A0 */ lui $t6, %hi(func_80A02A20) ## $t6 = 80A00000 +/* 000D8 80A01D08 240D0400 */ addiu $t5, $zero, 0x0400 ## $t5 = 00000400 +/* 000DC 80A01D0C 25CE2A20 */ addiu $t6, $t6, %lo(func_80A02A20) ## $t6 = 80A02A20 +/* 000E0 80A01D10 A48D02AE */ sh $t5, 0x02AE($a0) ## 000002AE +/* 000E4 80A01D14 A48002B0 */ sh $zero, 0x02B0($a0) ## 000002B0 +/* 000E8 80A01D18 AC8E02C8 */ sw $t6, 0x02C8($a0) ## 000002C8 +/* 000EC 80A01D1C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +/* 000F0 80A01D20 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 +/* 000F4 80A01D24 03E00008 */ jr $ra +/* 000F8 80A01D28 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 +glabel L80A01D2C +/* 000FC 80A01D2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 00100 80A01D30 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 00104 80A01D34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 +/* 00108 80A01D38 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 +/* 0010C 80A01D3C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 +/* 00110 80A01D40 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 +/* 00114 80A01D44 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 +/* 00118 80A01D48 240F1000 */ addiu $t7, $zero, 0x1000 ## $t7 = 00001000 +/* 0011C 80A01D4C 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 +/* 00120 80A01D50 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 +/* 00124 80A01D54 A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE +/* 00128 80A01D58 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 +/* 0012C 80A01D5C AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 +/* 00130 80A01D60 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +/* 00134 80A01D64 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 +/* 00138 80A01D68 03E00008 */ jr $ra +/* 0013C 80A01D6C E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 +glabel L80A01D70 +/* 00140 80A01D70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 +/* 00144 80A01D74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 00148 80A01D78 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 0014C 80A01D7C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 +/* 00150 80A01D80 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 +/* 00154 80A01D84 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E +/* 00158 80A01D88 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 +/* 0015C 80A01D8C AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 +/* 00160 80A01D90 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE +/* 00164 80A01D94 A48A02C0 */ sh $t2, 0x02C0($a0) ## 000002C0 +/* 00168 80A01D98 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 +/* 0016C 80A01D9C E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 +/* 00170 80A01DA0 03E00008 */ jr $ra +/* 00174 80A01DA4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +glabel L80A01DA8 +/* 00178 80A01DA8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 +/* 0017C 80A01DAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 00180 80A01DB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 00184 80A01DB4 3C0D80A0 */ lui $t5, %hi(func_80A02A20) ## $t5 = 80A00000 +/* 00188 80A01DB8 240B1000 */ addiu $t3, $zero, 0x1000 ## $t3 = 00001000 +/* 0018C 80A01DBC 240C0200 */ addiu $t4, $zero, 0x0200 ## $t4 = 00000200 +/* 00190 80A01DC0 25AD2A20 */ addiu $t5, $t5, %lo(func_80A02A20) ## $t5 = 80A02A20 +/* 00194 80A01DC4 A48B02AE */ sh $t3, 0x02AE($a0) ## 000002AE +/* 00198 80A01DC8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 +/* 0019C 80A01DCC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 +/* 001A0 80A01DD0 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 +/* 001A4 80A01DD4 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 +/* 001A8 80A01DD8 03E00008 */ jr $ra +/* 001AC 80A01DDC E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +glabel L80A01DE0 +/* 001B0 80A01DE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 +/* 001B4 80A01DE4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 +/* 001B8 80A01DE8 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 +/* 001BC 80A01DEC 44812000 */ mtc1 $at, $f4 ## $f4 = 7.50 +/* 001C0 80A01DF0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 +/* 001C4 80A01DF4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 +/* 001C8 80A01DF8 3C1880A0 */ lui $t8, %hi(func_80A02A20) ## $t8 = 80A00000 +/* 001CC 80A01DFC 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 +/* 001D0 80A01E00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 +/* 001D4 80A01E04 27182A20 */ addiu $t8, $t8, %lo(func_80A02A20) ## $t8 = 80A02A20 +/* 001D8 80A01E08 A48E02AE */ sh $t6, 0x02AE($a0) ## 000002AE +/* 001DC 80A01E0C A48F02B0 */ sh $t7, 0x02B0($a0) ## 000002B0 +/* 001E0 80A01E10 AC9802C8 */ sw $t8, 0x02C8($a0) ## 000002C8 +/* 001E4 80A01E14 E49202B4 */ swc1 $f18, 0x02B4($a0) ## 000002B4 +/* 001E8 80A01E18 E48402B8 */ swc1 $f4, 0x02B8($a0) ## 000002B8 +/* 001EC 80A01E1C 03E00008 */ jr $ra +/* 001F0 80A01E20 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 +glabel L80A01E24 +/* 001F4 80A01E24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 001F8 80A01E28 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 001FC 80A01E2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 +/* 00200 80A01E30 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 +/* 00204 80A01E34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 +/* 00208 80A01E38 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 +/* 0020C 80A01E3C 3C0980A0 */ lui $t1, %hi(func_80A02AA4) ## $t1 = 80A00000 +/* 00210 80A01E40 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 +/* 00214 80A01E44 24081000 */ addiu $t0, $zero, 0x1000 ## $t0 = 00001000 +/* 00218 80A01E48 25292AA4 */ addiu $t1, $t1, %lo(func_80A02AA4) ## $t1 = 80A02AA4 +/* 0021C 80A01E4C A49902AE */ sh $t9, 0x02AE($a0) ## 000002AE +/* 00220 80A01E50 A48802B0 */ sh $t0, 0x02B0($a0) ## 000002B0 +/* 00224 80A01E54 AC8902C8 */ sw $t1, 0x02C8($a0) ## 000002C8 +/* 00228 80A01E58 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +/* 0022C 80A01E5C E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 +/* 00230 80A01E60 03E00008 */ jr $ra +/* 00234 80A01E64 E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 +glabel L80A01E68 +/* 00238 80A01E68 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 0023C 80A01E6C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 00240 80A01E70 3C0B80A0 */ lui $t3, %hi(func_80A02B38) ## $t3 = 80A00000 +/* 00244 80A01E74 240A0600 */ addiu $t2, $zero, 0x0600 ## $t2 = 00000600 +/* 00248 80A01E78 256B2B38 */ addiu $t3, $t3, %lo(func_80A02B38) ## $t3 = 80A02B38 +/* 0024C 80A01E7C A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 +/* 00250 80A01E80 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 +/* 00254 80A01E84 E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 +/* 00258 80A01E88 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 +/* 0025C 80A01E8C 03E00008 */ jr $ra +/* 00260 80A01E90 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +glabel L80A01E94 +/* 00264 80A01E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 +/* 00268 80A01E98 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 +/* 0026C 80A01E9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 +/* 00270 80A01EA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 +/* 00274 80A01EA4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 +/* 00278 80A01EA8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 +/* 0027C 80A01EAC 3C0D80A0 */ lui $t5, %hi(func_80A02B38) ## $t5 = 80A00000 +/* 00280 80A01EB0 240C0800 */ addiu $t4, $zero, 0x0800 ## $t4 = 00000800 +/* 00284 80A01EB4 25AD2B38 */ addiu $t5, $t5, %lo(func_80A02B38) ## $t5 = 80A02B38 +/* 00288 80A01EB8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 +/* 0028C 80A01EBC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 +/* 00290 80A01EC0 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 +/* 00294 80A01EC4 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 +/* 00298 80A01EC8 03E00008 */ jr $ra +/* 0029C 80A01ECC E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 +glabel L80A01ED0 +/* 002A0 80A01ED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 +/* 002A4 80A01ED4 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 +/* 002A8 80A01ED8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 +/* 002AC 80A01EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 +/* 002B0 80A01EE0 3C0F80A0 */ lui $t7, %hi(func_80A02B38) ## $t7 = 80A00000 +/* 002B4 80A01EE4 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 +/* 002B8 80A01EE8 25EF2B38 */ addiu $t7, $t7, %lo(func_80A02B38) ## $t7 = 80A02B38 +/* 002BC 80A01EEC A48E02B0 */ sh $t6, 0x02B0($a0) ## 000002B0 +/* 002C0 80A01EF0 AC8F02C8 */ sw $t7, 0x02C8($a0) ## 000002C8 +/* 002C4 80A01EF4 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 +/* 002C8 80A01EF8 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 +/* 002CC 80A01EFC 03E00008 */ jr $ra +/* 002D0 80A01F00 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 +glabel L80A01F04 +/* 002D4 80A01F04 3C014270 */ lui $at, 0x4270 ## $at = 42700000 +/* 002D8 80A01F08 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 +/* 002DC 80A01F0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 +/* 002E0 80A01F10 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 +/* 002E4 80A01F14 3C014000 */ lui $at, 0x4000 ## $at = 40000000 +/* 002E8 80A01F18 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 +/* 002EC 80A01F1C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 +/* 002F0 80A01F20 24181000 */ addiu $t8, $zero, 0x1000 ## $t8 = 00001000 +/* 002F4 80A01F24 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 +/* 002F8 80A01F28 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 +/* 002FC 80A01F2C A49802AE */ sh $t8, 0x02AE($a0) ## 000002AE +/* 00300 80A01F30 A49902B0 */ sh $t9, 0x02B0($a0) ## 000002B0 +/* 00304 80A01F34 AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 +/* 00308 80A01F38 E48602B4 */ swc1 $f6, 0x02B4($a0) ## 000002B4 +/* 0030C 80A01F3C E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 +/* 00310 80A01F40 03E00008 */ jr $ra +/* 00314 80A01F44 E48A0168 */ swc1 $f10, 0x0168($a0) ## 00000168 +glabel L80A01F48 +/* 00318 80A01F48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 +/* 0031C 80A01F4C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 +/* 00320 80A01F50 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 +/* 00324 80A01F54 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 +/* 00328 80A01F58 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 +/* 0032C 80A01F5C 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 +/* 00330 80A01F60 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 +/* 00334 80A01F64 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 +/* 00338 80A01F68 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A +/* 0033C 80A01F6C A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE +/* 00340 80A01F70 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 +/* 00344 80A01F74 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 +/* 00348 80A01F78 A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 +/* 0034C 80A01F7C E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 +/* 00350 80A01F80 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 +/* 00354 80A01F84 E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 +.L80A01F88: +/* 00358 80A01F88 03E00008 */ jr $ra +/* 0035C 80A01F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s deleted file mode 100644 index 844615194..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A01CAC -/* 0007C 80A01CAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00080 80A01CB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00084 80A01CB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00088 80A01CB8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0008C 80A01CBC 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 00090 80A01CC0 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00094 80A01CC4 240A0200 */ addiu $t2, $zero, 0x0200 ## $t2 = 00000200 -/* 00098 80A01CC8 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 0009C 80A01CCC 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 000A0 80A01CD0 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 000A4 80A01CD4 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 000A8 80A01CD8 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 000AC 80A01CDC A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 000B0 80A01CE0 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 000B4 80A01CE4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000B8 80A01CE8 03E00008 */ jr $ra -/* 000BC 80A01CEC E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s deleted file mode 100644 index 0bb7be66f..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A01CF0 -/* 000C0 80A01CF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000C4 80A01CF4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 000C8 80A01CF8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 000CC 80A01CFC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000D0 80A01D00 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 000D4 80A01D04 3C0E80A0 */ lui $t6, %hi(func_80A02A20) ## $t6 = 80A00000 -/* 000D8 80A01D08 240D0400 */ addiu $t5, $zero, 0x0400 ## $t5 = 00000400 -/* 000DC 80A01D0C 25CE2A20 */ addiu $t6, $t6, %lo(func_80A02A20) ## $t6 = 80A02A20 -/* 000E0 80A01D10 A48D02AE */ sh $t5, 0x02AE($a0) ## 000002AE -/* 000E4 80A01D14 A48002B0 */ sh $zero, 0x02B0($a0) ## 000002B0 -/* 000E8 80A01D18 AC8E02C8 */ sw $t6, 0x02C8($a0) ## 000002C8 -/* 000EC 80A01D1C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000F0 80A01D20 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 000F4 80A01D24 03E00008 */ jr $ra -/* 000F8 80A01D28 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s deleted file mode 100644 index 6da08eb97..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A01D2C -/* 000FC 80A01D2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00100 80A01D30 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00104 80A01D34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00108 80A01D38 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0010C 80A01D3C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00110 80A01D40 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 00114 80A01D44 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 -/* 00118 80A01D48 240F1000 */ addiu $t7, $zero, 0x1000 ## $t7 = 00001000 -/* 0011C 80A01D4C 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 -/* 00120 80A01D50 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 -/* 00124 80A01D54 A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE -/* 00128 80A01D58 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 -/* 0012C 80A01D5C AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 -/* 00130 80A01D60 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00134 80A01D64 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00138 80A01D68 03E00008 */ jr $ra -/* 0013C 80A01D6C E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s deleted file mode 100644 index 961f17b30..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A01D70 -/* 00140 80A01D70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00144 80A01D74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00148 80A01D78 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0014C 80A01D7C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 00150 80A01D80 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 00154 80A01D84 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 00158 80A01D88 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0015C 80A01D8C AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00160 80A01D90 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00164 80A01D94 A48A02C0 */ sh $t2, 0x02C0($a0) ## 000002C0 -/* 00168 80A01D98 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 0016C 80A01D9C E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00170 80A01DA0 03E00008 */ jr $ra -/* 00174 80A01DA4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s deleted file mode 100644 index 2fd06d8da..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A01DA8 -/* 00178 80A01DA8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0017C 80A01DAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00180 80A01DB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00184 80A01DB4 3C0D80A0 */ lui $t5, %hi(func_80A02A20) ## $t5 = 80A00000 -/* 00188 80A01DB8 240B1000 */ addiu $t3, $zero, 0x1000 ## $t3 = 00001000 -/* 0018C 80A01DBC 240C0200 */ addiu $t4, $zero, 0x0200 ## $t4 = 00000200 -/* 00190 80A01DC0 25AD2A20 */ addiu $t5, $t5, %lo(func_80A02A20) ## $t5 = 80A02A20 -/* 00194 80A01DC4 A48B02AE */ sh $t3, 0x02AE($a0) ## 000002AE -/* 00198 80A01DC8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0019C 80A01DCC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 001A0 80A01DD0 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 001A4 80A01DD4 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 001A8 80A01DD8 03E00008 */ jr $ra -/* 001AC 80A01DDC E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s deleted file mode 100644 index 7345887a0..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A01DE0 -/* 001B0 80A01DE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 001B4 80A01DE4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 001B8 80A01DE8 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 001BC 80A01DEC 44812000 */ mtc1 $at, $f4 ## $f4 = 7.50 -/* 001C0 80A01DF0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 001C4 80A01DF4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 001C8 80A01DF8 3C1880A0 */ lui $t8, %hi(func_80A02A20) ## $t8 = 80A00000 -/* 001CC 80A01DFC 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 -/* 001D0 80A01E00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 001D4 80A01E04 27182A20 */ addiu $t8, $t8, %lo(func_80A02A20) ## $t8 = 80A02A20 -/* 001D8 80A01E08 A48E02AE */ sh $t6, 0x02AE($a0) ## 000002AE -/* 001DC 80A01E0C A48F02B0 */ sh $t7, 0x02B0($a0) ## 000002B0 -/* 001E0 80A01E10 AC9802C8 */ sw $t8, 0x02C8($a0) ## 000002C8 -/* 001E4 80A01E14 E49202B4 */ swc1 $f18, 0x02B4($a0) ## 000002B4 -/* 001E8 80A01E18 E48402B8 */ swc1 $f4, 0x02B8($a0) ## 000002B8 -/* 001EC 80A01E1C 03E00008 */ jr $ra -/* 001F0 80A01E20 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s deleted file mode 100644 index 96a1f0081..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A01E24 -/* 001F4 80A01E24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001F8 80A01E28 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 001FC 80A01E2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00200 80A01E30 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00204 80A01E34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00208 80A01E38 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 0020C 80A01E3C 3C0980A0 */ lui $t1, %hi(func_80A02AA4) ## $t1 = 80A00000 -/* 00210 80A01E40 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 -/* 00214 80A01E44 24081000 */ addiu $t0, $zero, 0x1000 ## $t0 = 00001000 -/* 00218 80A01E48 25292AA4 */ addiu $t1, $t1, %lo(func_80A02AA4) ## $t1 = 80A02AA4 -/* 0021C 80A01E4C A49902AE */ sh $t9, 0x02AE($a0) ## 000002AE -/* 00220 80A01E50 A48802B0 */ sh $t0, 0x02B0($a0) ## 000002B0 -/* 00224 80A01E54 AC8902C8 */ sw $t1, 0x02C8($a0) ## 000002C8 -/* 00228 80A01E58 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 0022C 80A01E5C E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 00230 80A01E60 03E00008 */ jr $ra -/* 00234 80A01E64 E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s deleted file mode 100644 index add0a00a0..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A01E68 -/* 00238 80A01E68 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0023C 80A01E6C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00240 80A01E70 3C0B80A0 */ lui $t3, %hi(func_80A02B38) ## $t3 = 80A00000 -/* 00244 80A01E74 240A0600 */ addiu $t2, $zero, 0x0600 ## $t2 = 00000600 -/* 00248 80A01E78 256B2B38 */ addiu $t3, $t3, %lo(func_80A02B38) ## $t3 = 80A02B38 -/* 0024C 80A01E7C A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00250 80A01E80 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00254 80A01E84 E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00258 80A01E88 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 0025C 80A01E8C 03E00008 */ jr $ra -/* 00260 80A01E90 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s deleted file mode 100644 index 76317d806..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A01E94 -/* 00264 80A01E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00268 80A01E98 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 0026C 80A01E9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00270 80A01EA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00274 80A01EA4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00278 80A01EA8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 0027C 80A01EAC 3C0D80A0 */ lui $t5, %hi(func_80A02B38) ## $t5 = 80A00000 -/* 00280 80A01EB0 240C0800 */ addiu $t4, $zero, 0x0800 ## $t4 = 00000800 -/* 00284 80A01EB4 25AD2B38 */ addiu $t5, $t5, %lo(func_80A02B38) ## $t5 = 80A02B38 -/* 00288 80A01EB8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0028C 80A01EBC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 00290 80A01EC0 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 -/* 00294 80A01EC4 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 00298 80A01EC8 03E00008 */ jr $ra -/* 0029C 80A01ECC E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s deleted file mode 100644 index ca5ef72ad..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A01ED0 -/* 002A0 80A01ED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002A4 80A01ED4 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 002A8 80A01ED8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 002AC 80A01EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 002B0 80A01EE0 3C0F80A0 */ lui $t7, %hi(func_80A02B38) ## $t7 = 80A00000 -/* 002B4 80A01EE4 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 002B8 80A01EE8 25EF2B38 */ addiu $t7, $t7, %lo(func_80A02B38) ## $t7 = 80A02B38 -/* 002BC 80A01EEC A48E02B0 */ sh $t6, 0x02B0($a0) ## 000002B0 -/* 002C0 80A01EF0 AC8F02C8 */ sw $t7, 0x02C8($a0) ## 000002C8 -/* 002C4 80A01EF4 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 002C8 80A01EF8 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 002CC 80A01EFC 03E00008 */ jr $ra -/* 002D0 80A01F00 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s deleted file mode 100644 index e184ab26d..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A01F04 -/* 002D4 80A01F04 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 002D8 80A01F08 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 002DC 80A01F0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 002E0 80A01F10 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 002E4 80A01F14 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002E8 80A01F18 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 002EC 80A01F1C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 002F0 80A01F20 24181000 */ addiu $t8, $zero, 0x1000 ## $t8 = 00001000 -/* 002F4 80A01F24 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 -/* 002F8 80A01F28 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 002FC 80A01F2C A49802AE */ sh $t8, 0x02AE($a0) ## 000002AE -/* 00300 80A01F30 A49902B0 */ sh $t9, 0x02B0($a0) ## 000002B0 -/* 00304 80A01F34 AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00308 80A01F38 E48602B4 */ swc1 $f6, 0x02B4($a0) ## 000002B4 -/* 0030C 80A01F3C E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -/* 00310 80A01F40 03E00008 */ jr $ra -/* 00314 80A01F44 E48A0168 */ swc1 $f10, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s deleted file mode 100644 index b378e25bb..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A01F48 -/* 00318 80A01F48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0031C 80A01F4C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00320 80A01F50 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00324 80A01F54 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00328 80A01F58 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 0032C 80A01F5C 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00330 80A01F60 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 -/* 00334 80A01F64 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 00338 80A01F68 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0033C 80A01F6C A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00340 80A01F70 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00344 80A01F74 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00348 80A01F78 A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 0034C 80A01F7C E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00350 80A01F80 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00354 80A01F84 E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 -.L80A01F88: -/* 00358 80A01F88 03E00008 */ jr $ra -/* 0035C 80A01F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s index a50c32c97..59b2f7608 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s @@ -6,9 +6,9 @@ glabel func_80A3EFE8 /* 00A88 80A3EFF8 2DC10051 */ sltiu $at, $t6, 0x0051 /* 00A8C 80A3EFFC 10200013 */ beq $at, $zero, .L80A3F04C /* 00A90 80A3F000 000E7080 */ sll $t6, $t6, 2 -/* 00A94 80A3F004 3C0180A4 */ lui $at, %hi(D_80A41F84) ## $at = 80A40000 +/* 00A94 80A3F004 3C0180A4 */ lui $at, %hi(jtbl_80A41F84) ## $at = 80A40000 /* 00A98 80A3F008 002E0821 */ addu $at, $at, $t6 -/* 00A9C 80A3F00C 8C2E1F84 */ lw $t6, %lo(D_80A41F84)($at) +/* 00A9C 80A3F00C 8C2E1F84 */ lw $t6, %lo(jtbl_80A41F84)($at) /* 00AA0 80A3F010 01C00008 */ jr $t6 /* 00AA4 80A3F014 00000000 */ nop .L80A3F018: @@ -17,3 +17,20 @@ glabel func_80A3EFE8 /* 00AB0 80A3F020 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00AB4 80A3F024 03E00008 */ jr $ra /* 00AB8 80A3F028 00000000 */ nop +glabel L80A3F02C +/* 00ABC 80A3F02C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 +/* 00AC0 80A3F030 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 +/* 00AC4 80A3F034 03E00008 */ jr $ra +/* 00AC8 80A3F038 00000000 */ nop +glabel L80A3F03C +/* 00ACC 80A3F03C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 +/* 00AD0 80A3F040 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 +/* 00AD4 80A3F044 03E00008 */ jr $ra +/* 00AD8 80A3F048 00000000 */ nop +glabel L80A3F04C +.L80A3F04C: +/* 00ADC 80A3F04C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 +/* 00AE0 80A3F050 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 +/* 00AE4 80A3F054 00000000 */ nop +/* 00AE8 80A3F058 03E00008 */ jr $ra +/* 00AEC 80A3F05C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s deleted file mode 100644 index b8ddbc348..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A3F02C -/* 00ABC 80A3F02C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00AC0 80A3F030 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 00AC4 80A3F034 03E00008 */ jr $ra -/* 00AC8 80A3F038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s deleted file mode 100644 index 77178167b..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A3F03C -/* 00ACC 80A3F03C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00AD0 80A3F040 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 00AD4 80A3F044 03E00008 */ jr $ra -/* 00AD8 80A3F048 00000000 */ nop -glabel L80A3F04C -.L80A3F04C: -/* 00ADC 80A3F04C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00AE0 80A3F050 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 00AE4 80A3F054 00000000 */ nop -/* 00AE8 80A3F058 03E00008 */ jr $ra -/* 00AEC 80A3F05C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s index 4fe7d3417..dfb882eef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s @@ -6,9 +6,9 @@ glabel func_80A96FD0 /* 00230 80A96FE0 2DE1000D */ sltiu $at, $t7, 0x000D /* 00234 80A96FE4 102000D2 */ beq $at, $zero, .L80A97330 /* 00238 80A96FE8 000F7880 */ sll $t7, $t7, 2 -/* 0023C 80A96FEC 3C0180AA */ lui $at, %hi(D_80A9A7BC) ## $at = 80AA0000 +/* 0023C 80A96FEC 3C0180AA */ lui $at, %hi(jtbl_80A9A7BC) ## $at = 80AA0000 /* 00240 80A96FF0 002F0821 */ addu $at, $at, $t7 -/* 00244 80A96FF4 8C2FA7BC */ lw $t7, %lo(D_80A9A7BC)($at) +/* 00244 80A96FF4 8C2FA7BC */ lw $t7, %lo(jtbl_80A9A7BC)($at) /* 00248 80A96FF8 01E00008 */ jr $t7 /* 0024C 80A96FFC 00000000 */ nop glabel L80A97000 @@ -42,3 +42,221 @@ glabel L80A97000 .L80A97060: /* 002B0 80A97060 03E00008 */ jr $ra /* 002B4 80A97064 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 000010D8 +glabel L80A97068 +/* 002B8 80A97068 3C028016 */ lui $v0, %hi(gSaveContext) +/* 002BC 80A9706C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 002C0 80A97070 944D0EDC */ lhu $t5, 0x0EDC($v0) ## 8015F53C +/* 002C4 80A97074 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) +/* 002C8 80A97078 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 +/* 002CC 80A9707C 11C00003 */ beq $t6, $zero, .L80A9708C +/* 002D0 80A97080 00000000 */ nop +/* 002D4 80A97084 03E00008 */ jr $ra +/* 002D8 80A97088 24021025 */ addiu $v0, $zero, 0x1025 ## $v0 = 00001025 +.L80A9708C: +/* 002DC 80A9708C 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) +/* 002E0 80A97090 8C5800A4 */ lw $t8, 0x00A4($v0) ## 000010C9 +/* 002E4 80A97094 01F8C824 */ and $t9, $t7, $t8 +/* 002E8 80A97098 13200003 */ beq $t9, $zero, .L80A970A8 +/* 002EC 80A9709C 00000000 */ nop +/* 002F0 80A970A0 03E00008 */ jr $ra +/* 002F4 80A970A4 24021042 */ addiu $v0, $zero, 0x1042 ## $v0 = 00001042 +.L80A970A8: +/* 002F8 80A970A8 03E00008 */ jr $ra +/* 002FC 80A970AC 24021004 */ addiu $v0, $zero, 0x1004 ## $v0 = 00001004 +glabel L80A970B0 +/* 00300 80A970B0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00304 80A970B4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00308 80A970B8 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C +/* 0030C 80A970BC 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) +/* 00310 80A970C0 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 +/* 00314 80A970C4 11200003 */ beq $t1, $zero, .L80A970D4 +/* 00318 80A970C8 00000000 */ nop +/* 0031C 80A970CC 03E00008 */ jr $ra +/* 00320 80A970D0 24021023 */ addiu $v0, $zero, 0x1023 ## $v0 = 00001023 +.L80A970D4: +/* 00324 80A970D4 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) +/* 00328 80A970D8 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 000010C7 +/* 0032C 80A970DC 014B6024 */ and $t4, $t2, $t3 +/* 00330 80A970E0 51800004 */ beql $t4, $zero, .L80A970F4 +/* 00334 80A970E4 944D0EFA */ lhu $t5, 0x0EFA($v0) ## 00001F1D +/* 00338 80A970E8 03E00008 */ jr $ra +/* 0033C 80A970EC 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 +.L80A970F0: +/* 00340 80A970F0 944D0EFA */ lhu $t5, 0x0EFA($v0) ## 00001F3D +.L80A970F4: +/* 00344 80A970F4 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 +/* 00348 80A970F8 11C00003 */ beq $t6, $zero, .L80A97108 +/* 0034C 80A970FC 00000000 */ nop +/* 00350 80A97100 03E00008 */ jr $ra +/* 00354 80A97104 24021006 */ addiu $v0, $zero, 0x1006 ## $v0 = 00001006 +.L80A97108: +/* 00358 80A97108 03E00008 */ jr $ra +/* 0035C 80A9710C 24021005 */ addiu $v0, $zero, 0x1005 ## $v0 = 00001005 +glabel L80A97110 +/* 00360 80A97110 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00364 80A97114 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00368 80A97118 944F0EDC */ lhu $t7, 0x0EDC($v0) ## 8015F53C +/* 0036C 80A9711C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 +/* 00370 80A97120 13000003 */ beq $t8, $zero, .L80A97130 +/* 00374 80A97124 00000000 */ nop +/* 00378 80A97128 03E00008 */ jr $ra +/* 0037C 80A9712C 24021022 */ addiu $v0, $zero, 0x1022 ## $v0 = 00001022 +.L80A97130: +/* 00380 80A97130 03E00008 */ jr $ra +/* 00384 80A97134 24021007 */ addiu $v0, $zero, 0x1007 ## $v0 = 00001007 +glabel L80A97138 +/* 00388 80A97138 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0038C 80A9713C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00390 80A97140 94590EDC */ lhu $t9, 0x0EDC($v0) ## 8015F53C +/* 00394 80A97144 3C098012 */ lui $t1, %hi(gBitFlags+0x48) +/* 00398 80A97148 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 +/* 0039C 80A9714C 11000003 */ beq $t0, $zero, .L80A9715C +/* 003A0 80A97150 00000000 */ nop +/* 003A4 80A97154 03E00008 */ jr $ra +/* 003A8 80A97158 24021021 */ addiu $v0, $zero, 0x1021 ## $v0 = 00001021 +.L80A9715C: +/* 003AC 80A9715C 8D297168 */ lw $t1, %lo(gBitFlags+0x48)($t1) +/* 003B0 80A97160 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 000010C5 +/* 003B4 80A97164 012A5824 */ and $t3, $t1, $t2 +/* 003B8 80A97168 51600004 */ beql $t3, $zero, .L80A9717C +/* 003BC 80A9716C 944C0EFC */ lhu $t4, 0x0EFC($v0) ## 00001F1D +/* 003C0 80A97170 03E00008 */ jr $ra +/* 003C4 80A97174 24021044 */ addiu $v0, $zero, 0x1044 ## $v0 = 00001044 +.L80A97178: +/* 003C8 80A97178 944C0EFC */ lhu $t4, 0x0EFC($v0) ## 00001F40 +.L80A9717C: +/* 003CC 80A9717C 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 +/* 003D0 80A97180 11A00003 */ beq $t5, $zero, .L80A97190 +/* 003D4 80A97184 00000000 */ nop +/* 003D8 80A97188 03E00008 */ jr $ra +/* 003DC 80A9718C 24021009 */ addiu $v0, $zero, 0x1009 ## $v0 = 00001009 +.L80A97190: +/* 003E0 80A97190 03E00008 */ jr $ra +/* 003E4 80A97194 24021008 */ addiu $v0, $zero, 0x1008 ## $v0 = 00001008 +glabel L80A97198 +/* 003E8 80A97198 3C028016 */ lui $v0, %hi(gSaveContext) +/* 003EC 80A9719C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 003F0 80A971A0 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C +/* 003F4 80A971A4 3C188012 */ lui $t8, %hi(gBitFlags+0x48) +/* 003F8 80A971A8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 +/* 003FC 80A971AC 11E00003 */ beq $t7, $zero, .L80A971BC +/* 00400 80A971B0 00000000 */ nop +/* 00404 80A971B4 03E00008 */ jr $ra +/* 00408 80A971B8 24021097 */ addiu $v0, $zero, 0x1097 ## $v0 = 00001097 +.L80A971BC: +/* 0040C 80A971BC 8F187168 */ lw $t8, %lo(gBitFlags+0x48)($t8) +/* 00410 80A971C0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 0000113B +/* 00414 80A971C4 03194024 */ and $t0, $t8, $t9 +/* 00418 80A971C8 51000004 */ beql $t0, $zero, .L80A971DC +/* 0041C 80A971CC 94490EFC */ lhu $t1, 0x0EFC($v0) ## 00001F93 +/* 00420 80A971D0 03E00008 */ jr $ra +/* 00424 80A971D4 24021042 */ addiu $v0, $zero, 0x1042 ## $v0 = 00001042 +.L80A971D8: +/* 00428 80A971D8 94490EFC */ lhu $t1, 0x0EFC($v0) ## 00001F3E +.L80A971DC: +/* 0042C 80A971DC 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 +/* 00430 80A971E0 11400003 */ beq $t2, $zero, .L80A971F0 +/* 00434 80A971E4 00000000 */ nop +/* 00438 80A971E8 03E00008 */ jr $ra +/* 0043C 80A971EC 2402100B */ addiu $v0, $zero, 0x100B ## $v0 = 0000100B +.L80A971F0: +/* 00440 80A971F0 03E00008 */ jr $ra +/* 00444 80A971F4 2402100A */ addiu $v0, $zero, 0x100A ## $v0 = 0000100A +glabel L80A971F8 +/* 00448 80A971F8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0044C 80A971FC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00450 80A97200 944B0EDC */ lhu $t3, 0x0EDC($v0) ## 8015F53C +/* 00454 80A97204 3C0D8012 */ lui $t5, %hi(gBitFlags+0x48) +/* 00458 80A97208 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 +/* 0045C 80A9720C 11800003 */ beq $t4, $zero, .L80A9721C +/* 00460 80A97210 00000000 */ nop +/* 00464 80A97214 03E00008 */ jr $ra +/* 00468 80A97218 240210B0 */ addiu $v0, $zero, 0x10B0 ## $v0 = 000010B0 +.L80A9721C: +/* 0046C 80A9721C 8DAD7168 */ lw $t5, %lo(gBitFlags+0x48)($t5) +/* 00470 80A97220 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 00001154 +/* 00474 80A97224 01AE7824 */ and $t7, $t5, $t6 +/* 00478 80A97228 51E00004 */ beql $t7, $zero, .L80A9723C +/* 0047C 80A9722C 94580EFC */ lhu $t8, 0x0EFC($v0) ## 00001FAC +/* 00480 80A97230 03E00008 */ jr $ra +/* 00484 80A97234 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 +.L80A97238: +/* 00488 80A97238 94580EFC */ lhu $t8, 0x0EFC($v0) ## 00001F3F +.L80A9723C: +/* 0048C 80A9723C 33190040 */ andi $t9, $t8, 0x0040 ## $t9 = 00000000 +/* 00490 80A97240 13200003 */ beq $t9, $zero, .L80A97250 +/* 00494 80A97244 00000000 */ nop +/* 00498 80A97248 03E00008 */ jr $ra +/* 0049C 80A9724C 2402100D */ addiu $v0, $zero, 0x100D ## $v0 = 0000100D +.L80A97250: +/* 004A0 80A97250 03E00008 */ jr $ra +/* 004A4 80A97254 2402100C */ addiu $v0, $zero, 0x100C ## $v0 = 0000100C +glabel L80A97258 +/* 004A8 80A97258 3C028016 */ lui $v0, %hi(gSaveContext) +/* 004AC 80A9725C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 004B0 80A97260 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C +/* 004B4 80A97264 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) +/* 004B8 80A97268 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 +/* 004BC 80A9726C 11200003 */ beq $t1, $zero, .L80A9727C +/* 004C0 80A97270 00000000 */ nop +/* 004C4 80A97274 03E00008 */ jr $ra +/* 004C8 80A97278 240210B5 */ addiu $v0, $zero, 0x10B5 ## $v0 = 000010B5 +.L80A9727C: +/* 004CC 80A9727C 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) +/* 004D0 80A97280 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 00001159 +/* 004D4 80A97284 014B6024 */ and $t4, $t2, $t3 +/* 004D8 80A97288 51800004 */ beql $t4, $zero, .L80A9729C +/* 004DC 80A9728C 944D0EFC */ lhu $t5, 0x0EFC($v0) ## 00001FB1 +/* 004E0 80A97290 03E00008 */ jr $ra +/* 004E4 80A97294 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 +.L80A97298: +/* 004E8 80A97298 944D0EFC */ lhu $t5, 0x0EFC($v0) ## 00001F3F +.L80A9729C: +/* 004EC 80A9729C 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 +/* 004F0 80A972A0 11C00003 */ beq $t6, $zero, .L80A972B0 +/* 004F4 80A972A4 00000000 */ nop +/* 004F8 80A972A8 03E00008 */ jr $ra +/* 004FC 80A972AC 24021019 */ addiu $v0, $zero, 0x1019 ## $v0 = 00001019 +.L80A972B0: +/* 00500 80A972B0 03E00008 */ jr $ra +/* 00504 80A972B4 2402100E */ addiu $v0, $zero, 0x100E ## $v0 = 0000100E +glabel L80A972B8 +/* 00508 80A972B8 03E00008 */ jr $ra +/* 0050C 80A972BC 24021035 */ addiu $v0, $zero, 0x1035 ## $v0 = 00001035 +glabel L80A972C0 +/* 00510 80A972C0 03E00008 */ jr $ra +/* 00514 80A972C4 24021038 */ addiu $v0, $zero, 0x1038 ## $v0 = 00001038 +glabel L80A972C8 +/* 00518 80A972C8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0051C 80A972CC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00520 80A972D0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) +/* 00524 80A972D4 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) +/* 00528 80A972D8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 +/* 0052C 80A972DC 01F8C824 */ and $t9, $t7, $t8 +/* 00530 80A972E0 13200003 */ beq $t9, $zero, .L80A972F0 +/* 00534 80A972E4 00000000 */ nop +/* 00538 80A972E8 03E00008 */ jr $ra +/* 0053C 80A972EC 2402104B */ addiu $v0, $zero, 0x104B ## $v0 = 0000104B +.L80A972F0: +/* 00540 80A972F0 03E00008 */ jr $ra +/* 00544 80A972F4 2402103C */ addiu $v0, $zero, 0x103C ## $v0 = 0000103C +glabel L80A972F8 +/* 00548 80A972F8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0054C 80A972FC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00550 80A97300 3C088012 */ lui $t0, %hi(gBitFlags+0x48) +/* 00554 80A97304 8D087168 */ lw $t0, %lo(gBitFlags+0x48)($t0) +/* 00558 80A97308 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 +/* 0055C 80A9730C 01095024 */ and $t2, $t0, $t1 +/* 00560 80A97310 11400003 */ beq $t2, $zero, .L80A97320 +/* 00564 80A97314 00000000 */ nop +/* 00568 80A97318 03E00008 */ jr $ra +/* 0056C 80A9731C 2402104C */ addiu $v0, $zero, 0x104C ## $v0 = 0000104C +.L80A97320: +/* 00570 80A97320 03E00008 */ jr $ra +/* 00574 80A97324 2402103D */ addiu $v0, $zero, 0x103D ## $v0 = 0000103D +glabel L80A97328 +/* 00578 80A97328 03E00008 */ jr $ra +/* 0057C 80A9732C 2402103E */ addiu $v0, $zero, 0x103E ## $v0 = 0000103E +.L80A97330: +/* 00580 80A97330 03E00008 */ jr $ra +/* 00584 80A97334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s deleted file mode 100644 index f3ae67bd8..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A97068 -/* 002B8 80A97068 3C028016 */ lui $v0, %hi(gSaveContext) -/* 002BC 80A9706C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 002C0 80A97070 944D0EDC */ lhu $t5, 0x0EDC($v0) ## 8015F53C -/* 002C4 80A97074 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) -/* 002C8 80A97078 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 002CC 80A9707C 11C00003 */ beq $t6, $zero, .L80A9708C -/* 002D0 80A97080 00000000 */ nop -/* 002D4 80A97084 03E00008 */ jr $ra -/* 002D8 80A97088 24021025 */ addiu $v0, $zero, 0x1025 ## $v0 = 00001025 -.L80A9708C: -/* 002DC 80A9708C 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) -/* 002E0 80A97090 8C5800A4 */ lw $t8, 0x00A4($v0) ## 000010C9 -/* 002E4 80A97094 01F8C824 */ and $t9, $t7, $t8 -/* 002E8 80A97098 13200003 */ beq $t9, $zero, .L80A970A8 -/* 002EC 80A9709C 00000000 */ nop -/* 002F0 80A970A0 03E00008 */ jr $ra -/* 002F4 80A970A4 24021042 */ addiu $v0, $zero, 0x1042 ## $v0 = 00001042 -.L80A970A8: -/* 002F8 80A970A8 03E00008 */ jr $ra -/* 002FC 80A970AC 24021004 */ addiu $v0, $zero, 0x1004 ## $v0 = 00001004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s deleted file mode 100644 index cbecce1a2..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A970B0 -/* 00300 80A970B0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00304 80A970B4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00308 80A970B8 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C -/* 0030C 80A970BC 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) -/* 00310 80A970C0 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00314 80A970C4 11200003 */ beq $t1, $zero, .L80A970D4 -/* 00318 80A970C8 00000000 */ nop -/* 0031C 80A970CC 03E00008 */ jr $ra -/* 00320 80A970D0 24021023 */ addiu $v0, $zero, 0x1023 ## $v0 = 00001023 -.L80A970D4: -/* 00324 80A970D4 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) -/* 00328 80A970D8 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 000010C7 -/* 0032C 80A970DC 014B6024 */ and $t4, $t2, $t3 -/* 00330 80A970E0 51800004 */ beql $t4, $zero, .L80A970F4 -/* 00334 80A970E4 944D0EFA */ lhu $t5, 0x0EFA($v0) ## 00001F1D -/* 00338 80A970E8 03E00008 */ jr $ra -/* 0033C 80A970EC 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 -.L80A970F0: -/* 00340 80A970F0 944D0EFA */ lhu $t5, 0x0EFA($v0) ## 00001F3D -.L80A970F4: -/* 00344 80A970F4 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 -/* 00348 80A970F8 11C00003 */ beq $t6, $zero, .L80A97108 -/* 0034C 80A970FC 00000000 */ nop -/* 00350 80A97100 03E00008 */ jr $ra -/* 00354 80A97104 24021006 */ addiu $v0, $zero, 0x1006 ## $v0 = 00001006 -.L80A97108: -/* 00358 80A97108 03E00008 */ jr $ra -/* 0035C 80A9710C 24021005 */ addiu $v0, $zero, 0x1005 ## $v0 = 00001005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s deleted file mode 100644 index 6e19167c2..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A97110 -/* 00360 80A97110 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00364 80A97114 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00368 80A97118 944F0EDC */ lhu $t7, 0x0EDC($v0) ## 8015F53C -/* 0036C 80A9711C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00370 80A97120 13000003 */ beq $t8, $zero, .L80A97130 -/* 00374 80A97124 00000000 */ nop -/* 00378 80A97128 03E00008 */ jr $ra -/* 0037C 80A9712C 24021022 */ addiu $v0, $zero, 0x1022 ## $v0 = 00001022 -.L80A97130: -/* 00380 80A97130 03E00008 */ jr $ra -/* 00384 80A97134 24021007 */ addiu $v0, $zero, 0x1007 ## $v0 = 00001007 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s deleted file mode 100644 index d5c008636..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A97138 -/* 00388 80A97138 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0038C 80A9713C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00390 80A97140 94590EDC */ lhu $t9, 0x0EDC($v0) ## 8015F53C -/* 00394 80A97144 3C098012 */ lui $t1, %hi(gBitFlags+0x48) -/* 00398 80A97148 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0039C 80A9714C 11000003 */ beq $t0, $zero, .L80A9715C -/* 003A0 80A97150 00000000 */ nop -/* 003A4 80A97154 03E00008 */ jr $ra -/* 003A8 80A97158 24021021 */ addiu $v0, $zero, 0x1021 ## $v0 = 00001021 -.L80A9715C: -/* 003AC 80A9715C 8D297168 */ lw $t1, %lo(gBitFlags+0x48)($t1) -/* 003B0 80A97160 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 000010C5 -/* 003B4 80A97164 012A5824 */ and $t3, $t1, $t2 -/* 003B8 80A97168 51600004 */ beql $t3, $zero, .L80A9717C -/* 003BC 80A9716C 944C0EFC */ lhu $t4, 0x0EFC($v0) ## 00001F1D -/* 003C0 80A97170 03E00008 */ jr $ra -/* 003C4 80A97174 24021044 */ addiu $v0, $zero, 0x1044 ## $v0 = 00001044 -.L80A97178: -/* 003C8 80A97178 944C0EFC */ lhu $t4, 0x0EFC($v0) ## 00001F40 -.L80A9717C: -/* 003CC 80A9717C 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 003D0 80A97180 11A00003 */ beq $t5, $zero, .L80A97190 -/* 003D4 80A97184 00000000 */ nop -/* 003D8 80A97188 03E00008 */ jr $ra -/* 003DC 80A9718C 24021009 */ addiu $v0, $zero, 0x1009 ## $v0 = 00001009 -.L80A97190: -/* 003E0 80A97190 03E00008 */ jr $ra -/* 003E4 80A97194 24021008 */ addiu $v0, $zero, 0x1008 ## $v0 = 00001008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s deleted file mode 100644 index 9bcd3ba37..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A97198 -/* 003E8 80A97198 3C028016 */ lui $v0, %hi(gSaveContext) -/* 003EC 80A9719C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 003F0 80A971A0 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 003F4 80A971A4 3C188012 */ lui $t8, %hi(gBitFlags+0x48) -/* 003F8 80A971A8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 003FC 80A971AC 11E00003 */ beq $t7, $zero, .L80A971BC -/* 00400 80A971B0 00000000 */ nop -/* 00404 80A971B4 03E00008 */ jr $ra -/* 00408 80A971B8 24021097 */ addiu $v0, $zero, 0x1097 ## $v0 = 00001097 -.L80A971BC: -/* 0040C 80A971BC 8F187168 */ lw $t8, %lo(gBitFlags+0x48)($t8) -/* 00410 80A971C0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 0000113B -/* 00414 80A971C4 03194024 */ and $t0, $t8, $t9 -/* 00418 80A971C8 51000004 */ beql $t0, $zero, .L80A971DC -/* 0041C 80A971CC 94490EFC */ lhu $t1, 0x0EFC($v0) ## 00001F93 -/* 00420 80A971D0 03E00008 */ jr $ra -/* 00424 80A971D4 24021042 */ addiu $v0, $zero, 0x1042 ## $v0 = 00001042 -.L80A971D8: -/* 00428 80A971D8 94490EFC */ lhu $t1, 0x0EFC($v0) ## 00001F3E -.L80A971DC: -/* 0042C 80A971DC 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 -/* 00430 80A971E0 11400003 */ beq $t2, $zero, .L80A971F0 -/* 00434 80A971E4 00000000 */ nop -/* 00438 80A971E8 03E00008 */ jr $ra -/* 0043C 80A971EC 2402100B */ addiu $v0, $zero, 0x100B ## $v0 = 0000100B -.L80A971F0: -/* 00440 80A971F0 03E00008 */ jr $ra -/* 00444 80A971F4 2402100A */ addiu $v0, $zero, 0x100A ## $v0 = 0000100A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s deleted file mode 100644 index 9b18cf026..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A971F8 -/* 00448 80A971F8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0044C 80A971FC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00450 80A97200 944B0EDC */ lhu $t3, 0x0EDC($v0) ## 8015F53C -/* 00454 80A97204 3C0D8012 */ lui $t5, %hi(gBitFlags+0x48) -/* 00458 80A97208 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 0045C 80A9720C 11800003 */ beq $t4, $zero, .L80A9721C -/* 00460 80A97210 00000000 */ nop -/* 00464 80A97214 03E00008 */ jr $ra -/* 00468 80A97218 240210B0 */ addiu $v0, $zero, 0x10B0 ## $v0 = 000010B0 -.L80A9721C: -/* 0046C 80A9721C 8DAD7168 */ lw $t5, %lo(gBitFlags+0x48)($t5) -/* 00470 80A97220 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 00001154 -/* 00474 80A97224 01AE7824 */ and $t7, $t5, $t6 -/* 00478 80A97228 51E00004 */ beql $t7, $zero, .L80A9723C -/* 0047C 80A9722C 94580EFC */ lhu $t8, 0x0EFC($v0) ## 00001FAC -/* 00480 80A97230 03E00008 */ jr $ra -/* 00484 80A97234 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 -.L80A97238: -/* 00488 80A97238 94580EFC */ lhu $t8, 0x0EFC($v0) ## 00001F3F -.L80A9723C: -/* 0048C 80A9723C 33190040 */ andi $t9, $t8, 0x0040 ## $t9 = 00000000 -/* 00490 80A97240 13200003 */ beq $t9, $zero, .L80A97250 -/* 00494 80A97244 00000000 */ nop -/* 00498 80A97248 03E00008 */ jr $ra -/* 0049C 80A9724C 2402100D */ addiu $v0, $zero, 0x100D ## $v0 = 0000100D -.L80A97250: -/* 004A0 80A97250 03E00008 */ jr $ra -/* 004A4 80A97254 2402100C */ addiu $v0, $zero, 0x100C ## $v0 = 0000100C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s deleted file mode 100644 index aa652853c..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A97258 -/* 004A8 80A97258 3C028016 */ lui $v0, %hi(gSaveContext) -/* 004AC 80A9725C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 004B0 80A97260 94480EDC */ lhu $t0, 0x0EDC($v0) ## 8015F53C -/* 004B4 80A97264 3C0A8012 */ lui $t2, %hi(gBitFlags+0x48) -/* 004B8 80A97268 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 004BC 80A9726C 11200003 */ beq $t1, $zero, .L80A9727C -/* 004C0 80A97270 00000000 */ nop -/* 004C4 80A97274 03E00008 */ jr $ra -/* 004C8 80A97278 240210B5 */ addiu $v0, $zero, 0x10B5 ## $v0 = 000010B5 -.L80A9727C: -/* 004CC 80A9727C 8D4A7168 */ lw $t2, %lo(gBitFlags+0x48)($t2) -/* 004D0 80A97280 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 00001159 -/* 004D4 80A97284 014B6024 */ and $t4, $t2, $t3 -/* 004D8 80A97288 51800004 */ beql $t4, $zero, .L80A9729C -/* 004DC 80A9728C 944D0EFC */ lhu $t5, 0x0EFC($v0) ## 00001FB1 -/* 004E0 80A97290 03E00008 */ jr $ra -/* 004E4 80A97294 24021043 */ addiu $v0, $zero, 0x1043 ## $v0 = 00001043 -.L80A97298: -/* 004E8 80A97298 944D0EFC */ lhu $t5, 0x0EFC($v0) ## 00001F3F -.L80A9729C: -/* 004EC 80A9729C 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 004F0 80A972A0 11C00003 */ beq $t6, $zero, .L80A972B0 -/* 004F4 80A972A4 00000000 */ nop -/* 004F8 80A972A8 03E00008 */ jr $ra -/* 004FC 80A972AC 24021019 */ addiu $v0, $zero, 0x1019 ## $v0 = 00001019 -.L80A972B0: -/* 00500 80A972B0 03E00008 */ jr $ra -/* 00504 80A972B4 2402100E */ addiu $v0, $zero, 0x100E ## $v0 = 0000100E -glabel L80A972B8 -/* 00508 80A972B8 03E00008 */ jr $ra -/* 0050C 80A972BC 24021035 */ addiu $v0, $zero, 0x1035 ## $v0 = 00001035 -glabel L80A972C0 -/* 00510 80A972C0 03E00008 */ jr $ra -/* 00514 80A972C4 24021038 */ addiu $v0, $zero, 0x1038 ## $v0 = 00001038 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s deleted file mode 100644 index 78d448014..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A972C8 -/* 00518 80A972C8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0051C 80A972CC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00520 80A972D0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) -/* 00524 80A972D4 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) -/* 00528 80A972D8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 0052C 80A972DC 01F8C824 */ and $t9, $t7, $t8 -/* 00530 80A972E0 13200003 */ beq $t9, $zero, .L80A972F0 -/* 00534 80A972E4 00000000 */ nop -/* 00538 80A972E8 03E00008 */ jr $ra -/* 0053C 80A972EC 2402104B */ addiu $v0, $zero, 0x104B ## $v0 = 0000104B -.L80A972F0: -/* 00540 80A972F0 03E00008 */ jr $ra -/* 00544 80A972F4 2402103C */ addiu $v0, $zero, 0x103C ## $v0 = 0000103C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s deleted file mode 100644 index 38b3e4beb..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A972F8 -/* 00548 80A972F8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0054C 80A972FC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00550 80A97300 3C088012 */ lui $t0, %hi(gBitFlags+0x48) -/* 00554 80A97304 8D087168 */ lw $t0, %lo(gBitFlags+0x48)($t0) -/* 00558 80A97308 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 -/* 0055C 80A9730C 01095024 */ and $t2, $t0, $t1 -/* 00560 80A97310 11400003 */ beq $t2, $zero, .L80A97320 -/* 00564 80A97314 00000000 */ nop -/* 00568 80A97318 03E00008 */ jr $ra -/* 0056C 80A9731C 2402104C */ addiu $v0, $zero, 0x104C ## $v0 = 0000104C -.L80A97320: -/* 00570 80A97320 03E00008 */ jr $ra -/* 00574 80A97324 2402103D */ addiu $v0, $zero, 0x103D ## $v0 = 0000103D -glabel L80A97328 -/* 00578 80A97328 03E00008 */ jr $ra -/* 0057C 80A9732C 2402103E */ addiu $v0, $zero, 0x103E ## $v0 = 0000103E -.L80A97330: -/* 00580 80A97330 03E00008 */ jr $ra -/* 00584 80A97334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s index 33486a51b..f71b1b76f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s @@ -6,9 +6,9 @@ glabel func_80A97338 /* 00598 80A97348 2DE1000D */ sltiu $at, $t7, 0x000D /* 0059C 80A9734C 102000AE */ beq $at, $zero, .L80A97608 /* 005A0 80A97350 000F7880 */ sll $t7, $t7, 2 -/* 005A4 80A97354 3C0180AA */ lui $at, %hi(D_80A9A7F0) ## $at = 80AA0000 +/* 005A4 80A97354 3C0180AA */ lui $at, %hi(jtbl_80A9A7F0) ## $at = 80AA0000 /* 005A8 80A97358 002F0821 */ addu $at, $at, $t7 -/* 005AC 80A9735C 8C2FA7F0 */ lw $t7, %lo(D_80A9A7F0)($at) +/* 005AC 80A9735C 8C2FA7F0 */ lw $t7, %lo(jtbl_80A9A7F0)($at) /* 005B0 80A97360 01E00008 */ jr $t7 /* 005B4 80A97364 00000000 */ nop glabel L80A97368 @@ -16,3 +16,203 @@ glabel L80A97368 /* 005BC 80A9736C A0780693 */ sb $t8, 0x0693($v1) ## 00000693 /* 005C0 80A97370 03E00008 */ jr $ra /* 005C4 80A97374 240210B9 */ addiu $v0, $zero, 0x10B9 ## $v0 = 000010B9 +glabel L80A97378 +/* 005C8 80A97378 3C028016 */ lui $v0, %hi(gSaveContext) +/* 005CC 80A9737C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 005D0 80A97380 3C198012 */ lui $t9, %hi(gBitFlags) +/* 005D4 80A97384 8F397120 */ lw $t9, %lo(gBitFlags)($t9) +/* 005D8 80A97388 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 +/* 005DC 80A9738C 03284824 */ and $t1, $t9, $t0 +/* 005E0 80A97390 51200004 */ beql $t1, $zero, .L80A973A4 +/* 005E4 80A97394 944A0F00 */ lhu $t2, 0x0F00($v0) ## 8015F560 +/* 005E8 80A97398 03E00008 */ jr $ra +/* 005EC 80A9739C 24021072 */ addiu $v0, $zero, 0x1072 ## $v0 = 00001072 +.L80A973A0: +/* 005F0 80A973A0 944A0F00 */ lhu $t2, 0x0F00($v0) ## 00001F72 +.L80A973A4: +/* 005F4 80A973A4 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 +/* 005F8 80A973A8 11600003 */ beq $t3, $zero, .L80A973B8 +/* 005FC 80A973AC 00000000 */ nop +/* 00600 80A973B0 03E00008 */ jr $ra +/* 00604 80A973B4 24021056 */ addiu $v0, $zero, 0x1056 ## $v0 = 00001056 +.L80A973B8: +/* 00608 80A973B8 03E00008 */ jr $ra +/* 0060C 80A973BC 24021055 */ addiu $v0, $zero, 0x1055 ## $v0 = 00001055 +glabel L80A973C0 +/* 00610 80A973C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00614 80A973C4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00618 80A973C8 3C0C8012 */ lui $t4, %hi(gBitFlags) +/* 0061C 80A973CC 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) +/* 00620 80A973D0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 +/* 00624 80A973D4 018D7024 */ and $t6, $t4, $t5 +/* 00628 80A973D8 11C00003 */ beq $t6, $zero, .L80A973E8 +/* 0062C 80A973DC 00000000 */ nop +/* 00630 80A973E0 03E00008 */ jr $ra +/* 00634 80A973E4 24021073 */ addiu $v0, $zero, 0x1073 ## $v0 = 00001073 +.L80A973E8: +/* 00638 80A973E8 03E00008 */ jr $ra +/* 0063C 80A973EC 2402105A */ addiu $v0, $zero, 0x105A ## $v0 = 0000105A +glabel L80A973F0 +/* 00640 80A973F0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00644 80A973F4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00648 80A973F8 3C0F8012 */ lui $t7, %hi(gBitFlags) +/* 0064C 80A973FC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) +/* 00650 80A97400 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 +/* 00654 80A97404 01F8C824 */ and $t9, $t7, $t8 +/* 00658 80A97408 53200004 */ beql $t9, $zero, .L80A9741C +/* 0065C 80A9740C 94480F00 */ lhu $t0, 0x0F00($v0) ## 8015F560 +/* 00660 80A97410 03E00008 */ jr $ra +/* 00664 80A97414 24021074 */ addiu $v0, $zero, 0x1074 ## $v0 = 00001074 +.L80A97418: +/* 00668 80A97418 94480F00 */ lhu $t0, 0x0F00($v0) ## 00001F74 +.L80A9741C: +/* 0066C 80A9741C 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 +/* 00670 80A97420 11200003 */ beq $t1, $zero, .L80A97430 +/* 00674 80A97424 00000000 */ nop +/* 00678 80A97428 03E00008 */ jr $ra +/* 0067C 80A9742C 2402105E */ addiu $v0, $zero, 0x105E ## $v0 = 0000105E +.L80A97430: +/* 00680 80A97430 03E00008 */ jr $ra +/* 00684 80A97434 2402105D */ addiu $v0, $zero, 0x105D ## $v0 = 0000105D +glabel L80A97438 +/* 00688 80A97438 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0068C 80A9743C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00690 80A97440 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 00694 80A97444 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) +/* 00698 80A97448 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 +/* 0069C 80A9744C 014B6024 */ and $t4, $t2, $t3 +/* 006A0 80A97450 11800003 */ beq $t4, $zero, .L80A97460 +/* 006A4 80A97454 00000000 */ nop +/* 006A8 80A97458 03E00008 */ jr $ra +/* 006AC 80A9745C 24021075 */ addiu $v0, $zero, 0x1075 ## $v0 = 00001075 +.L80A97460: +/* 006B0 80A97460 03E00008 */ jr $ra +/* 006B4 80A97464 2402105B */ addiu $v0, $zero, 0x105B ## $v0 = 0000105B +glabel L80A97468 +/* 006B8 80A97468 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006BC 80A9746C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 006C0 80A97470 3C0D8012 */ lui $t5, %hi(gBitFlags) +/* 006C4 80A97474 8DAD7120 */ lw $t5, %lo(gBitFlags)($t5) +/* 006C8 80A97478 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 8015E704 +/* 006CC 80A9747C 01AE7824 */ and $t7, $t5, $t6 +/* 006D0 80A97480 11E00003 */ beq $t7, $zero, .L80A97490 +/* 006D4 80A97484 00000000 */ nop +/* 006D8 80A97488 03E00008 */ jr $ra +/* 006DC 80A9748C 24021076 */ addiu $v0, $zero, 0x1076 ## $v0 = 00001076 +.L80A97490: +/* 006E0 80A97490 03E00008 */ jr $ra +/* 006E4 80A97494 2402105F */ addiu $v0, $zero, 0x105F ## $v0 = 0000105F +glabel L80A97498 +/* 006E8 80A97498 03E00008 */ jr $ra +/* 006EC 80A9749C 24021057 */ addiu $v0, $zero, 0x1057 ## $v0 = 00001057 +glabel L80A974A0 +/* 006F0 80A974A0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 006F4 80A974A4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 006F8 80A974A8 3C188012 */ lui $t8, %hi(gBitFlags) +/* 006FC 80A974AC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) +/* 00700 80A974B0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 +/* 00704 80A974B4 03194024 */ and $t0, $t8, $t9 +/* 00708 80A974B8 51000004 */ beql $t0, $zero, .L80A974CC +/* 0070C 80A974BC 94490F02 */ lhu $t1, 0x0F02($v0) ## 8015F562 +/* 00710 80A974C0 03E00008 */ jr $ra +/* 00714 80A974C4 24021077 */ addiu $v0, $zero, 0x1077 ## $v0 = 00001077 +.L80A974C8: +/* 00718 80A974C8 94490F02 */ lhu $t1, 0x0F02($v0) ## 00001F79 +.L80A974CC: +/* 0071C 80A974CC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 +/* 00720 80A974D0 11400003 */ beq $t2, $zero, .L80A974E0 +/* 00724 80A974D4 00000000 */ nop +/* 00728 80A974D8 03E00008 */ jr $ra +/* 0072C 80A974DC 24021059 */ addiu $v0, $zero, 0x1059 ## $v0 = 00001059 +.L80A974E0: +/* 00730 80A974E0 03E00008 */ jr $ra +/* 00734 80A974E4 24021058 */ addiu $v0, $zero, 0x1058 ## $v0 = 00001058 +glabel L80A974E8 +/* 00738 80A974E8 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0073C 80A974EC 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00740 80A974F0 3C0B8012 */ lui $t3, %hi(gBitFlags) +/* 00744 80A974F4 8D6B7120 */ lw $t3, %lo(gBitFlags)($t3) +/* 00748 80A974F8 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 +/* 0074C 80A974FC 016C6824 */ and $t5, $t3, $t4 +/* 00750 80A97500 11A00003 */ beq $t5, $zero, .L80A97510 +/* 00754 80A97504 00000000 */ nop +/* 00758 80A97508 03E00008 */ jr $ra +/* 0075C 80A9750C 24021079 */ addiu $v0, $zero, 0x1079 ## $v0 = 00001079 +.L80A97510: +/* 00760 80A97510 03E00008 */ jr $ra +/* 00764 80A97514 2402104E */ addiu $v0, $zero, 0x104E ## $v0 = 0000104E +glabel L80A97518 +/* 00768 80A97518 3C028016 */ lui $v0, %hi(gSaveContext) +/* 0076C 80A9751C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00770 80A97520 3C0E8012 */ lui $t6, %hi(gBitFlags) +/* 00774 80A97524 8DCE7120 */ lw $t6, %lo(gBitFlags)($t6) +/* 00778 80A97528 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 +/* 0077C 80A9752C 01CFC024 */ and $t8, $t6, $t7 +/* 00780 80A97530 53000004 */ beql $t8, $zero, .L80A97544 +/* 00784 80A97534 94590F02 */ lhu $t9, 0x0F02($v0) ## 8015F562 +/* 00788 80A97538 03E00008 */ jr $ra +/* 0078C 80A9753C 2402107A */ addiu $v0, $zero, 0x107A ## $v0 = 0000107A +.L80A97540: +/* 00790 80A97540 94590F02 */ lhu $t9, 0x0F02($v0) ## 00001F7C +.L80A97544: +/* 00794 80A97544 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 +/* 00798 80A97548 11000003 */ beq $t0, $zero, .L80A97558 +/* 0079C 80A9754C 00000000 */ nop +/* 007A0 80A97550 03E00008 */ jr $ra +/* 007A4 80A97554 24021050 */ addiu $v0, $zero, 0x1050 ## $v0 = 00001050 +.L80A97558: +/* 007A8 80A97558 03E00008 */ jr $ra +/* 007AC 80A9755C 2402104F */ addiu $v0, $zero, 0x104F ## $v0 = 0000104F +glabel L80A97560 +/* 007B0 80A97560 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007B4 80A97564 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 007B8 80A97568 3C098012 */ lui $t1, %hi(gBitFlags) +/* 007BC 80A9756C 8D297120 */ lw $t1, %lo(gBitFlags)($t1) +/* 007C0 80A97570 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 8015E704 +/* 007C4 80A97574 012A5824 */ and $t3, $t1, $t2 +/* 007C8 80A97578 11600003 */ beq $t3, $zero, .L80A97588 +/* 007CC 80A9757C 00000000 */ nop +/* 007D0 80A97580 03E00008 */ jr $ra +/* 007D4 80A97584 2402107B */ addiu $v0, $zero, 0x107B ## $v0 = 0000107B +.L80A97588: +/* 007D8 80A97588 03E00008 */ jr $ra +/* 007DC 80A9758C 24021051 */ addiu $v0, $zero, 0x1051 ## $v0 = 00001051 +glabel L80A97590 +/* 007E0 80A97590 3C028016 */ lui $v0, %hi(gSaveContext) +/* 007E4 80A97594 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 007E8 80A97598 3C0C8012 */ lui $t4, %hi(gBitFlags) +/* 007EC 80A9759C 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) +/* 007F0 80A975A0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 +/* 007F4 80A975A4 018D7024 */ and $t6, $t4, $t5 +/* 007F8 80A975A8 11C00003 */ beq $t6, $zero, .L80A975B8 +/* 007FC 80A975AC 00000000 */ nop +/* 00800 80A975B0 03E00008 */ jr $ra +/* 00804 80A975B4 2402107C */ addiu $v0, $zero, 0x107C ## $v0 = 0000107C +.L80A975B8: +/* 00808 80A975B8 03E00008 */ jr $ra +/* 0080C 80A975BC 24021052 */ addiu $v0, $zero, 0x1052 ## $v0 = 00001052 +glabel L80A975C0 +/* 00810 80A975C0 3C028016 */ lui $v0, %hi(gSaveContext) +/* 00814 80A975C4 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 00818 80A975C8 3C0F8012 */ lui $t7, %hi(gBitFlags) +/* 0081C 80A975CC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) +/* 00820 80A975D0 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 +/* 00824 80A975D4 01F8C824 */ and $t9, $t7, $t8 +/* 00828 80A975D8 53200004 */ beql $t9, $zero, .L80A975EC +/* 0082C 80A975DC 94480F04 */ lhu $t0, 0x0F04($v0) ## 8015F564 +/* 00830 80A975E0 03E00008 */ jr $ra +/* 00834 80A975E4 2402107C */ addiu $v0, $zero, 0x107C ## $v0 = 0000107C +.L80A975E8: +/* 00838 80A975E8 94480F04 */ lhu $t0, 0x0F04($v0) ## 00001F80 +.L80A975EC: +/* 0083C 80A975EC 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 +/* 00840 80A975F0 11200003 */ beq $t1, $zero, .L80A97600 +/* 00844 80A975F4 00000000 */ nop +/* 00848 80A975F8 03E00008 */ jr $ra +/* 0084C 80A975FC 24021054 */ addiu $v0, $zero, 0x1054 ## $v0 = 00001054 +.L80A97600: +/* 00850 80A97600 03E00008 */ jr $ra +/* 00854 80A97604 24021053 */ addiu $v0, $zero, 0x1053 ## $v0 = 00001053 +.L80A97608: +/* 00858 80A97608 03E00008 */ jr $ra +/* 0085C 80A9760C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s deleted file mode 100644 index 3483d476a..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A97378 -/* 005C8 80A97378 3C028016 */ lui $v0, %hi(gSaveContext) -/* 005CC 80A9737C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 005D0 80A97380 3C198012 */ lui $t9, %hi(gBitFlags) -/* 005D4 80A97384 8F397120 */ lw $t9, %lo(gBitFlags)($t9) -/* 005D8 80A97388 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 -/* 005DC 80A9738C 03284824 */ and $t1, $t9, $t0 -/* 005E0 80A97390 51200004 */ beql $t1, $zero, .L80A973A4 -/* 005E4 80A97394 944A0F00 */ lhu $t2, 0x0F00($v0) ## 8015F560 -/* 005E8 80A97398 03E00008 */ jr $ra -/* 005EC 80A9739C 24021072 */ addiu $v0, $zero, 0x1072 ## $v0 = 00001072 -.L80A973A0: -/* 005F0 80A973A0 944A0F00 */ lhu $t2, 0x0F00($v0) ## 00001F72 -.L80A973A4: -/* 005F4 80A973A4 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 005F8 80A973A8 11600003 */ beq $t3, $zero, .L80A973B8 -/* 005FC 80A973AC 00000000 */ nop -/* 00600 80A973B0 03E00008 */ jr $ra -/* 00604 80A973B4 24021056 */ addiu $v0, $zero, 0x1056 ## $v0 = 00001056 -.L80A973B8: -/* 00608 80A973B8 03E00008 */ jr $ra -/* 0060C 80A973BC 24021055 */ addiu $v0, $zero, 0x1055 ## $v0 = 00001055 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s deleted file mode 100644 index b3ef6d30e..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A973C0 -/* 00610 80A973C0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00614 80A973C4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00618 80A973C8 3C0C8012 */ lui $t4, %hi(gBitFlags) -/* 0061C 80A973CC 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) -/* 00620 80A973D0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 -/* 00624 80A973D4 018D7024 */ and $t6, $t4, $t5 -/* 00628 80A973D8 11C00003 */ beq $t6, $zero, .L80A973E8 -/* 0062C 80A973DC 00000000 */ nop -/* 00630 80A973E0 03E00008 */ jr $ra -/* 00634 80A973E4 24021073 */ addiu $v0, $zero, 0x1073 ## $v0 = 00001073 -.L80A973E8: -/* 00638 80A973E8 03E00008 */ jr $ra -/* 0063C 80A973EC 2402105A */ addiu $v0, $zero, 0x105A ## $v0 = 0000105A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s deleted file mode 100644 index 4939f12b6..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A973F0 -/* 00640 80A973F0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00644 80A973F4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00648 80A973F8 3C0F8012 */ lui $t7, %hi(gBitFlags) -/* 0064C 80A973FC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) -/* 00650 80A97400 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 00654 80A97404 01F8C824 */ and $t9, $t7, $t8 -/* 00658 80A97408 53200004 */ beql $t9, $zero, .L80A9741C -/* 0065C 80A9740C 94480F00 */ lhu $t0, 0x0F00($v0) ## 8015F560 -/* 00660 80A97410 03E00008 */ jr $ra -/* 00664 80A97414 24021074 */ addiu $v0, $zero, 0x1074 ## $v0 = 00001074 -.L80A97418: -/* 00668 80A97418 94480F00 */ lhu $t0, 0x0F00($v0) ## 00001F74 -.L80A9741C: -/* 0066C 80A9741C 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 00670 80A97420 11200003 */ beq $t1, $zero, .L80A97430 -/* 00674 80A97424 00000000 */ nop -/* 00678 80A97428 03E00008 */ jr $ra -/* 0067C 80A9742C 2402105E */ addiu $v0, $zero, 0x105E ## $v0 = 0000105E -.L80A97430: -/* 00680 80A97430 03E00008 */ jr $ra -/* 00684 80A97434 2402105D */ addiu $v0, $zero, 0x105D ## $v0 = 0000105D diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s deleted file mode 100644 index c7bb03cf8..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A97438 -/* 00688 80A97438 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0068C 80A9743C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00690 80A97440 3C0A8012 */ lui $t2, %hi(gBitFlags) -/* 00694 80A97444 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) -/* 00698 80A97448 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 -/* 0069C 80A9744C 014B6024 */ and $t4, $t2, $t3 -/* 006A0 80A97450 11800003 */ beq $t4, $zero, .L80A97460 -/* 006A4 80A97454 00000000 */ nop -/* 006A8 80A97458 03E00008 */ jr $ra -/* 006AC 80A9745C 24021075 */ addiu $v0, $zero, 0x1075 ## $v0 = 00001075 -.L80A97460: -/* 006B0 80A97460 03E00008 */ jr $ra -/* 006B4 80A97464 2402105B */ addiu $v0, $zero, 0x105B ## $v0 = 0000105B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s deleted file mode 100644 index 17f6d5083..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A97468 -/* 006B8 80A97468 3C028016 */ lui $v0, %hi(gSaveContext) -/* 006BC 80A9746C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 006C0 80A97470 3C0D8012 */ lui $t5, %hi(gBitFlags) -/* 006C4 80A97474 8DAD7120 */ lw $t5, %lo(gBitFlags)($t5) -/* 006C8 80A97478 8C4E00A4 */ lw $t6, 0x00A4($v0) ## 8015E704 -/* 006CC 80A9747C 01AE7824 */ and $t7, $t5, $t6 -/* 006D0 80A97480 11E00003 */ beq $t7, $zero, .L80A97490 -/* 006D4 80A97484 00000000 */ nop -/* 006D8 80A97488 03E00008 */ jr $ra -/* 006DC 80A9748C 24021076 */ addiu $v0, $zero, 0x1076 ## $v0 = 00001076 -.L80A97490: -/* 006E0 80A97490 03E00008 */ jr $ra -/* 006E4 80A97494 2402105F */ addiu $v0, $zero, 0x105F ## $v0 = 0000105F -glabel L80A97498 -/* 006E8 80A97498 03E00008 */ jr $ra -/* 006EC 80A9749C 24021057 */ addiu $v0, $zero, 0x1057 ## $v0 = 00001057 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s deleted file mode 100644 index 1f5ca6df0..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A974A0 -/* 006F0 80A974A0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 006F4 80A974A4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 006F8 80A974A8 3C188012 */ lui $t8, %hi(gBitFlags) -/* 006FC 80A974AC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) -/* 00700 80A974B0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 -/* 00704 80A974B4 03194024 */ and $t0, $t8, $t9 -/* 00708 80A974B8 51000004 */ beql $t0, $zero, .L80A974CC -/* 0070C 80A974BC 94490F02 */ lhu $t1, 0x0F02($v0) ## 8015F562 -/* 00710 80A974C0 03E00008 */ jr $ra -/* 00714 80A974C4 24021077 */ addiu $v0, $zero, 0x1077 ## $v0 = 00001077 -.L80A974C8: -/* 00718 80A974C8 94490F02 */ lhu $t1, 0x0F02($v0) ## 00001F79 -.L80A974CC: -/* 0071C 80A974CC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 00720 80A974D0 11400003 */ beq $t2, $zero, .L80A974E0 -/* 00724 80A974D4 00000000 */ nop -/* 00728 80A974D8 03E00008 */ jr $ra -/* 0072C 80A974DC 24021059 */ addiu $v0, $zero, 0x1059 ## $v0 = 00001059 -.L80A974E0: -/* 00730 80A974E0 03E00008 */ jr $ra -/* 00734 80A974E4 24021058 */ addiu $v0, $zero, 0x1058 ## $v0 = 00001058 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s deleted file mode 100644 index d3cc89d12..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A974E8 -/* 00738 80A974E8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0073C 80A974EC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00740 80A974F0 3C0B8012 */ lui $t3, %hi(gBitFlags) -/* 00744 80A974F4 8D6B7120 */ lw $t3, %lo(gBitFlags)($t3) -/* 00748 80A974F8 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 -/* 0074C 80A974FC 016C6824 */ and $t5, $t3, $t4 -/* 00750 80A97500 11A00003 */ beq $t5, $zero, .L80A97510 -/* 00754 80A97504 00000000 */ nop -/* 00758 80A97508 03E00008 */ jr $ra -/* 0075C 80A9750C 24021079 */ addiu $v0, $zero, 0x1079 ## $v0 = 00001079 -.L80A97510: -/* 00760 80A97510 03E00008 */ jr $ra -/* 00764 80A97514 2402104E */ addiu $v0, $zero, 0x104E ## $v0 = 0000104E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s deleted file mode 100644 index 9d8415aaf..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A97518 -/* 00768 80A97518 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0076C 80A9751C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00770 80A97520 3C0E8012 */ lui $t6, %hi(gBitFlags) -/* 00774 80A97524 8DCE7120 */ lw $t6, %lo(gBitFlags)($t6) -/* 00778 80A97528 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 0077C 80A9752C 01CFC024 */ and $t8, $t6, $t7 -/* 00780 80A97530 53000004 */ beql $t8, $zero, .L80A97544 -/* 00784 80A97534 94590F02 */ lhu $t9, 0x0F02($v0) ## 8015F562 -/* 00788 80A97538 03E00008 */ jr $ra -/* 0078C 80A9753C 2402107A */ addiu $v0, $zero, 0x107A ## $v0 = 0000107A -.L80A97540: -/* 00790 80A97540 94590F02 */ lhu $t9, 0x0F02($v0) ## 00001F7C -.L80A97544: -/* 00794 80A97544 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 -/* 00798 80A97548 11000003 */ beq $t0, $zero, .L80A97558 -/* 0079C 80A9754C 00000000 */ nop -/* 007A0 80A97550 03E00008 */ jr $ra -/* 007A4 80A97554 24021050 */ addiu $v0, $zero, 0x1050 ## $v0 = 00001050 -.L80A97558: -/* 007A8 80A97558 03E00008 */ jr $ra -/* 007AC 80A9755C 2402104F */ addiu $v0, $zero, 0x104F ## $v0 = 0000104F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s deleted file mode 100644 index 5f9bf0600..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A97560 -/* 007B0 80A97560 3C028016 */ lui $v0, %hi(gSaveContext) -/* 007B4 80A97564 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 007B8 80A97568 3C098012 */ lui $t1, %hi(gBitFlags) -/* 007BC 80A9756C 8D297120 */ lw $t1, %lo(gBitFlags)($t1) -/* 007C0 80A97570 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 8015E704 -/* 007C4 80A97574 012A5824 */ and $t3, $t1, $t2 -/* 007C8 80A97578 11600003 */ beq $t3, $zero, .L80A97588 -/* 007CC 80A9757C 00000000 */ nop -/* 007D0 80A97580 03E00008 */ jr $ra -/* 007D4 80A97584 2402107B */ addiu $v0, $zero, 0x107B ## $v0 = 0000107B -.L80A97588: -/* 007D8 80A97588 03E00008 */ jr $ra -/* 007DC 80A9758C 24021051 */ addiu $v0, $zero, 0x1051 ## $v0 = 00001051 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s deleted file mode 100644 index 4633feaa3..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A97590 -/* 007E0 80A97590 3C028016 */ lui $v0, %hi(gSaveContext) -/* 007E4 80A97594 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 007E8 80A97598 3C0C8012 */ lui $t4, %hi(gBitFlags) -/* 007EC 80A9759C 8D8C7120 */ lw $t4, %lo(gBitFlags)($t4) -/* 007F0 80A975A0 8C4D00A4 */ lw $t5, 0x00A4($v0) ## 8015E704 -/* 007F4 80A975A4 018D7024 */ and $t6, $t4, $t5 -/* 007F8 80A975A8 11C00003 */ beq $t6, $zero, .L80A975B8 -/* 007FC 80A975AC 00000000 */ nop -/* 00800 80A975B0 03E00008 */ jr $ra -/* 00804 80A975B4 2402107C */ addiu $v0, $zero, 0x107C ## $v0 = 0000107C -.L80A975B8: -/* 00808 80A975B8 03E00008 */ jr $ra -/* 0080C 80A975BC 24021052 */ addiu $v0, $zero, 0x1052 ## $v0 = 00001052 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s deleted file mode 100644 index 56d4153fc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A975C0 -/* 00810 80A975C0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00814 80A975C4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00818 80A975C8 3C0F8012 */ lui $t7, %hi(gBitFlags) -/* 0081C 80A975CC 8DEF7120 */ lw $t7, %lo(gBitFlags)($t7) -/* 00820 80A975D0 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 00824 80A975D4 01F8C824 */ and $t9, $t7, $t8 -/* 00828 80A975D8 53200004 */ beql $t9, $zero, .L80A975EC -/* 0082C 80A975DC 94480F04 */ lhu $t0, 0x0F04($v0) ## 8015F564 -/* 00830 80A975E0 03E00008 */ jr $ra -/* 00834 80A975E4 2402107C */ addiu $v0, $zero, 0x107C ## $v0 = 0000107C -.L80A975E8: -/* 00838 80A975E8 94480F04 */ lhu $t0, 0x0F04($v0) ## 00001F80 -.L80A975EC: -/* 0083C 80A975EC 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 00840 80A975F0 11200003 */ beq $t1, $zero, .L80A97600 -/* 00844 80A975F4 00000000 */ nop -/* 00848 80A975F8 03E00008 */ jr $ra -/* 0084C 80A975FC 24021054 */ addiu $v0, $zero, 0x1054 ## $v0 = 00001054 -.L80A97600: -/* 00850 80A97600 03E00008 */ jr $ra -/* 00854 80A97604 24021053 */ addiu $v0, $zero, 0x1053 ## $v0 = 00001053 -.L80A97608: -/* 00858 80A97608 03E00008 */ jr $ra -/* 0085C 80A9760C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s index e89b771c4..bf16b9d26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s @@ -20,9 +20,9 @@ glabel func_80A98934 /* 01BC4 80A98974 2DC10008 */ sltiu $at, $t6, 0x0008 /* 01BC8 80A98978 102000A4 */ beq $at, $zero, .L80A98C0C /* 01BCC 80A9897C 000E7080 */ sll $t6, $t6, 2 -/* 01BD0 80A98980 3C0180AA */ lui $at, %hi(D_80A9A98C) ## $at = 80AA0000 +/* 01BD0 80A98980 3C0180AA */ lui $at, %hi(jtbl_80A9A98C) ## $at = 80AA0000 /* 01BD4 80A98984 002E0821 */ addu $at, $at, $t6 -/* 01BD8 80A98988 8C2EA98C */ lw $t6, %lo(D_80A9A98C)($at) +/* 01BD8 80A98988 8C2EA98C */ lw $t6, %lo(jtbl_80A9A98C)($at) /* 01BDC 80A9898C 01C00008 */ jr $t6 /* 01BE0 80A98990 00000000 */ nop /* 01BE4 80A98994 8482001C */ lh $v0, 0x001C($a0) ## 0000001C @@ -52,3 +52,163 @@ glabel func_80A98934 .L80A989EC: /* 01C3C 80A989EC 03E00008 */ jr $ra /* 01C40 80A989F0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +glabel L80A989F4 +/* 01C44 80A989F4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C +/* 01C48 80A989F8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 +/* 01C4C 80A989FC 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 +/* 01C50 80A98A00 10410007 */ beq $v0, $at, .L80A98A20 +/* 01C54 80A98A04 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 +/* 01C58 80A98A08 10410005 */ beq $v0, $at, .L80A98A20 +/* 01C5C 80A98A0C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B +/* 01C60 80A98A10 10410003 */ beq $v0, $at, .L80A98A20 +/* 01C64 80A98A14 00000000 */ nop +/* 01C68 80A98A18 03E00008 */ jr $ra +/* 01C6C 80A98A1C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98A20: +/* 01C70 80A98A20 03E00008 */ jr $ra +/* 01C74 80A98A24 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +glabel L80A98A28 +/* 01C78 80A98A28 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01C7C 80A98A2C 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 01C80 80A98A30 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 +/* 01C84 80A98A34 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 01C88 80A98A38 55200012 */ bnel $t1, $zero, .L80A98A84 +/* 01C8C 80A98A3C 848D001C */ lh $t5, 0x001C($a0) ## 0000001C +/* 01C90 80A98A40 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) +/* 01C94 80A98A44 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 +/* 01C98 80A98A48 014B6024 */ and $t4, $t2, $t3 +/* 01C9C 80A98A4C 5580000D */ bnel $t4, $zero, .L80A98A84 +/* 01CA0 80A98A50 848D001C */ lh $t5, 0x001C($a0) ## 0000001C +/* 01CA4 80A98A54 8482001C */ lh $v0, 0x001C($a0) ## 0000001C +/* 01CA8 80A98A58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 +/* 01CAC 80A98A5C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 +/* 01CB0 80A98A60 10410005 */ beq $v0, $at, .L80A98A78 +/* 01CB4 80A98A64 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 +/* 01CB8 80A98A68 10410003 */ beq $v0, $at, .L80A98A78 +/* 01CBC 80A98A6C 00000000 */ nop +/* 01CC0 80A98A70 03E00008 */ jr $ra +/* 01CC4 80A98A74 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98A78: +/* 01CC8 80A98A78 03E00008 */ jr $ra +/* 01CCC 80A98A7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98A80: +/* 01CD0 80A98A80 848D001C */ lh $t5, 0x001C($a0) ## 0000001C +.L80A98A84: +/* 01CD4 80A98A84 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 +/* 01CD8 80A98A88 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 +/* 01CDC 80A98A8C 11C10003 */ beq $t6, $at, .L80A98A9C +/* 01CE0 80A98A90 00000000 */ nop +/* 01CE4 80A98A94 03E00008 */ jr $ra +/* 01CE8 80A98A98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98A9C: +/* 01CEC 80A98A9C 03E00008 */ jr $ra +/* 01CF0 80A98AA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +glabel L80A98AA4 +/* 01CF4 80A98AA4 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01CF8 80A98AA8 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 01CFC 80A98AAC 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 +/* 01D00 80A98AB0 3C188012 */ lui $t8, %hi(gBitFlags) +/* 01D04 80A98AB4 15E00011 */ bne $t7, $zero, .L80A98AFC +/* 01D08 80A98AB8 00000000 */ nop +/* 01D0C 80A98ABC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) +/* 01D10 80A98AC0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 +/* 01D14 80A98AC4 03194024 */ and $t0, $t8, $t9 +/* 01D18 80A98AC8 1500000C */ bne $t0, $zero, .L80A98AFC +/* 01D1C 80A98ACC 00000000 */ nop +/* 01D20 80A98AD0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C +/* 01D24 80A98AD4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 +/* 01D28 80A98AD8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 +/* 01D2C 80A98ADC 10400005 */ beq $v0, $zero, .L80A98AF4 +/* 01D30 80A98AE0 00000000 */ nop +/* 01D34 80A98AE4 10410003 */ beq $v0, $at, .L80A98AF4 +/* 01D38 80A98AE8 00000000 */ nop +/* 01D3C 80A98AEC 03E00008 */ jr $ra +/* 01D40 80A98AF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98AF4: +/* 01D44 80A98AF4 03E00008 */ jr $ra +/* 01D48 80A98AF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98AFC: +/* 01D4C 80A98AFC 03E00008 */ jr $ra +/* 01D50 80A98B00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +glabel L80A98B04 +/* 01D54 80A98B04 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01D58 80A98B08 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 01D5C 80A98B0C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 +/* 01D60 80A98B10 3C0A8012 */ lui $t2, %hi(gBitFlags) +/* 01D64 80A98B14 1520000F */ bne $t1, $zero, .L80A98B54 +/* 01D68 80A98B18 00000000 */ nop +/* 01D6C 80A98B1C 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) +/* 01D70 80A98B20 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 +/* 01D74 80A98B24 014B6024 */ and $t4, $t2, $t3 +/* 01D78 80A98B28 1580000A */ bne $t4, $zero, .L80A98B54 +/* 01D7C 80A98B2C 00000000 */ nop +/* 01D80 80A98B30 848D001C */ lh $t5, 0x001C($a0) ## 0000001C +/* 01D84 80A98B34 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 +/* 01D88 80A98B38 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 +/* 01D8C 80A98B3C 11C10003 */ beq $t6, $at, .L80A98B4C +/* 01D90 80A98B40 00000000 */ nop +/* 01D94 80A98B44 03E00008 */ jr $ra +/* 01D98 80A98B48 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98B4C: +/* 01D9C 80A98B4C 03E00008 */ jr $ra +/* 01DA0 80A98B50 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98B54: +/* 01DA4 80A98B54 03E00008 */ jr $ra +/* 01DA8 80A98B58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +glabel L80A98B5C +/* 01DAC 80A98B5C 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01DB0 80A98B60 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 01DB4 80A98B64 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 +/* 01DB8 80A98B68 3C188012 */ lui $t8, %hi(gBitFlags) +/* 01DBC 80A98B6C 55E00012 */ bnel $t7, $zero, .L80A98BB8 +/* 01DC0 80A98B70 8489001C */ lh $t1, 0x001C($a0) ## 0000001C +/* 01DC4 80A98B74 8F187120 */ lw $t8, %lo(gBitFlags)($t8) +/* 01DC8 80A98B78 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 +/* 01DCC 80A98B7C 03194024 */ and $t0, $t8, $t9 +/* 01DD0 80A98B80 5500000D */ bnel $t0, $zero, .L80A98BB8 +/* 01DD4 80A98B84 8489001C */ lh $t1, 0x001C($a0) ## 0000001C +/* 01DD8 80A98B88 8482001C */ lh $v0, 0x001C($a0) ## 0000001C +/* 01DDC 80A98B8C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 +/* 01DE0 80A98B90 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 +/* 01DE4 80A98B94 10410005 */ beq $v0, $at, .L80A98BAC +/* 01DE8 80A98B98 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A +/* 01DEC 80A98B9C 10410003 */ beq $v0, $at, .L80A98BAC +/* 01DF0 80A98BA0 00000000 */ nop +/* 01DF4 80A98BA4 03E00008 */ jr $ra +/* 01DF8 80A98BA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98BAC: +/* 01DFC 80A98BAC 03E00008 */ jr $ra +/* 01E00 80A98BB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98BB4: +/* 01E04 80A98BB4 8489001C */ lh $t1, 0x001C($a0) ## 0000001C +.L80A98BB8: +/* 01E08 80A98BB8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A +/* 01E0C 80A98BBC 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 +/* 01E10 80A98BC0 11410003 */ beq $t2, $at, .L80A98BD0 +/* 01E14 80A98BC4 00000000 */ nop +/* 01E18 80A98BC8 03E00008 */ jr $ra +/* 01E1C 80A98BCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98BD0: +/* 01E20 80A98BD0 03E00008 */ jr $ra +/* 01E24 80A98BD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98BD8: +/* 01E28 80A98BD8 916B7491 */ lbu $t3, %lo(gItemSlots+0x2d)($t3) +/* 01E2C 80A98BDC 3C028016 */ lui $v0, %hi(gSaveContext) +/* 01E30 80A98BE0 2442E660 */ addiu $v0, %lo(gSaveContext) +/* 01E34 80A98BE4 004B6021 */ addu $t4, $v0, $t3 +/* 01E38 80A98BE8 918D0074 */ lbu $t5, 0x0074($t4) ## 00000074 +/* 01E3C 80A98BEC 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 +/* 01E40 80A98BF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 +/* 01E44 80A98BF4 15A10003 */ bne $t5, $at, .L80A98C04 +/* 01E48 80A98BF8 00000000 */ nop +/* 01E4C 80A98BFC 03E00008 */ jr $ra +/* 01E50 80A98C00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 +.L80A98C04: +/* 01E54 80A98C04 03E00008 */ jr $ra +/* 01E58 80A98C08 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 +glabel L80A98C0C +.L80A98C0C: +/* 01E5C 80A98C0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 +.L80A98C10: +/* 01E60 80A98C10 03E00008 */ jr $ra +/* 01E64 80A98C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s deleted file mode 100644 index 4f60826e2..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A989F4 -/* 01C44 80A989F4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01C48 80A989F8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01C4C 80A989FC 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 01C50 80A98A00 10410007 */ beq $v0, $at, .L80A98A20 -/* 01C54 80A98A04 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01C58 80A98A08 10410005 */ beq $v0, $at, .L80A98A20 -/* 01C5C 80A98A0C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01C60 80A98A10 10410003 */ beq $v0, $at, .L80A98A20 -/* 01C64 80A98A14 00000000 */ nop -/* 01C68 80A98A18 03E00008 */ jr $ra -/* 01C6C 80A98A1C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98A20: -/* 01C70 80A98A20 03E00008 */ jr $ra -/* 01C74 80A98A24 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s deleted file mode 100644 index 620136e65..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A98A28 -/* 01C78 80A98A28 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01C7C 80A98A2C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01C80 80A98A30 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 01C84 80A98A34 3C0A8012 */ lui $t2, %hi(gBitFlags) -/* 01C88 80A98A38 55200012 */ bnel $t1, $zero, .L80A98A84 -/* 01C8C 80A98A3C 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -/* 01C90 80A98A40 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) -/* 01C94 80A98A44 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 -/* 01C98 80A98A48 014B6024 */ and $t4, $t2, $t3 -/* 01C9C 80A98A4C 5580000D */ bnel $t4, $zero, .L80A98A84 -/* 01CA0 80A98A50 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -/* 01CA4 80A98A54 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01CA8 80A98A58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01CAC 80A98A5C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 -/* 01CB0 80A98A60 10410005 */ beq $v0, $at, .L80A98A78 -/* 01CB4 80A98A64 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01CB8 80A98A68 10410003 */ beq $v0, $at, .L80A98A78 -/* 01CBC 80A98A6C 00000000 */ nop -/* 01CC0 80A98A70 03E00008 */ jr $ra -/* 01CC4 80A98A74 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98A78: -/* 01CC8 80A98A78 03E00008 */ jr $ra -/* 01CCC 80A98A7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98A80: -/* 01CD0 80A98A80 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -.L80A98A84: -/* 01CD4 80A98A84 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01CD8 80A98A88 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 01CDC 80A98A8C 11C10003 */ beq $t6, $at, .L80A98A9C -/* 01CE0 80A98A90 00000000 */ nop -/* 01CE4 80A98A94 03E00008 */ jr $ra -/* 01CE8 80A98A98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98A9C: -/* 01CEC 80A98A9C 03E00008 */ jr $ra -/* 01CF0 80A98AA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s deleted file mode 100644 index d8804a4bc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A98AA4 -/* 01CF4 80A98AA4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01CF8 80A98AA8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01CFC 80A98AAC 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 01D00 80A98AB0 3C188012 */ lui $t8, %hi(gBitFlags) -/* 01D04 80A98AB4 15E00011 */ bne $t7, $zero, .L80A98AFC -/* 01D08 80A98AB8 00000000 */ nop -/* 01D0C 80A98ABC 8F187120 */ lw $t8, %lo(gBitFlags)($t8) -/* 01D10 80A98AC0 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 -/* 01D14 80A98AC4 03194024 */ and $t0, $t8, $t9 -/* 01D18 80A98AC8 1500000C */ bne $t0, $zero, .L80A98AFC -/* 01D1C 80A98ACC 00000000 */ nop -/* 01D20 80A98AD0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01D24 80A98AD4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01D28 80A98AD8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 -/* 01D2C 80A98ADC 10400005 */ beq $v0, $zero, .L80A98AF4 -/* 01D30 80A98AE0 00000000 */ nop -/* 01D34 80A98AE4 10410003 */ beq $v0, $at, .L80A98AF4 -/* 01D38 80A98AE8 00000000 */ nop -/* 01D3C 80A98AEC 03E00008 */ jr $ra -/* 01D40 80A98AF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98AF4: -/* 01D44 80A98AF4 03E00008 */ jr $ra -/* 01D48 80A98AF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98AFC: -/* 01D4C 80A98AFC 03E00008 */ jr $ra -/* 01D50 80A98B00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s deleted file mode 100644 index 5a56a089c..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A98B04 -/* 01D54 80A98B04 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01D58 80A98B08 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01D5C 80A98B0C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 01D60 80A98B10 3C0A8012 */ lui $t2, %hi(gBitFlags) -/* 01D64 80A98B14 1520000F */ bne $t1, $zero, .L80A98B54 -/* 01D68 80A98B18 00000000 */ nop -/* 01D6C 80A98B1C 8D4A7120 */ lw $t2, %lo(gBitFlags)($t2) -/* 01D70 80A98B20 8C4B00A4 */ lw $t3, 0x00A4($v0) ## 8015E704 -/* 01D74 80A98B24 014B6024 */ and $t4, $t2, $t3 -/* 01D78 80A98B28 1580000A */ bne $t4, $zero, .L80A98B54 -/* 01D7C 80A98B2C 00000000 */ nop -/* 01D80 80A98B30 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -/* 01D84 80A98B34 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01D88 80A98B38 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 01D8C 80A98B3C 11C10003 */ beq $t6, $at, .L80A98B4C -/* 01D90 80A98B40 00000000 */ nop -/* 01D94 80A98B44 03E00008 */ jr $ra -/* 01D98 80A98B48 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98B4C: -/* 01D9C 80A98B4C 03E00008 */ jr $ra -/* 01DA0 80A98B50 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98B54: -/* 01DA4 80A98B54 03E00008 */ jr $ra -/* 01DA8 80A98B58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s deleted file mode 100644 index bfa33f7cb..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80A98B5C -/* 01DAC 80A98B5C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01DB0 80A98B60 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01DB4 80A98B64 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 01DB8 80A98B68 3C188012 */ lui $t8, %hi(gBitFlags) -/* 01DBC 80A98B6C 55E00012 */ bnel $t7, $zero, .L80A98BB8 -/* 01DC0 80A98B70 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 01DC4 80A98B74 8F187120 */ lw $t8, %lo(gBitFlags)($t8) -/* 01DC8 80A98B78 8C5900A4 */ lw $t9, 0x00A4($v0) ## 8015E704 -/* 01DCC 80A98B7C 03194024 */ and $t0, $t8, $t9 -/* 01DD0 80A98B80 5500000D */ bnel $t0, $zero, .L80A98BB8 -/* 01DD4 80A98B84 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 01DD8 80A98B88 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01DDC 80A98B8C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01DE0 80A98B90 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000060 -/* 01DE4 80A98B94 10410005 */ beq $v0, $at, .L80A98BAC -/* 01DE8 80A98B98 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01DEC 80A98B9C 10410003 */ beq $v0, $at, .L80A98BAC -/* 01DF0 80A98BA0 00000000 */ nop -/* 01DF4 80A98BA4 03E00008 */ jr $ra -/* 01DF8 80A98BA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98BAC: -/* 01DFC 80A98BAC 03E00008 */ jr $ra -/* 01E00 80A98BB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98BB4: -/* 01E04 80A98BB4 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -.L80A98BB8: -/* 01E08 80A98BB8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01E0C 80A98BBC 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 -/* 01E10 80A98BC0 11410003 */ beq $t2, $at, .L80A98BD0 -/* 01E14 80A98BC4 00000000 */ nop -/* 01E18 80A98BC8 03E00008 */ jr $ra -/* 01E1C 80A98BCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98BD0: -/* 01E20 80A98BD0 03E00008 */ jr $ra -/* 01E24 80A98BD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98BD8: -/* 01E28 80A98BD8 916B7491 */ lbu $t3, %lo(gItemSlots+0x2d)($t3) -/* 01E2C 80A98BDC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01E30 80A98BE0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01E34 80A98BE4 004B6021 */ addu $t4, $v0, $t3 -/* 01E38 80A98BE8 918D0074 */ lbu $t5, 0x0074($t4) ## 00000074 -/* 01E3C 80A98BEC 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 -/* 01E40 80A98BF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 01E44 80A98BF4 15A10003 */ bne $t5, $at, .L80A98C04 -/* 01E48 80A98BF8 00000000 */ nop -/* 01E4C 80A98BFC 03E00008 */ jr $ra -/* 01E50 80A98C00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A98C04: -/* 01E54 80A98C04 03E00008 */ jr $ra -/* 01E58 80A98C08 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -glabel L80A98C0C -.L80A98C0C: -/* 01E5C 80A98C0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A98C10: -/* 01E60 80A98C10 03E00008 */ jr $ra -/* 01E64 80A98C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s index 650dd0231..6706a6fcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s @@ -15,3 +15,15 @@ glabel L80B9B658 /* 004DC 80B9B65C 27183350 */ addiu $t8, $t8, 0x3350 ## $t8 = 05003350 /* 004E0 80B9B660 03E00008 */ jr $ra /* 004E4 80B9B664 AC9801CC */ sw $t8, 0x01CC($a0) ## 000001CC +glabel L80B9B668 +/* 004E8 80B9B668 3C190500 */ lui $t9, 0x0500 ## $t9 = 05000000 +/* 004EC 80B9B66C 27393B50 */ addiu $t9, $t9, 0x3B50 ## $t9 = 05003B50 +/* 004F0 80B9B670 03E00008 */ jr $ra +/* 004F4 80B9B674 AC9901CC */ sw $t9, 0x01CC($a0) ## 000001CC +glabel L80B9B678 +/* 004F8 80B9B678 3C080500 */ lui $t0, 0x0500 ## $t0 = 05000000 +/* 004FC 80B9B67C 25084350 */ addiu $t0, $t0, 0x4350 ## $t0 = 05004350 +/* 00500 80B9B680 AC8801CC */ sw $t0, 0x01CC($a0) ## 000001CC +.L80B9B684: +/* 00504 80B9B684 03E00008 */ jr $ra +/* 00508 80B9B688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s deleted file mode 100644 index f824ea158..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B9B668 -/* 004E8 80B9B668 3C190500 */ lui $t9, 0x0500 ## $t9 = 05000000 -/* 004EC 80B9B66C 27393B50 */ addiu $t9, $t9, 0x3B50 ## $t9 = 05003B50 -/* 004F0 80B9B670 03E00008 */ jr $ra -/* 004F4 80B9B674 AC9901CC */ sw $t9, 0x01CC($a0) ## 000001CC diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s deleted file mode 100644 index e6b7f400a..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B9B678 -/* 004F8 80B9B678 3C080500 */ lui $t0, 0x0500 ## $t0 = 05000000 -/* 004FC 80B9B67C 25084350 */ addiu $t0, $t0, 0x4350 ## $t0 = 05004350 -/* 00500 80B9B680 AC8801CC */ sw $t0, 0x01CC($a0) ## 000001CC -.L80B9B684: -/* 00504 80B9B684 03E00008 */ jr $ra -/* 00508 80B9B688 00000000 */ nop diff --git a/data/overlays/actors/z_boss_ganon.rodata.s b/data/overlays/actors/z_boss_ganon.rodata.s index 4fe6e5c94..2a20fda61 100644 --- a/data/overlays/actors/z_boss_ganon.rodata.s +++ b/data/overlays/actors/z_boss_ganon.rodata.s @@ -465,12 +465,12 @@ glabel jtbl_808F80EC .word L808DE980 .word L808DE980 .word L808DE980 -.word func_808DE784 -.word func_808DE7E0 -.word func_808DE828 -.word func_808DE884 -.word func_808DE8E0 -.word func_808DE928 +.word L808DE784 +.word L808DE7E0 +.word L808DE828 +.word L808DE884 +.word L808DE8E0 +.word L808DE928 glabel D_808F812C .word 0x46EC7A00 glabel D_808F8130 diff --git a/data/overlays/actors/z_boss_ganondrof.rodata.s b/data/overlays/actors/z_boss_ganondrof.rodata.s index 106b7422b..d5a4eb942 100644 --- a/data/overlays/actors/z_boss_ganondrof.rodata.s +++ b/data/overlays/actors/z_boss_ganondrof.rodata.s @@ -248,28 +248,28 @@ glabel D_809154C0 .float 0.001 .balign 4 -glabel D_809154C4 - .word func_809145BC -.word func_809145BC -.word func_809145BC -.word func_80914610 -.word func_80914610 -.word func_80914610 +glabel jtbl_80A3F02C + .word L809145BC +.word L809145BC +.word L809145BC +.word L80914610 +.word L80914610 +.word L80914610 .word L80914678 .word L80914678 -.word func_80914664 +.word L80914664 .word L80914678 .word L8091430C .word L80914678 .word L80914678 .word L80914678 -.word func_80914394 -.word func_809143F0 -.word func_8091444C +.word L80914394 +.word L809143F0 +.word L8091444C .word L80914678 -.word func_809144A8 -.word func_80914504 -.word func_80914560 +.word L809144A8 +.word L80914504 +.word L80914560 glabel D_80915518 .word 0x40490FF9, 0x00000000 diff --git a/data/overlays/actors/z_en_elf.rodata.s b/data/overlays/actors/z_en_elf.rodata.s index 250361b84..866ff128e 100644 --- a/data/overlays/actors/z_en_elf.rodata.s +++ b/data/overlays/actors/z_en_elf.rodata.s @@ -8,14 +8,16 @@ .section .rodata glabel D_80A060B0 - .float 4.656612873077393e-10 + .asciz "0" + .balign 4 glabel D_80A060B4 .asciz "../z_en_elf.c" .balign 4 glabel D_80A060C4 - .float 4.656612873077393e-10 + .asciz "0" + .balign 4 glabel D_80A060C8 .asciz "../z_en_elf.c" @@ -39,18 +41,18 @@ glabel D_80A06134 glabel jtbl_80A06144 .word L80A01C60 -.word func_80A01DE0 -.word func_80A01E24 -.word func_80A01E68 -.word func_80A01E94 -.word func_80A01ED0 -.word func_80A01F04 -.word func_80A01D70 -.word func_80A01DA8 -.word func_80A01D2C -.word func_80A01CF0 -.word func_80A01F48 -.word func_80A01CAC +.word L80A01DE0 +.word L80A01E24 +.word L80A01E68 +.word L80A01E94 +.word L80A01ED0 +.word L80A01F04 +.word L80A01D70 +.word L80A01DA8 +.word L80A01D2C +.word L80A01CF0 +.word L80A01F48 +.word L80A01CAC glabel D_80A06178 .float 32767.0 diff --git a/data/overlays/actors/z_en_go.rodata.s b/data/overlays/actors/z_en_go.rodata.s index 026eeabab..9f197e0ce 100644 --- a/data/overlays/actors/z_en_go.rodata.s +++ b/data/overlays/actors/z_en_go.rodata.s @@ -236,8 +236,8 @@ glabel jtbl_80A41F40 .word L80A3EA1C .word L80A3EAD8 .word L80A3EA38 -glabel D_80A41F84 - .word func_80A3F02C +glabel jtbl_80A41F84 + .word L80A3F02C .word L80A3F04C .word L80A3F04C .word L80A3F04C @@ -253,7 +253,7 @@ glabel D_80A41F84 .word L80A3F04C .word L80A3F04C .word L80A3F04C -.word func_80A3F02C +.word L80A3F02C .word L80A3F04C .word L80A3F04C .word L80A3F04C @@ -269,7 +269,7 @@ glabel D_80A41F84 .word L80A3F04C .word L80A3F04C .word L80A3F04C -.word func_80A3F03C +.word L80A3F03C .word L80A3F04C .word L80A3F04C .word L80A3F04C @@ -285,7 +285,7 @@ glabel D_80A41F84 .word L80A3F04C .word L80A3F04C .word L80A3F04C -.word func_80A3F02C +.word L80A3F02C .word L80A3F04C .word L80A3F04C .word L80A3F04C @@ -301,7 +301,7 @@ glabel D_80A41F84 .word L80A3F04C .word L80A3F04C .word L80A3F04C -.word func_80A3F02C +.word L80A3F02C .word L80A3F04C .word L80A3F04C .word L80A3F04C @@ -317,7 +317,7 @@ glabel D_80A41F84 .word L80A3F04C .word L80A3F04C .word L80A3F04C -.word func_80A3F02C +.word L80A3F02C glabel D_80A420C8 .word 0x462AA000 glabel D_80A420CC diff --git a/data/overlays/actors/z_en_ko.rodata.s b/data/overlays/actors/z_en_ko.rodata.s index d1cf7d13d..b683cd5f2 100644 --- a/data/overlays/actors/z_en_ko.rodata.s +++ b/data/overlays/actors/z_en_ko.rodata.s @@ -19,33 +19,33 @@ glabel D_80A9A7AC .asciz "../z_en_ko.c" .balign 4 -glabel D_80A9A7BC - .word func_80A97068 -.word func_80A970B0 -.word func_80A97110 -.word func_80A97138 -.word func_80A97198 -.word func_80A971F8 -.word func_80A97258 +glabel jtbl_80A9A7BC + .word L80A97068 +.word L80A970B0 +.word L80A97110 +.word L80A97138 +.word L80A97198 +.word L80A971F8 +.word L80A97258 .word L80A972B8 .word L80A972C0 -.word func_80A972C8 -.word func_80A972F8 +.word L80A972C8 +.word L80A972F8 .word L80A97328 .word L80A97000 -glabel D_80A9A7F0 - .word func_80A97378 -.word func_80A973C0 -.word func_80A973F0 -.word func_80A97438 -.word func_80A97468 +glabel jtbl_80A9A7F0 + .word L80A97378 +.word L80A973C0 +.word L80A973F0 +.word L80A97438 +.word L80A97468 .word L80A97498 -.word func_80A974A0 -.word func_80A974E8 -.word func_80A97518 -.word func_80A97560 -.word func_80A97590 -.word func_80A975C0 +.word L80A974A0 +.word L80A974E8 +.word L80A97518 +.word L80A97560 +.word L80A97590 +.word L80A975C0 .word L80A97368 glabel jtbl_80A9A824 .word L80A97890 @@ -144,15 +144,15 @@ glabel jtbl_80A9A958 .word L80A98744 .word L80A98754 .word L80A98764 -glabel D_80A9A98C - .word func_80A989F4 -.word func_80A98A28 -.word func_80A98AA4 -.word func_80A98B04 +glabel jtbl_80A9A98C + .word L80A989F4 +.word L80A98A28 +.word L80A98AA4 +.word L80A98B04 .word L80A98C0C .word L80A98C0C .word L80A98C0C -.word func_80A98B5C +.word L80A98B5C glabel jtbl_80A9A9AC .word L80A98F3C .word L80A98F4C diff --git a/data/overlays/actors/z_obj_oshihiki.rodata.s b/data/overlays/actors/z_obj_oshihiki.rodata.s index fb42ea143..a34ced259 100644 --- a/data/overlays/actors/z_obj_oshihiki.rodata.s +++ b/data/overlays/actors/z_obj_oshihiki.rodata.s @@ -82,12 +82,12 @@ glabel jtbl_80B9CCBC glabel jtbl_80B9CCDC .word L80B9B658 .word L80B9B658 -.word func_80B9B668 -.word func_80B9B678 +.word L80B9B668 +.word L80B9B678 .word L80B9B658 .word L80B9B658 -.word func_80B9B668 -.word func_80B9B678 +.word L80B9B668 +.word L80B9B678 glabel D_80B9CCFC .word 0xBA83126F glabel D_80B9CD00 diff --git a/data/z_message_PAL.rodata.s b/data/z_message_PAL.rodata.s index a6f1ac7a9..306775e35 100644 --- a/data/z_message_PAL.rodata.s +++ b/data/z_message_PAL.rodata.s @@ -669,12 +669,12 @@ glabel D_80154B00 glabel jtbl_80154B28 .word L80107934 .word L801076F4 - .word func_8010773C - .word func_801077B4 - .word func_80107804 - .word func_8010787C - .word func_801078CC - .word func_80107918 + .word L8010773C + .word L801077B4 + .word L80107804 + .word L8010787C + .word L801078CC + .word L80107918 glabel jtbl_80154B48 .word L801087EC diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 970f8bc24..a8efa8c3c 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -23,18 +23,6 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801076CC.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_8010773C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801077B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80107804.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_8010787C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801078CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80107918.s") - #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80107980.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801080B4.s") diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index fb4378a2e..884d69042 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -104,18 +104,6 @@ const ActorInit Boss_Ganon_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE734.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE784.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE7E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE828.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE884.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE8E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE928.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DED30.s") diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 2a7820b09..2a0755882 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -82,22 +82,6 @@ const ActorInit Boss_Ganondrof_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914394.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809143F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091444C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809144A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914504.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914560.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809145BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914610.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s") diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index f82fe42c1..17299f29c 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -26,30 +26,6 @@ const ActorInit En_Elf_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01CF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01D70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01DE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01E94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01ED0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F48.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s") diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 5a52fc74f..dd9aa5432 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -36,10 +36,6 @@ const ActorInit En_Go_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F02C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F03C.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s") diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 5e8e88b9a..685040ab6 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -32,48 +32,8 @@ const ActorInit En_Ko_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A96FD0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97068.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A970B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97110.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97138.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97198.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A971F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97258.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A972F8.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97338.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97378.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A973F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97438.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97468.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A974E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97518.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97560.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A975C0.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97738.s") @@ -116,16 +76,6 @@ const ActorInit En_Ko_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98934.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A989F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98A28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98AA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98B5C.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98C18.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A98CD8.s") diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index b5e54e5fd..b2e53ef81 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -48,10 +48,6 @@ const ActorInit Obj_Oshihiki_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B62C.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B678.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B68C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Init.s") |