From 7f6e9d55fe7447ca70d502e1c513e40e5f0ee9a8 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 8 Jul 2020 19:40:09 -0400 Subject: [PATCH] Decompiled ovl_Demo_Sa (#231) * Decompiled ovl_Demo_Sa * PR suggestions * ff -> alpha * PR suggestions * Reverting cutscene data --- .../actors/ovl_Demo_Sa/DemoSa_Destroy.s | 9 - .../overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s | 37 - .../overlays/actors/ovl_Demo_Sa/DemoSa_Init.s | 58 -- .../actors/ovl_Demo_Sa/DemoSa_Update.s | 34 - .../actors/ovl_Demo_Sa/func_8098E480.s | 40 - .../actors/ovl_Demo_Sa/func_8098E508.s | 6 - .../actors/ovl_Demo_Sa/func_8098E51C.s | 6 - .../actors/ovl_Demo_Sa/func_8098E530.s | 10 - .../actors/ovl_Demo_Sa/func_8098E554.s | 34 - .../actors/ovl_Demo_Sa/func_8098E5C8.s | 19 - .../actors/ovl_Demo_Sa/func_8098E610.s | 10 - .../actors/ovl_Demo_Sa/func_8098E630.s | 11 - .../actors/ovl_Demo_Sa/func_8098E654.s | 22 - .../actors/ovl_Demo_Sa/func_8098E6A0.s | 22 - .../actors/ovl_Demo_Sa/func_8098E6EC.s | 34 - .../actors/ovl_Demo_Sa/func_8098E76C.s | 41 - .../actors/ovl_Demo_Sa/func_8098E7FC.s | 34 - .../actors/ovl_Demo_Sa/func_8098E86C.s | 25 - .../actors/ovl_Demo_Sa/func_8098E8C8.s | 33 - .../actors/ovl_Demo_Sa/func_8098E944.s | 13 - .../actors/ovl_Demo_Sa/func_8098E960.s | 37 - .../actors/ovl_Demo_Sa/func_8098E9EC.s | 22 - .../actors/ovl_Demo_Sa/func_8098EA3C.s | 13 - .../actors/ovl_Demo_Sa/func_8098EA68.s | 42 - .../actors/ovl_Demo_Sa/func_8098EB00.s | 31 - .../actors/ovl_Demo_Sa/func_8098EB6C.s | 21 - .../actors/ovl_Demo_Sa/func_8098EBB8.s | 9 - .../actors/ovl_Demo_Sa/func_8098EBD8.s | 9 - .../actors/ovl_Demo_Sa/func_8098EBF8.s | 13 - .../actors/ovl_Demo_Sa/func_8098EC28.s | 15 - .../actors/ovl_Demo_Sa/func_8098EC60.s | 14 - .../actors/ovl_Demo_Sa/func_8098EC94.s | 15 - .../actors/ovl_Demo_Sa/func_8098ECCC.s | 11 - .../actors/ovl_Demo_Sa/func_8098ECF4.s | 50 - .../actors/ovl_Demo_Sa/func_8098EDB0.s | 25 - .../actors/ovl_Demo_Sa/func_8098EE08.s | 9 - .../actors/ovl_Demo_Sa/func_8098EE28.s | 34 - .../actors/ovl_Demo_Sa/func_8098EEA8.s | 23 - .../actors/ovl_Demo_Sa/func_8098EEFC.s | 89 -- .../actors/ovl_Demo_Sa/func_8098F050.s | 41 - .../actors/ovl_Demo_Sa/func_8098F0E8.s | 13 - .../actors/ovl_Demo_Sa/func_8098F118.s | 22 - .../actors/ovl_Demo_Sa/func_8098F16C.s | 22 - .../actors/ovl_Demo_Sa/func_8098F1C0.s | 127 --- .../actors/ovl_Demo_Sa/func_8098F390.s | 25 - .../actors/ovl_Demo_Sa/func_8098F3F0.s | 13 - .../actors/ovl_Demo_Sa/func_8098F420.s | 25 - .../actors/ovl_Demo_Sa/func_8098F480.s | 38 - .../actors/ovl_Demo_Sa/func_8098F50C.s | 15 - .../actors/ovl_Demo_Sa/func_8098F544.s | 21 - .../actors/ovl_Demo_Sa/func_8098F590.s | 17 - .../actors/ovl_Demo_Sa/func_8098F5D0.s | 17 - .../actors/ovl_Demo_Sa/func_8098F610.s | 19 - .../actors/ovl_Demo_Sa/func_8098F654.s | 62 -- .../actors/ovl_Demo_Sa/func_8098F714.s | 9 - .../actors/ovl_Demo_Sa/func_8098F734.s | 19 - .../actors/ovl_Demo_Sa/func_8098F77C.s | 17 - .../actors/ovl_Demo_Sa/func_8098F7BC.s | 17 - .../actors/ovl_Demo_Sa/func_8098F7FC.s | 17 - .../actors/ovl_Demo_Sa/func_8098F83C.s | 49 - .../actors/ovl_Demo_Sa/func_8098F8F8.s | 38 - .../actors/ovl_Demo_Sa/func_8098F984.s | 6 - .../actors/ovl_Demo_Sa/func_8098F998.s | 40 - .../actors/ovl_Demo_Sa/func_8098FA2C.s | 24 - .../actors/ovl_Demo_Sa/func_8098FA84.s | 24 - .../actors/ovl_Demo_Sa/func_8098FAE0.s | 22 - .../actors/ovl_Demo_Sa/func_8098FB34.s | 15 - .../actors/ovl_Demo_Sa/func_8098FB68.s | 70 -- .../actors/ovl_Demo_Sa/func_8098FC44.s | 9 - .../actors/ovl_Demo_Sa/func_8098FC64.s | 15 - .../actors/ovl_Demo_Sa/func_8098FC9C.s | 15 - .../actors/ovl_Demo_Sa/func_8098FCD4.s | 15 - .../actors/ovl_Demo_Sa/func_8098FD0C.s | 18 - .../actors/ovl_Demo_Sa/func_8098FE74.s | 15 - .../actors/ovl_Demo_Sa/func_8098FEA8.s | 4 - .../actors/ovl_Demo_Sa/func_8098FEB4.s | 124 --- data/overlays/actors/z_demo_sa.data.s | 53 - data/overlays/actors/z_demo_sa.reloc.s | 13 - spec | 3 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 953 +++++++++++++++--- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h | 15 +- .../ovl_Demo_Sa/z_demo_sa_cutscene_data.c | 94 ++ tools/csdis.py | 0 undefined_syms.txt | 15 + 84 files changed, 925 insertions(+), 2260 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s delete mode 100644 data/overlays/actors/z_demo_sa.data.s delete mode 100644 data/overlays/actors/z_demo_sa.reloc.s create mode 100644 src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c mode change 100644 => 100755 tools/csdis.py diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s deleted file mode 100644 index b3fd8a5cdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel DemoSa_Destroy -/* 00000 8098E460 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8098E468 0C0295BC */ jal SkelAnime_Free -/* 0000C 8098E46C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 8098E474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8098E478 03E00008 */ jr $ra -/* 0001C 8098E47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s deleted file mode 100644 index 7d596f83d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_80990EFC - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel DemoSa_Draw -/* 01C18 80990078 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C1C 8099007C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C20 80990080 8C82019C */ lw $v0, 0x019C($a0) ## 0000019C -/* 01C24 80990084 04400008 */ bltz $v0, .L809900A8 -/* 01C28 80990088 28410003 */ slti $at, $v0, 0x0003 -/* 01C2C 8099008C 10200006 */ beq $at, $zero, .L809900A8 -/* 01C30 80990090 00027080 */ sll $t6, $v0, 2 -/* 01C34 80990094 3C038099 */ lui $v1, %hi(D_80990DB0) ## $v1 = 80990000 -/* 01C38 80990098 006E1821 */ addu $v1, $v1, $t6 -/* 01C3C 8099009C 8C630DB0 */ lw $v1, %lo(D_80990DB0)($v1) -/* 01C40 809900A0 14600006 */ bne $v1, $zero, .L809900BC -/* 01C44 809900A4 00000000 */ nop -.L809900A8: -/* 01C48 809900A8 3C048099 */ lui $a0, %hi(D_80990EFC) ## $a0 = 80990000 -/* 01C4C 809900AC 0C00084C */ jal osSyncPrintf - -/* 01C50 809900B0 24840EFC */ addiu $a0, $a0, %lo(D_80990EFC) ## $a0 = 80990EFC -/* 01C54 809900B4 10000004 */ beq $zero, $zero, .L809900C8 -/* 01C58 809900B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809900BC: -/* 01C5C 809900BC 0060F809 */ jalr $ra, $v1 -/* 01C60 809900C0 00000000 */ nop -/* 01C64 809900C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809900C8: -/* 01C68 809900C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C6C 809900CC 03E00008 */ jr $ra -/* 01C70 809900D0 00000000 */ nop -/* 01C74 809900D4 00000000 */ nop -/* 01C78 809900D8 00000000 */ nop -/* 01C7C 809900DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s deleted file mode 100644 index 30719fb9bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel DemoSa_Init -/* 0194C 8098FDAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01950 8098FDB0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01954 8098FDB4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01958 8098FDB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0195C 8098FDBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01960 8098FDC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01964 8098FDC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01968 8098FDC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0196C 8098FDCC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01970 8098FDD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01974 8098FDD4 0C00AC78 */ jal ActorShape_Init - -/* 01978 8098FDD8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0197C 8098FDDC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01980 8098FDE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01984 8098FDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01988 8098FDE8 1041000B */ beq $v0, $at, .L8098FE18 -/* 0198C 8098FDEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01990 8098FDF0 1041000D */ beq $v0, $at, .L8098FE28 -/* 01994 8098FDF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01998 8098FDF8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0199C 8098FDFC 1041000E */ beq $v0, $at, .L8098FE38 -/* 019A0 8098FE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019A4 8098FE04 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 019A8 8098FE08 1041000F */ beq $v0, $at, .L8098FE48 -/* 019AC 8098FE0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019B0 8098FE10 10000011 */ beq $zero, $zero, .L8098FE58 -/* 019B4 8098FE14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8098FE18: -/* 019B8 8098FE18 0C263B3D */ jal func_8098ECF4 -/* 019BC 8098FE1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019C0 8098FE20 10000010 */ beq $zero, $zero, .L8098FE64 -/* 019C4 8098FE24 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE28: -/* 019C8 8098FE28 0C263CE4 */ jal func_8098F390 -/* 019CC 8098FE2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019D0 8098FE30 1000000C */ beq $zero, $zero, .L8098FE64 -/* 019D4 8098FE34 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE38: -/* 019D8 8098FE38 0C263D08 */ jal func_8098F420 -/* 019DC 8098FE3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019E0 8098FE40 10000008 */ beq $zero, $zero, .L8098FE64 -/* 019E4 8098FE44 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE48: -/* 019E8 8098FE48 0C263E0F */ jal func_8098F83C -/* 019EC 8098FE4C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019F0 8098FE50 10000004 */ beq $zero, $zero, .L8098FE64 -/* 019F4 8098FE54 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE58: -/* 019F8 8098FE58 0C2639FF */ jal func_8098E7FC -/* 019FC 8098FE5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01A00 8098FE60 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE64: -/* 01A04 8098FE64 8FB00014 */ lw $s0, 0x0014($sp) -/* 01A08 8098FE68 8FB10018 */ lw $s1, 0x0018($sp) -/* 01A0C 8098FE6C 03E00008 */ jr $ra -/* 01A10 8098FE70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s deleted file mode 100644 index d2fe71e814..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80990EA0 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel DemoSa_Update -/* 018F0 8098FD50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018F4 8098FD54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018F8 8098FD58 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 018FC 8098FD5C 04400008 */ bltz $v0, .L8098FD80 -/* 01900 8098FD60 28410015 */ slti $at, $v0, 0x0015 -/* 01904 8098FD64 10200006 */ beq $at, $zero, .L8098FD80 -/* 01908 8098FD68 00027080 */ sll $t6, $v0, 2 -/* 0190C 8098FD6C 3C038099 */ lui $v1, %hi(D_80990D5C) ## $v1 = 80990000 -/* 01910 8098FD70 006E1821 */ addu $v1, $v1, $t6 -/* 01914 8098FD74 8C630D5C */ lw $v1, %lo(D_80990D5C)($v1) -/* 01918 8098FD78 14600006 */ bne $v1, $zero, .L8098FD94 -/* 0191C 8098FD7C 00000000 */ nop -.L8098FD80: -/* 01920 8098FD80 3C048099 */ lui $a0, %hi(D_80990EA0) ## $a0 = 80990000 -/* 01924 8098FD84 0C00084C */ jal osSyncPrintf - -/* 01928 8098FD88 24840EA0 */ addiu $a0, $a0, %lo(D_80990EA0) ## $a0 = 80990EA0 -/* 0192C 8098FD8C 10000004 */ beq $zero, $zero, .L8098FDA0 -/* 01930 8098FD90 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098FD94: -/* 01934 8098FD94 0060F809 */ jalr $ra, $v1 -/* 01938 8098FD98 00000000 */ nop -/* 0193C 8098FD9C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098FDA0: -/* 01940 8098FDA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01944 8098FDA4 03E00008 */ jr $ra -/* 01948 8098FDA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s deleted file mode 100644 index 09a7f09f9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8098E480 -/* 00020 8098E480 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00024 8098E484 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 8098E488 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 8098E48C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 8098E490 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 8098E494 15C00003 */ bne $t6, $zero, .L8098E4A4 -/* 00038 8098E498 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 8098E49C 10000005 */ beq $zero, $zero, .L8098E4B4 -/* 00040 8098E4A0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L8098E4A4: -/* 00044 8098E4A4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 8098E4A8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 8098E4AC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 8098E4B0 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L8098E4B4: -/* 00054 8098E4B4 14400008 */ bne $v0, $zero, .L8098E4D8 -/* 00058 8098E4B8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 8098E4BC 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 8098E4C0 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 8098E4C4 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 8098E4C8 AFA60038 */ sw $a2, 0x0038($sp) -/* 0006C 8098E4CC 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 8098E4D0 8FA60038 */ lw $a2, 0x0038($sp) -/* 00074 8098E4D4 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L8098E4D8: -/* 00078 8098E4D8 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 8098E4DC 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 8098E4E0 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 8098E4E4 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00088 8098E4E8 29010003 */ slti $at, $t0, 0x0003 -/* 0008C 8098E4EC 54200003 */ bnel $at, $zero, .L8098E4FC -/* 00090 8098E4F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 8098E4F4 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 8098E4F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098E4FC: -/* 0009C 8098E4FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A0 8098E500 03E00008 */ jr $ra -/* 000A4 8098E504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s deleted file mode 100644 index 6b327e4797..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098E508 -/* 000A8 8098E508 AFA50004 */ sw $a1, 0x0004($sp) -/* 000AC 8098E50C 00052C00 */ sll $a1, $a1, 16 -/* 000B0 8098E510 00052C03 */ sra $a1, $a1, 16 -/* 000B4 8098E514 03E00008 */ jr $ra -/* 000B8 8098E518 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s deleted file mode 100644 index 3f8cd6e5b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098E51C -/* 000BC 8098E51C AFA50004 */ sw $a1, 0x0004($sp) -/* 000C0 8098E520 00052C00 */ sll $a1, $a1, 16 -/* 000C4 8098E524 00052C03 */ sra $a1, $a1, 16 -/* 000C8 8098E528 03E00008 */ jr $ra -/* 000CC 8098E52C A4850194 */ sh $a1, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s deleted file mode 100644 index bd3e2a1c8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8098E530 -/* 000D0 8098E530 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 000D4 8098E534 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 000D8 8098E538 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 000DC 8098E53C AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 000E0 8098E540 AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 000E4 8098E544 AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 000E8 8098E548 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 000EC 8098E54C 03E00008 */ jr $ra -/* 000F0 8098E550 E48401A0 */ swc1 $f4, 0x01A0($a0) ## 000001A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s deleted file mode 100644 index 6a06a71d21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098E554 -/* 000F4 8098E554 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 8098E558 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000FC 8098E55C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00100 8098E560 3C0F8099 */ lui $t7, %hi(D_80990108) ## $t7 = 80990000 -/* 00104 8098E564 3C198099 */ lui $t9, %hi(D_80990108) ## $t9 = 80990000 -/* 00108 8098E568 15C0000D */ bne $t6, $zero, .L8098E5A0 -/* 0010C 8098E56C 00000000 */ nop -/* 00110 8098E570 8DEF0108 */ lw $t7, %lo(D_80990108)($t7) -/* 00114 8098E574 51E00011 */ beql $t7, $zero, .L8098E5BC -/* 00118 8098E578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0011C 8098E57C 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00120 8098E580 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00124 8098E584 17010003 */ bne $t8, $at, .L8098E594 -/* 00128 8098E588 00000000 */ nop -/* 0012C 8098E58C 0C26394C */ jal func_8098E530 -/* 00130 8098E590 00000000 */ nop -.L8098E594: -/* 00134 8098E594 3C018099 */ lui $at, %hi(D_80990108) ## $at = 80990000 -/* 00138 8098E598 10000007 */ beq $zero, $zero, .L8098E5B8 -/* 0013C 8098E59C AC200108 */ sw $zero, %lo(D_80990108)($at) -.L8098E5A0: -/* 00140 8098E5A0 8F390108 */ lw $t9, %lo(D_80990108)($t9) -/* 00144 8098E5A4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00148 8098E5A8 3C018099 */ lui $at, %hi(D_80990108) ## $at = 80990000 -/* 0014C 8098E5AC 57200003 */ bnel $t9, $zero, .L8098E5BC -/* 00150 8098E5B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00154 8098E5B4 AC280108 */ sw $t0, %lo(D_80990108)($at) -.L8098E5B8: -/* 00158 8098E5B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098E5BC: -/* 0015C 8098E5BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00160 8098E5C0 03E00008 */ jr $ra -/* 00164 8098E5C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s deleted file mode 100644 index 275fa0dba1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098E5C8 -/* 00168 8098E5C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0016C 8098E5CC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00170 8098E5D0 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00174 8098E5D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00178 8098E5D8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0017C 8098E5DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00180 8098E5E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00184 8098E5E4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00188 8098E5E8 44070000 */ mfc1 $a3, $f0 -/* 0018C 8098E5EC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00190 8098E5F0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00194 8098E5F4 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00198 8098E5F8 0C00B92D */ jal func_8002E4B4 -/* 0019C 8098E5FC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001A0 8098E600 8FBF001C */ lw $ra, 0x001C($sp) -/* 001A4 8098E604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001A8 8098E608 03E00008 */ jr $ra -/* 001AC 8098E60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s deleted file mode 100644 index a7a9f235dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8098E610 -/* 001B0 8098E610 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001B4 8098E614 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001B8 8098E618 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001BC 8098E61C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 8098E620 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C4 8098E624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 8098E628 03E00008 */ jr $ra -/* 001CC 8098E62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s deleted file mode 100644 index a3ede9690b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8098E630 -/* 001D0 8098E630 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 001D4 8098E634 00057880 */ sll $t7, $a1, 2 -/* 001D8 8098E638 008FC021 */ addu $t8, $a0, $t7 -/* 001DC 8098E63C 11C00003 */ beq $t6, $zero, .L8098E64C -/* 001E0 8098E640 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001E4 8098E644 03E00008 */ jr $ra -/* 001E8 8098E648 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L8098E64C: -/* 001EC 8098E64C 03E00008 */ jr $ra -/* 001F0 8098E650 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s deleted file mode 100644 index e4a9852ceb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E654 -/* 001F4 8098E654 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 8098E658 AFA40018 */ sw $a0, 0x0018($sp) -/* 001FC 8098E65C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00200 8098E660 AFA5001C */ sw $a1, 0x001C($sp) -/* 00204 8098E664 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00208 8098E668 AFA60020 */ sw $a2, 0x0020($sp) -/* 0020C 8098E66C 0C26398C */ jal func_8098E630 -/* 00210 8098E670 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00214 8098E674 10400007 */ beq $v0, $zero, .L8098E694 -/* 00218 8098E678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0021C 8098E67C 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00220 8098E680 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00224 8098E684 55CF0004 */ bnel $t6, $t7, .L8098E698 -/* 00228 8098E688 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0022C 8098E68C 10000002 */ beq $zero, $zero, .L8098E698 -/* 00230 8098E690 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8098E694: -/* 00234 8098E694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8098E698: -/* 00238 8098E698 03E00008 */ jr $ra -/* 0023C 8098E69C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s deleted file mode 100644 index 22a21ae7ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E6A0 -/* 00240 8098E6A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00244 8098E6A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00248 8098E6A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0024C 8098E6AC AFA5001C */ sw $a1, 0x001C($sp) -/* 00250 8098E6B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00254 8098E6B4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00258 8098E6B8 0C26398C */ jal func_8098E630 -/* 0025C 8098E6BC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00260 8098E6C0 10400007 */ beq $v0, $zero, .L8098E6E0 -/* 00264 8098E6C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00268 8098E6C8 97AE0022 */ lhu $t6, 0x0022($sp) -/* 0026C 8098E6CC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00270 8098E6D0 51CF0004 */ beql $t6, $t7, .L8098E6E4 -/* 00274 8098E6D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00278 8098E6D8 10000002 */ beq $zero, $zero, .L8098E6E4 -/* 0027C 8098E6DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8098E6E0: -/* 00280 8098E6E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8098E6E4: -/* 00284 8098E6E4 03E00008 */ jr $ra -/* 00288 8098E6E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s deleted file mode 100644 index 1c11c0fcf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098E6EC -/* 0028C 8098E6EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00290 8098E6F0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00294 8098E6F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00298 8098E6F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0029C 8098E6FC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A0 8098E700 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 002A4 8098E704 0C26398C */ jal func_8098E630 -/* 002A8 8098E708 AFA70018 */ sw $a3, 0x0018($sp) -/* 002AC 8098E70C 10400013 */ beq $v0, $zero, .L8098E75C -/* 002B0 8098E710 8FA70018 */ lw $a3, 0x0018($sp) -/* 002B4 8098E714 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 002B8 8098E718 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 002BC 8098E71C 00000000 */ nop -/* 002C0 8098E720 468021A0 */ cvt.s.w $f6, $f4 -/* 002C4 8098E724 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 002C8 8098E728 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 002CC 8098E72C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 002D0 8098E730 00000000 */ nop -/* 002D4 8098E734 468042A0 */ cvt.s.w $f10, $f8 -/* 002D8 8098E738 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 002DC 8098E73C 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 002E0 8098E740 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 002E4 8098E744 00000000 */ nop -/* 002E8 8098E748 468084A0 */ cvt.s.w $f18, $f16 -/* 002EC 8098E74C E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 002F0 8098E750 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 002F4 8098E754 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 002F8 8098E758 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L8098E75C: -/* 002FC 8098E75C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00300 8098E760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00304 8098E764 03E00008 */ jr $ra -/* 00308 8098E768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s deleted file mode 100644 index c83b662efd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8098E76C -/* 0030C 8098E76C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00310 8098E770 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 8098E774 AFA40028 */ sw $a0, 0x0028($sp) -/* 00318 8098E778 AFA5002C */ sw $a1, 0x002C($sp) -/* 0031C 8098E77C AFA60030 */ sw $a2, 0x0030($sp) -/* 00320 8098E780 AFA70034 */ sw $a3, 0x0034($sp) -/* 00324 8098E784 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00328 8098E788 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 8098E78C 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00330 8098E790 8FA40028 */ lw $a0, 0x0028($sp) -/* 00334 8098E794 8FA5002C */ lw $a1, 0x002C($sp) -/* 00338 8098E798 15C00007 */ bne $t6, $zero, .L8098E7B8 -/* 0033C 8098E79C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00340 8098E7A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00344 8098E7A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 8098E7A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0034C 8098E7AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00350 8098E7B0 10000006 */ beq $zero, $zero, .L8098E7CC -/* 00354 8098E7B4 468020A0 */ cvt.s.w $f2, $f4 -.L8098E7B8: -/* 00358 8098E7B8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0035C 8098E7BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00360 8098E7C0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00364 8098E7C4 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00368 8098E7C8 46803020 */ cvt.s.w $f0, $f6 -.L8098E7CC: -/* 0036C 8098E7CC 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00370 8098E7D0 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00374 8098E7D4 44066000 */ mfc1 $a2, $f12 -/* 00378 8098E7D8 44070000 */ mfc1 $a3, $f0 -/* 0037C 8098E7DC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 8098E7E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00384 8098E7E4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00388 8098E7E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0038C 8098E7EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00390 8098E7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 8098E7F4 03E00008 */ jr $ra -/* 00398 8098E7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s deleted file mode 100644 index 427de3c762..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s +++ /dev/null @@ -1,34 +0,0 @@ -.late_rodata -glabel D_80990F34 - .word 0xC61C4000 - -.text -glabel func_8098E7FC -/* 0039C 8098E7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 8098E808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B4 8098E814 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 003B8 8098E818 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 003BC 8098E81C 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 -/* 003C0 8098E820 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 8098E830 0C0291BE */ jal SkelAnime_InitSV -/* 003D4 8098E834 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 003D8 8098E838 3C018099 */ lui $at, %hi(D_80990F34) ## $at = 80990000 -/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) -/* 003E4 8098E844 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 8098E848 0C263942 */ jal func_8098E508 -/* 003EC 8098E84C E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 8098E854 0C263947 */ jal func_8098E51C -/* 003F8 8098E858 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 8098E860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 8098E864 03E00008 */ jr $ra -/* 00408 8098E868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s deleted file mode 100644 index fcdf2c0ef0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098E86C -/* 0040C 8098E86C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00410 8098E870 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00414 8098E874 AFA40038 */ sw $a0, 0x0038($sp) -/* 00418 8098E878 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0041C 8098E87C C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 00420 8098E880 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 00424 8098E884 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00428 8098E888 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0042C 8098E88C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00430 8098E890 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00434 8098E894 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00438 8098E898 AFA00024 */ sw $zero, 0x0024($sp) -/* 0043C 8098E89C AFA00020 */ sw $zero, 0x0020($sp) -/* 00440 8098E8A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00444 8098E8A4 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 00448 8098E8A8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0044C 8098E8AC E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00450 8098E8B0 0C00C916 */ jal Actor_SpawnAttached - -/* 00454 8098E8B4 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00458 8098E8B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0045C 8098E8BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00460 8098E8C0 03E00008 */ jr $ra -/* 00464 8098E8C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s deleted file mode 100644 index 9ce213d6bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8098E8C8 -/* 00468 8098E8C8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0046C 8098E8CC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00470 8098E8D0 AFA40038 */ sw $a0, 0x0038($sp) -/* 00474 8098E8D4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00478 8098E8D8 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 0047C 8098E8DC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00480 8098E8E0 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 00484 8098E8E4 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00488 8098E8E8 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0048C 8098E8EC C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00490 8098E8F0 46062080 */ add.s $f2, $f4, $f6 -/* 00494 8098E8F4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00498 8098E8F8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 0049C 8098E8FC AFAE0028 */ sw $t6, 0x0028($sp) -/* 004A0 8098E900 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004A4 8098E904 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004A8 8098E908 AFA6003C */ sw $a2, 0x003C($sp) -/* 004AC 8098E90C AFA00024 */ sw $zero, 0x0024($sp) -/* 004B0 8098E910 AFA00020 */ sw $zero, 0x0020($sp) -/* 004B4 8098E914 AFA0001C */ sw $zero, 0x001C($sp) -/* 004B8 8098E918 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 004BC 8098E91C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004C0 8098E920 0C00C916 */ jal Actor_SpawnAttached - -/* 004C4 8098E924 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004C8 8098E928 8FA4003C */ lw $a0, 0x003C($sp) -/* 004CC 8098E92C 0C021344 */ jal Item_Give -/* 004D0 8098E930 24050066 */ addiu $a1, $zero, 0x0066 ## $a1 = 00000066 -/* 004D4 8098E934 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004D8 8098E938 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004DC 8098E93C 03E00008 */ jr $ra -/* 004E0 8098E940 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s deleted file mode 100644 index 48f4478332..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_80990F38 - .word 0x42A6AAAB, 0x00000000 - -.text -glabel func_8098E944 -/* 004E4 8098E944 AFA50004 */ sw $a1, 0x0004($sp) -/* 004E8 8098E948 3C018099 */ lui $at, %hi(D_80990F38) ## $at = 80990000 -/* 004EC 8098E94C C4260F38 */ lwc1 $f6, %lo(D_80990F38)($at) -/* 004F0 8098E950 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 004F4 8098E954 46062200 */ add.s $f8, $f4, $f6 -/* 004F8 8098E958 03E00008 */ jr $ra -/* 004FC 8098E95C E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s deleted file mode 100644 index f73793e8da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8098E960 -/* 00500 8098E960 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00504 8098E964 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00508 8098E968 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 0050C 8098E96C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00510 8098E970 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 8098E974 15C00019 */ bne $t6, $zero, .L8098E9DC -/* 00518 8098E978 AFA40028 */ sw $a0, 0x0028($sp) -/* 0051C 8098E97C 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00520 8098E980 3C088099 */ lui $t0, %hi(D_8099010C) ## $t0 = 80990000 -/* 00524 8098E984 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00528 8098E988 29E10004 */ slti $at, $t7, 0x0004 -/* 0052C 8098E98C 10200013 */ beq $at, $zero, .L8098E9DC -/* 00530 8098E990 2508010C */ addiu $t0, $t0, %lo(D_8099010C) ## $t0 = 8099010C -/* 00534 8098E994 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00538 8098E998 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 0053C 8098E99C ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 00540 8098E9A0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00544 8098E9A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00548 8098E9A8 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 0054C 8098E9AC 24050066 */ addiu $a1, $zero, 0x0066 ## $a1 = 00000066 -/* 00550 8098E9B0 0C021344 */ jal Item_Give -/* 00554 8098E9B4 AFA3001C */ sw $v1, 0x001C($sp) -/* 00558 8098E9B8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0055C 8098E9BC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00560 8098E9C0 8FA3001C */ lw $v1, 0x001C($sp) -/* 00564 8098E9C4 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 00568 8098E9C8 00411021 */ addu $v0, $v0, $at -/* 0056C 8098E9CC 00021400 */ sll $v0, $v0, 16 -/* 00570 8098E9D0 00021403 */ sra $v0, $v0, 16 -/* 00574 8098E9D4 A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 00578 8098E9D8 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L8098E9DC: -/* 0057C 8098E9DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00580 8098E9E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00584 8098E9E4 03E00008 */ jr $ra -/* 00588 8098E9E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s deleted file mode 100644 index d81b00b961..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E9EC -/* 0058C 8098E9EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00590 8098E9F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00594 8098E9F4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00598 8098E9F8 51C0000D */ beql $t6, $zero, .L8098EA30 -/* 0059C 8098E9FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005A0 8098EA00 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 005A4 8098EA04 5040000A */ beql $v0, $zero, .L8098EA30 -/* 005A8 8098EA08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005AC 8098EA0C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 005B0 8098EA10 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 005B4 8098EA14 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 005B8 8098EA18 546F0005 */ bnel $v1, $t7, .L8098EA30 -/* 005BC 8098EA1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C0 8098EA20 AC830198 */ sw $v1, 0x0198($a0) ## 00000198 -/* 005C4 8098EA24 0C263A1B */ jal func_8098E86C -/* 005C8 8098EA28 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C -/* 005CC 8098EA2C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EA30: -/* 005D0 8098EA30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D4 8098EA34 03E00008 */ jr $ra -/* 005D8 8098EA38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s deleted file mode 100644 index 0435307a2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098EA3C -/* 005DC 8098EA3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005E0 8098EA40 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 005E4 8098EA44 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 005E8 8098EA48 4604003E */ c.le.s $f0, $f4 -/* 005EC 8098EA4C 00000000 */ nop -/* 005F0 8098EA50 45000003 */ bc1f .L8098EA60 -/* 005F4 8098EA54 00000000 */ nop -/* 005F8 8098EA58 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 005FC 8098EA5C E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L8098EA60: -/* 00600 8098EA60 03E00008 */ jr $ra -/* 00604 8098EA64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s deleted file mode 100644 index 280375226b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8098EA68 -/* 00608 8098EA68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0060C 8098EA6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00610 8098EA70 AFA40028 */ sw $a0, 0x0028($sp) -/* 00614 8098EA74 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00618 8098EA78 51C0001E */ beql $t6, $zero, .L8098EAF4 -/* 0061C 8098EA7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00620 8098EA80 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 00624 8098EA84 5040001B */ beql $v0, $zero, .L8098EAF4 -/* 00628 8098EA88 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0062C 8098EA8C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00630 8098EA90 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00634 8098EA94 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00638 8098EA98 55E10016 */ bnel $t7, $at, .L8098EAF4 -/* 0063C 8098EA9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00640 8098EAA0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00644 8098EAA4 2484DF80 */ addiu $a0, $a0, 0xDF80 ## $a0 = 0600DF80 -/* 00648 8098EAA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0064C 8098EAAC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00650 8098EAB0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00654 8098EAB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 8098EAB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0065C 8098EABC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00660 8098EAC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00664 8098EAC4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00668 8098EAC8 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 0066C 8098EACC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00670 8098EAD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00674 8098EAD4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00678 8098EAD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0067C 8098EADC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00680 8098EAE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00684 8098EAE4 8FA80028 */ lw $t0, 0x0028($sp) -/* 00688 8098EAE8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 0068C 8098EAEC AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 00690 8098EAF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8098EAF4: -/* 00694 8098EAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00698 8098EAF8 03E00008 */ jr $ra -/* 0069C 8098EAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s deleted file mode 100644 index c66830f1af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8098EB00 -/* 006A0 8098EB00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 8098EB04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A8 8098EB08 10A00014 */ beq $a1, $zero, .L8098EB5C -/* 006AC 8098EB0C AFA40028 */ sw $a0, 0x0028($sp) -/* 006B0 8098EB10 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 006B4 8098EB14 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006B8 8098EB18 2484E500 */ addiu $a0, $a0, 0xE500 ## $a0 = 0600E500 -/* 006BC 8098EB1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006C0 8098EB20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C4 8098EB24 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C8 8098EB28 468021A0 */ cvt.s.w $f6, $f4 -/* 006CC 8098EB2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006D0 8098EB30 44070000 */ mfc1 $a3, $f0 -/* 006D4 8098EB34 24A5E500 */ addiu $a1, $a1, 0xE500 ## $a1 = 0600E500 -/* 006D8 8098EB38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 8098EB3C AFA00014 */ sw $zero, 0x0014($sp) -/* 006E0 8098EB40 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006E4 8098EB44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E8 8098EB48 0C029468 */ jal SkelAnime_ChangeAnim - -/* 006EC 8098EB4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006F0 8098EB50 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 8098EB54 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 006F8 8098EB58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8098EB5C: -/* 006FC 8098EB5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00700 8098EB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00704 8098EB64 03E00008 */ jr $ra -/* 00708 8098EB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s deleted file mode 100644 index 14ff1b41ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098EB6C -/* 0070C 8098EB6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00710 8098EB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 8098EB74 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00718 8098EB78 51C0000C */ beql $t6, $zero, .L8098EBAC -/* 0071C 8098EB7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00720 8098EB80 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00724 8098EB84 50400009 */ beql $v0, $zero, .L8098EBAC -/* 00728 8098EB88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0072C 8098EB8C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00730 8098EB90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00734 8098EB94 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00738 8098EB98 55E10004 */ bnel $t7, $at, .L8098EBAC -/* 0073C 8098EB9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00740 8098EBA0 0C263A32 */ jal func_8098E8C8 -/* 00744 8098EBA4 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 00748 8098EBA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EBAC: -/* 0074C 8098EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00750 8098EBB0 03E00008 */ jr $ra -/* 00754 8098EBB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s deleted file mode 100644 index 85261851a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EBB8 -/* 00758 8098EBB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0075C 8098EBBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00760 8098EBC0 0C263A58 */ jal func_8098E960 -/* 00764 8098EBC4 00000000 */ nop -/* 00768 8098EBC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0076C 8098EBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00770 8098EBD0 03E00008 */ jr $ra -/* 00774 8098EBD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s deleted file mode 100644 index 05e98bd0f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EBD8 -/* 00778 8098EBD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0077C 8098EBDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00780 8098EBE0 0C263A7B */ jal func_8098E9EC -/* 00784 8098EBE4 00000000 */ nop -/* 00788 8098EBE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0078C 8098EBEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00790 8098EBF0 03E00008 */ jr $ra -/* 00794 8098EBF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s deleted file mode 100644 index 50200ac757..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098EBF8 -/* 00798 8098EBF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 8098EBFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 007A0 8098EC00 0C263A51 */ jal func_8098E944 -/* 007A4 8098EC04 AFA40018 */ sw $a0, 0x0018($sp) -/* 007A8 8098EC08 0C263984 */ jal func_8098E610 -/* 007AC 8098EC0C 8FA40018 */ lw $a0, 0x0018($sp) -/* 007B0 8098EC10 0C263A8F */ jal func_8098EA3C -/* 007B4 8098EC14 8FA40018 */ lw $a0, 0x0018($sp) -/* 007B8 8098EC18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007BC 8098EC1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C0 8098EC20 03E00008 */ jr $ra -/* 007C4 8098EC24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s deleted file mode 100644 index b9aec7996a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098EC28 -/* 007C8 8098EC28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007CC 8098EC2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 007D0 8098EC30 AFA40018 */ sw $a0, 0x0018($sp) -/* 007D4 8098EC34 0C263972 */ jal func_8098E5C8 -/* 007D8 8098EC38 AFA5001C */ sw $a1, 0x001C($sp) -/* 007DC 8098EC3C 0C263984 */ jal func_8098E610 -/* 007E0 8098EC40 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E4 8098EC44 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E8 8098EC48 0C263A9A */ jal func_8098EA68 -/* 007EC 8098EC4C 8FA5001C */ lw $a1, 0x001C($sp) -/* 007F0 8098EC50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F4 8098EC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F8 8098EC58 03E00008 */ jr $ra -/* 007FC 8098EC5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s deleted file mode 100644 index 11844bc17c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8098EC60 -/* 00800 8098EC60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00804 8098EC64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00808 8098EC68 0C263972 */ jal func_8098E5C8 -/* 0080C 8098EC6C AFA40018 */ sw $a0, 0x0018($sp) -/* 00810 8098EC70 0C263984 */ jal func_8098E610 -/* 00814 8098EC74 8FA40018 */ lw $a0, 0x0018($sp) -/* 00818 8098EC78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0081C 8098EC7C 0C263AC0 */ jal func_8098EB00 -/* 00820 8098EC80 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00824 8098EC84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00828 8098EC88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0082C 8098EC8C 03E00008 */ jr $ra -/* 00830 8098EC90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s deleted file mode 100644 index 46b69f810f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098EC94 -/* 00834 8098EC94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00838 8098EC98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0083C 8098EC9C AFA40018 */ sw $a0, 0x0018($sp) -/* 00840 8098ECA0 0C263972 */ jal func_8098E5C8 -/* 00844 8098ECA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00848 8098ECA8 0C263984 */ jal func_8098E610 -/* 0084C 8098ECAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00850 8098ECB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00854 8098ECB4 0C263ADB */ jal func_8098EB6C -/* 00858 8098ECB8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0085C 8098ECBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00860 8098ECC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00864 8098ECC4 03E00008 */ jr $ra -/* 00868 8098ECC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s deleted file mode 100644 index 67db0d921a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8098ECCC -/* 0086C 8098ECCC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00870 8098ECD0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00874 8098ECD4 0C263972 */ jal func_8098E5C8 -/* 00878 8098ECD8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0087C 8098ECDC 0C263984 */ jal func_8098E610 -/* 00880 8098ECE0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00884 8098ECE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00888 8098ECE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0088C 8098ECEC 03E00008 */ jr $ra -/* 00890 8098ECF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s deleted file mode 100644 index 5f51cec9f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_8098ECF4 -/* 00894 8098ECF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0089C 8098ECFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) -/* 008A4 8098ED04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) -/* 008AC 8098ED0C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008B0 8098ED10 24841334 */ addiu $a0, $a0, 0x1334 ## $a0 = 06001334 -/* 008B4 8098ED14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008B8 8098ED18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 008BC 8098ED1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 -/* 008C4 8098ED24 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) -/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) -/* 008D0 8098ED30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) -/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) -/* 008E0 8098ED40 0C0291BE */ jal SkelAnime_InitSV -/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) -/* 008E8 8098ED48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 008F0 8098ED50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008F4 8098ED54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 -/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00900 8098ED60 24A51334 */ addiu $a1, $a1, 0x1334 ## $a1 = 06001334 -/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) -/* 00908 8098ED68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00918 8098ED78 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 0091C 8098ED7C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00920 8098ED80 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00924 8098ED84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 8098ED88 0C263942 */ jal func_8098E508 -/* 0092C 8098ED8C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00930 8098ED90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00934 8098ED94 0C263947 */ jal func_8098E51C -/* 00938 8098ED98 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00944 8098EDA4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00948 8098EDA8 03E00008 */ jr $ra -/* 0094C 8098EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s deleted file mode 100644 index ce469475e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098EDB0 -/* 00950 8098EDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00954 8098EDB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00958 8098EDB8 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 0095C 8098EDBC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00960 8098EDC0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00964 8098EDC4 15C1000C */ bne $t6, $at, .L8098EDF8 -/* 00968 8098EDC8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 0096C 8098EDCC 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 00970 8098EDD0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00974 8098EDD4 4600203E */ c.le.s $f4, $f0 -/* 00978 8098EDD8 00000000 */ nop -/* 0097C 8098EDDC 45020007 */ bc1fl .L8098EDFC -/* 00980 8098EDE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00984 8098EDE4 0C263942 */ jal func_8098E508 -/* 00988 8098EDE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0098C 8098EDEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00990 8098EDF0 0C263947 */ jal func_8098E51C -/* 00994 8098EDF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L8098EDF8: -/* 00998 8098EDF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EDFC: -/* 0099C 8098EDFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A0 8098EE00 03E00008 */ jr $ra -/* 009A4 8098EE04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s deleted file mode 100644 index e5c9c83b0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EE08 -/* 009A8 8098EE08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009AC 8098EE0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009B0 8098EE10 0C01E233 */ jal func_800788CC -/* 009B4 8098EE14 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 009B8 8098EE18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009BC 8098EE1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009C0 8098EE20 03E00008 */ jr $ra -/* 009C4 8098EE24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s deleted file mode 100644 index d5a502493b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098EE28 -/* 009C8 8098EE28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 009CC 8098EE2C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 009D0 8098EE30 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 009D4 8098EE34 AFBF0034 */ sw $ra, 0x0034($sp) -/* 009D8 8098EE38 AFA40038 */ sw $a0, 0x0038($sp) -/* 009DC 8098EE3C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 009E0 8098EE40 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 009E4 8098EE44 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 009E8 8098EE48 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009EC 8098EE4C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 009F0 8098EE50 85CF1482 */ lh $t7, 0x1482($t6) ## 80161482 -/* 009F4 8098EE54 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 009F8 8098EE58 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 009FC 8098EE5C 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00A00 8098EE60 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00A04 8098EE64 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00A08 8098EE68 46803220 */ cvt.s.w $f8, $f6 -/* 00A0C 8098EE6C 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00A10 8098EE70 460A4400 */ add.s $f16, $f8, $f10 -/* 00A14 8098EE74 46128100 */ add.s $f4, $f16, $f18 -/* 00A18 8098EE78 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00A1C 8098EE7C C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 00A20 8098EE80 AFB80028 */ sw $t8, 0x0028($sp) -/* 00A24 8098EE84 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A28 8098EE88 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A2C 8098EE8C AFA0001C */ sw $zero, 0x001C($sp) -/* 00A30 8098EE90 0C00C916 */ jal Actor_SpawnAttached - -/* 00A34 8098EE94 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00A38 8098EE98 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00A3C 8098EE9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A40 8098EEA0 03E00008 */ jr $ra -/* 00A44 8098EEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s deleted file mode 100644 index 99bedf2855..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8098EEA8 -/* 00A48 8098EEA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A4C 8098EEAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A50 8098EEB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A54 8098EEB4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A58 8098EEB8 0C263995 */ jal func_8098E654 -/* 00A5C 8098EEBC 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00A60 8098EEC0 1040000A */ beq $v0, $zero, .L8098EEEC -/* 00A64 8098EEC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A68 8098EEC8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00A6C 8098EECC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00A70 8098EED0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00A74 8098EED4 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 00A78 8098EED8 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 00A7C 8098EEDC AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 00A80 8098EEE0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00A84 8098EEE4 0C263B82 */ jal func_8098EE08 -/* 00A88 8098EEE8 E48401A0 */ swc1 $f4, 0x01A0($a0) ## 000001A0 -.L8098EEEC: -/* 00A8C 8098EEEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A90 8098EEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A94 8098EEF4 03E00008 */ jr $ra -/* 00A98 8098EEF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s deleted file mode 100644 index 69b68a9876..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_8098EEFC -/* 00A9C 8098EEFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA0 8098EF00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AA4 8098EF04 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AA8 8098EF08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00AAC 8098EF0C 0C263995 */ jal func_8098E654 -/* 00AB0 8098EF10 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00AB4 8098EF14 10400025 */ beq $v0, $zero, .L8098EFAC -/* 00AB8 8098EF18 8FA40018 */ lw $a0, 0x0018($sp) -/* 00ABC 8098EF1C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AC0 8098EF20 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00AC4 8098EF24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AC8 8098EF28 248201A0 */ addiu $v0, $a0, 0x01A0 ## $v0 = 000001A0 -/* 00ACC 8098EF2C C4440000 */ lwc1 $f4, 0x0000($v0) ## 000001A0 -/* 00AD0 8098EF30 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00AD4 8098EF34 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00AD8 8098EF38 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00ADC 8098EF3C 46062200 */ add.s $f8, $f4, $f6 -/* 00AE0 8098EF40 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00AE4 8098EF44 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00AE8 8098EF48 E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A0 -/* 00AEC 8098EF4C 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00AF0 8098EF50 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A0 -/* 00AF4 8098EF54 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00AF8 8098EF58 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00AFC 8098EF5C 00000000 */ nop -/* 00B00 8098EF60 46805420 */ cvt.s.w $f16, $f10 -/* 00B04 8098EF64 46028480 */ add.s $f18, $f16, $f2 -/* 00B08 8098EF68 4600903E */ c.le.s $f18, $f0 -/* 00B0C 8098EF6C 00000000 */ nop -/* 00B10 8098EF70 45000020 */ bc1f .L8098EFF4 -/* 00B14 8098EF74 00000000 */ nop -/* 00B18 8098EF78 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 00B1C 8098EF7C AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 00B20 8098EF80 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00B24 8098EF84 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00B28 8098EF88 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00B2C 8098EF8C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00B30 8098EF90 00000000 */ nop -/* 00B34 8098EF94 468021A0 */ cvt.s.w $f6, $f4 -/* 00B38 8098EF98 46023200 */ add.s $f8, $f6, $f2 -/* 00B3C 8098EF9C E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A0 -/* 00B40 8098EFA0 AC8301A4 */ sw $v1, 0x01A4($a0) ## 000001A4 -/* 00B44 8098EFA4 10000026 */ beq $zero, $zero, .L8098F040 -/* 00B48 8098EFA8 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L8098EFAC: -/* 00B4C 8098EFAC 248201A0 */ addiu $v0, $a0, 0x01A0 ## $v0 = 000001A0 -/* 00B50 8098EFB0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00B54 8098EFB4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00B58 8098EFB8 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000001A0 -/* 00B5C 8098EFBC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00B60 8098EFC0 46105481 */ sub.s $f18, $f10, $f16 -/* 00B64 8098EFC4 E4520000 */ swc1 $f18, 0x0000($v0) ## 000001A0 -/* 00B68 8098EFC8 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A0 -/* 00B6C 8098EFCC 4602003E */ c.le.s $f0, $f2 -/* 00B70 8098EFD0 00000000 */ nop -/* 00B74 8098EFD4 45000007 */ bc1f .L8098EFF4 -/* 00B78 8098EFD8 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00B7C 8098EFDC AC8A0198 */ sw $t2, 0x0198($a0) ## 00000198 -/* 00B80 8098EFE0 AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 00B84 8098EFE4 E4420000 */ swc1 $f2, 0x0000($v0) ## 000001A0 -/* 00B88 8098EFE8 AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 00B8C 8098EFEC 10000014 */ beq $zero, $zero, .L8098F040 -/* 00B90 8098EFF0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L8098EFF4: -/* 00B94 8098EFF4 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00B98 8098EFF8 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00B9C 8098EFFC 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00BA0 8098F000 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BA4 8098F004 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00BA8 8098F008 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00BAC 8098F00C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00BB0 8098F010 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00BB4 8098F014 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00BB8 8098F018 00000000 */ nop -/* 00BBC 8098F01C 468021A0 */ cvt.s.w $f6, $f4 -/* 00BC0 8098F020 46023200 */ add.s $f8, $f6, $f2 -/* 00BC4 8098F024 46080283 */ div.s $f10, $f0, $f8 -/* 00BC8 8098F028 46105482 */ mul.s $f18, $f10, $f16 -/* 00BCC 8098F02C 4600910D */ trunc.w.s $f4, $f18 -/* 00BD0 8098F030 44022000 */ mfc1 $v0, $f4 -/* 00BD4 8098F034 00000000 */ nop -/* 00BD8 8098F038 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 00BDC 8098F03C A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F040: -/* 00BE0 8098F040 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE4 8098F044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BE8 8098F048 03E00008 */ jr $ra -/* 00BEC 8098F04C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s deleted file mode 100644 index cd5b81e055..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8098F050 -/* 00BF0 8098F050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF4 8098F054 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BF8 8098F058 AFA5001C */ sw $a1, 0x001C($sp) -/* 00BFC 8098F05C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 8098F060 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00C04 8098F064 0C2639A8 */ jal func_8098E6A0 -/* 00C08 8098F068 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00C0C 8098F06C 1040001A */ beq $v0, $zero, .L8098F0D8 -/* 00C10 8098F070 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C14 8098F074 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00C18 8098F078 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00C1C 8098F07C AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 00C20 8098F080 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 00C24 8098F084 3C188016 */ lui $t8, %hi(gGameInfo) -/* 00C28 8098F088 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 00C2C 8098F08C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C30 8098F090 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00C34 8098F094 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 00C38 8098F098 8C8901A8 */ lw $t1, 0x01A8($a0) ## 000001A8 -/* 00C3C 8098F09C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00C40 8098F0A0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00C44 8098F0A4 AC8801A4 */ sw $t0, 0x01A4($a0) ## 000001A4 -/* 00C48 8098F0A8 468021A0 */ cvt.s.w $f6, $f4 -/* 00C4C 8098F0AC 46083280 */ add.s $f10, $f6, $f8 -/* 00C50 8098F0B0 15200007 */ bne $t1, $zero, .L8098F0D0 -/* 00C54 8098F0B4 E48A01A0 */ swc1 $f10, 0x01A0($a0) ## 000001A0 -/* 00C58 8098F0B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C5C 8098F0BC 0C263B8A */ jal func_8098EE28 -/* 00C60 8098F0C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C64 8098F0C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C68 8098F0C8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00C6C 8098F0CC AC8A01A8 */ sw $t2, 0x01A8($a0) ## 000001A8 -.L8098F0D0: -/* 00C70 8098F0D0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00C74 8098F0D4 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L8098F0D8: -/* 00C78 8098F0D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C7C 8098F0DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C80 8098F0E0 03E00008 */ jr $ra -/* 00C84 8098F0E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s deleted file mode 100644 index 7fb1d3e90b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098F0E8 -/* 00C88 8098F0E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C8C 8098F0EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C90 8098F0F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C94 8098F0F4 0C263BAA */ jal func_8098EEA8 -/* 00C98 8098F0F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C9C 8098F0FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CA0 8098F100 0C263955 */ jal func_8098E554 -/* 00CA4 8098F104 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CA8 8098F108 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CAC 8098F10C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CB0 8098F110 03E00008 */ jr $ra -/* 00CB4 8098F114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s deleted file mode 100644 index f57b5f1d57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098F118 -/* 00CB8 8098F118 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CBC 8098F11C AFBF001C */ sw $ra, 0x001C($sp) -/* 00CC0 8098F120 AFB00018 */ sw $s0, 0x0018($sp) -/* 00CC4 8098F124 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CC8 8098F128 0C263972 */ jal func_8098E5C8 -/* 00CCC 8098F12C AFA50024 */ sw $a1, 0x0024($sp) -/* 00CD0 8098F130 0C263984 */ jal func_8098E610 -/* 00CD4 8098F134 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CD8 8098F138 0C263920 */ jal func_8098E480 -/* 00CDC 8098F13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CE0 8098F140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CE4 8098F144 0C263BBF */ jal func_8098EEFC -/* 00CE8 8098F148 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CEC 8098F14C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF0 8098F150 0C263955 */ jal func_8098E554 -/* 00CF4 8098F154 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CF8 8098F158 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CFC 8098F15C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D00 8098F160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D04 8098F164 03E00008 */ jr $ra -/* 00D08 8098F168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s deleted file mode 100644 index e82112e246..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098F16C -/* 00D0C 8098F16C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D10 8098F170 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D14 8098F174 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D18 8098F178 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D1C 8098F17C 0C263972 */ jal func_8098E5C8 -/* 00D20 8098F180 AFA50024 */ sw $a1, 0x0024($sp) -/* 00D24 8098F184 0C263984 */ jal func_8098E610 -/* 00D28 8098F188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D2C 8098F18C 0C263B6C */ jal func_8098EDB0 -/* 00D30 8098F190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D34 8098F194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D38 8098F198 0C263C14 */ jal func_8098F050 -/* 00D3C 8098F19C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D40 8098F1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D44 8098F1A4 0C263955 */ jal func_8098E554 -/* 00D48 8098F1A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D4C 8098F1AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D50 8098F1B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D54 8098F1B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D58 8098F1B8 03E00008 */ jr $ra -/* 00D5C 8098F1BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s deleted file mode 100644 index f6b3fa3537..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80990DE0 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80990E04 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_8098F1C0 -/* 00D60 8098F1C0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) -/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) -/* 00D74 8098F1D4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00D78 8098F1D8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 -/* 00D7C 8098F1DC 3C0A8099 */ lui $t2, %hi(D_809900F4) ## $t2 = 80990000 -/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 -/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 -/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) -/* 00D8C 8098F1EC 3C068099 */ lui $a2, %hi(D_80990DE0) ## $a2 = 80990000 -/* 00D90 8098F1F0 24C60DE0 */ addiu $a2, $a2, %lo(D_80990DE0) ## $a2 = 80990DE0 -/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) -/* 00D98 8098F1F8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 00D9C 8098F1FC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 00DA0 8098F200 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 -/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 -/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) -/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) -/* 00DB4 8098F214 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DB8 8098F218 0C031AB1 */ jal Graph_OpenDisps -/* 00DBC 8098F21C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) -/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 -/* 00DC8 8098F228 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) -/* 00DD0 8098F230 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DD4 8098F234 3C078016 */ lui $a3, %hi(gSegments) -/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 -/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 -/* 00DE0 8098F240 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00DE4 8098F244 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00DE8 8098F248 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00DEC 8098F24C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 -/* 00DF4 8098F254 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 -/* 00DFC 8098F25C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E00 8098F260 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 00E04 8098F264 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 00E08 8098F268 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 -/* 00E10 8098F270 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 -/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 -/* 00E1C 8098F27C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00E20 8098F280 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E24 8098F284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00E28 8098F288 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 00E2C 8098F28C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00E30 8098F290 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00E34 8098F294 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E38 8098F298 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00E3C 8098F29C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00E40 8098F2A0 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 -/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 -/* 00E4C 8098F2AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) -/* 00E54 8098F2B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 -/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 -/* 00E60 8098F2C0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00E64 8098F2C4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 -/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 -/* 00E70 8098F2D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00E74 8098F2D4 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 -/* 00E7C 8098F2DC 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 -/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 -/* 00E88 8098F2E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00E8C 8098F2EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) -/* 00E94 8098F2F4 3C0A8011 */ lui $t2, %hi(D_80116280) -/* 00E98 8098F2F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00E9C 8098F2FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00EA0 8098F300 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00EA4 8098F304 8D0F01A4 */ lw $t7, 0x01A4($t0) ## 010001A3 -/* 00EA8 8098F308 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00EAC 8098F30C 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 -/* 00EB0 8098F310 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000024 -/* 00EB4 8098F314 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00EB8 8098F318 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00EBC 8098F31C 254A6280 */ addiu $t2, %lo(D_80116280) -/* 00EC0 8098F320 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00EC4 8098F324 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00EC8 8098F328 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00ECC 8098F32C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00ED0 8098F330 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0100014B -/* 00ED4 8098F334 8C450004 */ lw $a1, 0x0004($v0) ## 0100014F -/* 00ED8 8098F338 8C460020 */ lw $a2, 0x0020($v0) ## 0100016B -/* 00EDC 8098F33C 90470002 */ lbu $a3, 0x0002($v0) ## 0100014D -/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) -/* 00EEC 8098F34C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) -/* 00EF4 8098F354 0C0289CF */ jal SkelAnime_DrawSV2 -/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) -/* 00EFC 8098F35C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) -/* 00F04 8098F364 3C068099 */ lui $a2, %hi(D_80990E04) ## $a2 = 80990000 -/* 00F08 8098F368 24C60E04 */ addiu $a2, $a2, %lo(D_80990E04) ## $a2 = 80990E04 -/* 00F0C 8098F36C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 00F10 8098F370 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 -/* 00F14 8098F374 0C031AD5 */ jal Graph_CloseDisps -/* 00F18 8098F378 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F24 8098F384 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00F28 8098F388 03E00008 */ jr $ra -/* 00F2C 8098F38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s deleted file mode 100644 index df68cb4a3b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098F390 -/* 00F30 8098F390 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) -/* 00F3C 8098F39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F48 8098F3A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00F4C 8098F3AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00F50 8098F3B0 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 -/* 00F54 8098F3B4 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) -/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F64 8098F3C4 0C0291BE */ jal SkelAnime_InitSV -/* 00F68 8098F3C8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) -/* 00F70 8098F3D0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00F74 8098F3D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00F78 8098F3D8 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 -/* 00F7C 8098F3DC AC4F019C */ sw $t7, 0x019C($v0) ## 0000019C -/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F84 8098F3E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F88 8098F3E8 03E00008 */ jr $ra -/* 00F8C 8098F3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s deleted file mode 100644 index 8a68e04134..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098F3F0 -/* 00F90 8098F3F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F94 8098F3F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F98 8098F3F8 0C263972 */ jal func_8098E5C8 -/* 00F9C 8098F3FC AFA40018 */ sw $a0, 0x0018($sp) -/* 00FA0 8098F400 0C263984 */ jal func_8098E610 -/* 00FA4 8098F404 8FA40018 */ lw $a0, 0x0018($sp) -/* 00FA8 8098F408 0C263920 */ jal func_8098E480 -/* 00FAC 8098F40C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00FB0 8098F410 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FB4 8098F414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FB8 8098F418 03E00008 */ jr $ra -/* 00FBC 8098F41C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s deleted file mode 100644 index 2fec2267c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098F420 -/* 00FC0 8098F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FCC 8098F42C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) -/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FD8 8098F438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00FDC 8098F43C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 00FE0 8098F440 24E7FFD4 */ addiu $a3, $a3, 0xFFD4 ## $a3 = 0600FFD4 -/* 00FE4 8098F444 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) -/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FF4 8098F454 0C0291BE */ jal SkelAnime_InitSV -/* 00FF8 8098F458 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) -/* 01000 8098F460 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 01004 8098F464 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 -/* 01008 8098F468 AC40019C */ sw $zero, 0x019C($v0) ## 0000019C -/* 0100C 8098F46C A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01014 8098F474 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01018 8098F478 03E00008 */ jr $ra -/* 0101C 8098F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s deleted file mode 100644 index 33a07c4d8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8098F480 -/* 01020 8098F480 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01024 8098F484 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01028 8098F488 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 0102C 8098F48C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01030 8098F490 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01034 8098F494 46062200 */ add.s $f8, $f4, $f6 -/* 01038 8098F498 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 0103C 8098F49C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 01040 8098F4A0 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 01044 8098F4A4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01048 8098F4A8 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 0104C 8098F4AC 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 01050 8098F4B0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01054 8098F4B4 00000000 */ nop -/* 01058 8098F4B8 46805420 */ cvt.s.w $f16, $f10 -/* 0105C 8098F4BC 46128000 */ add.s $f0, $f16, $f18 -/* 01060 8098F4C0 4604003E */ c.le.s $f0, $f4 -/* 01064 8098F4C4 00000000 */ nop -/* 01068 8098F4C8 45020005 */ bc1fl .L8098F4E0 -/* 0106C 8098F4CC C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -/* 01070 8098F4D0 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 01074 8098F4D4 03E00008 */ jr $ra -/* 01078 8098F4D8 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F4DC: -/* 0107C 8098F4DC C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -.L8098F4E0: -/* 01080 8098F4E0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01084 8098F4E4 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 01088 8098F4E8 46003203 */ div.s $f8, $f6, $f0 -/* 0108C 8098F4EC 460A4402 */ mul.s $f16, $f8, $f10 -/* 01090 8098F4F0 4600848D */ trunc.w.s $f18, $f16 -/* 01094 8098F4F4 44029000 */ mfc1 $v0, $f18 -/* 01098 8098F4F8 00000000 */ nop -/* 0109C 8098F4FC AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 010A0 8098F500 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 010A4 8098F504 03E00008 */ jr $ra -/* 010A8 8098F508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s deleted file mode 100644 index a6e7d7140e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098F50C -/* 010AC 8098F50C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B0 8098F510 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010B4 8098F514 AFA40018 */ sw $a0, 0x0018($sp) -/* 010B8 8098F518 0C2639BB */ jal func_8098E6EC -/* 010BC 8098F51C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 010C0 8098F520 8FA40018 */ lw $a0, 0x0018($sp) -/* 010C4 8098F524 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 010C8 8098F528 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 010CC 8098F52C AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 010D0 8098F530 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 010D4 8098F534 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010D8 8098F538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010DC 8098F53C 03E00008 */ jr $ra -/* 010E0 8098F540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s deleted file mode 100644 index 628044ce90..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098F544 -/* 010E4 8098F544 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 010E8 8098F548 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 010EC 8098F54C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 010F0 8098F550 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 010F4 8098F554 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 010F8 8098F558 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 010FC 8098F55C 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 01100 8098F560 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01104 8098F564 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01108 8098F568 46803220 */ cvt.s.w $f8, $f6 -/* 0110C 8098F56C 460A4400 */ add.s $f16, $f8, $f10 -/* 01110 8098F570 4604803E */ c.le.s $f16, $f4 -/* 01114 8098F574 00000000 */ nop -/* 01118 8098F578 45000003 */ bc1f .L8098F588 -/* 0111C 8098F57C 00000000 */ nop -/* 01120 8098F580 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 01124 8098F584 AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -.L8098F588: -/* 01128 8098F588 03E00008 */ jr $ra -/* 0112C 8098F58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s deleted file mode 100644 index 3dd89376d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F590 -/* 01130 8098F590 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01134 8098F594 AFBF001C */ sw $ra, 0x001C($sp) -/* 01138 8098F598 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0113C 8098F59C AFA40020 */ sw $a0, 0x0020($sp) -/* 01140 8098F5A0 24A5F580 */ addiu $a1, $a1, 0xF580 ## $a1 = 0600F580 -/* 01144 8098F5A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01148 8098F5A8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0114C 8098F5AC 0C2639DB */ jal func_8098E76C -/* 01150 8098F5B0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01154 8098F5B4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01158 8098F5B8 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 0115C 8098F5BC ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 01160 8098F5C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01164 8098F5C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01168 8098F5C8 03E00008 */ jr $ra -/* 0116C 8098F5CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s deleted file mode 100644 index 3c35d2dcbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F5D0 -/* 01170 8098F5D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01174 8098F5D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01178 8098F5D8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0117C 8098F5DC AFA40020 */ sw $a0, 0x0020($sp) -/* 01180 8098F5E0 24A5FCE0 */ addiu $a1, $a1, 0xFCE0 ## $a1 = 0600FCE0 -/* 01184 8098F5E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01188 8098F5E8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0118C 8098F5EC 0C2639DB */ jal func_8098E76C -/* 01190 8098F5F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01194 8098F5F4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01198 8098F5F8 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 0119C 8098F5FC ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 011A0 8098F600 8FBF001C */ lw $ra, 0x001C($sp) -/* 011A4 8098F604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 011A8 8098F608 03E00008 */ jr $ra -/* 011AC 8098F60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s deleted file mode 100644 index 014b760da3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098F610 -/* 011B0 8098F610 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011B4 8098F614 AFBF001C */ sw $ra, 0x001C($sp) -/* 011B8 8098F618 10A0000A */ beq $a1, $zero, .L8098F644 -/* 011BC 8098F61C AFA40020 */ sw $a0, 0x0020($sp) -/* 011C0 8098F620 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 011C4 8098F624 24A5FFD4 */ addiu $a1, $a1, 0xFFD4 ## $a1 = 0600FFD4 -/* 011C8 8098F628 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011CC 8098F62C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 011D0 8098F630 0C2639DB */ jal func_8098E76C -/* 011D4 8098F634 AFA00010 */ sw $zero, 0x0010($sp) -/* 011D8 8098F638 8FAF0020 */ lw $t7, 0x0020($sp) -/* 011DC 8098F63C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 011E0 8098F640 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8098F644: -/* 011E4 8098F644 8FBF001C */ lw $ra, 0x001C($sp) -/* 011E8 8098F648 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 011EC 8098F64C 03E00008 */ jr $ra -/* 011F0 8098F650 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s deleted file mode 100644 index 8a91cc2ff6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_80990E28 - .asciz "Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8098F654 -/* 011F4 8098F654 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011F8 8098F658 AFB00018 */ sw $s0, 0x0018($sp) -/* 011FC 8098F65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01200 8098F660 AFBF001C */ sw $ra, 0x001C($sp) -/* 01204 8098F664 AFA5002C */ sw $a1, 0x002C($sp) -/* 01208 8098F668 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0120C 8098F66C 0C26398C */ jal func_8098E630 -/* 01210 8098F670 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01214 8098F674 50400023 */ beql $v0, $zero, .L8098F704 -/* 01218 8098F678 8FBF001C */ lw $ra, 0x001C($sp) -/* 0121C 8098F67C 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01220 8098F680 8E0301AC */ lw $v1, 0x01AC($s0) ## 000001AC -/* 01224 8098F684 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01228 8098F688 50C3001E */ beql $a2, $v1, .L8098F704 -/* 0122C 8098F68C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01230 8098F690 10C10009 */ beq $a2, $at, .L8098F6B8 -/* 01234 8098F694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01238 8098F698 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0123C 8098F69C 10C1000B */ beq $a2, $at, .L8098F6CC -/* 01240 8098F6A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01244 8098F6A4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01248 8098F6A8 10C1000C */ beq $a2, $at, .L8098F6DC -/* 0124C 8098F6AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01250 8098F6B0 1000000E */ beq $zero, $zero, .L8098F6EC -/* 01254 8098F6B4 3C048099 */ lui $a0, %hi(D_80990E28) ## $a0 = 80990000 -.L8098F6B8: -/* 01258 8098F6B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0125C 8098F6BC 0C263D43 */ jal func_8098F50C -/* 01260 8098F6C0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01264 8098F6C4 1000000D */ beq $zero, $zero, .L8098F6FC -/* 01268 8098F6C8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6CC: -/* 0126C 8098F6CC 0C263D64 */ jal func_8098F590 -/* 01270 8098F6D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01274 8098F6D4 10000009 */ beq $zero, $zero, .L8098F6FC -/* 01278 8098F6D8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6DC: -/* 0127C 8098F6DC 0C263D74 */ jal func_8098F5D0 -/* 01280 8098F6E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01284 8098F6E4 10000005 */ beq $zero, $zero, .L8098F6FC -/* 01288 8098F6E8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6EC: -/* 0128C 8098F6EC 24840E28 */ addiu $a0, $a0, %lo(D_80990E28) ## $a0 = 00000E28 -/* 01290 8098F6F0 0C00084C */ jal osSyncPrintf - -/* 01294 8098F6F4 AFA60020 */ sw $a2, 0x0020($sp) -/* 01298 8098F6F8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6FC: -/* 0129C 8098F6FC AE0601AC */ sw $a2, 0x01AC($s0) ## 000001AC -/* 012A0 8098F700 8FBF001C */ lw $ra, 0x001C($sp) -.L8098F704: -/* 012A4 8098F704 8FB00018 */ lw $s0, 0x0018($sp) -/* 012A8 8098F708 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012AC 8098F70C 03E00008 */ jr $ra -/* 012B0 8098F710 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s deleted file mode 100644 index ffac5a2226..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098F714 -/* 012B4 8098F714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012B8 8098F718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012BC 8098F71C 0C263D95 */ jal func_8098F654 -/* 012C0 8098F720 00000000 */ nop -/* 012C4 8098F724 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012C8 8098F728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012CC 8098F72C 03E00008 */ jr $ra -/* 012D0 8098F730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s deleted file mode 100644 index f8c8c5655a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098F734 -/* 012D4 8098F734 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012D8 8098F738 AFBF001C */ sw $ra, 0x001C($sp) -/* 012DC 8098F73C AFB00018 */ sw $s0, 0x0018($sp) -/* 012E0 8098F740 0C263972 */ jal func_8098E5C8 -/* 012E4 8098F744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012E8 8098F748 0C263984 */ jal func_8098E610 -/* 012EC 8098F74C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012F0 8098F750 0C263920 */ jal func_8098E480 -/* 012F4 8098F754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012F8 8098F758 0C263D20 */ jal func_8098F480 -/* 012FC 8098F75C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 8098F760 0C263D51 */ jal func_8098F544 -/* 01304 8098F764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01308 8098F768 8FBF001C */ lw $ra, 0x001C($sp) -/* 0130C 8098F76C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01310 8098F770 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01314 8098F774 03E00008 */ jr $ra -/* 01318 8098F778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s deleted file mode 100644 index c107002763..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F77C -/* 0131C 8098F77C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01320 8098F780 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01324 8098F784 AFA40018 */ sw $a0, 0x0018($sp) -/* 01328 8098F788 0C263972 */ jal func_8098E5C8 -/* 0132C 8098F78C AFA5001C */ sw $a1, 0x001C($sp) -/* 01330 8098F790 0C263984 */ jal func_8098E610 -/* 01334 8098F794 8FA40018 */ lw $a0, 0x0018($sp) -/* 01338 8098F798 0C263920 */ jal func_8098E480 -/* 0133C 8098F79C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01340 8098F7A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01344 8098F7A4 0C263D95 */ jal func_8098F654 -/* 01348 8098F7A8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0134C 8098F7AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01350 8098F7B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01354 8098F7B4 03E00008 */ jr $ra -/* 01358 8098F7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s deleted file mode 100644 index 0e662cbb60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F7BC -/* 0135C 8098F7BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01360 8098F7C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01364 8098F7C4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01368 8098F7C8 0C263972 */ jal func_8098E5C8 -/* 0136C 8098F7CC AFA5001C */ sw $a1, 0x001C($sp) -/* 01370 8098F7D0 0C263984 */ jal func_8098E610 -/* 01374 8098F7D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01378 8098F7D8 0C263920 */ jal func_8098E480 -/* 0137C 8098F7DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01380 8098F7E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01384 8098F7E4 0C263D95 */ jal func_8098F654 -/* 01388 8098F7E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0138C 8098F7EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01390 8098F7F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01394 8098F7F4 03E00008 */ jr $ra -/* 01398 8098F7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s deleted file mode 100644 index 19f40e4237..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F7FC -/* 0139C 8098F7FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013A0 8098F800 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013A4 8098F804 0C263972 */ jal func_8098E5C8 -/* 013A8 8098F808 AFA40020 */ sw $a0, 0x0020($sp) -/* 013AC 8098F80C 0C263984 */ jal func_8098E610 -/* 013B0 8098F810 8FA40020 */ lw $a0, 0x0020($sp) -/* 013B4 8098F814 AFA2001C */ sw $v0, 0x001C($sp) -/* 013B8 8098F818 0C263920 */ jal func_8098E480 -/* 013BC 8098F81C 8FA40020 */ lw $a0, 0x0020($sp) -/* 013C0 8098F820 8FA40020 */ lw $a0, 0x0020($sp) -/* 013C4 8098F824 0C263D84 */ jal func_8098F610 -/* 013C8 8098F828 8FA5001C */ lw $a1, 0x001C($sp) -/* 013CC 8098F82C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013D0 8098F830 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013D4 8098F834 03E00008 */ jr $ra -/* 013D8 8098F838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s deleted file mode 100644 index c542919cfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_8098F83C -/* 013DC 8098F83C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) -/* 013E4 8098F844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) -/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) -/* 013F0 8098F850 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 013F4 8098F854 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 013F8 8098F858 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 013FC 8098F85C 24E7113C */ addiu $a3, $a3, 0x113C ## $a3 = 0601113C -/* 01400 8098F860 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 01404 8098F864 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) -/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) -/* 01410 8098F870 0C0291BE */ jal SkelAnime_InitSV -/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) -/* 01418 8098F878 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 -/* 0141C 8098F87C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000024 -/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) -/* 01424 8098F884 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0142C 8098F88C C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000028 -/* 01430 8098F890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01434 8098F894 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0143C 8098F89C C4480008 */ lwc1 $f8, 0x0008($v0) ## 0000002C -/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) -/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) -/* 01450 8098F8B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01454 8098F8B4 0C00C916 */ jal Actor_SpawnAttached - -/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0145C 8098F8BC 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 01460 8098F8C0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 01464 8098F8C4 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C -/* 01468 8098F8C8 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 0146C 8098F8CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 8098F8D0 0C263942 */ jal func_8098E508 -/* 01474 8098F8D4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01478 8098F8D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C -/* 01480 8098F8E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) -/* 0148C 8098F8EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01490 8098F8F0 03E00008 */ jr $ra -/* 01494 8098F8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s deleted file mode 100644 index 2863b949ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8098F8F8 -/* 01498 8098F8F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0149C 8098F8FC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 014A0 8098F900 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 014A4 8098F904 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 014A8 8098F908 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 014AC 8098F90C 46062200 */ add.s $f8, $f4, $f6 -/* 014B0 8098F910 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 014B4 8098F914 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 014B8 8098F918 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 014BC 8098F91C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 014C0 8098F920 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 014C4 8098F924 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 014C8 8098F928 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 014CC 8098F92C 00000000 */ nop -/* 014D0 8098F930 46805420 */ cvt.s.w $f16, $f10 -/* 014D4 8098F934 46128000 */ add.s $f0, $f16, $f18 -/* 014D8 8098F938 4604003E */ c.le.s $f0, $f4 -/* 014DC 8098F93C 00000000 */ nop -/* 014E0 8098F940 45020005 */ bc1fl .L8098F958 -/* 014E4 8098F944 C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -/* 014E8 8098F948 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 014EC 8098F94C 03E00008 */ jr $ra -/* 014F0 8098F950 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F954: -/* 014F4 8098F954 C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -.L8098F958: -/* 014F8 8098F958 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 014FC 8098F95C 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 01500 8098F960 46003203 */ div.s $f8, $f6, $f0 -/* 01504 8098F964 460A4402 */ mul.s $f16, $f8, $f10 -/* 01508 8098F968 4600848D */ trunc.w.s $f18, $f16 -/* 0150C 8098F96C 44029000 */ mfc1 $v0, $f18 -/* 01510 8098F970 00000000 */ nop -/* 01514 8098F974 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 01518 8098F978 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 0151C 8098F97C 03E00008 */ jr $ra -/* 01520 8098F980 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s deleted file mode 100644 index db0efb4441..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098F984 -/* 01524 8098F984 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01528 8098F988 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 0152C 8098F98C AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 01530 8098F990 03E00008 */ jr $ra -/* 01534 8098F994 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s deleted file mode 100644 index a0579dd32c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8098F998 -/* 01538 8098F998 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0153C 8098F99C AFBF001C */ sw $ra, 0x001C($sp) -/* 01540 8098F9A0 8C8E01AC */ lw $t6, 0x01AC($a0) ## 000001AC -/* 01544 8098F9A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01548 8098F9A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0154C 8098F9AC 15C1000C */ bne $t6, $at, .L8098F9E0 -/* 01550 8098F9B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01554 8098F9B4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01558 8098F9B8 0C2639BB */ jal func_8098E6EC -/* 0155C 8098F9BC AFA40020 */ sw $a0, 0x0020($sp) -/* 01560 8098F9C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01564 8098F9C4 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 -/* 01568 8098F9C8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0156C 8098F9CC AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 01570 8098F9D0 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C -/* 01574 8098F9D4 AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 01578 8098F9D8 1000000E */ beq $zero, $zero, .L8098FA14 -/* 0157C 8098F9DC A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L8098F9E0: -/* 01580 8098F9E0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01584 8098F9E4 24A5113C */ addiu $a1, $a1, 0x113C ## $a1 = 0601113C -/* 01588 8098F9E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0158C 8098F9EC 0C2639DB */ jal func_8098E76C -/* 01590 8098F9F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01594 8098F9F4 8FA40020 */ lw $a0, 0x0020($sp) -/* 01598 8098F9F8 24190012 */ addiu $t9, $zero, 0x0012 ## $t9 = 00000012 -/* 0159C 8098F9FC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 015A0 8098FA00 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 015A4 8098FA04 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 015A8 8098FA08 AC88019C */ sw $t0, 0x019C($a0) ## 0000019C -/* 015AC 8098FA0C AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 015B0 8098FA10 A08900C8 */ sb $t1, 0x00C8($a0) ## 000000C8 -.L8098FA14: -/* 015B4 8098FA14 0C263942 */ jal func_8098E508 -/* 015B8 8098FA18 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 015BC 8098FA1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 015C0 8098FA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015C4 8098FA24 03E00008 */ jr $ra -/* 015C8 8098FA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s deleted file mode 100644 index da7737f5fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8098FA2C -/* 015CC 8098FA2C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 015D0 8098FA30 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 015D4 8098FA34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 015D8 8098FA38 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 015DC 8098FA3C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 015E0 8098FA40 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 015E4 8098FA44 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 015E8 8098FA48 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 015EC 8098FA4C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015F0 8098FA50 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 015F4 8098FA54 46803220 */ cvt.s.w $f8, $f6 -/* 015F8 8098FA58 460A4400 */ add.s $f16, $f8, $f10 -/* 015FC 8098FA5C 4604803E */ c.le.s $f16, $f4 -/* 01600 8098FA60 00000000 */ nop -/* 01604 8098FA64 45000005 */ bc1f .L8098FA7C -/* 01608 8098FA68 00000000 */ nop -/* 0160C 8098FA6C AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 01610 8098FA70 AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 01614 8098FA74 AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 01618 8098FA78 A08800C8 */ sb $t0, 0x00C8($a0) ## 000000C8 -.L8098FA7C: -/* 0161C 8098FA7C 03E00008 */ jr $ra -/* 01620 8098FA80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s deleted file mode 100644 index b6cd889231..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8098FA84 -/* 01624 8098FA84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01628 8098FA88 AFBF001C */ sw $ra, 0x001C($sp) -/* 0162C 8098FA8C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01630 8098FA90 24A540BC */ addiu $a1, $a1, 0x40BC ## $a1 = 060140BC -/* 01634 8098FA94 AFA00010 */ sw $zero, 0x0010($sp) -/* 01638 8098FA98 AFA40020 */ sw $a0, 0x0020($sp) -/* 0163C 8098FA9C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01640 8098FAA0 0C2639DB */ jal func_8098E76C -/* 01644 8098FAA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01648 8098FAA8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0164C 8098FAAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01650 8098FAB0 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 01654 8098FAB4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01658 8098FAB8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0165C 8098FABC AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 01660 8098FAC0 AC82019C */ sw $v0, 0x019C($a0) ## 0000019C -/* 01664 8098FAC4 AC8201B0 */ sw $v0, 0x01B0($a0) ## 000001B0 -/* 01668 8098FAC8 0C263942 */ jal func_8098E508 -/* 0166C 8098FACC A08F00C8 */ sb $t7, 0x00C8($a0) ## 000000C8 -/* 01670 8098FAD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01674 8098FAD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01678 8098FAD8 03E00008 */ jr $ra -/* 0167C 8098FADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s deleted file mode 100644 index 6a926a8e5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098FAE0 -/* 01680 8098FAE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01684 8098FAE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01688 8098FAE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0168C 8098FAEC 24A535EC */ addiu $a1, $a1, 0x35EC ## $a1 = 060135EC -/* 01690 8098FAF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01694 8098FAF4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01698 8098FAF8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0169C 8098FAFC 0C2639DB */ jal func_8098E76C -/* 016A0 8098FB00 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 016A4 8098FB04 8FA40020 */ lw $a0, 0x0020($sp) -/* 016A8 8098FB08 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 016AC 8098FB0C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 016B0 8098FB10 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 016B4 8098FB14 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 016B8 8098FB18 AC82019C */ sw $v0, 0x019C($a0) ## 0000019C -/* 016BC 8098FB1C AC8201B0 */ sw $v0, 0x01B0($a0) ## 000001B0 -/* 016C0 8098FB20 A08F00C8 */ sb $t7, 0x00C8($a0) ## 000000C8 -/* 016C4 8098FB24 8FBF001C */ lw $ra, 0x001C($sp) -/* 016C8 8098FB28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 016CC 8098FB2C 03E00008 */ jr $ra -/* 016D0 8098FB30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s deleted file mode 100644 index 7d4f5f8ce0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FB34 -/* 016D4 8098FB34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016D8 8098FB38 10A00007 */ beq $a1, $zero, .L8098FB58 -/* 016DC 8098FB3C AFBF001C */ sw $ra, 0x001C($sp) -/* 016E0 8098FB40 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 016E4 8098FB44 24A53CD8 */ addiu $a1, $a1, 0x3CD8 ## $a1 = 06013CD8 -/* 016E8 8098FB48 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 016EC 8098FB4C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 016F0 8098FB50 0C2639DB */ jal func_8098E76C -/* 016F4 8098FB54 AFA00010 */ sw $zero, 0x0010($sp) -.L8098FB58: -/* 016F8 8098FB58 8FBF001C */ lw $ra, 0x001C($sp) -/* 016FC 8098FB5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01700 8098FB60 03E00008 */ jr $ra -/* 01704 8098FB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s deleted file mode 100644 index e3d7b0a511..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s +++ /dev/null @@ -1,70 +0,0 @@ -.rdata -glabel D_80990E64 - .asciz "Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8098FB68 -/* 01708 8098FB68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0170C 8098FB6C AFB00018 */ sw $s0, 0x0018($sp) -/* 01710 8098FB70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01714 8098FB74 AFBF001C */ sw $ra, 0x001C($sp) -/* 01718 8098FB78 AFA5002C */ sw $a1, 0x002C($sp) -/* 0171C 8098FB7C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01720 8098FB80 0C26398C */ jal func_8098E630 -/* 01724 8098FB84 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01728 8098FB88 5040002A */ beql $v0, $zero, .L8098FC34 -/* 0172C 8098FB8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01730 8098FB90 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01734 8098FB94 8E0301AC */ lw $v1, 0x01AC($s0) ## 000001AC -/* 01738 8098FB98 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0173C 8098FB9C 50C30025 */ beql $a2, $v1, .L8098FC34 -/* 01740 8098FBA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01744 8098FBA4 10C1000C */ beq $a2, $at, .L8098FBD8 -/* 01748 8098FBA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 8098FBAC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01750 8098FBB0 10C1000D */ beq $a2, $at, .L8098FBE8 -/* 01754 8098FBB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01758 8098FBB8 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0175C 8098FBBC 10C1000F */ beq $a2, $at, .L8098FBFC -/* 01760 8098FBC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01764 8098FBC4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01768 8098FBC8 10C10010 */ beq $a2, $at, .L8098FC0C -/* 0176C 8098FBCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 8098FBD0 10000012 */ beq $zero, $zero, .L8098FC1C -/* 01774 8098FBD4 3C048099 */ lui $a0, %hi(D_80990E64) ## $a0 = 80990000 -.L8098FBD8: -/* 01778 8098FBD8 0C263E61 */ jal func_8098F984 -/* 0177C 8098FBDC AFA60020 */ sw $a2, 0x0020($sp) -/* 01780 8098FBE0 10000012 */ beq $zero, $zero, .L8098FC2C -/* 01784 8098FBE4 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FBE8: -/* 01788 8098FBE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0178C 8098FBEC 0C263E66 */ jal func_8098F998 -/* 01790 8098FBF0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01794 8098FBF4 1000000D */ beq $zero, $zero, .L8098FC2C -/* 01798 8098FBF8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FBFC: -/* 0179C 8098FBFC 0C263EA1 */ jal func_8098FA84 -/* 017A0 8098FC00 AFA60020 */ sw $a2, 0x0020($sp) -/* 017A4 8098FC04 10000009 */ beq $zero, $zero, .L8098FC2C -/* 017A8 8098FC08 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC0C: -/* 017AC 8098FC0C 0C263EB8 */ jal func_8098FAE0 -/* 017B0 8098FC10 AFA60020 */ sw $a2, 0x0020($sp) -/* 017B4 8098FC14 10000005 */ beq $zero, $zero, .L8098FC2C -/* 017B8 8098FC18 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC1C: -/* 017BC 8098FC1C 24840E64 */ addiu $a0, $a0, %lo(D_80990E64) ## $a0 = 00000E64 -/* 017C0 8098FC20 0C00084C */ jal osSyncPrintf - -/* 017C4 8098FC24 AFA60020 */ sw $a2, 0x0020($sp) -/* 017C8 8098FC28 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC2C: -/* 017CC 8098FC2C AE0601AC */ sw $a2, 0x01AC($s0) ## 000001AC -/* 017D0 8098FC30 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FC34: -/* 017D4 8098FC34 8FB00018 */ lw $s0, 0x0018($sp) -/* 017D8 8098FC38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017DC 8098FC3C 03E00008 */ jr $ra -/* 017E0 8098FC40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s deleted file mode 100644 index b895ecf77e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098FC44 -/* 017E4 8098FC44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017E8 8098FC48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017EC 8098FC4C 0C263EDA */ jal func_8098FB68 -/* 017F0 8098FC50 00000000 */ nop -/* 017F4 8098FC54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017F8 8098FC58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017FC 8098FC5C 03E00008 */ jr $ra -/* 01800 8098FC60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s deleted file mode 100644 index 2ceaa492cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FC64 -/* 01804 8098FC64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01808 8098FC68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0180C 8098FC6C 0C263972 */ jal func_8098E5C8 -/* 01810 8098FC70 AFA40018 */ sw $a0, 0x0018($sp) -/* 01814 8098FC74 0C263984 */ jal func_8098E610 -/* 01818 8098FC78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0181C 8098FC7C 0C263E3E */ jal func_8098F8F8 -/* 01820 8098FC80 8FA40018 */ lw $a0, 0x0018($sp) -/* 01824 8098FC84 0C263E8B */ jal func_8098FA2C -/* 01828 8098FC88 8FA40018 */ lw $a0, 0x0018($sp) -/* 0182C 8098FC8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01830 8098FC90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01834 8098FC94 03E00008 */ jr $ra -/* 01838 8098FC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s deleted file mode 100644 index 9f667fd8f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FC9C -/* 0183C 8098FC9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01840 8098FCA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01844 8098FCA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01848 8098FCA8 0C263972 */ jal func_8098E5C8 -/* 0184C 8098FCAC AFA5001C */ sw $a1, 0x001C($sp) -/* 01850 8098FCB0 0C263984 */ jal func_8098E610 -/* 01854 8098FCB4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01858 8098FCB8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0185C 8098FCBC 0C263EDA */ jal func_8098FB68 -/* 01860 8098FCC0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01864 8098FCC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01868 8098FCC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0186C 8098FCCC 03E00008 */ jr $ra -/* 01870 8098FCD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s deleted file mode 100644 index e8710d10cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FCD4 -/* 01874 8098FCD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01878 8098FCD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0187C 8098FCDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01880 8098FCE0 0C263972 */ jal func_8098E5C8 -/* 01884 8098FCE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01888 8098FCE8 0C263984 */ jal func_8098E610 -/* 0188C 8098FCEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01890 8098FCF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01894 8098FCF4 0C263EDA */ jal func_8098FB68 -/* 01898 8098FCF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0189C 8098FCFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018A0 8098FD00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018A4 8098FD04 03E00008 */ jr $ra -/* 018A8 8098FD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s deleted file mode 100644 index 7180d30728..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8098FD0C -/* 018AC 8098FD0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018B0 8098FD10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018B4 8098FD14 AFA40018 */ sw $a0, 0x0018($sp) -/* 018B8 8098FD18 0C263972 */ jal func_8098E5C8 -/* 018BC 8098FD1C AFA5001C */ sw $a1, 0x001C($sp) -/* 018C0 8098FD20 0C263984 */ jal func_8098E610 -/* 018C4 8098FD24 8FA40018 */ lw $a0, 0x0018($sp) -/* 018C8 8098FD28 8FA40018 */ lw $a0, 0x0018($sp) -/* 018CC 8098FD2C 0C263ECD */ jal func_8098FB34 -/* 018D0 8098FD30 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 018D4 8098FD34 8FA40018 */ lw $a0, 0x0018($sp) -/* 018D8 8098FD38 0C263EDA */ jal func_8098FB68 -/* 018DC 8098FD3C 8FA5001C */ lw $a1, 0x001C($sp) -/* 018E0 8098FD40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018E4 8098FD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018E8 8098FD48 03E00008 */ jr $ra -/* 018EC 8098FD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s deleted file mode 100644 index d5119a433e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FE74 -/* 01A14 8098FE74 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01A18 8098FE78 AFA40000 */ sw $a0, 0x0000($sp) -/* 01A1C 8098FE7C 14A10008 */ bne $a1, $at, .L8098FEA0 -/* 01A20 8098FE80 AFA7000C */ sw $a3, 0x000C($sp) -/* 01A24 8098FE84 8FAE0014 */ lw $t6, 0x0014($sp) -/* 01A28 8098FE88 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01A2C 8098FE8C 27187B80 */ addiu $t8, $t8, 0x7B80 ## $t8 = 06007B80 -/* 01A30 8098FE90 8DCF01B0 */ lw $t7, 0x01B0($t6) ## 000001B0 -/* 01A34 8098FE94 11E00002 */ beq $t7, $zero, .L8098FEA0 -/* 01A38 8098FE98 00000000 */ nop -/* 01A3C 8098FE9C ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 -.L8098FEA0: -/* 01A40 8098FEA0 03E00008 */ jr $ra -/* 01A44 8098FEA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s deleted file mode 100644 index 274baa2179..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8098FEA8 -/* 01A48 8098FEA8 AFA40000 */ sw $a0, 0x0000($sp) -/* 01A4C 8098FEAC 03E00008 */ jr $ra -/* 01A50 8098FEB0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s deleted file mode 100644 index d6e0b014dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ /dev/null @@ -1,124 +0,0 @@ -.rdata -glabel D_80990EDC - .asciz "../z_demo_sa.c" - .balign 4 - -glabel D_80990EEC - .asciz "../z_demo_sa.c" - .balign 4 - -.text -glabel func_8098FEB4 -/* 01A54 8098FEB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) -/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) -/* 01A64 8098FEC4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01A68 8098FEC8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 -/* 01A6C 8098FECC 3C0B8099 */ lui $t3, %hi(D_809900F4) ## $t3 = 80990000 -/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 -/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 -/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) -/* 01A7C 8098FEDC 3C068099 */ lui $a2, %hi(D_80990EDC) ## $a2 = 80990000 -/* 01A80 8098FEE0 24C60EDC */ addiu $a2, $a2, %lo(D_80990EDC) ## $a2 = 80990EDC -/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) -/* 01A88 8098FEE8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 01A8C 8098FEEC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01A90 8098FEF0 2407025A */ addiu $a3, $zero, 0x025A ## $a3 = 0000025A -/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 -/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 -/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) -/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) -/* 01AA4 8098FF04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01AA8 8098FF08 0C031AB1 */ jal Graph_OpenDisps -/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) -/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) -/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 -/* 01AB8 8098FF18 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) -/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) -/* 01AC4 8098FF24 3C078016 */ lui $a3, %hi(gSegments) -/* 01AC8 8098FF28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 -/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 -/* 01AD4 8098FF34 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01AD8 8098FF38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01ADC 8098FF3C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 -/* 01AE4 8098FF44 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 01AE8 8098FF48 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 -/* 01AF0 8098FF50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01AF4 8098FF54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 01AF8 8098FF58 3C0900FF */ lui $t1, 0x00FF ## $t1 = 00FF0000 -/* 01AFC 8098FF5C 3529FFFF */ ori $t1, $t1, 0xFFFF ## $t1 = 00FFFFFF -/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 -/* 01B04 8098FF64 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 -/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 -/* 01B10 8098FF70 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01B14 8098FF74 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B18 8098FF78 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01B1C 8098FF7C 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 01B20 8098FF80 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01B24 8098FF84 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01B28 8098FF88 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01B2C 8098FF8C 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 01B30 8098FF90 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01B34 8098FF94 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 -/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 -/* 01B40 8098FFA0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) -/* 01B48 8098FFA8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 -/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 -/* 01B54 8098FFB4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 -/* 01B5C 8098FFBC AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 -/* 01B64 8098FFC4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01B68 8098FFC8 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 -/* 01B70 8098FFD0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 -/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 -/* 01B7C 8098FFDC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 01B80 8098FFE0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B84 8098FFE4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01B88 8098FFE8 3C0F8011 */ lui $t7, %hi(D_80116280+0x10) -/* 01B8C 8098FFEC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01B90 8098FFF0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 01B94 8098FFF4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01B98 8098FFF8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01B9C 8098FFFC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01BA0 80990000 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01BA4 80990004 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 -/* 01BA8 80990008 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01BAC 8099000C AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 01BB0 80990010 25EF6290 */ addiu $t7, %lo(D_80116280+0x10) -/* 01BB4 80990014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01BB8 80990018 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) -/* 01BC0 80990020 3C188099 */ lui $t8, %hi(func_8098FE74) ## $t8 = 80990000 -/* 01BC4 80990024 2718FE74 */ addiu $t8, $t8, %lo(func_8098FE74) ## $t8 = 8098FE74 -/* 01BC8 80990028 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 01BCC 8099002C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01BD0 80990030 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01BD4 80990034 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) -/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) -/* 01BE4 80990044 0C0286B2 */ jal SkelAnime_DrawSV -/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) -/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) -/* 01BF0 80990050 3C068099 */ lui $a2, %hi(D_80990EEC) ## $a2 = 80990000 -/* 01BF4 80990054 24C60EEC */ addiu $a2, $a2, %lo(D_80990EEC) ## $a2 = 80990EEC -/* 01BF8 80990058 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01BFC 8099005C 24070272 */ addiu $a3, $zero, 0x0272 ## $a3 = 00000272 -/* 01C00 80990060 0C031AD5 */ jal Graph_CloseDisps -/* 01C04 80990064 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01C10 80990070 03E00008 */ jr $ra -/* 01C14 80990074 00000000 */ nop diff --git a/data/overlays/actors/z_demo_sa.data.s b/data/overlays/actors/z_demo_sa.data.s deleted file mode 100644 index fabbaba005..0000000000 --- a/data/overlays/actors/z_demo_sa.data.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809900E0 - .word 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48 -glabel D_809900F4 - .word 0x06003588, 0x06004C48, 0x06003348, 0x06004448, 0x06004648 -glabel D_80990108 - .word 0x00000000 -glabel D_8099010C - .word 0x0000001D, 0x00000BB9, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x02640000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020264, 0x02650000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040265, 0x02AC0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000202AC, 0x02DC0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0xC032AAAB, 0x00000000, 0x000302DC, 0x0B600000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x000D0000, 0x01050000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050105, 0x02580000, 0x95550000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130258, 0x04DB0000, 0x15550000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002B, 0x00000003, 0x00010000, 0x00A50000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000200A5, 0x01D20000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000301D2, 0x0BB90000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x0001024E, 0x025F025F, 0x0000002D, 0x00000001, 0x00050269, 0x02870287, 0x0000002D, 0x00000001, 0x0001036B, 0x03890389, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0xFFFFFF9E, 0x00000000, 0x00000062, 0xFFFFFF9E, 0x00000000, 0x00000062, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, 0x00000001, 0x00040000, 0x0BB80000, 0x00000000, 0xFFFFFFDD, 0x00000061, 0xFFFFFFC4, 0xFFFFFFDD, 0x00000061, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x006403CE, 0x041A041A, 0x00000013, 0x0000000A, 0xFFFF0000, 0x012FFFFF, 0xFFFFFFFF, 0x106A012F, 0x01430000, 0x00000000, 0xFFFF0143, 0x0158FFFF, 0xFFFFFFFF, 0x108F0158, 0x018A0000, 0x00000000, 0xFFFF018A, 0x019FFFFF, 0xFFFFFFFF, 0x1090019F, 0x01D10000, 0x00000000, 0xFFFF01D1, 0x0367FFFF, 0xFFFFFFFF, 0x003E0367, 0x036B0000, 0x00000000, 0xFFFF036B, 0x03A8FFFF, 0xFFFFFFFF, 0x106B03A8, 0x03B20000, 0x00000000, 0x00000056, 0x00000001, 0x004402AE, 0x02AF0000, 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040226, 0x02580000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04D90000, 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B0072, 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B006F, 0x00000000, 0x432A32CA, 0x009F0969, 0x002B002F, 0x00000000, 0x432A32CA, 0x009F00CA, 0x002B0073, 0x00000000, 0x4235998B, 0x009E00DE, 0x002A0061, 0x00000000, 0x4235998B, 0x009E0095, 0x002A006F, 0x00000000, 0x4235998B, 0x009E006F, 0x002A006D, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0065, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0061, 0xFF000000, 0x4235998B, 0x009E006F, 0x002A0061, 0x00000001, 0x000100BE, 0x01870000, 0x00000000, 0x4223FFEE, 0xFFA50012, 0xFF620072, 0x00000000, 0x4223FFEE, 0xFFA60011, 0xFF63006F, 0x00000000, 0x4223FFEE, 0xFFA6001F, 0xFF63002F, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630073, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630061, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF63006F, 0xFF000000, 0x4223FFEE, 0xFFA60025, 0xFF63006D, 0x00000001, 0x00010107, 0x054A0000, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0072, 0x00000000, 0x41C332EC, 0x00070061, 0x007F006F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F002F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0073, 0xFF000000, 0x41C332EC, 0x00070061, 0x007F0061, 0x00000001, 0x0001014D, 0x05900000, 0x00000000, 0x4235998B, 0xFEE90067, 0x00440072, 0x00000000, 0x4235998B, 0xFEE90067, 0x0044006F, 0x00000000, 0x4235998B, 0xFEE90067, 0x0044002F, 0x00000000, 0x4235998B, 0xFEE90067, 0x00440073, 0xFF000000, 0x4235998B, 0xFEE90067, 0x00440061, 0x00000001, 0x00010193, 0x05D60000, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD0072, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD006F, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD002F, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD0073, 0xFF000000, 0x4235998C, 0xFFCC0023, 0xFFAD0061, 0x00000001, 0x000101D9, 0x06B40000, 0x00000000, 0x4235998C, 0xFFBF003D, 0xFF910072, 0x00000000, 0x4235998C, 0xFFBF003D, 0xFF91006F, 0x00000000, 0x4235998C, 0xFFCD004A, 0xFFAA002F, 0x00000000, 0x42726668, 0x00000088, 0x000B0073, 0x00000000, 0x42726668, 0x01820202, 0x02E00061, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006F, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006D, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0065, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0061, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0061, 0xFF000000, 0x424A665D, 0x0243009C, 0x044B0072, 0x00000001, 0x00010261, 0x03B70000, 0x00000000, 0x42700000, 0x000D0356, 0x00020072, 0x00000000, 0x42700000, 0x00090355, 0x0005006F, 0x00000000, 0x42700000, 0xFFFD0355, 0x0005002F, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0073, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF0061, 0x00000000, 0x42700000, 0x00090354, 0xFFEF006F, 0x00000000, 0x42700000, 0x00100354, 0xFFFA006D, 0x00000000, 0x42700000, 0x00090354, 0x00050065, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00050061, 0x00000005, 0x000102AD, 0x074A0000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50072, 0x00000000, 0x4289332C, 0x00000021, 0xFFE5006F, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6002F, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60073, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60061, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6006F, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6006D, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60065, 0x00000002, 0x00010000, 0x04F60000, 0x0000001E, 0x432A32CA, 0x009A0A24, 0x00290072, 0x0000001E, 0x432A32CA, 0x009A0A24, 0x0029006F, 0x0000001E, 0x432A32CA, 0x009A08C8, 0x0029002F, 0x0000001E, 0x432A32CA, 0x009A002A, 0x00290073, 0x0000001E, 0x4270CCCD, 0x0052005E, 0x00170061, 0x0000001E, 0x424BFFF7, 0x0021004F, 0x0000006F, 0x0000001E, 0x4235998B, 0x001E003E, 0xFFF2006D, 0x000003E8, 0x4235998B, 0x001E003E, 0xFFF20065, 0x0000001E, 0x4235998B, 0x001E003E, 0xFFF20061, 0xFF00001E, 0x4235998B, 0x001F003E, 0xFFF20061, 0x00000002, 0x000100BE, 0x01A40000, 0x00000032, 0x4223FFEE, 0x000D002A, 0x00140072, 0x0000001E, 0x4223FFEE, 0x000C002F, 0x0012006F, 0x0000001E, 0x4223FFEE, 0x000B0032, 0x0014002F, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x00140073, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x00140061, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x0014006F, 0xFF00001E, 0x4223FFEE, 0x000B0035, 0x0014006D, 0x00000002, 0x00010107, 0x05670000, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A0072, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A006F, 0x000003E8, 0x41C332EC, 0xFFD60011, 0xFF6A002F, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A0073, 0xFF00001E, 0x41C332EC, 0xFFD60011, 0xFF6A0061, 0x00000002, 0x0001014D, 0x05AD0000, 0x0001001E, 0x4234CCBE, 0xFFE6000D, 0xFFAB0072, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB006F, 0x000003E8, 0x4235998B, 0xFFE6000D, 0xFFAB002F, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB0073, 0xFF00001E, 0x4235998B, 0xFFE6000D, 0xFFAB0061, 0x00000002, 0x00010193, 0x05F30000, 0x0000001E, 0x41F6662E, 0xFF1E000A, 0xFE5D0072, 0x0000001E, 0x41F7FFC8, 0xFF1E000A, 0xFE5D006F, 0x000003E8, 0x420E664F, 0xFF1E000A, 0xFE5D002F, 0x0000001E, 0x42219987, 0xFF1E000A, 0xFE5E0073, 0xFF00001E, 0x4235998C, 0xFF1E000A, 0xFE5E0061, 0x00000002, 0x000101D9, 0x06D10000, 0x0000001E, 0x4235998C, 0xFF26FFA8, 0xFE740072, 0x0000001E, 0x4235998C, 0xFF26FFA8, 0xFE74006F, 0x0000001E, 0x4235998C, 0xFF34FFB5, 0xFE8E002F, 0x0000001E, 0x4282CCCC, 0xFF6BFFF6, 0xFEF30073, 0x00000019, 0x428D998E, 0x011F00EF, 0x02270061, 0x0000001E, 0x42A0CCAE, 0x023A01ED, 0x043B006F, 0x0000000A, 0x42499990, 0x024201EC, 0x0449006D, 0x0000001E, 0x424A665D, 0x024201EC, 0x04490065, 0x000003E8, 0x424A665D, 0x024201EB, 0x04490061, 0x0000001B, 0x424A665D, 0x024201EB, 0x04490061, 0xFF00001E, 0x424A665D, 0x024201EB, 0x04490072, 0x00000002, 0x00010261, 0x03E80000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA0072, 0x00000028, 0x42700000, 0x00030006, 0xFFFA006F, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFA002F, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0073, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA0061, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA006F, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA006D, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0065, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA0061, 0x00000006, 0x000102AD, 0x07670000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050072, 0x0000001E, 0x4289332C, 0x00000065, 0x0006006F, 0x0000001E, 0x4289332C, 0x00010063, 0x0029002F, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100073, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100061, 0x000003E8, 0x4289332C, 0x0000002A, 0x0010006F, 0x0000001E, 0x4289332C, 0x0000002A, 0x0010006D, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100065, 0xFFFFFFFF, 0x00000000 -glabel D_80990D5C - .word func_8098EBB8 -.word func_8098EBD8 -.word func_8098EBF8 -.word func_8098EC28 -.word func_8098EC60 -.word func_8098EC94 -.word func_8098ECCC -.word func_8098F0E8 -.word func_8098F118 -.word func_8098F16C -.word func_8098F3F0 -.word func_8098F714 -.word func_8098F734 -.word func_8098F77C -.word func_8098F7BC -.word func_8098F7FC -.word func_8098FC44 -.word func_8098FC64 -.word func_8098FC9C -.word func_8098FCD4 -.word func_8098FD0C -glabel D_80990DB0 - .word func_8098FEA8 -.word func_8098FEB4 -.word func_8098F1C0 -glabel Demo_Sa_InitVars - .word 0x00C90400, 0x00000010, 0x00BC0000, 0x000001B4 -.word DemoSa_Init -.word DemoSa_Destroy -.word DemoSa_Update -.word DemoSa_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_demo_sa.reloc.s b/data/overlays/actors/z_demo_sa.reloc.s deleted file mode 100644 index 91224b1087..0000000000 --- a/data/overlays/actors/z_demo_sa.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80990F40 - .incbin "baserom/ovl_Demo_Sa", 0x2AE0, 0x000002F0 diff --git a/spec b/spec index 84b3170c8c..19ed81d9f7 100644 --- a/spec +++ b/spec @@ -1649,8 +1649,7 @@ endseg beginseg name "ovl_Demo_Sa" include "build/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.o" - include "build/data/overlays/actors/z_demo_sa.data.o" - include "build/data/overlays/actors/z_demo_sa.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Sa/ovl_Demo_Sa_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 32888e063d..b598cb8b69 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -1,5 +1,13 @@ +/* + * File: z_demo_sa.c + * Overlay: Demo_Sa + * Description: Saria (Cutscene) + */ + #include "z_demo_sa.h" +#include + #define FLAGS 0x00000010 #define THIS ((DemoSa*)thisx) @@ -9,7 +17,56 @@ void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx); void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_8098EBB8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC28(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC60(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC94(DemoSa* this, GlobalContext* globalCtx); +void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx); +void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx); +void func_8098F118(DemoSa* this, GlobalContext* globalCtx); +void func_8098F16C(DemoSa* this, GlobalContext* globalCtx); +void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx); +void func_8098F714(DemoSa* this, GlobalContext* globalCtx); +void func_8098F734(DemoSa* this, GlobalContext* globalCtx); +void func_8098F77C(DemoSa* this, GlobalContext* globalCtx); +void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx); +void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC44(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC64(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx); +void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx); +void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx); + +void func_8098FEA8(DemoSa* this, GlobalContext* globalCtx); +void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx); +void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx); + +UNK_PTR D_809900E0[] = { + 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48, +}; + +UNK_PTR D_809900F4[] = { + 0x06003588, 0x06004C48, 0x06003348, 0x06004448, 0x06004648, +}; + +u32 D_80990108 = 0; + +#include "z_demo_sa_cutscene_data.c" + +static DemoSaActionFunc sActionFuncs[] = { + func_8098EBB8, func_8098EBD8, func_8098EBF8, func_8098EC28, func_8098EC60, func_8098EC94, func_8098ECCC, + func_8098F0E8, func_8098F118, func_8098F16C, func_8098F3F0, func_8098F714, func_8098F734, func_8098F77C, + func_8098F7BC, func_8098F7FC, func_8098FC44, func_8098FC64, func_8098FC9C, func_8098FCD4, func_8098FD0C, +}; + +static DemoSaDrawFunc sDrawFuncs[] = { + func_8098FEA8, + func_8098FEB4, + func_8098F1C0, +}; + const ActorInit Demo_Sa_InitVars = { ACTOR_DEMO_SA, ACTORTYPE_NPC, @@ -21,155 +78,747 @@ const ActorInit Demo_Sa_InitVars = { (ActorFunc)DemoSa_Update, (ActorFunc)DemoSa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s") +void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +extern AnimationHeader D_06001334; +extern AnimationHeader D_060021D8; +extern Gfx D_06007B80[]; +extern SkeletonHeader D_0600B1A0; +extern AnimationHeader D_0600DF80; +extern AnimationHeader D_0600E500; +extern AnimationHeader D_0600F580; +extern AnimationHeader D_0600FCE0; +extern AnimationHeader D_0600FFD4; +extern AnimationHeader D_0601113C; +extern AnimationHeader D_060135EC; +extern AnimationHeader D_06013CD8; +extern AnimationHeader D_060140BC; + +void func_8098E480(DemoSa* this) { + s32 pad[2]; + s16* unk_190 = &this->unk_190; + s16* unk_192 = &this->unk_192; + + if (DECR(*unk_192) == 0) { + *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_190 = *unk_192; + if (*unk_190 >= 3) { + *unk_190 = 0; + } +} + +void func_8098E508(DemoSa* this, s16 arg1) { + this->unk_190 = arg1; +} + +void func_8098E51C(DemoSa* this, s16 arg1) { + this->unk_194 = arg1; +} + +void func_8098E530(DemoSa* this) { + this->action = 7; + this->drawConfig = 0; + this->unk_1A4 = 0; + this->unk_1A8 = 0; + this->actor.shape.unk_14 = 0; + this->unk_1A0 = 0.0f; +} + +void func_8098E554(DemoSa* this, GlobalContext* globalCtx) { + u32* something = &D_80990108; + + if (globalCtx->csCtx.state == 0) { + if (*something != 0) { + if (this->actor.params == 2) { + func_8098E530(this); + } + *something = 0; + } + } else if (*something == 0) { + *something = 1; + } +} + +void func_8098E5C8(DemoSa* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 DemoSa_FrameUpdateMatrix(DemoSa* this) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* DemoSa_GetNpcAction(GlobalContext* globalCtx, s32 idx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[idx]; + } + return NULL; +} + +s32 func_8098E654(DemoSa* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, arg3); + + if ((npcAction != NULL) && (npcAction->action == arg2)) { + return 1; + } + return 0; +} + +s32 func_8098E6A0(DemoSa* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, arg3); + + if ((npcAction != NULL) && (npcAction->action != arg2)) { + return 1; + } + return 0; +} + +void func_8098E6EC(DemoSa* this, GlobalContext* globalCtx, s32 actionIdx) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, actionIdx); + + if (npcAction != NULL) { + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void func_8098E76C(DemoSa* this, AnimationHeader* animationHeader, u8 arg2, f32 transitionRate, s32 arg4) { + s32 pad[2]; + s16 frameCount = SkelAnime_GetFrameCount(&animationHeader->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + fc = 0.0f; + unk0 = frameCount; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animationHeader, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +void func_8098E7FC(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_060021D8, NULL, NULL, 0); + this->actor.shape.unk_08 = -10000.0f; + func_8098E508(this, 1); + func_8098E51C(this, 0); +} + +void func_8098E86C(DemoSa* this, GlobalContext* globalCtx) { + Vec3f* posRot = &this->actor.posRot.pos; + f32 posX = posRot->x; + f32 posY = posRot->y; + f32 posZ = posRot->z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +void func_8098E8C8(DemoSa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.posRot.pos.x; + f32 posY = player->actor.posRot.pos.y + 80.0f; + f32 posZ = player->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + 0xB); + Item_Give(globalCtx, ITEM_MEDALLION_FOREST); +} + +void func_8098E944(DemoSa* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += (250.0f / 3.0f); +} + +void func_8098E960(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player; + + if ((gSaveContext.chamberCutsceneNum == 0) && (gSaveContext.sceneSetupIndex < 4)) { + player = PLAYER; + this->action = 1; + globalCtx->csCtx.segment = D_8099010C; + gSaveContext.cutsceneTrigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_FOREST); + player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + } +} + +void func_8098E9EC(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[4]; + if ((npcAction != NULL) && (npcAction->action == 2)) { + this->action = 2; + this->drawConfig = 1; + func_8098E86C(this, globalCtx); + } + } +} + +void func_8098EA3C(DemoSa* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} + +void func_8098EA68(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[4]; + if ((npcAction != NULL) && (npcAction->action == 3)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600DF80.genericHeader, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600DF80.genericHeader), 2, -4.0f); + this->action = 4; + } + } +} + +void func_8098EB00(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600E500, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600E500.genericHeader), 0, 0.0f); + this->action = 5; + } +} + +void func_8098EB6C(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[6]; + if ((npcAction != NULL) && (npcAction->action == 2)) { + this->action = 6; + func_8098E8C8(this, globalCtx); + } + } +} + +void func_8098EBB8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E960(this, globalCtx); +} + +void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E9EC(this, globalCtx); +} + +void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E944(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EA3C(this); +} + +void func_8098EC28(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EA68(this, globalCtx); +} + +void func_8098EC60(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + func_8098EB00(this, DemoSa_FrameUpdateMatrix(this)); +} + +void func_8098EC94(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EB6C(this, globalCtx); +} + +void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); +} + +void func_8098ECF4(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = SkelAnime_GetFrameCount(&D_06001334.genericHeader); + + SkelAnime_InitSV(globalCtx, skelAnime, &D_0600B1A0, NULL, NULL, NULL, 0); + SkelAnime_ChangeAnim(skelAnime, &D_06001334, 1.0f, 0.0f, frameCount, 2, 0.0f); + this->action = 7; + this->actor.shape.unk_14 = 0; + func_8098E508(this, 2); + func_8098E51C(this, 2); +} + +void func_8098EDB0(DemoSa* this) { + f32 animCurrentFrame = this->skelAnime.animCurrentFrame; + + if ((this->skelAnime.mode == 2) && (animCurrentFrame >= 32.0f)) { + func_8098E508(this, 1); + func_8098E51C(this, 0); + } +} + +void func_8098EE08(void) { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +void func_8098EE28(DemoSa* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + (kREG(23) + 25.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 4); +} + +void func_8098EEA8(DemoSa* this, GlobalContext* globalCtx) { + if (func_8098E654(this, globalCtx, 4, 4)) { + this->action = 8; + this->drawConfig = 2; + this->unk_1A4 = 0; + this->actor.shape.unk_14 = 0; + this->unk_1A0 = 0.0f; + func_8098EE08(); + } +} + +void func_8098EEFC(DemoSa* this, GlobalContext* globalCtx) { + s32 alpha = 0xFF; + f32* unk_1A0 = &this->unk_1A0; + + if (func_8098E654(this, globalCtx, 4, 4)) { + *unk_1A0 += 1.0f; + if ((kREG(5) + 10.0f) <= *unk_1A0) { + this->action = 9; + this->drawConfig = 1; + *unk_1A0 = kREG(5) + 10.0f; + this->unk_1A4 = alpha; + this->actor.shape.unk_14 = alpha; + return; + } + } else { + *unk_1A0 -= 1.0f; + if (*unk_1A0 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_1A0 = 0.0f; + this->unk_1A4 = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / (kREG(5) + 10.0f)) * 255.0f; +} + +void func_8098F050(DemoSa* this, GlobalContext* globalCtx) { + if (func_8098E6A0(this, globalCtx, 4, 4)) { + this->action = 8; + this->drawConfig = 2; + this->unk_1A0 = kREG(5) + 10.0f; + this->unk_1A4 = 0xFF; + if (this->unk_1A8 == 0) { + func_8098EE28(this, globalCtx); + this->unk_1A8 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx) { + func_8098EEA8(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F118(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098EEFC(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F16C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EDB0(this); + func_8098F050(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + UNK_PTR sp78 = D_809900E0[unk_190]; + s16 unk_194 = this->unk_194; + s32 pad2; + UNK_PTR sp6C = D_809900F4[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 296); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_1A4); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, D_80116280); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + NULL, NULL, NULL, gfxCtx->polyXlu.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 325); +} + +void func_8098F390(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_060021D8, NULL, NULL, 0); + this->action = 10; + this->drawConfig = 1; +} + +void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); +} + +void func_8098F420(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0600FFD4, NULL, NULL, 0); + this->action = 11; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_8098F480(DemoSa* this) { + s32 alpha = 0xFF; + f32* unk_1A0 = &this->unk_1A0; + f32 temp_f0; + + *unk_1A0 += 1.0f; + temp_f0 = kREG(17) + 10.0f; + + if (temp_f0 <= *unk_1A0) { + this->actor.shape.unk_14 = this->unk_1A4 = alpha; + } else { + this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / temp_f0) * 255.0f; + } +} + +void func_8098F50C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E6EC(this, globalCtx, 4); + this->action = 12; + this->drawConfig = 2; +} + +void func_8098F544(DemoSa* this) { + if (this->unk_1A0 >= kREG(17) + 10.0f) { + this->action = 13; + this->drawConfig = 1; + } +} + +void func_8098F590(DemoSa* this) { + func_8098E76C(this, &D_0600F580, 2, -8.0f, 0); + this->action = 14; +} + +void func_8098F5D0(DemoSa* this) { + func_8098E76C(this, &D_0600FCE0, 2, 0.0f, 0); + this->action = 15; +} + +void func_8098F610(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + func_8098E76C(this, &D_0600FFD4, 0, 0.0f, 0); + this->action = 13; + } +} + +void func_8098F654(DemoSa* this, GlobalContext* globalCtx) { + s32 unk_1AC; + s32 action; + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, 4); + + if (npcAction != NULL) { + action = npcAction->action; + unk_1AC = this->unk_1AC; + if (action != unk_1AC) { + switch (action) { + case 7: + func_8098F50C(this, globalCtx); + break; + case 8: + func_8098F590(this); + break; + case 9: + func_8098F5D0(this); + break; + default: + osSyncPrintf("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_1AC = action; + } + } +} + +void func_8098F714(DemoSa* this, GlobalContext* globalCtx) { + func_8098F654(this, globalCtx); +} + +void func_8098F734(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F480(this); + func_8098F544(this); +} + +void func_8098F77C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F654(this, globalCtx); +} + +void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F654(this, globalCtx); +} + +void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx) { + s32 sp1C; + + func_8098E5C8(this, globalCtx); + sp1C = DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F610(this, sp1C); +} + +void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) { + Vec3f* thisPos = &this->actor.posRot.pos; + + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0601113C, NULL, NULL, 0); + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, + 0, 0, 0, 3); + this->action = 16; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; + func_8098E508(this, 4); + func_8098E51C(this, 2); +} + +void func_8098F8F8(DemoSa* this) { + s32 alpha = 0xFF; + f32* unk_1A0 = &this->unk_1A0; + f32 temp_f0; + + *unk_1A0 += 1.0f; + temp_f0 = kREG(17) + 10.0f; + + if (temp_f0 <= *unk_1A0) { + this->actor.shape.unk_14 = this->unk_1A4 = alpha; + } else { + this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / temp_f0) * 255.0f; + } +} + +void func_8098F984(DemoSa* this) { + this->action = 16; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_8098F998(DemoSa* this, GlobalContext* globalCtx) { + if (this->unk_1AC == 4) { + func_8098E6EC(this, globalCtx, 1); + this->action = 17; + this->drawConfig = 2; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0; + } else { + func_8098E76C(this, &D_0601113C, 0, 0.0f, 0); + this->action = 18; + this->drawConfig = 1; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0xFF; + } + func_8098E508(this, 4); +} + +void func_8098FA2C(DemoSa* this) { + if (this->unk_1A0 >= kREG(17) + 10.0f) { + this->action = 18; + this->drawConfig = 1; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_8098FA84(DemoSa* this) { + func_8098E76C(this, &D_060140BC, 0, 0.0f, 0); + this->action = 19; + this->drawConfig = 1; + this->unk_1B0 = 1; + this->actor.shape.unk_14 = 0xFF; + func_8098E508(this, 2); +} + +void func_8098FAE0(DemoSa* this) { + func_8098E76C(this, &D_060135EC, 2, -8.0f, 0); + this->action = 20; + this->drawConfig = 1; + this->unk_1B0 = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_8098FB34(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + func_8098E76C(this, &D_06013CD8, 0, 0, 0); + } +} + +void func_8098FB68(DemoSa* this, GlobalContext* globalCtx) { + s32 unk_1AC; + s32 action; + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, 1); + + if (npcAction != NULL) { + action = npcAction->action; + unk_1AC = this->unk_1AC; + if (action != unk_1AC) { + switch (action) { + case 4: + func_8098F984(this); + break; + case 12: + func_8098F998(this, globalCtx); + break; + case 13: + func_8098FA84(this); + break; + case 14: + func_8098FAE0(this); + break; + default: + osSyncPrintf("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_1AC = action; + } + } +} + +void func_8098FC44(DemoSa* this, GlobalContext* globalCtx) { + func_8098FB68(this, globalCtx); +} + +void func_8098FC64(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098F8F8(this); + func_8098FA2C(this); +} + +void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098FB68(this, globalCtx); +} + +void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098FB68(this, globalCtx); +} + +void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + func_8098FB34(this, DemoSa_FrameUpdateMatrix(this)); + func_8098FB68(this, globalCtx); +} + +void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + if (this->action < 0 || this->action >= 21 || sActionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void DemoSa_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + + switch (this->actor.params) { + case 2: + func_8098ECF4(this, globalCtx); + break; + case 3: + func_8098F390(this, globalCtx); + break; + case 4: + func_8098F420(this, globalCtx); + break; + case 5: + func_8098F83C(this, globalCtx); + break; + default: + func_8098E7FC(this, globalCtx); + } +} + +s32 DemoSa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + DemoSa* this = THIS; + + if ((limbIndex == 15) && (this->unk_1B0 != 0)) { + *dList = &D_06007B80; + } + return 0; +} + +void func_8098FEA8(DemoSa* this, GlobalContext* globalCtx) { +} + +void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + UNK_PTR sp70 = D_809900E0[unk_190]; + s32 pad2; + s16 unk_194 = this->unk_194; + UNK_PTR sp64 = D_809900F4[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(&dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa.c", 602); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + DemoSa_OverrideLimbDraw, NULL, &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa.c", 626); +} + +void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h index 51eb75c114..d2ef5b71b9 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h @@ -6,9 +6,22 @@ struct DemoSa; +typedef void (*DemoSaActionFunc)(struct DemoSa*, GlobalContext*); +typedef void (*DemoSaDrawFunc)(struct DemoSa*, GlobalContext*); + typedef struct DemoSa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x68]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 unk_190; + /* 0x0192 */ s16 unk_192; + /* 0x0194 */ s16 unk_194; + /* 0x0198 */ s32 action; + /* 0x019C */ s32 drawConfig; + /* 0x01A0 */ f32 unk_1A0; + /* 0x01A4 */ s32 unk_1A4; + /* 0x01A8 */ s32 unk_1A8; + /* 0x01AC */ s32 unk_1AC; + /* 0x01B0 */ s32 unk_1B0; } DemoSa; // size = 0x01B4 extern const ActorInit Demo_Sa_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c new file mode 100644 index 0000000000..b72aa83efb --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c @@ -0,0 +1,94 @@ +#include "z_demo_sa.h" + +#include + +static CutsceneData D_8099010C[] = { + 0x0000001D, 0x00000BB9, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, + 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, + 0x00010000, 0x02640000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00020264, 0x02650000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040265, 0x02AC0000, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x000202AC, 0x02DC0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0xC032AAAB, 0x00000000, 0x000302DC, 0x0B600000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x000D0000, + 0x01050000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00050105, 0x02580000, 0x95550000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130258, 0x04DB0000, 0x15550000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002B, + 0x00000003, 0x00010000, 0x00A50000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, + 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000200A5, 0x01D20000, 0x00000000, 0xFFFFFF9E, 0x00000006, + 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000301D2, 0x0BB90000, + 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, + 0x00000000, 0x0000002D, 0x00000001, 0x0001024E, 0x025F025F, 0x0000002D, 0x00000001, 0x00050269, 0x02870287, + 0x0000002D, 0x00000001, 0x0001036B, 0x03890389, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, + 0xFFFFFF9E, 0x00000000, 0x00000062, 0xFFFFFF9E, 0x00000000, 0x00000062, 0x00000000, 0x00000000, 0x00000000, + 0x0000003E, 0x00000001, 0x00040000, 0x0BB80000, 0x00000000, 0xFFFFFFDD, 0x00000061, 0xFFFFFFC4, 0xFFFFFFDD, + 0x00000061, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x006403CE, 0x041A041A, + 0x00000013, 0x0000000A, 0xFFFF0000, 0x012FFFFF, 0xFFFFFFFF, 0x106A012F, 0x01430000, 0x00000000, 0xFFFF0143, + 0x0158FFFF, 0xFFFFFFFF, 0x108F0158, 0x018A0000, 0x00000000, 0xFFFF018A, 0x019FFFFF, 0xFFFFFFFF, 0x1090019F, + 0x01D10000, 0x00000000, 0xFFFF01D1, 0x0367FFFF, 0xFFFFFFFF, 0x003E0367, 0x036B0000, 0x00000000, 0xFFFF036B, + 0x03A8FFFF, 0xFFFFFFFF, 0x106B03A8, 0x03B20000, 0x00000000, 0x00000056, 0x00000001, 0x004402AE, 0x02AF0000, + 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0x00000000, + 0x00000000, 0x0000007C, 0x00000001, 0x00040226, 0x02580000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000066, + 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04D90000, + 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B0072, 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B006F, 0x00000000, + 0x432A32CA, 0x009F0969, 0x002B002F, 0x00000000, 0x432A32CA, 0x009F00CA, 0x002B0073, 0x00000000, 0x4235998B, + 0x009E00DE, 0x002A0061, 0x00000000, 0x4235998B, 0x009E0095, 0x002A006F, 0x00000000, 0x4235998B, 0x009E006F, + 0x002A006D, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0065, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0061, + 0xFF000000, 0x4235998B, 0x009E006F, 0x002A0061, 0x00000001, 0x000100BE, 0x01870000, 0x00000000, 0x4223FFEE, + 0xFFA50012, 0xFF620072, 0x00000000, 0x4223FFEE, 0xFFA60011, 0xFF63006F, 0x00000000, 0x4223FFEE, 0xFFA6001F, + 0xFF63002F, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630073, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630061, + 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF63006F, 0xFF000000, 0x4223FFEE, 0xFFA60025, 0xFF63006D, 0x00000001, + 0x00010107, 0x054A0000, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0072, 0x00000000, 0x41C332EC, 0x00070061, + 0x007F006F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F002F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0073, + 0xFF000000, 0x41C332EC, 0x00070061, 0x007F0061, 0x00000001, 0x0001014D, 0x05900000, 0x00000000, 0x4235998B, + 0xFEE90067, 0x00440072, 0x00000000, 0x4235998B, 0xFEE90067, 0x0044006F, 0x00000000, 0x4235998B, 0xFEE90067, + 0x0044002F, 0x00000000, 0x4235998B, 0xFEE90067, 0x00440073, 0xFF000000, 0x4235998B, 0xFEE90067, 0x00440061, + 0x00000001, 0x00010193, 0x05D60000, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD0072, 0x00000000, 0x4235998C, + 0xFFCC0023, 0xFFAD006F, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD002F, 0x00000000, 0x4235998C, 0xFFCC0023, + 0xFFAD0073, 0xFF000000, 0x4235998C, 0xFFCC0023, 0xFFAD0061, 0x00000001, 0x000101D9, 0x06B40000, 0x00000000, + 0x4235998C, 0xFFBF003D, 0xFF910072, 0x00000000, 0x4235998C, 0xFFBF003D, 0xFF91006F, 0x00000000, 0x4235998C, + 0xFFCD004A, 0xFFAA002F, 0x00000000, 0x42726668, 0x00000088, 0x000B0073, 0x00000000, 0x42726668, 0x01820202, + 0x02E00061, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006F, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006D, + 0x00000000, 0x424A665D, 0x0243009C, 0x044B0065, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0061, 0x00000000, + 0x424A665D, 0x0243009C, 0x044B0061, 0xFF000000, 0x424A665D, 0x0243009C, 0x044B0072, 0x00000001, 0x00010261, + 0x03B70000, 0x00000000, 0x42700000, 0x000D0356, 0x00020072, 0x00000000, 0x42700000, 0x00090355, 0x0005006F, + 0x00000000, 0x42700000, 0xFFFD0355, 0x0005002F, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0073, 0x00000000, + 0x42700000, 0xFFFE0354, 0xFFEF0061, 0x00000000, 0x42700000, 0x00090354, 0xFFEF006F, 0x00000000, 0x42700000, + 0x00100354, 0xFFFA006D, 0x00000000, 0x42700000, 0x00090354, 0x00050065, 0xFF000000, 0x42700000, 0xFFFD0353, + 0x00050061, 0x00000005, 0x000102AD, 0x074A0000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50072, 0x00000000, + 0x4289332C, 0x00000021, 0xFFE5006F, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6002F, 0x00000000, 0x4289332C, + 0x00000067, 0xFFE60073, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60061, 0x00000000, 0x4289332C, 0x00000067, + 0xFFE6006F, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6006D, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60065, + 0x00000002, 0x00010000, 0x04F60000, 0x0000001E, 0x432A32CA, 0x009A0A24, 0x00290072, 0x0000001E, 0x432A32CA, + 0x009A0A24, 0x0029006F, 0x0000001E, 0x432A32CA, 0x009A08C8, 0x0029002F, 0x0000001E, 0x432A32CA, 0x009A002A, + 0x00290073, 0x0000001E, 0x4270CCCD, 0x0052005E, 0x00170061, 0x0000001E, 0x424BFFF7, 0x0021004F, 0x0000006F, + 0x0000001E, 0x4235998B, 0x001E003E, 0xFFF2006D, 0x000003E8, 0x4235998B, 0x001E003E, 0xFFF20065, 0x0000001E, + 0x4235998B, 0x001E003E, 0xFFF20061, 0xFF00001E, 0x4235998B, 0x001F003E, 0xFFF20061, 0x00000002, 0x000100BE, + 0x01A40000, 0x00000032, 0x4223FFEE, 0x000D002A, 0x00140072, 0x0000001E, 0x4223FFEE, 0x000C002F, 0x0012006F, + 0x0000001E, 0x4223FFEE, 0x000B0032, 0x0014002F, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x00140073, 0x0000001E, + 0x4223FFEE, 0x000B0035, 0x00140061, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x0014006F, 0xFF00001E, 0x4223FFEE, + 0x000B0035, 0x0014006D, 0x00000002, 0x00010107, 0x05670000, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A0072, + 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A006F, 0x000003E8, 0x41C332EC, 0xFFD60011, 0xFF6A002F, 0x0000001E, + 0x41C332EC, 0xFFD60011, 0xFF6A0073, 0xFF00001E, 0x41C332EC, 0xFFD60011, 0xFF6A0061, 0x00000002, 0x0001014D, + 0x05AD0000, 0x0001001E, 0x4234CCBE, 0xFFE6000D, 0xFFAB0072, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB006F, + 0x000003E8, 0x4235998B, 0xFFE6000D, 0xFFAB002F, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB0073, 0xFF00001E, + 0x4235998B, 0xFFE6000D, 0xFFAB0061, 0x00000002, 0x00010193, 0x05F30000, 0x0000001E, 0x41F6662E, 0xFF1E000A, + 0xFE5D0072, 0x0000001E, 0x41F7FFC8, 0xFF1E000A, 0xFE5D006F, 0x000003E8, 0x420E664F, 0xFF1E000A, 0xFE5D002F, + 0x0000001E, 0x42219987, 0xFF1E000A, 0xFE5E0073, 0xFF00001E, 0x4235998C, 0xFF1E000A, 0xFE5E0061, 0x00000002, + 0x000101D9, 0x06D10000, 0x0000001E, 0x4235998C, 0xFF26FFA8, 0xFE740072, 0x0000001E, 0x4235998C, 0xFF26FFA8, + 0xFE74006F, 0x0000001E, 0x4235998C, 0xFF34FFB5, 0xFE8E002F, 0x0000001E, 0x4282CCCC, 0xFF6BFFF6, 0xFEF30073, + 0x00000019, 0x428D998E, 0x011F00EF, 0x02270061, 0x0000001E, 0x42A0CCAE, 0x023A01ED, 0x043B006F, 0x0000000A, + 0x42499990, 0x024201EC, 0x0449006D, 0x0000001E, 0x424A665D, 0x024201EC, 0x04490065, 0x000003E8, 0x424A665D, + 0x024201EB, 0x04490061, 0x0000001B, 0x424A665D, 0x024201EB, 0x04490061, 0xFF00001E, 0x424A665D, 0x024201EB, + 0x04490072, 0x00000002, 0x00010261, 0x03E80000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA0072, 0x00000028, + 0x42700000, 0x00030006, 0xFFFA006F, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFA002F, 0x00000014, 0x41A4CC7E, + 0x00030006, 0xFFFA0073, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA0061, 0x00000032, 0x412665BD, 0x00030006, + 0xFFFA006F, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA006D, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0065, + 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA0061, 0x00000006, 0x000102AD, 0x07670000, 0x0000001E, 0x4289332C, + 0x00000064, 0x00050072, 0x0000001E, 0x4289332C, 0x00000065, 0x0006006F, 0x0000001E, 0x4289332C, 0x00010063, + 0x0029002F, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100073, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100061, + 0x000003E8, 0x4289332C, 0x0000002A, 0x0010006F, 0x0000001E, 0x4289332C, 0x0000002A, 0x0010006D, 0xFF00001E, + 0x4289332C, 0x0000002A, 0x00100065, 0xFFFFFFFF, 0x00000000, +}; diff --git a/tools/csdis.py b/tools/csdis.py old mode 100644 new mode 100755 diff --git a/undefined_syms.txt b/undefined_syms.txt index a7877a2182..689d26d898 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -352,6 +352,21 @@ D_06004930 = 0x06004930; D_0600E680 = 0x0600E680; D_0600FEF0 = 0x0600FEF0; +// z_demo_sa +D_06001334 = 0x06001334; +D_060021D8 = 0x060021D8; +D_06007B80 = 0x06007B80; +D_0600B1A0 = 0x0600B1A0; +D_0600DF80 = 0x0600DF80; +D_0600E500 = 0x0600E500; +D_0600F580 = 0x0600F580; +D_0600FCE0 = 0x0600FCE0; +D_0600FFD4 = 0x0600FFD4; +D_0601113C = 0x0601113C; +D_060135EC = 0x060135EC; +D_06013CD8 = 0x06013CD8; +D_060140BC = 0x060140BC; + // z_en_test D_0600316C = 0x0600316C; D_06007C28 = 0x06007C28;