diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s deleted file mode 100644 index 112a1f1d96..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnTana_Destroy -/* 0007C 80B17FAC AFA40000 */ sw $a0, 0x0000($sp) -/* 00080 80B17FB0 03E00008 */ jr $ra -/* 00084 80B17FB4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s deleted file mode 100644 index 56ed26e0d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EnTana_Init -/* 00000 80B17F30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B17F34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B17F38 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80B17F3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00010 80B17F40 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 00014 80B17F44 3C0580B2 */ lui $a1, %hi(D_80B18200) ## $a1 = 80B20000 -/* 00018 80B17F48 3C0480B2 */ lui $a0, %hi(D_80B18240) ## $a0 = 80B20000 -/* 0001C 80B17F4C 000E7880 */ sll $t7, $t6, 2 -/* 00020 80B17F50 00AF2821 */ addu $a1, $a1, $t7 -/* 00024 80B17F54 8CA58200 */ lw $a1, %lo(D_80B18200)($a1) -/* 00028 80B17F58 24848240 */ addiu $a0, $a0, %lo(D_80B18240) ## $a0 = 80B18240 -/* 0002C 80B17F5C 0C00084C */ jal osSyncPrintf - -/* 00030 80B17F60 AFA60018 */ sw $a2, 0x0018($sp) -/* 00034 80B17F64 8FA40018 */ lw $a0, 0x0018($sp) -/* 00038 80B17F68 0C00B58B */ jal Actor_SetScale - -/* 0003C 80B17F6C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00040 80B17F70 8FA60018 */ lw $a2, 0x0018($sp) -/* 00044 80B17F74 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00048 80B17F78 3C0A80B2 */ lui $t2, %hi(D_80B18208) ## $t2 = 80B20000 -/* 0004C 80B17F7C 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 00050 80B17F80 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 00054 80B17F84 0301C824 */ and $t9, $t8, $at -/* 00058 80B17F88 00084880 */ sll $t1, $t0, 2 -/* 0005C 80B17F8C 01495021 */ addu $t2, $t2, $t1 -/* 00060 80B17F90 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 00064 80B17F94 8D4A8208 */ lw $t2, %lo(D_80B18208)($t2) -/* 00068 80B17F98 ACCA0134 */ sw $t2, 0x0134($a2) ## 00000134 -/* 0006C 80B17F9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00070 80B17FA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00074 80B17FA4 03E00008 */ jr $ra -/* 00078 80B17FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s deleted file mode 100644 index 45021ba456..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnTana_Update -/* 00088 80B17FB8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0008C 80B17FBC 03E00008 */ jr $ra -/* 00090 80B17FC0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s deleted file mode 100644 index 5eb0dd9285..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B17FC4 -/* 00094 80B17FC4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00098 80B17FC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0009C 80B17FCC AFB00018 */ sw $s0, 0x0018($sp) -/* 000A0 80B17FD0 AFA40048 */ sw $a0, 0x0048($sp) -/* 000A4 80B17FD4 AFA5004C */ sw $a1, 0x004C($sp) -/* 000A8 80B17FD8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 000AC 80B17FDC 3C0680B2 */ lui $a2, %hi(D_80B18254) ## $a2 = 80B20000 -/* 000B0 80B17FE0 24C68254 */ addiu $a2, $a2, %lo(D_80B18254) ## $a2 = 80B18254 -/* 000B4 80B17FE4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 000B8 80B17FE8 24070094 */ addiu $a3, $zero, 0x0094 ## $a3 = 00000094 -/* 000BC 80B17FEC 0C031AB1 */ jal func_800C6AC4 -/* 000C0 80B17FF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 000C4 80B17FF4 8FAF004C */ lw $t7, 0x004C($sp) -/* 000C8 80B17FF8 0C024F46 */ jal func_80093D18 -/* 000CC 80B17FFC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 000D0 80B18000 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 000D4 80B18004 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 000D8 80B18008 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 000DC 80B1800C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 000E0 80B18010 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 000E4 80B18014 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 000E8 80B18018 8FA8004C */ lw $t0, 0x004C($sp) -/* 000EC 80B1801C 3C0580B2 */ lui $a1, %hi(D_80B18264) ## $a1 = 80B20000 -/* 000F0 80B18020 24A58264 */ addiu $a1, $a1, %lo(D_80B18264) ## $a1 = 80B18264 -/* 000F4 80B18024 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 000F8 80B18028 24060098 */ addiu $a2, $zero, 0x0098 ## $a2 = 00000098 -/* 000FC 80B1802C 0C0346A2 */ jal Matrix_NewMtx -/* 00100 80B18030 AFA2002C */ sw $v0, 0x002C($sp) -/* 00104 80B18034 8FA3002C */ lw $v1, 0x002C($sp) -/* 00108 80B18038 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0010C 80B1803C 3C0E80B2 */ lui $t6, %hi(D_80B18214) ## $t6 = 80B20000 -/* 00110 80B18040 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00114 80B18044 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00118 80B18048 3C0680B2 */ lui $a2, %hi(D_80B18274) ## $a2 = 80B20000 -/* 0011C 80B1804C 24C68274 */ addiu $a2, $a2, %lo(D_80B18274) ## $a2 = 80B18274 -/* 00120 80B18050 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00124 80B18054 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 00128 80B18058 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0012C 80B1805C 8FAB0048 */ lw $t3, 0x0048($sp) -/* 00130 80B18060 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00134 80B18064 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00138 80B18068 856C001C */ lh $t4, 0x001C($t3) ## 0000001C -/* 0013C 80B1806C 000C6880 */ sll $t5, $t4, 2 -/* 00140 80B18070 01CD7021 */ addu $t6, $t6, $t5 -/* 00144 80B18074 8DCE8214 */ lw $t6, %lo(D_80B18214)($t6) -/* 00148 80B18078 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0014C 80B1807C 8FAF004C */ lw $t7, 0x004C($sp) -/* 00150 80B18080 0C031AD5 */ jal func_800C6B54 -/* 00154 80B18084 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 00158 80B18088 8FBF001C */ lw $ra, 0x001C($sp) -/* 0015C 80B1808C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00160 80B18090 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00164 80B18094 03E00008 */ jr $ra -/* 00168 80B18098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s deleted file mode 100644 index 65e5da51f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80B1809C -/* 0016C 80B1809C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00170 80B180A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00174 80B180A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00178 80B180A8 AFA40048 */ sw $a0, 0x0048($sp) -/* 0017C 80B180AC AFA5004C */ sw $a1, 0x004C($sp) -/* 00180 80B180B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00184 80B180B4 3C0680B2 */ lui $a2, %hi(D_80B18284) ## $a2 = 80B20000 -/* 00188 80B180B8 24C68284 */ addiu $a2, $a2, %lo(D_80B18284) ## $a2 = 80B18284 -/* 0018C 80B180BC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00190 80B180C0 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 -/* 00194 80B180C4 0C031AB1 */ jal func_800C6AC4 -/* 00198 80B180C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0019C 80B180CC 8FAF004C */ lw $t7, 0x004C($sp) -/* 001A0 80B180D0 0C024F46 */ jal func_80093D18 -/* 001A4 80B180D4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 001A8 80B180D8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 001AC 80B180DC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 001B0 80B180E0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 001B4 80B180E4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 001B8 80B180E8 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 001BC 80B180EC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 001C0 80B180F0 8FA80048 */ lw $t0, 0x0048($sp) -/* 001C4 80B180F4 3C0480B2 */ lui $a0, %hi(D_80B18220) ## $a0 = 80B20000 -/* 001C8 80B180F8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 001CC 80B180FC 8509001C */ lh $t1, 0x001C($t0) ## 0000001C -/* 001D0 80B18100 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 001D4 80B18104 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 001D8 80B18108 00095080 */ sll $t2, $t1, 2 -/* 001DC 80B1810C 008A2021 */ addu $a0, $a0, $t2 -/* 001E0 80B18110 8C848220 */ lw $a0, %lo(D_80B18220)($a0) -/* 001E4 80B18114 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 001E8 80B18118 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 001EC 80B1811C 00046100 */ sll $t4, $a0, 4 -/* 001F0 80B18120 000C6F02 */ srl $t5, $t4, 28 -/* 001F4 80B18124 000D7080 */ sll $t6, $t5, 2 -/* 001F8 80B18128 01EE7821 */ addu $t7, $t7, $t6 -/* 001FC 80B1812C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 00200 80B18130 00815824 */ and $t3, $a0, $at -/* 00204 80B18134 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00208 80B18138 016FC021 */ addu $t8, $t3, $t7 -/* 0020C 80B1813C 0301C821 */ addu $t9, $t8, $at -/* 00210 80B18140 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00214 80B18144 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00218 80B18148 3C0580B2 */ lui $a1, %hi(D_80B18294) ## $a1 = 80B20000 -/* 0021C 80B1814C 24A58294 */ addiu $a1, $a1, %lo(D_80B18294) ## $a1 = 80B18294 -/* 00220 80B18150 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00224 80B18154 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 00228 80B18158 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0022C 80B1815C 8FAA004C */ lw $t2, 0x004C($sp) -/* 00230 80B18160 240600A9 */ addiu $a2, $zero, 0x00A9 ## $a2 = 000000A9 -/* 00234 80B18164 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00238 80B18168 0C0346A2 */ jal Matrix_NewMtx -/* 0023C 80B1816C AFA20028 */ sw $v0, 0x0028($sp) -/* 00240 80B18170 8FA30028 */ lw $v1, 0x0028($sp) -/* 00244 80B18174 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00248 80B18178 3C1880B2 */ lui $t8, %hi(D_80B18214) ## $t8 = 80B20000 -/* 0024C 80B1817C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00250 80B18180 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00254 80B18184 3C0680B2 */ lui $a2, %hi(D_80B182A4) ## $a2 = 80B20000 -/* 00258 80B18188 24C682A4 */ addiu $a2, $a2, %lo(D_80B182A4) ## $a2 = 80B182A4 -/* 0025C 80B1818C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00260 80B18190 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 00264 80B18194 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00268 80B18198 8FAE0048 */ lw $t6, 0x0048($sp) -/* 0026C 80B1819C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00270 80B181A0 240700AE */ addiu $a3, $zero, 0x00AE ## $a3 = 000000AE -/* 00274 80B181A4 85CB001C */ lh $t3, 0x001C($t6) ## 0000001C -/* 00278 80B181A8 000B7880 */ sll $t7, $t3, 2 -/* 0027C 80B181AC 030FC021 */ addu $t8, $t8, $t7 -/* 00280 80B181B0 8F188214 */ lw $t8, %lo(D_80B18214)($t8) -/* 00284 80B181B4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00288 80B181B8 8FB9004C */ lw $t9, 0x004C($sp) -/* 0028C 80B181BC 0C031AD5 */ jal func_800C6B54 -/* 00290 80B181C0 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 00294 80B181C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00298 80B181C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0029C 80B181CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002A0 80B181D0 03E00008 */ jr $ra -/* 002A4 80B181D4 00000000 */ nop -/* 002A8 80B181D8 00000000 */ nop -/* 002AC 80B181DC 00000000 */ nop - diff --git a/data/overlays/actors/z_en_tana.data.s b/data/overlays/actors/z_en_tana.data.s deleted file mode 100644 index bfaeed8ec2..0000000000 --- a/data/overlays/actors/z_en_tana.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Tana_InitVars - .word 0x00C20600, 0x00000009, 0x00B20000, 0x0000014C -.word EnTana_Init -.word EnTana_Destroy -.word EnTana_Update -.word 0x00000000 -glabel D_80B18200 - .word D_80B18230 -.word D_80B18238 -glabel D_80B18208 - .word func_80B17FC4 -.word func_80B1809C -.word func_80B1809C -glabel D_80B18214 - .word 0x06000B80, 0x060027E8, 0x060027E8 -glabel D_80B18220 - .word 0x00000000, 0x06000E08, 0x06001608, 0x00000000 - diff --git a/data/overlays/actors/z_en_tana.reloc.s b/data/overlays/actors/z_en_tana.reloc.s deleted file mode 100644 index b8a9b26409..0000000000 --- a/data/overlays/actors/z_en_tana.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80B182C0 - -.incbin "baserom/ovl_En_Tana", 0x390, 0x000000A0 diff --git a/data/overlays/actors/z_en_tana.rodata.s b/data/overlays/actors/z_en_tana.rodata.s deleted file mode 100644 index 4d24152e2d..0000000000 --- a/data/overlays/actors/z_en_tana.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B18230 - .word 0xCCDAA4CE, 0xC3AA0000 -glabel D_80B18238 - .word 0xC0D0A4CE, 0xC3AA0000 -glabel D_80B18240 - .asciz "☆☆☆ %s ☆☆☆\n" - .balign 4 - -glabel D_80B18254 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18264 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18274 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18284 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18294 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B182A4 - .word 0x2E2E2F7A, 0x5F656E5F, 0x74616E61, 0x2E630000, 0x00000000, 0x00000000, 0x00000000 - -