From 40fc24420a5aebc84dc07cd127a3e96c62d59fcc Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 15 Aug 2020 14:07:28 -0400 Subject: [PATCH] Decompiled ovl_Demo_Im (#296) * First steps * more * more * clean * Decompiled ovl_Demo_Im * fixes * comment update * consistency * PR comments --- .../actors/ovl_Demo_Im/DemoIm_Destroy.s | 9 - .../overlays/actors/ovl_Demo_Im/DemoIm_Draw.s | 36 - .../overlays/actors/ovl_Demo_Im/DemoIm_Init.s | 93 -- .../actors/ovl_Demo_Im/DemoIm_Update.s | 34 - .../actors/ovl_Demo_Im/func_80984BE0.s | 40 - .../actors/ovl_Demo_Im/func_80984C68.s | 10 - .../actors/ovl_Demo_Im/func_80984C8C.s | 34 - .../actors/ovl_Demo_Im/func_80984D00.s | 21 - .../actors/ovl_Demo_Im/func_80984D4C.s | 12 - .../actors/ovl_Demo_Im/func_80984D74.s | 20 - .../actors/ovl_Demo_Im/func_80984DB8.s | 45 - .../actors/ovl_Demo_Im/func_80984E58.s | 49 - .../actors/ovl_Demo_Im/func_80984F10.s | 34 - .../actors/ovl_Demo_Im/func_80984F94.s | 34 - .../actors/ovl_Demo_Im/func_80985018.s | 19 - .../actors/ovl_Demo_Im/func_80985060.s | 10 - .../actors/ovl_Demo_Im/func_80985080.s | 10 - .../actors/ovl_Demo_Im/func_809850A0.s | 20 - .../actors/ovl_Demo_Im/func_809850E8.s | 22 - .../actors/ovl_Demo_Im/func_80985134.s | 22 - .../actors/ovl_Demo_Im/func_80985180.s | 34 - .../actors/ovl_Demo_Im/func_80985200.s | 34 - .../actors/ovl_Demo_Im/func_80985280.s | 41 - .../actors/ovl_Demo_Im/func_80985310.s | 24 - .../actors/ovl_Demo_Im/func_80985358.s | 25 - .../actors/ovl_Demo_Im/func_809853B4.s | 33 - .../actors/ovl_Demo_Im/func_80985430.s | 13 - .../actors/ovl_Demo_Im/func_8098544C.s | 38 - .../actors/ovl_Demo_Im/func_809854DC.s | 45 - .../actors/ovl_Demo_Im/func_8098557C.s | 13 - .../actors/ovl_Demo_Im/func_809855A8.s | 42 - .../actors/ovl_Demo_Im/func_80985640.s | 31 - .../actors/ovl_Demo_Im/func_809856AC.s | 21 - .../actors/ovl_Demo_Im/func_809856F8.s | 9 - .../actors/ovl_Demo_Im/func_80985718.s | 9 - .../actors/ovl_Demo_Im/func_80985738.s | 15 - .../actors/ovl_Demo_Im/func_80985770.s | 17 - .../actors/ovl_Demo_Im/func_809857B0.s | 17 - .../actors/ovl_Demo_Im/func_809857F0.s | 17 - .../actors/ovl_Demo_Im/func_80985830.s | 13 - .../actors/ovl_Demo_Im/func_80985860.s | 19 - .../actors/ovl_Demo_Im/func_809858A8.s | 9 - .../actors/ovl_Demo_Im/func_809858C8.s | 34 - .../actors/ovl_Demo_Im/func_80985948.s | 42 - .../actors/ovl_Demo_Im/func_809859E0.s | 89 -- .../actors/ovl_Demo_Im/func_80985B34.s | 60 - .../actors/ovl_Demo_Im/func_80985C10.s | 13 - .../actors/ovl_Demo_Im/func_80985C40.s | 22 - .../actors/ovl_Demo_Im/func_80985C94.s | 22 - .../actors/ovl_Demo_Im/func_80985CE8.s | 105 -- .../actors/ovl_Demo_Im/func_80985E60.s | 20 - .../actors/ovl_Demo_Im/func_80985EAC.s | 21 - .../actors/ovl_Demo_Im/func_80985EF4.s | 27 - .../actors/ovl_Demo_Im/func_80985F54.s | 5 - .../actors/ovl_Demo_Im/func_80985F64.s | 36 - .../actors/ovl_Demo_Im/func_80985FE8.s | 29 - .../actors/ovl_Demo_Im/func_8098604C.s | 34 - .../actors/ovl_Demo_Im/func_809860C8.s | 6 - .../actors/ovl_Demo_Im/func_809860DC.s | 31 - .../actors/ovl_Demo_Im/func_80986148.s | 34 - .../actors/ovl_Demo_Im/func_809861C4.s | 68 - .../actors/ovl_Demo_Im/func_8098629C.s | 19 - .../actors/ovl_Demo_Im/func_809862E0.s | 84 - .../actors/ovl_Demo_Im/func_809863BC.s | 9 - .../actors/ovl_Demo_Im/func_809863DC.s | 22 - .../actors/ovl_Demo_Im/func_80986430.s | 26 - .../actors/ovl_Demo_Im/func_80986494.s | 17 - .../actors/ovl_Demo_Im/func_809864D4.s | 23 - .../actors/ovl_Demo_Im/func_8098652C.s | 18 - .../actors/ovl_Demo_Im/func_80986570.s | 38 - .../actors/ovl_Demo_Im/func_809865F8.s | 73 - .../actors/ovl_Demo_Im/func_80986700.s | 5 - .../actors/ovl_Demo_Im/func_80986710.s | 36 - .../actors/ovl_Demo_Im/func_80986794.s | 33 - .../actors/ovl_Demo_Im/func_8098680C.s | 71 - .../actors/ovl_Demo_Im/func_809868E8.s | 9 - .../actors/ovl_Demo_Im/func_80986908.s | 17 - .../actors/ovl_Demo_Im/func_80986948.s | 27 - .../actors/ovl_Demo_Im/func_809869B0.s | 19 - .../actors/ovl_Demo_Im/func_809869F8.s | 27 - .../actors/ovl_Demo_Im/func_80986A5C.s | 31 - .../actors/ovl_Demo_Im/func_80986AD0.s | 26 - .../actors/ovl_Demo_Im/func_80986B2C.s | 31 - .../actors/ovl_Demo_Im/func_80986BA0.s | 19 - .../actors/ovl_Demo_Im/func_80986BE4.s | 7 - .../actors/ovl_Demo_Im/func_80986BF8.s | 16 - .../actors/ovl_Demo_Im/func_80986C30.s | 40 - .../actors/ovl_Demo_Im/func_80986CC8.s | 15 - .../actors/ovl_Demo_Im/func_80986CFC.s | 19 - .../actors/ovl_Demo_Im/func_80986D40.s | 40 - .../actors/ovl_Demo_Im/func_80986DC8.s | 23 - .../actors/ovl_Demo_Im/func_80986E20.s | 9 - .../actors/ovl_Demo_Im/func_80986E40.s | 28 - .../actors/ovl_Demo_Im/func_80986EAC.s | 24 - .../actors/ovl_Demo_Im/func_80986F08.s | 9 - .../actors/ovl_Demo_Im/func_80986F28.s | 25 - .../actors/ovl_Demo_Im/func_80986F88.s | 9 - .../actors/ovl_Demo_Im/func_80986FA8.s | 29 - .../actors/ovl_Demo_Im/func_80987018.s | 20 - .../actors/ovl_Demo_Im/func_80987064.s | 38 - .../actors/ovl_Demo_Im/func_809870F0.s | 15 - .../actors/ovl_Demo_Im/func_80987128.s | 21 - .../actors/ovl_Demo_Im/func_80987174.s | 17 - .../actors/ovl_Demo_Im/func_809871B4.s | 15 - .../actors/ovl_Demo_Im/func_809871E8.s | 54 - .../actors/ovl_Demo_Im/func_80987288.s | 9 - .../actors/ovl_Demo_Im/func_809872A8.s | 19 - .../actors/ovl_Demo_Im/func_809872F0.s | 17 - .../actors/ovl_Demo_Im/func_80987330.s | 17 - .../actors/ovl_Demo_Im/func_80987514.s | 49 - .../actors/ovl_Demo_Im/func_809875C0.s | 37 - .../actors/ovl_Demo_Im/func_8098764C.s | 4 - .../actors/ovl_Demo_Im/func_80987658.s | 104 -- data/overlays/actors/z_demo_im.data.s | 64 - data/overlays/actors/z_demo_im.reloc.s | 13 - spec | 3 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 1418 ++++++++++++++--- src/overlays/actors/ovl_Demo_Im/z_demo_im.h | 21 +- .../ovl_Demo_Im/z_demo_im_cutscene_data.c | 222 +++ undefined_syms.txt | 15 + 120 files changed, 1450 insertions(+), 3506 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s delete mode 100644 data/overlays/actors/z_demo_im.data.s delete mode 100644 data/overlays/actors/z_demo_im.reloc.s create mode 100644 src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s deleted file mode 100644 index 1ecc3d9eb9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel DemoIm_Destroy -/* 02914 809874F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02918 809874F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0291C 809874FC 0C261353 */ jal func_80984D4C -/* 02920 80987500 00000000 */ nop -/* 02924 80987504 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02928 80987508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0292C 8098750C 03E00008 */ jr $ra -/* 02930 80987510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s deleted file mode 100644 index 64e91b9c89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_809889A0 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoIm_Draw -/* 02BEC 809877CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BF0 809877D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BF4 809877D4 8C820264 */ lw $v0, 0x0264($a0) ## 00000264 -/* 02BF8 809877D8 04400008 */ bltz $v0, .L809877FC -/* 02BFC 809877DC 28410003 */ slti $at, $v0, 0x0003 -/* 02C00 809877E0 10200006 */ beq $at, $zero, .L809877FC -/* 02C04 809877E4 00027080 */ sll $t6, $v0, 2 -/* 02C08 809877E8 3C038099 */ lui $v1, %hi(D_809887E4) ## $v1 = 80990000 -/* 02C0C 809877EC 006E1821 */ addu $v1, $v1, $t6 -/* 02C10 809877F0 8C6387E4 */ lw $v1, %lo(D_809887E4)($v1) -/* 02C14 809877F4 14600006 */ bne $v1, $zero, .L80987810 -/* 02C18 809877F8 00000000 */ nop -.L809877FC: -/* 02C1C 809877FC 3C048099 */ lui $a0, %hi(D_809889A0) ## $a0 = 80990000 -/* 02C20 80987800 0C00084C */ jal osSyncPrintf - -/* 02C24 80987804 248489A0 */ addiu $a0, $a0, %lo(D_809889A0) ## $a0 = 809889A0 -/* 02C28 80987808 10000004 */ beq $zero, $zero, .L8098781C -/* 02C2C 8098780C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80987810: -/* 02C30 80987810 0060F809 */ jalr $ra, $v1 -/* 02C34 80987814 00000000 */ nop -/* 02C38 80987818 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098781C: -/* 02C3C 8098781C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C40 80987820 03E00008 */ jr $ra -/* 02C44 80987824 00000000 */ nop -/* 02C48 80987828 00000000 */ nop -/* 02C4C 8098782C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s deleted file mode 100644 index 57299ac928..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s +++ /dev/null @@ -1,93 +0,0 @@ -.late_rodata -glabel jtbl_80988A04 -.word L80987470 -.word L80987484 -.word L80987498 -.word L809874AC -.word L809874C0 -.word 0x00000000, 0x00000000 - -.text -glabel DemoIm_Init -/* 027EC 809873CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 027F4 809873D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 027F8 809873D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027FC 809873DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02804 809873E4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 02808 809873E8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0280C 809873EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02810 809873F0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 02814 809873F4 0C00AC78 */ jal ActorShape_Init - -/* 02818 809873F8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0281C 809873FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02820 80987400 0C261340 */ jal func_80984D00 -/* 02824 80987404 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02828 80987408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0282C 8098740C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 02830 80987410 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 -/* 02834 80987414 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 02838 80987418 AFB80018 */ sw $t8, 0x0018($sp) -/* 0283C 8098741C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02840 80987420 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02844 80987424 24C6F788 */ addiu $a2, $a2, 0xF788 ## $a2 = 0600F788 -/* 02848 80987428 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0284C 8098742C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02850 80987430 0C0291BE */ jal SkelAnime_InitSV -/* 02854 80987434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02858 80987438 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 0285C 8098743C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 02860 80987440 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02864 80987444 03214024 */ and $t0, $t9, $at -/* 02868 80987448 252AFFFE */ addiu $t2, $t1, 0xFFFE ## $t2 = FFFFFFFE -/* 0286C 8098744C 2D410005 */ sltiu $at, $t2, 0x0005 -/* 02870 80987450 10200020 */ beq $at, $zero, .L809874D4 -/* 02874 80987454 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 02878 80987458 000A5080 */ sll $t2, $t2, 2 -/* 0287C 8098745C 3C018099 */ lui $at, %hi(jtbl_80988A04) ## $at = 80990000 -/* 02880 80987460 002A0821 */ addu $at, $at, $t2 -/* 02884 80987464 8C2A8A04 */ lw $t2, %lo(jtbl_80988A04)($at) -/* 02888 80987468 01400008 */ jr $t2 -/* 0288C 8098746C 00000000 */ nop -glabel L80987470 -/* 02890 80987470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02894 80987474 0C261618 */ jal func_80985860 -/* 02898 80987478 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0289C 8098747C 10000019 */ beq $zero, $zero, .L809874E4 -/* 028A0 80987480 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80987484 -/* 028A4 80987484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A8 80987488 0C261798 */ jal func_80985E60 -/* 028AC 8098748C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028B0 80987490 10000014 */ beq $zero, $zero, .L809874E4 -/* 028B4 80987494 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80987498 -/* 028B8 80987498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028BC 8098749C 0C26194B */ jal func_8098652C -/* 028C0 809874A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028C4 809874A4 1000000F */ beq $zero, $zero, .L809874E4 -/* 028C8 809874A8 8FBF002C */ lw $ra, 0x002C($sp) -glabel L809874AC -/* 028CC 809874AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028D0 809874B0 0C261A6C */ jal func_809869B0 -/* 028D4 809874B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028D8 809874B8 1000000A */ beq $zero, $zero, .L809874E4 -/* 028DC 809874BC 8FBF002C */ lw $ra, 0x002C($sp) -glabel L809874C0 -/* 028E0 809874C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E4 809874C4 0C261C06 */ jal func_80987018 -/* 028E8 809874C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028EC 809874CC 10000005 */ beq $zero, $zero, .L809874E4 -/* 028F0 809874D0 8FBF002C */ lw $ra, 0x002C($sp) -.L809874D4: -/* 028F4 809874D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 809874D8 0C2614C4 */ jal func_80985310 -/* 028FC 809874DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02900 809874E0 8FBF002C */ lw $ra, 0x002C($sp) -.L809874E4: -/* 02904 809874E4 8FB00024 */ lw $s0, 0x0024($sp) -/* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0290C 809874EC 03E00008 */ jr $ra -/* 02910 809874F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s deleted file mode 100644 index d9140b78df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80988944 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoIm_Update -/* 02790 80987370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02794 80987374 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02798 80987378 8C820260 */ lw $v0, 0x0260($a0) ## 00000260 -/* 0279C 8098737C 04400008 */ bltz $v0, .L809873A0 -/* 027A0 80987380 2841001F */ slti $at, $v0, 0x001F -/* 027A4 80987384 10200006 */ beq $at, $zero, .L809873A0 -/* 027A8 80987388 00027080 */ sll $t6, $v0, 2 -/* 027AC 8098738C 3C038099 */ lui $v1, %hi(D_8098875C) ## $v1 = 80990000 -/* 027B0 80987390 006E1821 */ addu $v1, $v1, $t6 -/* 027B4 80987394 8C63875C */ lw $v1, %lo(D_8098875C)($v1) -/* 027B8 80987398 14600006 */ bne $v1, $zero, .L809873B4 -/* 027BC 8098739C 00000000 */ nop -.L809873A0: -/* 027C0 809873A0 3C048099 */ lui $a0, %hi(D_80988944) ## $a0 = 80990000 -/* 027C4 809873A4 0C00084C */ jal osSyncPrintf - -/* 027C8 809873A8 24848944 */ addiu $a0, $a0, %lo(D_80988944) ## $a0 = 80988944 -/* 027CC 809873AC 10000004 */ beq $zero, $zero, .L809873C0 -/* 027D0 809873B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809873B4: -/* 027D4 809873B4 0060F809 */ jalr $ra, $v1 -/* 027D8 809873B8 00000000 */ nop -/* 027DC 809873BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809873C0: -/* 027E0 809873C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027E4 809873C4 03E00008 */ jr $ra -/* 027E8 809873C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s deleted file mode 100644 index 0ab9ed13f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80984BE0 -/* 00000 80984BE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80984BE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80984BE8 848E025E */ lh $t6, 0x025E($a0) ## 0000025E -/* 0000C 80984BEC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00010 80984BF0 24C3025E */ addiu $v1, $a2, 0x025E ## $v1 = 0000025E -/* 00014 80984BF4 15C00003 */ bne $t6, $zero, .L80984C04 -/* 00018 80984BF8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0001C 80984BFC 10000005 */ beq $zero, $zero, .L80984C14 -/* 00020 80984C00 2483025E */ addiu $v1, $a0, 0x025E ## $v1 = 0000025E -.L80984C04: -/* 00024 80984C04 846F0000 */ lh $t7, 0x0000($v1) ## 0000025E -/* 00028 80984C08 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0002C 80984C0C A4780000 */ sh $t8, 0x0000($v1) ## 0000025E -/* 00030 80984C10 84620000 */ lh $v0, 0x0000($v1) ## 0000025E -.L80984C14: -/* 00034 80984C14 14400008 */ bne $v0, $zero, .L80984C38 -/* 00038 80984C18 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0003C 80984C1C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00040 80984C20 AFA3001C */ sw $v1, 0x001C($sp) -/* 00044 80984C24 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00048 80984C28 AFA60038 */ sw $a2, 0x0038($sp) -/* 0004C 80984C2C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00050 80984C30 8FA60038 */ lw $a2, 0x0038($sp) -/* 00054 80984C34 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80984C38: -/* 00058 80984C38 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0005C 80984C3C 24C2025C */ addiu $v0, $a2, 0x025C ## $v0 = 0000025C -/* 00060 80984C40 A4590000 */ sh $t9, 0x0000($v0) ## 0000025C -/* 00064 80984C44 84480000 */ lh $t0, 0x0000($v0) ## 0000025C -/* 00068 80984C48 29010003 */ slti $at, $t0, 0x0003 -/* 0006C 80984C4C 54200003 */ bnel $at, $zero, .L80984C5C -/* 00070 80984C50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00074 80984C54 A4400000 */ sh $zero, 0x0000($v0) ## 0000025C -/* 00078 80984C58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80984C5C: -/* 0007C 80984C5C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 80984C60 03E00008 */ jr $ra -/* 00084 80984C64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s deleted file mode 100644 index 7fe7feb269..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80984C68 -/* 00088 80984C68 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0008C 80984C6C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00090 80984C70 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 00094 80984C74 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 00098 80984C78 AC80026C */ sw $zero, 0x026C($a0) ## 0000026C -/* 0009C 80984C7C AC800270 */ sw $zero, 0x0270($a0) ## 00000270 -/* 000A0 80984C80 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 000A4 80984C84 03E00008 */ jr $ra -/* 000A8 80984C88 E4840268 */ swc1 $f4, 0x0268($a0) ## 00000268 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s deleted file mode 100644 index 172d9c6710..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80984C8C -/* 000AC 80984C8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B0 80984C90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000B4 80984C94 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 000B8 80984C98 3C0F8098 */ lui $t7, %hi(D_8098783C) ## $t7 = 80980000 -/* 000BC 80984C9C 3C198098 */ lui $t9, %hi(D_8098783C) ## $t9 = 80980000 -/* 000C0 80984CA0 15C0000D */ bne $t6, $zero, .L80984CD8 -/* 000C4 80984CA4 00000000 */ nop -/* 000C8 80984CA8 8DEF783C */ lw $t7, %lo(D_8098783C)($t7) -/* 000CC 80984CAC 51E00011 */ beql $t7, $zero, .L80984CF4 -/* 000D0 80984CB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D4 80984CB4 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 000D8 80984CB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 000DC 80984CBC 17010003 */ bne $t8, $at, .L80984CCC -/* 000E0 80984CC0 00000000 */ nop -/* 000E4 80984CC4 0C26131A */ jal func_80984C68 -/* 000E8 80984CC8 00000000 */ nop -.L80984CCC: -/* 000EC 80984CCC 3C018098 */ lui $at, %hi(D_8098783C) ## $at = 80980000 -/* 000F0 80984CD0 10000007 */ beq $zero, $zero, .L80984CF0 -/* 000F4 80984CD4 AC20783C */ sw $zero, %lo(D_8098783C)($at) -.L80984CD8: -/* 000F8 80984CD8 8F39783C */ lw $t9, %lo(D_8098783C)($t9) -/* 000FC 80984CDC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00100 80984CE0 3C018098 */ lui $at, %hi(D_8098783C) ## $at = 80980000 -/* 00104 80984CE4 57200003 */ bnel $t9, $zero, .L80984CF4 -/* 00108 80984CE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0010C 80984CEC AC28783C */ sw $t0, %lo(D_8098783C)($at) -.L80984CF0: -/* 00110 80984CF0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80984CF4: -/* 00114 80984CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00118 80984CF8 03E00008 */ jr $ra -/* 0011C 80984CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s deleted file mode 100644 index bded04b92b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80984D00 -/* 00120 80984D00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00124 80984D04 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00128 80984D08 AFA50024 */ sw $a1, 0x0024($sp) -/* 0012C 80984D0C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00130 80984D10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00134 80984D14 24C50284 */ addiu $a1, $a2, 0x0284 ## $a1 = 00000284 -/* 00138 80984D18 AFA50018 */ sw $a1, 0x0018($sp) -/* 0013C 80984D1C 0C0170D9 */ jal Collider_InitCylinder - -/* 00140 80984D20 AFA60020 */ sw $a2, 0x0020($sp) -/* 00144 80984D24 3C078098 */ lui $a3, %hi(D_80987840) ## $a3 = 80980000 -/* 00148 80984D28 8FA50018 */ lw $a1, 0x0018($sp) -/* 0014C 80984D2C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00150 80984D30 24E77840 */ addiu $a3, $a3, %lo(D_80987840) ## $a3 = 80987840 -/* 00154 80984D34 0C017114 */ jal Collider_SetCylinder_Set3 -/* 00158 80984D38 8FA40024 */ lw $a0, 0x0024($sp) -/* 0015C 80984D3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00160 80984D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00164 80984D44 03E00008 */ jr $ra -/* 00168 80984D48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s deleted file mode 100644 index 5a2f7e5b42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80984D4C -/* 0016C 80984D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00170 80984D50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00174 80984D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00178 80984D58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0017C 80984D5C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00180 80984D60 24C50284 */ addiu $a1, $a2, 0x0284 ## $a1 = 00000284 -/* 00184 80984D64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00188 80984D68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0018C 80984D6C 03E00008 */ jr $ra -/* 00190 80984D70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s deleted file mode 100644 index bb968c3df7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80984D74 -/* 00194 80984D74 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00198 80984D78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0019C 80984D7C AFA50034 */ sw $a1, 0x0034($sp) -/* 001A0 80984D80 24860284 */ addiu $a2, $a0, 0x0284 ## $a2 = 00000284 -/* 001A4 80984D84 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000284 -/* 001A8 80984D88 0C0189B7 */ jal Collider_CylinderUpdate - -/* 001AC 80984D8C AFA60018 */ sw $a2, 0x0018($sp) -/* 001B0 80984D90 8FA40034 */ lw $a0, 0x0034($sp) -/* 001B4 80984D94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001B8 80984D98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 001BC 80984D9C 8FA60018 */ lw $a2, 0x0018($sp) -/* 001C0 80984DA0 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 001C4 80984DA4 00812821 */ addu $a1, $a0, $at -/* 001C8 80984DA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001CC 80984DAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 001D0 80984DB0 03E00008 */ jr $ra -/* 001D4 80984DB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s deleted file mode 100644 index 38309d4bc8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80984DB8 -/* 001D8 80984DB8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 001DC 80984DBC AFA40038 */ sw $a0, 0x0038($sp) -/* 001E0 80984DC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 001E4 80984DC4 248402DC */ addiu $a0, $a0, 0x02DC ## $a0 = 000002DC -/* 001E8 80984DC8 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 001EC 80984DCC AFAE0010 */ sw $t6, 0x0010($sp) -/* 001F0 80984DD0 AFA40024 */ sw $a0, 0x0024($sp) -/* 001F4 80984DD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001F8 80984DD8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 001FC 80984DDC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00200 80984DE0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00204 80984DE4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00208 80984DE8 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 0020C 80984DEC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00210 80984DF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00214 80984DF4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00218 80984DF8 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 0021C 80984DFC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00220 80984E00 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 00224 80984E04 8FA40038 */ lw $a0, 0x0038($sp) -/* 00228 80984E08 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 0022C 80984E0C AFB80010 */ sw $t8, 0x0010($sp) -/* 00230 80984E10 248402E2 */ addiu $a0, $a0, 0x02E2 ## $a0 = 000002E2 -/* 00234 80984E14 AFA40024 */ sw $a0, 0x0024($sp) -/* 00238 80984E18 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0023C 80984E1C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00240 80984E20 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00244 80984E24 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00248 80984E28 8FA40024 */ lw $a0, 0x0024($sp) -/* 0024C 80984E2C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 00250 80984E30 AFB90010 */ sw $t9, 0x0010($sp) -/* 00254 80984E34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00258 80984E38 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0025C 80984E3C 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00260 80984E40 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00264 80984E44 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 00268 80984E48 8FBF001C */ lw $ra, 0x001C($sp) -/* 0026C 80984E4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00270 80984E50 03E00008 */ jr $ra -/* 00274 80984E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s deleted file mode 100644 index cc2b010f9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80984E58 -/* 00278 80984E58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0027C 80984E5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00280 80984E60 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00284 80984E64 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00288 80984E68 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 0028C 80984E6C 8C4F0024 */ lw $t7, 0x0024($v0) ## 00000024 -/* 00290 80984E70 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00294 80984E74 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00298 80984E78 AC8F02EC */ sw $t7, 0x02EC($a0) ## 000002EC -/* 0029C 80984E7C 8C4E0028 */ lw $t6, 0x0028($v0) ## 00000028 -/* 002A0 80984E80 848A00B6 */ lh $t2, 0x00B6($a0) ## 000000B6 -/* 002A4 80984E84 8489008A */ lh $t1, 0x008A($a0) ## 0000008A -/* 002A8 80984E88 AC8E02F0 */ sw $t6, 0x02F0($a0) ## 000002F0 -/* 002AC 80984E8C 8C4F002C */ lw $t7, 0x002C($v0) ## 0000002C -/* 002B0 80984E90 012A1823 */ subu $v1, $t1, $t2 -/* 002B4 80984E94 00031C00 */ sll $v1, $v1, 16 -/* 002B8 80984E98 AC8F02F4 */ sw $t7, 0x02F4($a0) ## 000002F4 -/* 002BC 80984E9C 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 -/* 002C0 80984EA0 00031C03 */ sra $v1, $v1, 16 -/* 002C4 80984EA4 00031023 */ subu $v0, $zero, $v1 -/* 002C8 80984EA8 87191474 */ lh $t9, 0x1474($t8) ## 00001474 -/* 002CC 80984EAC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 002D0 80984EB0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 002D4 80984EB4 00000000 */ nop -/* 002D8 80984EB8 468021A0 */ cvt.s.w $f6, $f4 -/* 002DC 80984EBC 46083280 */ add.s $f10, $f6, $f8 -/* 002E0 80984EC0 04600003 */ bltz $v1, .L80984ED0 -/* 002E4 80984EC4 E48A02E8 */ swc1 $f10, 0x02E8($a0) ## 000002E8 -/* 002E8 80984EC8 10000001 */ beq $zero, $zero, .L80984ED0 -/* 002EC 80984ECC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80984ED0: -/* 002F0 80984ED0 284118E3 */ slti $at, $v0, 0x18E3 -/* 002F4 80984ED4 10200003 */ beq $at, $zero, .L80984EE4 -/* 002F8 80984ED8 00000000 */ nop -/* 002FC 80984EDC 10000001 */ beq $zero, $zero, .L80984EE4 -/* 00300 80984EE0 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -.L80984EE4: -/* 00304 80984EE4 8D0B0000 */ lw $t3, 0x0000($t0) ## 8015FA90 -/* 00308 80984EE8 248502D4 */ addiu $a1, $a0, 0x02D4 ## $a1 = 000002D4 -/* 0030C 80984EEC 85661476 */ lh $a2, 0x1476($t3) ## 00001476 -/* 00310 80984EF0 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 00314 80984EF4 00063400 */ sll $a2, $a2, 16 -/* 00318 80984EF8 0C00D285 */ jal func_80034A14 -/* 0031C 80984EFC 00063403 */ sra $a2, $a2, 16 -/* 00320 80984F00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00324 80984F04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00328 80984F08 03E00008 */ jr $ra -/* 0032C 80984F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s deleted file mode 100644 index 7a975d759b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80984F10 -/* 00330 80984F10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00334 80984F14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00338 80984F18 AFA5001C */ sw $a1, 0x001C($sp) -/* 0033C 80984F1C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00340 80984F20 3C038016 */ lui $v1, %hi(gGameInfo) -/* 00344 80984F24 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 00348 80984F28 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 0034C 80984F2C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00350 80984F30 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 00354 80984F34 AC9802EC */ sw $t8, 0x02EC($a0) ## 000002EC -/* 00358 80984F38 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 0035C 80984F3C 248502D4 */ addiu $a1, $a0, 0x02D4 ## $a1 = 000002D4 -/* 00360 80984F40 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00364 80984F44 AC8F02F0 */ sw $t7, 0x02F0($a0) ## 000002F0 -/* 00368 80984F48 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 0036C 80984F4C AC9802F4 */ sw $t8, 0x02F4($a0) ## 000002F4 -/* 00370 80984F50 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 00374 80984F54 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 00378 80984F58 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 0037C 80984F5C 00000000 */ nop -/* 00380 80984F60 468021A0 */ cvt.s.w $f6, $f4 -/* 00384 80984F64 46083280 */ add.s $f10, $f6, $f8 -/* 00388 80984F68 E48A02E8 */ swc1 $f10, 0x02E8($a0) ## 000002E8 -/* 0038C 80984F6C 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 00390 80984F70 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 00394 80984F74 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 00398 80984F78 00063400 */ sll $a2, $a2, 16 -/* 0039C 80984F7C 0C00D285 */ jal func_80034A14 -/* 003A0 80984F80 00063403 */ sra $a2, $a2, 16 -/* 003A4 80984F84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003A8 80984F88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003AC 80984F8C 03E00008 */ jr $ra -/* 003B0 80984F90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s deleted file mode 100644 index 17df566daa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80984F94 -/* 003B4 80984F94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B8 80984F98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003BC 80984F9C AFA5001C */ sw $a1, 0x001C($sp) -/* 003C0 80984FA0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C4 80984FA4 3C038016 */ lui $v1, %hi(gGameInfo) -/* 003C8 80984FA8 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 003CC 80984FAC 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 003D0 80984FB0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 003D4 80984FB4 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 003D8 80984FB8 AC9802EC */ sw $t8, 0x02EC($a0) ## 000002EC -/* 003DC 80984FBC 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 003E0 80984FC0 248502D4 */ addiu $a1, $a0, 0x02D4 ## $a1 = 000002D4 -/* 003E4 80984FC4 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 003E8 80984FC8 AC8F02F0 */ sw $t7, 0x02F0($a0) ## 000002F0 -/* 003EC 80984FCC 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 003F0 80984FD0 AC9802F4 */ sw $t8, 0x02F4($a0) ## 000002F4 -/* 003F4 80984FD4 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 003F8 80984FD8 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 003FC 80984FDC 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00400 80984FE0 00000000 */ nop -/* 00404 80984FE4 468021A0 */ cvt.s.w $f6, $f4 -/* 00408 80984FE8 46083280 */ add.s $f10, $f6, $f8 -/* 0040C 80984FEC E48A02E8 */ swc1 $f10, 0x02E8($a0) ## 000002E8 -/* 00410 80984FF0 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 00414 80984FF4 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 00418 80984FF8 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 0041C 80984FFC 00063400 */ sll $a2, $a2, 16 -/* 00420 80985000 0C00D285 */ jal func_80034A14 -/* 00424 80985004 00063403 */ sra $a2, $a2, 16 -/* 00428 80985008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0042C 8098500C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00430 80985010 03E00008 */ jr $ra -/* 00434 80985014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s deleted file mode 100644 index 73ef62762d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80985018 -/* 00438 80985018 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0043C 8098501C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00440 80985020 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00444 80985024 AFA50024 */ sw $a1, 0x0024($sp) -/* 00448 80985028 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0044C 8098502C AFBF001C */ sw $ra, 0x001C($sp) -/* 00450 80985030 AFA40020 */ sw $a0, 0x0020($sp) -/* 00454 80985034 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00458 80985038 44070000 */ mfc1 $a3, $f0 -/* 0045C 8098503C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00460 80985040 8FA40024 */ lw $a0, 0x0024($sp) -/* 00464 80985044 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00468 80985048 0C00B92D */ jal func_8002E4B4 -/* 0046C 8098504C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00470 80985050 8FBF001C */ lw $ra, 0x001C($sp) -/* 00474 80985054 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00478 80985058 03E00008 */ jr $ra -/* 0047C 8098505C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s deleted file mode 100644 index 487f3aae91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80985060 -/* 00480 80985060 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00484 80985064 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00488 80985068 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0048C 8098506C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00490 80985070 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00494 80985074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00498 80985078 03E00008 */ jr $ra -/* 0049C 8098507C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s deleted file mode 100644 index 09a09f9eef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80985080 -/* 004A0 80985080 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 004A4 80985084 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 004A8 80985088 15C00003 */ bne $t6, $zero, .L80985098 -/* 004AC 8098508C 00000000 */ nop -/* 004B0 80985090 03E00008 */ jr $ra -/* 004B4 80985094 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80985098: -/* 004B8 80985098 03E00008 */ jr $ra -/* 004BC 8098509C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s deleted file mode 100644 index 66aafebe4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_809850A0 -/* 004C0 809850A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004C4 809850A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004C8 809850A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 004CC 809850AC AFA5002C */ sw $a1, 0x002C($sp) -/* 004D0 809850B0 0C261420 */ jal func_80985080 -/* 004D4 809850B4 AFA0001C */ sw $zero, 0x001C($sp) -/* 004D8 809850B8 14400006 */ bne $v0, $zero, .L809850D4 -/* 004DC 809850BC 8FA3001C */ lw $v1, 0x001C($sp) -/* 004E0 809850C0 8FAF002C */ lw $t7, 0x002C($sp) -/* 004E4 809850C4 8FAE0028 */ lw $t6, 0x0028($sp) -/* 004E8 809850C8 000FC080 */ sll $t8, $t7, 2 -/* 004EC 809850CC 01D8C821 */ addu $t9, $t6, $t8 -/* 004F0 809850D0 8F231D8C */ lw $v1, 0x1D8C($t9) ## 00001D8C -.L809850D4: -/* 004F4 809850D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F8 809850D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004FC 809850DC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00500 809850E0 03E00008 */ jr $ra -/* 00504 809850E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s deleted file mode 100644 index a33b3214a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_809850E8 -/* 00508 809850E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0050C 809850EC AFA40018 */ sw $a0, 0x0018($sp) -/* 00510 809850F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 809850F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00518 809850F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0051C 809850FC AFA60020 */ sw $a2, 0x0020($sp) -/* 00520 80985100 0C261428 */ jal func_809850A0 -/* 00524 80985104 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00528 80985108 10400007 */ beq $v0, $zero, .L80985128 -/* 0052C 8098510C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00530 80985110 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00534 80985114 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00538 80985118 55CF0004 */ bnel $t6, $t7, .L8098512C -/* 0053C 8098511C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00540 80985120 10000002 */ beq $zero, $zero, .L8098512C -/* 00544 80985124 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80985128: -/* 00548 80985128 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8098512C: -/* 0054C 8098512C 03E00008 */ jr $ra -/* 00550 80985130 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s deleted file mode 100644 index d24ecea9d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80985134 -/* 00554 80985134 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00558 80985138 AFA40018 */ sw $a0, 0x0018($sp) -/* 0055C 8098513C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00560 80985140 AFA5001C */ sw $a1, 0x001C($sp) -/* 00564 80985144 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00568 80985148 AFA60020 */ sw $a2, 0x0020($sp) -/* 0056C 8098514C 0C261428 */ jal func_809850A0 -/* 00570 80985150 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00574 80985154 10400007 */ beq $v0, $zero, .L80985174 -/* 00578 80985158 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0057C 8098515C 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00580 80985160 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00584 80985164 51CF0004 */ beql $t6, $t7, .L80985178 -/* 00588 80985168 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0058C 8098516C 10000002 */ beq $zero, $zero, .L80985178 -/* 00590 80985170 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80985174: -/* 00594 80985174 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80985178: -/* 00598 80985178 03E00008 */ jr $ra -/* 0059C 8098517C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s deleted file mode 100644 index aa9e3426b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80985180 -/* 005A0 80985180 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A4 80985184 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005A8 80985188 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 8098518C AFA5001C */ sw $a1, 0x001C($sp) -/* 005B0 80985190 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B4 80985194 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 005B8 80985198 0C261428 */ jal func_809850A0 -/* 005BC 8098519C AFA70018 */ sw $a3, 0x0018($sp) -/* 005C0 809851A0 10400013 */ beq $v0, $zero, .L809851F0 -/* 005C4 809851A4 8FA70018 */ lw $a3, 0x0018($sp) -/* 005C8 809851A8 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 005CC 809851AC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 005D0 809851B0 00000000 */ nop -/* 005D4 809851B4 468021A0 */ cvt.s.w $f6, $f4 -/* 005D8 809851B8 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 005DC 809851BC 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 005E0 809851C0 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 005E4 809851C4 00000000 */ nop -/* 005E8 809851C8 468042A0 */ cvt.s.w $f10, $f8 -/* 005EC 809851CC E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 005F0 809851D0 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 005F4 809851D4 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 005F8 809851D8 00000000 */ nop -/* 005FC 809851DC 468084A0 */ cvt.s.w $f18, $f16 -/* 00600 809851E0 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 00604 809851E4 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00608 809851E8 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 0060C 809851EC A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L809851F0: -/* 00610 809851F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00614 809851F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00618 809851F8 03E00008 */ jr $ra -/* 0061C 809851FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s deleted file mode 100644 index e28982402f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80985200 -/* 00620 80985200 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00624 80985204 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00628 80985208 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0062C 8098520C AFA5001C */ sw $a1, 0x001C($sp) -/* 00630 80985210 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00634 80985214 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00638 80985218 0C261428 */ jal func_809850A0 -/* 0063C 8098521C AFA70018 */ sw $a3, 0x0018($sp) -/* 00640 80985220 10400013 */ beq $v0, $zero, .L80985270 -/* 00644 80985224 8FA70018 */ lw $a3, 0x0018($sp) -/* 00648 80985228 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 0064C 8098522C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00650 80985230 00000000 */ nop -/* 00654 80985234 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 80985238 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 0065C 8098523C 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00660 80985240 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00664 80985244 00000000 */ nop -/* 00668 80985248 468042A0 */ cvt.s.w $f10, $f8 -/* 0066C 8098524C E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00670 80985250 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 00674 80985254 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00678 80985258 00000000 */ nop -/* 0067C 8098525C 468084A0 */ cvt.s.w $f18, $f16 -/* 00680 80985260 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 00684 80985264 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00688 80985268 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 0068C 8098526C A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80985270: -/* 00690 80985270 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00694 80985274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00698 80985278 03E00008 */ jr $ra -/* 0069C 8098527C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s deleted file mode 100644 index 56d9fe3040..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80985280 -/* 006A0 80985280 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 80985284 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A8 80985288 AFA40028 */ sw $a0, 0x0028($sp) -/* 006AC 8098528C AFA5002C */ sw $a1, 0x002C($sp) -/* 006B0 80985290 AFA60030 */ sw $a2, 0x0030($sp) -/* 006B4 80985294 AFA70034 */ sw $a3, 0x0034($sp) -/* 006B8 80985298 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006BC 8098529C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006C0 809852A0 8FAE0038 */ lw $t6, 0x0038($sp) -/* 006C4 809852A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C8 809852A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006CC 809852AC 15C00007 */ bne $t6, $zero, .L809852CC -/* 006D0 809852B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D4 809852B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006D8 809852B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 006DC 809852BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006E0 809852C0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 006E4 809852C4 10000006 */ beq $zero, $zero, .L809852E0 -/* 006E8 809852C8 468020A0 */ cvt.s.w $f2, $f4 -.L809852CC: -/* 006EC 809852CC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 006F0 809852D0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 006F4 809852D4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 006F8 809852D8 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 006FC 809852DC 46803020 */ cvt.s.w $f0, $f6 -.L809852E0: -/* 00700 809852E0 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00704 809852E4 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00708 809852E8 44066000 */ mfc1 $a2, $f12 -/* 0070C 809852EC 44070000 */ mfc1 $a3, $f0 -/* 00710 809852F0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00714 809852F4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00718 809852F8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0071C 809852FC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00720 80985300 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00724 80985304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00728 80985308 03E00008 */ jr $ra -/* 0072C 8098530C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s deleted file mode 100644 index 1a8f9e6c77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s +++ /dev/null @@ -1,24 +0,0 @@ -.late_rodata -glabel D_809889D8 - .word 0xC61C4000 - -.text -glabel func_80985310 -/* 00730 80985310 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00734 80985314 AFA50024 */ sw $a1, 0x0024($sp) -/* 00738 80985318 AFBF001C */ sw $ra, 0x001C($sp) -/* 0073C 8098531C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00740 80985320 AFA40020 */ sw $a0, 0x0020($sp) -/* 00744 80985324 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 00748 80985328 AFA00010 */ sw $zero, 0x0010($sp) -/* 0074C 8098532C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00750 80985330 0C2614A0 */ jal func_80985280 -/* 00754 80985334 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00758 80985338 3C018099 */ lui $at, %hi(D_809889D8) ## $at = 80990000 -/* 0075C 8098533C C42489D8 */ lwc1 $f4, %lo(D_809889D8)($at) -/* 00760 80985340 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00764 80985344 E5C400BC */ swc1 $f4, 0x00BC($t6) ## 000000BC -/* 00768 80985348 8FBF001C */ lw $ra, 0x001C($sp) -/* 0076C 8098534C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00770 80985350 03E00008 */ jr $ra -/* 00774 80985354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s deleted file mode 100644 index 1fdd09c995..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80985358 -/* 00778 80985358 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0077C 8098535C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00780 80985360 AFA40038 */ sw $a0, 0x0038($sp) -/* 00784 80985364 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 00788 80985368 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 0078C 8098536C C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 00790 80985370 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00794 80985374 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00798 80985378 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0079C 8098537C AFAE0028 */ sw $t6, 0x0028($sp) -/* 007A0 80985380 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 007A4 80985384 AFA00024 */ sw $zero, 0x0024($sp) -/* 007A8 80985388 AFA00020 */ sw $zero, 0x0020($sp) -/* 007AC 8098538C AFA0001C */ sw $zero, 0x001C($sp) -/* 007B0 80985390 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 007B4 80985394 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 007B8 80985398 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 007BC 8098539C 0C00C916 */ jal Actor_SpawnAttached - -/* 007C0 809853A0 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 007C4 809853A4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 007C8 809853A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 007CC 809853AC 03E00008 */ jr $ra -/* 007D0 809853B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s deleted file mode 100644 index 5bf24d1a53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809853B4 -/* 007D4 809853B4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 007D8 809853B8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 007DC 809853BC AFA40038 */ sw $a0, 0x0038($sp) -/* 007E0 809853C0 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 007E4 809853C4 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 007E8 809853C8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 007EC 809853CC 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 007F0 809853D0 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 007F4 809853D4 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 007F8 809853D8 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 007FC 809853DC 46062080 */ add.s $f2, $f4, $f6 -/* 00800 809853E0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00804 809853E4 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00808 809853E8 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0080C 809853EC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00810 809853F0 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00814 809853F4 AFA6003C */ sw $a2, 0x003C($sp) -/* 00818 809853F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0081C 809853FC AFA00020 */ sw $zero, 0x0020($sp) -/* 00820 80985400 AFA0001C */ sw $zero, 0x001C($sp) -/* 00824 80985404 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 00828 80985408 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0082C 8098540C 0C00C916 */ jal Actor_SpawnAttached - -/* 00830 80985410 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00834 80985414 8FA4003C */ lw $a0, 0x003C($sp) -/* 00838 80985418 0C021344 */ jal Item_Give -/* 0083C 8098541C 2405006A */ addiu $a1, $zero, 0x006A ## $a1 = 0000006A -/* 00840 80985420 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00844 80985424 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00848 80985428 03E00008 */ jr $ra -/* 0084C 8098542C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s deleted file mode 100644 index 93b605db30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_809889DC - .word 0x42A6AAAB - -.text -glabel func_80985430 -/* 00850 80985430 AFA50004 */ sw $a1, 0x0004($sp) -/* 00854 80985434 3C018099 */ lui $at, %hi(D_809889DC) ## $at = 80990000 -/* 00858 80985438 C42689DC */ lwc1 $f6, %lo(D_809889DC)($at) -/* 0085C 8098543C C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 00860 80985440 46062200 */ add.s $f8, $f4, $f6 -/* 00864 80985444 03E00008 */ jr $ra -/* 00868 80985448 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s deleted file mode 100644 index 663f33614b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8098544C -/* 0086C 8098544C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00870 80985450 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00874 80985454 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 00878 80985458 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0087C 8098545C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00880 80985460 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00884 80985464 15C10019 */ bne $t6, $at, .L809854CC -/* 00888 80985468 AFA40028 */ sw $a0, 0x0028($sp) -/* 0088C 8098546C 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00890 80985470 3C088098 */ lui $t0, %hi(D_8098786C) ## $t0 = 80980000 -/* 00894 80985474 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00898 80985478 29E10004 */ slti $at, $t7, 0x0004 -/* 0089C 8098547C 10200013 */ beq $at, $zero, .L809854CC -/* 008A0 80985480 2508786C */ addiu $t0, $t0, %lo(D_8098786C) ## $t0 = 8098786C -/* 008A4 80985484 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 008A8 80985488 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 008AC 8098548C ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 008B0 80985490 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 008B4 80985494 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008B8 80985498 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 008BC 8098549C 2405006A */ addiu $a1, $zero, 0x006A ## $a1 = 0000006A -/* 008C0 809854A0 0C021344 */ jal Item_Give -/* 008C4 809854A4 AFA3001C */ sw $v1, 0x001C($sp) -/* 008C8 809854A8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 008CC 809854AC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 008D0 809854B0 8FA3001C */ lw $v1, 0x001C($sp) -/* 008D4 809854B4 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 008D8 809854B8 00411021 */ addu $v0, $v0, $at -/* 008DC 809854BC 00021400 */ sll $v0, $v0, 16 -/* 008E0 809854C0 00021403 */ sra $v0, $v0, 16 -/* 008E4 809854C4 A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 008E8 809854C8 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L809854CC: -/* 008EC 809854CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008F0 809854D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008F4 809854D4 03E00008 */ jr $ra -/* 008F8 809854D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s deleted file mode 100644 index 0a40c7cd2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_809854DC -/* 008FC 809854DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00900 809854E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00904 809854E4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00908 809854E8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0090C 809854EC 51C00020 */ beql $t6, $zero, .L80985570 -/* 00910 809854F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00914 809854F4 8CA21DA0 */ lw $v0, 0x1DA0($a1) ## 00001DA0 -/* 00918 809854F8 5040001D */ beql $v0, $zero, .L80985570 -/* 0091C 809854FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00920 80985500 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00924 80985504 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00928 80985508 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0092C 8098550C 15E10017 */ bne $t7, $at, .L8098556C -/* 00930 80985510 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 -/* 00934 80985514 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00938 80985518 AFA5002C */ sw $a1, 0x002C($sp) -/* 0093C 8098551C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00940 80985520 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00944 80985524 8FA40028 */ lw $a0, 0x0028($sp) -/* 00948 80985528 468021A0 */ cvt.s.w $f6, $f4 -/* 0094C 8098552C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00950 80985530 44070000 */ mfc1 $a3, $f0 -/* 00954 80985534 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 00958 80985538 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0095C 8098553C AFA00014 */ sw $zero, 0x0014($sp) -/* 00960 80985540 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00964 80985544 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00968 80985548 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0096C 8098554C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00970 80985550 8FA40028 */ lw $a0, 0x0028($sp) -/* 00974 80985554 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00978 80985558 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0097C 8098555C AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 00980 80985560 AC990264 */ sw $t9, 0x0264($a0) ## 00000264 -/* 00984 80985564 0C2614D6 */ jal func_80985358 -/* 00988 80985568 8FA5002C */ lw $a1, 0x002C($sp) -.L8098556C: -/* 0098C 8098556C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80985570: -/* 00990 80985570 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00994 80985574 03E00008 */ jr $ra -/* 00998 80985578 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s deleted file mode 100644 index 48ab52a1ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098557C -/* 0099C 8098557C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 009A0 80985580 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 009A4 80985584 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 009A8 80985588 4604003E */ c.le.s $f0, $f4 -/* 009AC 8098558C 00000000 */ nop -/* 009B0 80985590 45000003 */ bc1f .L809855A0 -/* 009B4 80985594 00000000 */ nop -/* 009B8 80985598 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 009BC 8098559C E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L809855A0: -/* 009C0 809855A0 03E00008 */ jr $ra -/* 009C4 809855A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s deleted file mode 100644 index 666cc3c37a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_809855A8 -/* 009C8 809855A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009CC 809855AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 009D0 809855B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 009D4 809855B4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 009D8 809855B8 51C0001E */ beql $t6, $zero, .L80985634 -/* 009DC 809855BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009E0 809855C0 8CA21DA0 */ lw $v0, 0x1DA0($a1) ## 00001DA0 -/* 009E4 809855C4 5040001B */ beql $v0, $zero, .L80985634 -/* 009E8 809855C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009EC 809855CC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 009F0 809855D0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 009F4 809855D4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 009F8 809855D8 55E10016 */ bnel $t7, $at, .L80985634 -/* 009FC 809855DC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A00 809855E0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A04 809855E4 24840710 */ addiu $a0, $a0, 0x0710 ## $a0 = 06000710 -/* 00A08 809855E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A0C 809855EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00A10 809855F0 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00A14 809855F4 468021A0 */ cvt.s.w $f6, $f4 -/* 00A18 809855F8 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A1C 809855FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A20 80985600 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00A24 80985604 AFB80014 */ sw $t8, 0x0014($sp) -/* 00A28 80985608 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 -/* 00A2C 8098560C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00A30 80985610 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A34 80985614 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00A38 80985618 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00A3C 8098561C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00A40 80985620 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A44 80985624 8FA80028 */ lw $t0, 0x0028($sp) -/* 00A48 80985628 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 00A4C 8098562C AD190260 */ sw $t9, 0x0260($t0) ## 00000260 -/* 00A50 80985630 8FBF0024 */ lw $ra, 0x0024($sp) -.L80985634: -/* 00A54 80985634 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A58 80985638 03E00008 */ jr $ra -/* 00A5C 8098563C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s deleted file mode 100644 index ea984da9b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80985640 -/* 00A60 80985640 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A64 80985644 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A68 80985648 10A00014 */ beq $a1, $zero, .L8098569C -/* 00A6C 8098564C AFA40028 */ sw $a0, 0x0028($sp) -/* 00A70 80985650 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A74 80985654 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A78 80985658 24840AFC */ addiu $a0, $a0, 0x0AFC ## $a0 = 06000AFC -/* 00A7C 8098565C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A80 80985660 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A84 80985664 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A88 80985668 468021A0 */ cvt.s.w $f6, $f4 -/* 00A8C 8098566C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A90 80985670 44070000 */ mfc1 $a3, $f0 -/* 00A94 80985674 24A50AFC */ addiu $a1, $a1, 0x0AFC ## $a1 = 06000AFC -/* 00A98 80985678 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A9C 8098567C AFA00014 */ sw $zero, 0x0014($sp) -/* 00AA0 80985680 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00AA4 80985684 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AA8 80985688 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00AAC 8098568C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00AB0 80985690 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00AB4 80985694 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00AB8 80985698 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -.L8098569C: -/* 00ABC 8098569C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AC0 809856A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AC4 809856A4 03E00008 */ jr $ra -/* 00AC8 809856A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s deleted file mode 100644 index 9978dad7f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809856AC -/* 00ACC 809856AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD0 809856B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD4 809856B4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00AD8 809856B8 51C0000C */ beql $t6, $zero, .L809856EC -/* 00ADC 809856BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AE0 809856C0 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00AE4 809856C4 50400009 */ beql $v0, $zero, .L809856EC -/* 00AE8 809856C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AEC 809856CC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00AF0 809856D0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00AF4 809856D4 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00AF8 809856D8 55E10004 */ bnel $t7, $at, .L809856EC -/* 00AFC 809856DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B00 809856E0 0C2614ED */ jal func_809853B4 -/* 00B04 809856E4 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 00B08 809856E8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809856EC: -/* 00B0C 809856EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B10 809856F0 03E00008 */ jr $ra -/* 00B14 809856F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s deleted file mode 100644 index aff586e7de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809856F8 -/* 00B18 809856F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B1C 809856FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B20 80985700 0C261513 */ jal func_8098544C -/* 00B24 80985704 00000000 */ nop -/* 00B28 80985708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B2C 8098570C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B30 80985710 03E00008 */ jr $ra -/* 00B34 80985714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s deleted file mode 100644 index 8a082278ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80985718 -/* 00B38 80985718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B3C 8098571C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B40 80985720 0C261537 */ jal func_809854DC -/* 00B44 80985724 00000000 */ nop -/* 00B48 80985728 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B4C 8098572C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B50 80985730 03E00008 */ jr $ra -/* 00B54 80985734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s deleted file mode 100644 index 5b209b356c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80985738 -/* 00B58 80985738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B5C 8098573C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B60 80985740 0C26150C */ jal func_80985430 -/* 00B64 80985744 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B68 80985748 0C261418 */ jal func_80985060 -/* 00B6C 8098574C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B70 80985750 0C2612F8 */ jal func_80984BE0 -/* 00B74 80985754 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B78 80985758 0C26155F */ jal func_8098557C -/* 00B7C 8098575C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B80 80985760 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B84 80985764 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B88 80985768 03E00008 */ jr $ra -/* 00B8C 8098576C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s deleted file mode 100644 index 49f50585ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80985770 -/* 00B90 80985770 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B94 80985774 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B98 80985778 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B9C 8098577C 0C261406 */ jal func_80985018 -/* 00BA0 80985780 AFA5001C */ sw $a1, 0x001C($sp) -/* 00BA4 80985784 0C261418 */ jal func_80985060 -/* 00BA8 80985788 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BAC 8098578C 0C2612F8 */ jal func_80984BE0 -/* 00BB0 80985790 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BB4 80985794 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BB8 80985798 0C26156A */ jal func_809855A8 -/* 00BBC 8098579C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BC0 809857A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BC4 809857A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BC8 809857A8 03E00008 */ jr $ra -/* 00BCC 809857AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s deleted file mode 100644 index 7d9547c953..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809857B0 -/* 00BD0 809857B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00BD4 809857B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BD8 809857B8 0C261406 */ jal func_80985018 -/* 00BDC 809857BC AFA40020 */ sw $a0, 0x0020($sp) -/* 00BE0 809857C0 0C261418 */ jal func_80985060 -/* 00BE4 809857C4 8FA40020 */ lw $a0, 0x0020($sp) -/* 00BE8 809857C8 AFA2001C */ sw $v0, 0x001C($sp) -/* 00BEC 809857CC 0C2612F8 */ jal func_80984BE0 -/* 00BF0 809857D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00BF4 809857D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 00BF8 809857D8 0C261590 */ jal func_80985640 -/* 00BFC 809857DC 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C00 809857E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C04 809857E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C08 809857E8 03E00008 */ jr $ra -/* 00C0C 809857EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s deleted file mode 100644 index 74c3736773..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809857F0 -/* 00C10 809857F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C14 809857F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C18 809857F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C1C 809857FC 0C261406 */ jal func_80985018 -/* 00C20 80985800 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C24 80985804 0C261418 */ jal func_80985060 -/* 00C28 80985808 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C2C 8098580C 0C2612F8 */ jal func_80984BE0 -/* 00C30 80985810 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C34 80985814 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C38 80985818 0C2615AB */ jal func_809856AC -/* 00C3C 8098581C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C40 80985820 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C44 80985824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C48 80985828 03E00008 */ jr $ra -/* 00C4C 8098582C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s deleted file mode 100644 index 0f4462d3af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80985830 -/* 00C50 80985830 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C54 80985834 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C58 80985838 0C261406 */ jal func_80985018 -/* 00C5C 8098583C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C60 80985840 0C261418 */ jal func_80985060 -/* 00C64 80985844 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C68 80985848 0C2612F8 */ jal func_80984BE0 -/* 00C6C 8098584C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C70 80985850 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C74 80985854 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C78 80985858 03E00008 */ jr $ra -/* 00C7C 8098585C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s deleted file mode 100644 index bb3a31d650..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80985860 -/* 00C80 80985860 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C84 80985864 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C88 80985868 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C8C 8098586C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C90 80985870 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 00C94 80985874 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C98 80985878 AFA40020 */ sw $a0, 0x0020($sp) -/* 00C9C 8098587C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CA0 80985880 0C2614A0 */ jal func_80985280 -/* 00CA4 80985884 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00CA8 80985888 8FA40020 */ lw $a0, 0x0020($sp) -/* 00CAC 8098588C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00CB0 80985890 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 00CB4 80985894 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00CB8 80985898 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CBC 8098589C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CC0 809858A0 03E00008 */ jr $ra -/* 00CC4 809858A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s deleted file mode 100644 index a0c98d3050..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809858A8 -/* 00CC8 809858A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CCC 809858AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CD0 809858B0 0C01E233 */ jal func_800788CC -/* 00CD4 809858B4 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 00CD8 809858B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CDC 809858BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CE0 809858C0 03E00008 */ jr $ra -/* 00CE4 809858C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s deleted file mode 100644 index 689cc194ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_809858C8 -/* 00CE8 809858C8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00CEC 809858CC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00CF0 809858D0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00CF4 809858D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CF8 809858D8 AFA40038 */ sw $a0, 0x0038($sp) -/* 00CFC 809858DC C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 00D00 809858E0 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00D04 809858E4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00D08 809858E8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00D0C 809858EC 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 00D10 809858F0 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00D14 809858F4 44815000 */ mtc1 $at, $f10 ## $f10 = 24.00 -/* 00D18 809858F8 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00D1C 809858FC 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00D20 80985900 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00D24 80985904 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00D28 80985908 46803220 */ cvt.s.w $f8, $f6 -/* 00D2C 8098590C 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00D30 80985910 460A4400 */ add.s $f16, $f8, $f10 -/* 00D34 80985914 46128100 */ add.s $f4, $f16, $f18 -/* 00D38 80985918 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00D3C 8098591C C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 00D40 80985920 AFB80028 */ sw $t8, 0x0028($sp) -/* 00D44 80985924 AFA00024 */ sw $zero, 0x0024($sp) -/* 00D48 80985928 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D4C 8098592C AFA0001C */ sw $zero, 0x001C($sp) -/* 00D50 80985930 0C00C916 */ jal Actor_SpawnAttached - -/* 00D54 80985934 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00D58 80985938 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00D5C 8098593C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00D60 80985940 03E00008 */ jr $ra -/* 00D64 80985944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s deleted file mode 100644 index 7cbd00f27a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80985948 -/* 00D68 80985948 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D6C 8098594C AFBF002C */ sw $ra, 0x002C($sp) -/* 00D70 80985950 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D74 80985954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D78 80985958 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00D7C 8098595C 0C26143A */ jal func_809850E8 -/* 00D80 80985960 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00D84 80985964 10400019 */ beq $v0, $zero, .L809859CC -/* 00D88 80985968 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00D8C 8098596C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00D90 80985970 24841C08 */ addiu $a0, $a0, 0x1C08 ## $a0 = 06011C08 -/* 00D94 80985974 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00D98 80985978 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D9C 8098597C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00DA0 80985980 468021A0 */ cvt.s.w $f6, $f4 -/* 00DA4 80985984 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00DA8 80985988 44070000 */ mfc1 $a3, $f0 -/* 00DAC 8098598C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00DB0 80985990 24A51C08 */ addiu $a1, $a1, 0x1C08 ## $a1 = 06011C08 -/* 00DB4 80985994 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00DB8 80985998 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00DBC 8098599C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00DC0 809859A0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00DC4 809859A4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00DC8 809859A8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00DCC 809859AC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00DD0 809859B0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00DD4 809859B4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 00DD8 809859B8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 00DDC 809859BC AE00026C */ sw $zero, 0x026C($s0) ## 0000026C -/* 00DE0 809859C0 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00DE4 809859C4 0C26162A */ jal func_809858A8 -/* 00DE8 809859C8 E6080268 */ swc1 $f8, 0x0268($s0) ## 00000268 -.L809859CC: -/* 00DEC 809859CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DF0 809859D0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00DF4 809859D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00DF8 809859D8 03E00008 */ jr $ra -/* 00DFC 809859DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s deleted file mode 100644 index dc75b70ec2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_809859E0 -/* 00E00 809859E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E04 809859E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E08 809859E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E0C 809859EC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00E10 809859F0 0C26143A */ jal func_809850E8 -/* 00E14 809859F4 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00E18 809859F8 10400025 */ beq $v0, $zero, .L80985A90 -/* 00E1C 809859FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E20 80985A00 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00E24 80985A04 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00E28 80985A08 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00E2C 80985A0C 24820268 */ addiu $v0, $a0, 0x0268 ## $v0 = 00000268 -/* 00E30 80985A10 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000268 -/* 00E34 80985A14 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E38 80985A18 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00E3C 80985A1C 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00E40 80985A20 46062200 */ add.s $f8, $f4, $f6 -/* 00E44 80985A24 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00E48 80985A28 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00E4C 80985A2C E4480000 */ swc1 $f8, 0x0000($v0) ## 00000268 -/* 00E50 80985A30 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00E54 80985A34 C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000268 -/* 00E58 80985A38 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00E5C 80985A3C 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00E60 80985A40 00000000 */ nop -/* 00E64 80985A44 46805420 */ cvt.s.w $f16, $f10 -/* 00E68 80985A48 46028480 */ add.s $f18, $f16, $f2 -/* 00E6C 80985A4C 4600903E */ c.le.s $f18, $f0 -/* 00E70 80985A50 00000000 */ nop -/* 00E74 80985A54 45000020 */ bc1f .L80985AD8 -/* 00E78 80985A58 00000000 */ nop -/* 00E7C 80985A5C AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 00E80 80985A60 AC990264 */ sw $t9, 0x0264($a0) ## 00000264 -/* 00E84 80985A64 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00E88 80985A68 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00E8C 80985A6C 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00E90 80985A70 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00E94 80985A74 00000000 */ nop -/* 00E98 80985A78 468021A0 */ cvt.s.w $f6, $f4 -/* 00E9C 80985A7C 46023200 */ add.s $f8, $f6, $f2 -/* 00EA0 80985A80 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000268 -/* 00EA4 80985A84 AC83026C */ sw $v1, 0x026C($a0) ## 0000026C -/* 00EA8 80985A88 10000026 */ beq $zero, $zero, .L80985B24 -/* 00EAC 80985A8C A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80985A90: -/* 00EB0 80985A90 24820268 */ addiu $v0, $a0, 0x0268 ## $v0 = 00000268 -/* 00EB4 80985A94 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00EB8 80985A98 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00EBC 80985A9C C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000268 -/* 00EC0 80985AA0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00EC4 80985AA4 46105481 */ sub.s $f18, $f10, $f16 -/* 00EC8 80985AA8 E4520000 */ swc1 $f18, 0x0000($v0) ## 00000268 -/* 00ECC 80985AAC C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000268 -/* 00ED0 80985AB0 4602003E */ c.le.s $f0, $f2 -/* 00ED4 80985AB4 00000000 */ nop -/* 00ED8 80985AB8 45000007 */ bc1f .L80985AD8 -/* 00EDC 80985ABC 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00EE0 80985AC0 AC8A0260 */ sw $t2, 0x0260($a0) ## 00000260 -/* 00EE4 80985AC4 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 00EE8 80985AC8 E4420000 */ swc1 $f2, 0x0000($v0) ## 00000268 -/* 00EEC 80985ACC AC80026C */ sw $zero, 0x026C($a0) ## 0000026C -/* 00EF0 80985AD0 10000014 */ beq $zero, $zero, .L80985B24 -/* 00EF4 80985AD4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80985AD8: -/* 00EF8 80985AD8 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00EFC 80985ADC 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00F00 80985AE0 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00F04 80985AE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F08 80985AE8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00F0C 80985AEC 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00F10 80985AF0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00F14 80985AF4 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00F18 80985AF8 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00F1C 80985AFC 00000000 */ nop -/* 00F20 80985B00 468021A0 */ cvt.s.w $f6, $f4 -/* 00F24 80985B04 46023200 */ add.s $f8, $f6, $f2 -/* 00F28 80985B08 46080283 */ div.s $f10, $f0, $f8 -/* 00F2C 80985B0C 46105482 */ mul.s $f18, $f10, $f16 -/* 00F30 80985B10 4600910D */ trunc.w.s $f4, $f18 -/* 00F34 80985B14 44022000 */ mfc1 $v0, $f4 -/* 00F38 80985B18 00000000 */ nop -/* 00F3C 80985B1C AC82026C */ sw $v0, 0x026C($a0) ## 0000026C -/* 00F40 80985B20 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80985B24: -/* 00F44 80985B24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F48 80985B28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F4C 80985B2C 03E00008 */ jr $ra -/* 00F50 80985B30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s deleted file mode 100644 index 8cf24361e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80985B34 -/* 00F54 80985B34 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F58 80985B38 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F5C 80985B3C AFB00028 */ sw $s0, 0x0028($sp) -/* 00F60 80985B40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80985B44 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F68 80985B48 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00F6C 80985B4C 0C26144D */ jal func_80985134 -/* 00F70 80985B50 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00F74 80985B54 10400029 */ beq $v0, $zero, .L80985BFC -/* 00F78 80985B58 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00F7C 80985B5C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00F80 80985B60 24842218 */ addiu $a0, $a0, 0x2218 ## $a0 = 06012218 -/* 00F84 80985B64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F88 80985B68 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00F8C 80985B6C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00F90 80985B70 468021A0 */ cvt.s.w $f6, $f4 -/* 00F94 80985B74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00F98 80985B78 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00F9C 80985B7C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00FA0 80985B80 24A52218 */ addiu $a1, $a1, 0x2218 ## $a1 = 06012218 -/* 00FA4 80985B84 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00FA8 80985B88 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FAC 80985B8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FB0 80985B90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FB4 80985B94 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00FB8 80985B98 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00FBC 80985B9C 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00FC0 80985BA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00FC4 80985BA4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 00FC8 80985BA8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 00FCC 80985BAC 3C198016 */ lui $t9, %hi(gGameInfo) -/* 00FD0 80985BB0 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 00FD4 80985BB4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00FD8 80985BB8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00FDC 80985BBC 8728145E */ lh $t0, 0x145E($t9) ## 8016145E -/* 00FE0 80985BC0 8E0A0270 */ lw $t2, 0x0270($s0) ## 00000270 -/* 00FE4 80985BC4 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00FE8 80985BC8 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00FEC 80985BCC AE09026C */ sw $t1, 0x026C($s0) ## 0000026C -/* 00FF0 80985BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF4 80985BD4 46805420 */ cvt.s.w $f16, $f10 -/* 00FF8 80985BD8 46128100 */ add.s $f4, $f16, $f18 -/* 00FFC 80985BDC 15400005 */ bne $t2, $zero, .L80985BF4 -/* 01000 80985BE0 E6040268 */ swc1 $f4, 0x0268($s0) ## 00000268 -/* 01004 80985BE4 0C261632 */ jal func_809858C8 -/* 01008 80985BE8 8FA50034 */ lw $a1, 0x0034($sp) -/* 0100C 80985BEC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01010 80985BF0 AE0B0270 */ sw $t3, 0x0270($s0) ## 00000270 -.L80985BF4: -/* 01014 80985BF4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 01018 80985BF8 A20C00C8 */ sb $t4, 0x00C8($s0) ## 000000C8 -.L80985BFC: -/* 0101C 80985BFC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01020 80985C00 8FB00028 */ lw $s0, 0x0028($sp) -/* 01024 80985C04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01028 80985C08 03E00008 */ jr $ra -/* 0102C 80985C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s deleted file mode 100644 index de22285c0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80985C10 -/* 01030 80985C10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01034 80985C14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01038 80985C18 AFA40018 */ sw $a0, 0x0018($sp) -/* 0103C 80985C1C 0C261652 */ jal func_80985948 -/* 01040 80985C20 AFA5001C */ sw $a1, 0x001C($sp) -/* 01044 80985C24 8FA40018 */ lw $a0, 0x0018($sp) -/* 01048 80985C28 0C261323 */ jal func_80984C8C -/* 0104C 80985C2C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01050 80985C30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01054 80985C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01058 80985C38 03E00008 */ jr $ra -/* 0105C 80985C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s deleted file mode 100644 index d91b57df21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80985C40 -/* 01060 80985C40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01064 80985C44 AFBF001C */ sw $ra, 0x001C($sp) -/* 01068 80985C48 AFB00018 */ sw $s0, 0x0018($sp) -/* 0106C 80985C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01070 80985C50 0C261406 */ jal func_80985018 -/* 01074 80985C54 AFA50024 */ sw $a1, 0x0024($sp) -/* 01078 80985C58 0C261418 */ jal func_80985060 -/* 0107C 80985C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01080 80985C60 0C2612F8 */ jal func_80984BE0 -/* 01084 80985C64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01088 80985C68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0108C 80985C6C 0C261678 */ jal func_809859E0 -/* 01090 80985C70 8FA50024 */ lw $a1, 0x0024($sp) -/* 01094 80985C74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01098 80985C78 0C261323 */ jal func_80984C8C -/* 0109C 80985C7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 010A0 80985C80 8FBF001C */ lw $ra, 0x001C($sp) -/* 010A4 80985C84 8FB00018 */ lw $s0, 0x0018($sp) -/* 010A8 80985C88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 80985C8C 03E00008 */ jr $ra -/* 010B0 80985C90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s deleted file mode 100644 index 739207ca3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80985C94 -/* 010B4 80985C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010B8 80985C98 AFBF001C */ sw $ra, 0x001C($sp) -/* 010BC 80985C9C AFB00018 */ sw $s0, 0x0018($sp) -/* 010C0 80985CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010C4 80985CA4 0C261406 */ jal func_80985018 -/* 010C8 80985CA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 010CC 80985CAC 0C261418 */ jal func_80985060 -/* 010D0 80985CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010D4 80985CB4 0C2612F8 */ jal func_80984BE0 -/* 010D8 80985CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010DC 80985CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010E0 80985CC0 0C2616CD */ jal func_80985B34 -/* 010E4 80985CC4 8FA50024 */ lw $a1, 0x0024($sp) -/* 010E8 80985CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010EC 80985CCC 0C261323 */ jal func_80984C8C -/* 010F0 80985CD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 010F4 80985CD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 010F8 80985CD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 010FC 80985CDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01100 80985CE0 03E00008 */ jr $ra -/* 01104 80985CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s deleted file mode 100644 index c6fbd2e93f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_80988810 - .asciz "../z_demo_im_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80988834 - .asciz "../z_demo_im_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_80985CE8 -/* 01108 80985CE8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) -/* 01110 80985CF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 01114 80985CF4 AFA40078 */ sw $a0, 0x0078($sp) -/* 01118 80985CF8 AFA5007C */ sw $a1, 0x007C($sp) -/* 0111C 80985CFC 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 01120 80985D00 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 -/* 01124 80985D04 3C068099 */ lui $a2, %hi(D_80988810) ## $a2 = 80990000 -/* 01128 80985D08 00027880 */ sll $t7, $v0, 2 -/* 0112C 80985D0C 030FC021 */ addu $t8, $t8, $t7 -/* 01130 80985D10 8F187830 */ lw $t8, %lo(D_80987830)($t8) -/* 01134 80985D14 24C68810 */ addiu $a2, $a2, %lo(D_80988810) ## $a2 = 80988810 -/* 01138 80985D18 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) -/* 01140 80985D20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01144 80985D24 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 -/* 01148 80985D28 0C031AB1 */ jal Graph_OpenDisps -/* 0114C 80985D2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) -/* 01154 80985D34 0C024F61 */ jal func_80093D84 -/* 01158 80985D38 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 0115C 80985D3C 8FA70068 */ lw $a3, 0x0068($sp) -/* 01160 80985D40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01164 80985D44 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01168 80985D48 00076100 */ sll $t4, $a3, 4 -/* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 -/* 01170 80985D50 3C0F8016 */ lui $t7, %hi(gSegments) -/* 01174 80985D54 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01178 80985D58 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 0117C 80985D5C 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 -/* 01184 80985D64 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 -/* 0118C 80985D6C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01190 80985D70 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 01194 80985D74 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01198 80985D78 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0119C 80985D7C 00E12824 */ and $a1, $a3, $at -/* 011A0 80985D80 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 011A4 80985D84 0305C821 */ addu $t9, $t8, $a1 -/* 011A8 80985D88 03264821 */ addu $t1, $t9, $a2 -/* 011AC 80985D8C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 011B0 80985D90 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 011B4 80985D94 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 011B8 80985D98 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 011BC 80985D9C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 011C0 80985DA0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 011C4 80985DA4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 011C8 80985DA8 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 011CC 80985DAC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 011D0 80985DB0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 011D4 80985DB4 01856821 */ addu $t5, $t4, $a1 -/* 011D8 80985DB8 01A67021 */ addu $t6, $t5, $a2 -/* 011DC 80985DBC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 011E0 80985DC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) -/* 011E8 80985DC8 3C0C8011 */ lui $t4, %hi(D_80116280) -/* 011EC 80985DCC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 011F0 80985DD0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 011F4 80985DD4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 011F8 80985DD8 8D19026C */ lw $t9, 0x026C($t0) ## 0000026C -/* 011FC 80985DDC 258C6280 */ addiu $t4, %lo(D_80116280) -/* 01200 80985DE0 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 01204 80985DE4 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 01208 80985DE8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0120C 80985DEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01210 80985DF0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01214 80985DF4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01218 80985DF8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0121C 80985DFC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01220 80985E00 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 01224 80985E04 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01228 80985E08 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 0122C 80985E0C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01230 80985E10 AFA00018 */ sw $zero, 0x0018($sp) -/* 01234 80985E14 AFA00014 */ sw $zero, 0x0014($sp) -/* 01238 80985E18 AFA00010 */ sw $zero, 0x0010($sp) -/* 0123C 80985E1C 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01240 80985E20 8FA4007C */ lw $a0, 0x007C($sp) -/* 01244 80985E24 0C0289CF */ jal SkelAnime_DrawSV2 -/* 01248 80985E28 AFAD001C */ sw $t5, 0x001C($sp) -/* 0124C 80985E2C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01250 80985E30 8FAE007C */ lw $t6, 0x007C($sp) -/* 01254 80985E34 3C068099 */ lui $a2, %hi(D_80988834) ## $a2 = 80990000 -/* 01258 80985E38 24C68834 */ addiu $a2, $a2, %lo(D_80988834) ## $a2 = 80988834 -/* 0125C 80985E3C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 01260 80985E40 24070134 */ addiu $a3, $zero, 0x0134 ## $a3 = 00000134 -/* 01264 80985E44 0C031AD5 */ jal Graph_CloseDisps -/* 01268 80985E48 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) -/* 01274 80985E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01278 80985E58 03E00008 */ jr $ra -/* 0127C 80985E5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s deleted file mode 100644 index bdb28304cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80985E60 -/* 01280 80985E60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01284 80985E64 AFA50024 */ sw $a1, 0x0024($sp) -/* 01288 80985E68 AFBF001C */ sw $ra, 0x001C($sp) -/* 0128C 80985E6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01290 80985E70 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 01294 80985E74 AFA00010 */ sw $zero, 0x0010($sp) -/* 01298 80985E78 AFA40020 */ sw $a0, 0x0020($sp) -/* 0129C 80985E7C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012A0 80985E80 0C2614A0 */ jal func_80985280 -/* 012A4 80985E84 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 012A8 80985E88 8FA40020 */ lw $a0, 0x0020($sp) -/* 012AC 80985E8C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 012B0 80985E90 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 012B4 80985E94 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 012B8 80985E98 AC8F0280 */ sw $t7, 0x0280($a0) ## 00000280 -/* 012BC 80985E9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 012C0 80985EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 012C4 80985EA4 03E00008 */ jr $ra -/* 012C8 80985EA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s deleted file mode 100644 index f7fb607129..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80985EAC -/* 012CC 80985EAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 80985EB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012D4 80985EB4 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 012D8 80985EB8 28410050 */ slti $at, $v0, 0x0050 -/* 012DC 80985EBC 14200007 */ bne $at, $zero, .L80985EDC -/* 012E0 80985EC0 284100F3 */ slti $at, $v0, 0x00F3 -/* 012E4 80985EC4 10200005 */ beq $at, $zero, .L80985EDC -/* 012E8 80985EC8 00000000 */ nop -/* 012EC 80985ECC 0C2613C4 */ jal func_80984F10 -/* 012F0 80985ED0 00000000 */ nop -/* 012F4 80985ED4 10000004 */ beq $zero, $zero, .L80985EE8 -/* 012F8 80985ED8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80985EDC: -/* 012FC 80985EDC 0C26136E */ jal func_80984DB8 -/* 01300 80985EE0 00000000 */ nop -/* 01304 80985EE4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80985EE8: -/* 01308 80985EE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0130C 80985EEC 03E00008 */ jr $ra -/* 01310 80985EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s deleted file mode 100644 index f90d46fc96..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80985EF4 -/* 01314 80985EF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01318 80985EF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0131C 80985EFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01320 80985F00 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01324 80985F04 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01328 80985F08 2484182C */ addiu $a0, $a0, 0x182C ## $a0 = 0601182C -/* 0132C 80985F0C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01330 80985F10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01334 80985F14 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 01338 80985F18 468021A0 */ cvt.s.w $f6, $f4 -/* 0133C 80985F1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01340 80985F20 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01344 80985F24 46083281 */ sub.s $f10, $f6, $f8 -/* 01348 80985F28 44055000 */ mfc1 $a1, $f10 -/* 0134C 80985F2C 0C0295B2 */ jal func_800A56C8 -/* 01350 80985F30 00000000 */ nop -/* 01354 80985F34 54400004 */ bnel $v0, $zero, .L80985F48 -/* 01358 80985F38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0135C 80985F3C 0C261418 */ jal func_80985060 -/* 01360 80985F40 8FA40018 */ lw $a0, 0x0018($sp) -/* 01364 80985F44 8FBF0014 */ lw $ra, 0x0014($sp) -.L80985F48: -/* 01368 80985F48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0136C 80985F4C 03E00008 */ jr $ra -/* 01370 80985F50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s deleted file mode 100644 index 01f25769a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80985F54 -/* 01374 80985F54 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01378 80985F58 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 0137C 80985F5C 03E00008 */ jr $ra -/* 01380 80985F60 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s deleted file mode 100644 index 1b3d0924c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80985F64 -/* 01384 80985F64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01388 80985F68 AFA40028 */ sw $a0, 0x0028($sp) -/* 0138C 80985F6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01390 80985F70 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01394 80985F74 AFA5002C */ sw $a1, 0x002C($sp) -/* 01398 80985F78 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0139C 80985F7C 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 -/* 013A0 80985F80 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 013A4 80985F84 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013A8 80985F88 8FA40028 */ lw $a0, 0x0028($sp) -/* 013AC 80985F8C 468021A0 */ cvt.s.w $f6, $f4 -/* 013B0 80985F90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 013B4 80985F94 44070000 */ mfc1 $a3, $f0 -/* 013B8 80985F98 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 013BC 80985F9C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 013C0 80985FA0 AFA00014 */ sw $zero, 0x0014($sp) -/* 013C4 80985FA4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 013C8 80985FA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80985FAC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 013D0 80985FB0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 013D4 80985FB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 013D8 80985FB8 8FA5002C */ lw $a1, 0x002C($sp) -/* 013DC 80985FBC 0C261460 */ jal func_80985180 -/* 013E0 80985FC0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 013E4 80985FC4 8FA20028 */ lw $v0, 0x0028($sp) -/* 013E8 80985FC8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 013EC 80985FCC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 013F0 80985FD0 AC4E0260 */ sw $t6, 0x0260($v0) ## 00000260 -/* 013F4 80985FD4 AC4F0264 */ sw $t7, 0x0264($v0) ## 00000264 -/* 013F8 80985FD8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013FC 80985FDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01400 80985FE0 03E00008 */ jr $ra -/* 01404 80985FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s deleted file mode 100644 index de63c39e52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80985FE8 -/* 01408 80985FE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0140C 80985FEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01410 80985FF0 10A00012 */ beq $a1, $zero, .L8098603C -/* 01414 80985FF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01418 80985FF8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0141C 80985FFC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01420 80986000 2484182C */ addiu $a0, $a0, 0x182C ## $a0 = 0601182C -/* 01424 80986004 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01428 80986008 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 0142C 8098600C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01430 80986010 468021A0 */ cvt.s.w $f6, $f4 -/* 01434 80986014 8FA40028 */ lw $a0, 0x0028($sp) -/* 01438 80986018 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0143C 8098601C 24A5182C */ addiu $a1, $a1, 0x182C ## $a1 = 0601182C -/* 01440 80986020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01444 80986024 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01448 80986028 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0144C 8098602C AFA00014 */ sw $zero, 0x0014($sp) -/* 01450 80986030 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01454 80986034 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01458 80986038 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -.L8098603C: -/* 0145C 8098603C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01460 80986040 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01464 80986044 03E00008 */ jr $ra -/* 01468 80986048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s deleted file mode 100644 index 839a5b2821..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098604C -/* 0146C 8098604C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01470 80986050 AFA40028 */ sw $a0, 0x0028($sp) -/* 01474 80986054 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01478 80986058 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0147C 8098605C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01480 80986060 24840EE0 */ addiu $a0, $a0, 0x0EE0 ## $a0 = 06010EE0 -/* 01484 80986064 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01488 80986068 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 0148C 8098606C 8FA30028 */ lw $v1, 0x0028($sp) -/* 01490 80986070 468021A0 */ cvt.s.w $f6, $f4 -/* 01494 80986074 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01498 80986078 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0149C 8098607C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014A0 80986080 AFAE0014 */ sw $t6, 0x0014($sp) -/* 014A4 80986084 24A50EE0 */ addiu $a1, $a1, 0x0EE0 ## $a1 = 06010EE0 -/* 014A8 80986088 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 014AC 8098608C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014B0 80986090 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014B4 80986094 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 014B8 80986098 0C029468 */ jal SkelAnime_ChangeAnim - -/* 014BC 8098609C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 014C0 809860A0 8FA30028 */ lw $v1, 0x0028($sp) -/* 014C4 809860A4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 014C8 809860A8 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C -/* 014CC 809860AC AC6F0260 */ sw $t7, 0x0260($v1) ## 00000260 -/* 014D0 809860B0 AC620264 */ sw $v0, 0x0264($v1) ## 00000264 -/* 014D4 809860B4 AC6202D0 */ sw $v0, 0x02D0($v1) ## 000002D0 -/* 014D8 809860B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014DC 809860BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014E0 809860C0 03E00008 */ jr $ra -/* 014E4 809860C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s deleted file mode 100644 index 77143c55ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_809860C8 -/* 014E8 809860C8 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 014EC 809860CC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 014F0 809860D0 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 014F4 809860D4 03E00008 */ jr $ra -/* 014F8 809860D8 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s deleted file mode 100644 index ef335c8b46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809860DC -/* 014FC 809860DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01500 809860E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01504 809860E4 10A00014 */ beq $a1, $zero, .L80986138 -/* 01508 809860E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0150C 809860EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01510 809860F0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01514 809860F4 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 -/* 01518 809860F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0151C 809860FC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01520 80986100 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01524 80986104 468021A0 */ cvt.s.w $f6, $f4 -/* 01528 80986108 8FA40028 */ lw $a0, 0x0028($sp) -/* 0152C 8098610C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01530 80986110 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 01534 80986114 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01538 80986118 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0153C 8098611C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01540 80986120 AFA00014 */ sw $zero, 0x0014($sp) -/* 01544 80986124 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01548 80986128 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0154C 8098612C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01550 80986130 8FAE0028 */ lw $t6, 0x0028($sp) -/* 01554 80986134 ADC002D0 */ sw $zero, 0x02D0($t6) ## 000002D0 -.L80986138: -/* 01558 80986138 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0155C 8098613C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01560 80986140 03E00008 */ jr $ra -/* 01564 80986144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s deleted file mode 100644 index 040ebecaf5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80986148 -/* 01568 80986148 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0156C 8098614C AFA40028 */ sw $a0, 0x0028($sp) -/* 01570 80986150 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01574 80986154 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01578 80986158 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0157C 8098615C 24840EE0 */ addiu $a0, $a0, 0x0EE0 ## $a0 = 06010EE0 -/* 01580 80986160 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01584 80986164 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01588 80986168 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0158C 8098616C 46802120 */ cvt.s.w $f4, $f4 -/* 01590 80986170 8FA40028 */ lw $a0, 0x0028($sp) -/* 01594 80986174 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01598 80986178 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0159C 8098617C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 015A0 80986180 AFAE0014 */ sw $t6, 0x0014($sp) -/* 015A4 80986184 44072000 */ mfc1 $a3, $f4 -/* 015A8 80986188 24A50EE0 */ addiu $a1, $a1, 0x0EE0 ## $a1 = 06010EE0 -/* 015AC 8098618C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 015B0 80986190 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 015B4 80986194 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015B8 80986198 0C029468 */ jal SkelAnime_ChangeAnim - -/* 015BC 8098619C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 015C0 809861A0 8FA20028 */ lw $v0, 0x0028($sp) -/* 015C4 809861A4 240F000E */ addiu $t7, $zero, 0x000E ## $t7 = 0000000E -/* 015C8 809861A8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 015CC 809861AC AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 -/* 015D0 809861B0 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 015D4 809861B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 015D8 809861B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015DC 809861BC 03E00008 */ jr $ra -/* 015E0 809861C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s deleted file mode 100644 index dbfcdeefc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s +++ /dev/null @@ -1,68 +0,0 @@ -.rdata -glabel D_80988858 - .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_809861C4 -/* 015E4 809861C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 015E8 809861C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 015EC 809861CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015F0 809861D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 015F4 809861D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015F8 809861D8 0C261428 */ jal func_809850A0 -/* 015FC 809861DC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01600 809861E0 5040002A */ beql $v0, $zero, .L8098628C -/* 01604 809861E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01608 809861E8 94480000 */ lhu $t0, 0x0000($v0) ## 00000000 -/* 0160C 809861EC 8E030274 */ lw $v1, 0x0274($s0) ## 00000274 -/* 01610 809861F0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01614 809861F4 51030025 */ beql $t0, $v1, .L8098628C -/* 01618 809861F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0161C 809861FC 11010009 */ beq $t0, $at, .L80986224 -/* 01620 80986200 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01624 80986204 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01628 80986208 1501001A */ bne $t0, $at, .L80986274 -/* 0162C 8098620C 3C048099 */ lui $a0, %hi(D_80988858) ## $a0 = 80990000 -/* 01630 80986210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01634 80986214 0C261852 */ jal func_80986148 -/* 01638 80986218 AFA80030 */ sw $t0, 0x0030($sp) -/* 0163C 8098621C 10000019 */ beq $zero, $zero, .L80986284 -/* 01640 80986220 8FA80030 */ lw $t0, 0x0030($sp) -.L80986224: -/* 01644 80986224 2484182C */ addiu $a0, $a0, 0x182C ## $a0 = 0000182C -/* 01648 80986228 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0164C 8098622C AFA80030 */ sw $t0, 0x0030($sp) -/* 01650 80986230 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01654 80986234 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01658 80986238 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0165C 8098623C 468021A0 */ cvt.s.w $f6, $f4 -/* 01660 80986240 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01664 80986244 24A5182C */ addiu $a1, $a1, 0x182C ## $a1 = 0601182C -/* 01668 80986248 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0166C 8098624C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01670 80986250 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01674 80986254 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01678 80986258 AFA00014 */ sw $zero, 0x0014($sp) -/* 0167C 8098625C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01680 80986260 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01684 80986264 8FA80030 */ lw $t0, 0x0030($sp) -/* 01688 80986268 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 0168C 8098626C 10000005 */ beq $zero, $zero, .L80986284 -/* 01690 80986270 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 -.L80986274: -/* 01694 80986274 24848858 */ addiu $a0, $a0, %lo(D_80988858) ## $a0 = FFFF8858 -/* 01698 80986278 0C00084C */ jal osSyncPrintf - -/* 0169C 8098627C AFA80030 */ sw $t0, 0x0030($sp) -/* 016A0 80986280 8FA80030 */ lw $t0, 0x0030($sp) -.L80986284: -/* 016A4 80986284 AE080274 */ sw $t0, 0x0274($s0) ## 00000274 -/* 016A8 80986288 8FBF002C */ lw $ra, 0x002C($sp) -.L8098628C: -/* 016AC 8098628C 8FB00028 */ lw $s0, 0x0028($sp) -/* 016B0 80986290 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 016B4 80986294 03E00008 */ jr $ra -/* 016B8 80986298 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s deleted file mode 100644 index abd278e305..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098629C -/* 016BC 8098629C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016C0 809862A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016C4 809862A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 016C8 809862A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 016CC 809862AC 0C261420 */ jal func_80985080 -/* 016D0 809862B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 016D4 809862B4 10400006 */ beq $v0, $zero, .L809862D0 -/* 016D8 809862B8 8FA60018 */ lw $a2, 0x0018($sp) -/* 016DC 809862BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 016E0 809862C0 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 016E4 809862C4 ACCE0260 */ sw $t6, 0x0260($a2) ## 00000260 -/* 016E8 809862C8 ACC20264 */ sw $v0, 0x0264($a2) ## 00000264 -/* 016EC 809862CC ACC20280 */ sw $v0, 0x0280($a2) ## 00000280 -.L809862D0: -/* 016F0 809862D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016F4 809862D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016F8 809862D8 03E00008 */ jr $ra -/* 016FC 809862DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s deleted file mode 100644 index 3430f9c316..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_80988894 - .asciz "Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_809889E0 -.word L80986340 -.word L80986350 -.word L80986394 -.word L80986394 -.word L80986394 -.word L80986394 -.word L80986364 -.word L80986374 -.word L80986384 - -.text -glabel func_809862E0 -/* 01700 809862E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01704 809862E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01708 809862E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0170C 809862EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01710 809862F0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01714 809862F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01718 809862F8 0C261428 */ jal func_809850A0 -/* 0171C 809862FC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01720 80986300 5040002A */ beql $v0, $zero, .L809863AC -/* 01724 80986304 8FBF001C */ lw $ra, 0x001C($sp) -/* 01728 80986308 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 0172C 8098630C AFAE0020 */ sw $t6, 0x0020($sp) -/* 01730 80986310 8E030274 */ lw $v1, 0x0274($s0) ## 00000274 -/* 01734 80986314 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 01738 80986318 2F010009 */ sltiu $at, $t8, 0x0009 -/* 0173C 8098631C 51C30023 */ beql $t6, $v1, .L809863AC -/* 01740 80986320 8FBF001C */ lw $ra, 0x001C($sp) -/* 01744 80986324 1020001B */ beq $at, $zero, .L80986394 -/* 01748 80986328 0018C080 */ sll $t8, $t8, 2 -/* 0174C 8098632C 3C018099 */ lui $at, %hi(jtbl_809889E0) ## $at = 80990000 -/* 01750 80986330 00380821 */ addu $at, $at, $t8 -/* 01754 80986334 8C3889E0 */ lw $t8, %lo(jtbl_809889E0)($at) -/* 01758 80986338 03000008 */ jr $t8 -/* 0175C 8098633C 00000000 */ nop -glabel L80986340 -/* 01760 80986340 0C2617D5 */ jal func_80985F54 -/* 01764 80986344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80986348 10000016 */ beq $zero, $zero, .L809863A4 -/* 0176C 8098634C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80986350 -/* 01770 80986350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01774 80986354 0C2617D9 */ jal func_80985F64 -/* 01778 80986358 8FA5002C */ lw $a1, 0x002C($sp) -/* 0177C 8098635C 10000011 */ beq $zero, $zero, .L809863A4 -/* 01780 80986360 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80986364 -/* 01784 80986364 0C261813 */ jal func_8098604C -/* 01788 80986368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0178C 8098636C 1000000D */ beq $zero, $zero, .L809863A4 -/* 01790 80986370 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80986374 -/* 01794 80986374 0C261832 */ jal func_809860C8 -/* 01798 80986378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0179C 8098637C 10000009 */ beq $zero, $zero, .L809863A4 -/* 017A0 80986380 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80986384 -/* 017A4 80986384 0C261852 */ jal func_80986148 -/* 017A8 80986388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017AC 8098638C 10000005 */ beq $zero, $zero, .L809863A4 -/* 017B0 80986390 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80986394 -.L80986394: -/* 017B4 80986394 3C048099 */ lui $a0, %hi(D_80988894) ## $a0 = 80990000 -/* 017B8 80986398 0C00084C */ jal osSyncPrintf - -/* 017BC 8098639C 24848894 */ addiu $a0, $a0, %lo(D_80988894) ## $a0 = 80988894 -/* 017C0 809863A0 8FB90020 */ lw $t9, 0x0020($sp) -.L809863A4: -/* 017C4 809863A4 AE190274 */ sw $t9, 0x0274($s0) ## 00000274 -/* 017C8 809863A8 8FBF001C */ lw $ra, 0x001C($sp) -.L809863AC: -/* 017CC 809863AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 017D0 809863B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017D4 809863B4 03E00008 */ jr $ra -/* 017D8 809863B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s deleted file mode 100644 index 24e4cbb97e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809863BC -/* 017DC 809863BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017E0 809863C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017E4 809863C4 0C2618B8 */ jal func_809862E0 -/* 017E8 809863C8 00000000 */ nop -/* 017EC 809863CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017F0 809863D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017F4 809863D4 03E00008 */ jr $ra -/* 017F8 809863D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s deleted file mode 100644 index e70e9007a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_809863DC -/* 017FC 809863DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01800 809863E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01804 809863E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01808 809863E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0180C 809863EC 0C261406 */ jal func_80985018 -/* 01810 809863F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 01814 809863F4 0C261418 */ jal func_80985060 -/* 01818 809863F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0181C 809863FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01820 80986400 0C2617AB */ jal func_80985EAC -/* 01824 80986404 8FA50024 */ lw $a1, 0x0024($sp) -/* 01828 80986408 0C2612F8 */ jal func_80984BE0 -/* 0182C 8098640C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01830 80986410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01834 80986414 0C2618B8 */ jal func_809862E0 -/* 01838 80986418 8FA50024 */ lw $a1, 0x0024($sp) -/* 0183C 8098641C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01840 80986420 8FB00018 */ lw $s0, 0x0018($sp) -/* 01844 80986424 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01848 80986428 03E00008 */ jr $ra -/* 0184C 8098642C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s deleted file mode 100644 index 5cbc579a61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80986430 -/* 01850 80986430 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01854 80986434 AFBF001C */ sw $ra, 0x001C($sp) -/* 01858 80986438 AFB00018 */ sw $s0, 0x0018($sp) -/* 0185C 8098643C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01860 80986440 0C261406 */ jal func_80985018 -/* 01864 80986444 AFA5002C */ sw $a1, 0x002C($sp) -/* 01868 80986448 0C261418 */ jal func_80985060 -/* 0186C 8098644C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01870 80986450 AFA20024 */ sw $v0, 0x0024($sp) -/* 01874 80986454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01878 80986458 0C2617AB */ jal func_80985EAC -/* 0187C 8098645C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01880 80986460 0C2612F8 */ jal func_80984BE0 -/* 01884 80986464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01888 80986468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0188C 8098646C 0C2617FA */ jal func_80985FE8 -/* 01890 80986470 8FA50024 */ lw $a1, 0x0024($sp) -/* 01894 80986474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01898 80986478 0C2618B8 */ jal func_809862E0 -/* 0189C 8098647C 8FA5002C */ lw $a1, 0x002C($sp) -/* 018A0 80986480 8FBF001C */ lw $ra, 0x001C($sp) -/* 018A4 80986484 8FB00018 */ lw $s0, 0x0018($sp) -/* 018A8 80986488 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 018AC 8098648C 03E00008 */ jr $ra -/* 018B0 80986490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s deleted file mode 100644 index 1bea6be1bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80986494 -/* 018B4 80986494 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018B8 80986498 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018BC 8098649C AFA40018 */ sw $a0, 0x0018($sp) -/* 018C0 809864A0 0C261406 */ jal func_80985018 -/* 018C4 809864A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 018C8 809864A8 0C2617BD */ jal func_80985EF4 -/* 018CC 809864AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 018D0 809864B0 0C2612F8 */ jal func_80984BE0 -/* 018D4 809864B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 018D8 809864B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 018DC 809864BC 0C261871 */ jal func_809861C4 -/* 018E0 809864C0 8FA5001C */ lw $a1, 0x001C($sp) -/* 018E4 809864C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018E8 809864C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018EC 809864CC 03E00008 */ jr $ra -/* 018F0 809864D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s deleted file mode 100644 index bbcc3eb687..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_809864D4 -/* 018F4 809864D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 018F8 809864D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 018FC 809864DC AFB00018 */ sw $s0, 0x0018($sp) -/* 01900 809864E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01904 809864E4 0C261406 */ jal func_80985018 -/* 01908 809864E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0190C 809864EC 0C261418 */ jal func_80985060 -/* 01910 809864F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01914 809864F4 AFA20024 */ sw $v0, 0x0024($sp) -/* 01918 809864F8 0C2612F8 */ jal func_80984BE0 -/* 0191C 809864FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01920 80986500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01924 80986504 0C261837 */ jal func_809860DC -/* 01928 80986508 8FA50024 */ lw $a1, 0x0024($sp) -/* 0192C 8098650C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01930 80986510 0C2618A7 */ jal func_8098629C -/* 01934 80986514 8FA5002C */ lw $a1, 0x002C($sp) -/* 01938 80986518 8FBF001C */ lw $ra, 0x001C($sp) -/* 0193C 8098651C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01940 80986520 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01944 80986524 03E00008 */ jr $ra -/* 01948 80986528 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s deleted file mode 100644 index 6f27c9a255..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8098652C -/* 0194C 8098652C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01950 80986530 AFA50024 */ sw $a1, 0x0024($sp) -/* 01954 80986534 AFBF001C */ sw $ra, 0x001C($sp) -/* 01958 80986538 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0195C 8098653C AFA40020 */ sw $a0, 0x0020($sp) -/* 01960 80986540 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 01964 80986544 AFA00010 */ sw $zero, 0x0010($sp) -/* 01968 80986548 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0196C 8098654C 0C2614A0 */ jal func_80985280 -/* 01970 80986550 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01974 80986554 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01978 80986558 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 0197C 8098655C ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 01980 80986560 8FBF001C */ lw $ra, 0x001C($sp) -/* 01984 80986564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01988 80986568 03E00008 */ jr $ra -/* 0198C 8098656C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s deleted file mode 100644 index c61d91bb07..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80986570 -/* 01990 80986570 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01994 80986574 AFB00020 */ sw $s0, 0x0020($sp) -/* 01998 80986578 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0199C 8098657C AFBF0024 */ sw $ra, 0x0024($sp) -/* 019A0 80986580 AFA5002C */ sw $a1, 0x002C($sp) -/* 019A4 80986584 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 019A8 80986588 0C0295B2 */ jal func_800A56C8 -/* 019AC 8098658C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 019B0 80986590 50400015 */ beql $v0, $zero, .L809865E8 -/* 019B4 80986594 8FBF0024 */ lw $ra, 0x0024($sp) -/* 019B8 80986598 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 019BC 8098659C 8FA4002C */ lw $a0, 0x002C($sp) -/* 019C0 809865A0 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 019C4 809865A4 11E0000F */ beq $t7, $zero, .L809865E4 -/* 019C8 809865A8 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 019CC 809865AC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 019D0 809865B0 0C0107CD */ jal func_80041F34 -/* 019D4 809865B4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 019D8 809865B8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 019DC 809865BC 3C188013 */ lui $t8, %hi(D_801333E8) -/* 019E0 809865C0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 019E4 809865C4 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 019E8 809865C8 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 019EC 809865CC AFB80014 */ sw $t8, 0x0014($sp) -/* 019F0 809865D0 3064FFFF */ andi $a0, $v1, 0xFFFF ## $a0 = 00000800 -/* 019F4 809865D4 AFA70010 */ sw $a3, 0x0010($sp) -/* 019F8 809865D8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 019FC 809865DC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01A00 809865E0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L809865E4: -/* 01A04 809865E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809865E8: -/* 01A08 809865E8 8FB00020 */ lw $s0, 0x0020($sp) -/* 01A0C 809865EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A10 809865F0 03E00008 */ jr $ra -/* 01A14 809865F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s deleted file mode 100644 index 06ebaa7adc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_809865F8 -/* 01A18 809865F8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01A1C 809865FC AFB00030 */ sw $s0, 0x0030($sp) -/* 01A20 80986600 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A24 80986604 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01A28 80986608 10C00038 */ beq $a2, $zero, .L809866EC -/* 01A2C 8098660C AFA50064 */ sw $a1, 0x0064($sp) -/* 01A30 80986610 C4840278 */ lwc1 $f4, 0x0278($a0) ## 00000278 -/* 01A34 80986614 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01A38 80986618 26020278 */ addiu $v0, $s0, 0x0278 ## $v0 = 00000278 -/* 01A3C 8098661C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01A40 80986620 4604303E */ c.le.s $f6, $f4 -/* 01A44 80986624 00000000 */ nop -/* 01A48 80986628 4502002C */ bc1fl .L809866DC -/* 01A4C 8098662C C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000278 -/* 01A50 80986630 8C8E027C */ lw $t6, 0x027C($a0) ## 0000027C -/* 01A54 80986634 55C0002E */ bnel $t6, $zero, .L809866F0 -/* 01A58 80986638 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01A5C 8098663C 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01A60 80986640 0C01DE1C */ jal Math_Sins - ## sins? -/* 01A64 80986644 A7A4004E */ sh $a0, 0x004E($sp) -/* 01A68 80986648 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01A6C 8098664C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01A70 80986650 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 -/* 01A74 80986654 C4500000 */ lwc1 $f16, 0x0000($v0) ## 00000024 -/* 01A78 80986658 46080282 */ mul.s $f10, $f0, $f8 -/* 01A7C 8098665C 87A4004E */ lh $a0, 0x004E($sp) -/* 01A80 80986660 46105480 */ add.s $f18, $f10, $f16 -/* 01A84 80986664 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 01A88 80986668 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000028 -/* 01A8C 8098666C AFA2003C */ sw $v0, 0x003C($sp) -/* 01A90 80986670 0C01DE0D */ jal Math_Coss - ## coss? -/* 01A94 80986674 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 01A98 80986678 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01A9C 8098667C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 01AA0 80986680 8FA2003C */ lw $v0, 0x003C($sp) -/* 01AA4 80986684 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 01AA8 80986688 46060202 */ mul.s $f8, $f0, $f6 -/* 01AAC 8098668C C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 01AB0 80986690 240F0FA0 */ addiu $t7, $zero, 0x0FA0 ## $t7 = 00000FA0 -/* 01AB4 80986694 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01AB8 80986698 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01ABC 8098669C 8FA50064 */ lw $a1, 0x0064($sp) -/* 01AC0 809866A0 2419FFF6 */ addiu $t9, $zero, 0xFFF6 ## $t9 = FFFFFFF6 -/* 01AC4 809866A4 460A4080 */ add.s $f2, $f8, $f10 -/* 01AC8 809866A8 24060016 */ addiu $a2, $zero, 0x0016 ## $a2 = 00000016 -/* 01ACC 809866AC 8FA70048 */ lw $a3, 0x0048($sp) -/* 01AD0 809866B0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01AD4 809866B4 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 01AD8 809866B8 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 01ADC 809866BC AFB90024 */ sw $t9, 0x0024($sp) -/* 01AE0 809866C0 AFA00020 */ sw $zero, 0x0020($sp) -/* 01AE4 809866C4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01AE8 809866C8 AFB8001C */ sw $t8, 0x001C($sp) -/* 01AEC 809866CC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01AF0 809866D0 10000006 */ beq $zero, $zero, .L809866EC -/* 01AF4 809866D4 AE08027C */ sw $t0, 0x027C($s0) ## 0000027C -/* 01AF8 809866D8 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 -.L809866DC: -/* 01AFC 809866DC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 01B00 809866E0 00000000 */ nop -/* 01B04 809866E4 46049180 */ add.s $f6, $f18, $f4 -/* 01B08 809866E8 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000000 -.L809866EC: -/* 01B0C 809866EC 8FBF0034 */ lw $ra, 0x0034($sp) -.L809866F0: -/* 01B10 809866F0 8FB00030 */ lw $s0, 0x0030($sp) -/* 01B14 809866F4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01B18 809866F8 03E00008 */ jr $ra -/* 01B1C 809866FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s deleted file mode 100644 index a3d8922f79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80986700 -/* 01B20 80986700 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01B24 80986704 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 01B28 80986708 03E00008 */ jr $ra -/* 01B2C 8098670C AC800264 */ sw $zero, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s deleted file mode 100644 index 12202992c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80986710 -/* 01B30 80986710 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B34 80986714 AFA40028 */ sw $a0, 0x0028($sp) -/* 01B38 80986718 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B3C 8098671C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B40 80986720 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B44 80986724 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01B48 80986728 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 -/* 01B4C 8098672C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01B50 80986730 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01B54 80986734 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B58 80986738 468021A0 */ cvt.s.w $f6, $f4 -/* 01B5C 8098673C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B60 80986740 44070000 */ mfc1 $a3, $f0 -/* 01B64 80986744 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 01B68 80986748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B6C 8098674C AFA00014 */ sw $zero, 0x0014($sp) -/* 01B70 80986750 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01B74 80986754 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B78 80986758 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01B7C 8098675C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01B80 80986760 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B84 80986764 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B88 80986768 0C261460 */ jal func_80985180 -/* 01B8C 8098676C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01B90 80986770 8FA20028 */ lw $v0, 0x0028($sp) -/* 01B94 80986774 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01B98 80986778 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B9C 8098677C AC4E0260 */ sw $t6, 0x0260($v0) ## 00000260 -/* 01BA0 80986780 AC4F0264 */ sw $t7, 0x0264($v0) ## 00000264 -/* 01BA4 80986784 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01BA8 80986788 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BAC 8098678C 03E00008 */ jr $ra -/* 01BB0 80986790 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s deleted file mode 100644 index 6ef3eec747..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80986794 -/* 01BB4 80986794 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BB8 80986798 AFA40028 */ sw $a0, 0x0028($sp) -/* 01BBC 8098679C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01BC0 809867A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01BC4 809867A4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01BC8 809867A8 248414E4 */ addiu $a0, $a0, 0x14E4 ## $a0 = 060014E4 -/* 01BCC 809867AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01BD0 809867B0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01BD4 809867B4 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01BD8 809867B8 468021A0 */ cvt.s.w $f6, $f4 -/* 01BDC 809867BC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01BE0 809867C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01BE4 809867C4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01BE8 809867C8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01BEC 809867CC 24A514E4 */ addiu $a1, $a1, 0x14E4 ## $a1 = 060014E4 -/* 01BF0 809867D0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01BF4 809867D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BF8 809867D8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BFC 809867DC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01C00 809867E0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01C04 809867E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C08 809867E8 8FA20028 */ lw $v0, 0x0028($sp) -/* 01C0C 809867EC 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 -/* 01C10 809867F0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01C14 809867F4 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 -/* 01C18 809867F8 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 01C1C 809867FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C20 80986800 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C24 80986804 03E00008 */ jr $ra -/* 01C28 80986808 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s deleted file mode 100644 index 6a0f83cf81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_809888D0 - .asciz "Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8098680C -/* 01C2C 8098680C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C30 80986810 AFB00018 */ sw $s0, 0x0018($sp) -/* 01C34 80986814 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C38 80986818 AFBF001C */ sw $ra, 0x001C($sp) -/* 01C3C 8098681C AFA5002C */ sw $a1, 0x002C($sp) -/* 01C40 80986820 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01C44 80986824 0C261428 */ jal func_809850A0 -/* 01C48 80986828 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01C4C 8098682C 5040002A */ beql $v0, $zero, .L809868D8 -/* 01C50 80986830 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C54 80986834 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01C58 80986838 8E030274 */ lw $v1, 0x0274($s0) ## 00000274 -/* 01C5C 8098683C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01C60 80986840 50C30025 */ beql $a2, $v1, .L809868D8 -/* 01C64 80986844 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C68 80986848 10C1000C */ beq $a2, $at, .L8098687C -/* 01C6C 8098684C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C70 80986850 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01C74 80986854 10C1000D */ beq $a2, $at, .L8098688C -/* 01C78 80986858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C7C 8098685C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01C80 80986860 10C1000F */ beq $a2, $at, .L809868A0 -/* 01C84 80986864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C88 80986868 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01C8C 8098686C 10C10010 */ beq $a2, $at, .L809868B0 -/* 01C90 80986870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C94 80986874 10000012 */ beq $zero, $zero, .L809868C0 -/* 01C98 80986878 3C048099 */ lui $a0, %hi(D_809888D0) ## $a0 = 80990000 -.L8098687C: -/* 01C9C 8098687C 0C2619C0 */ jal func_80986700 -/* 01CA0 80986880 AFA60020 */ sw $a2, 0x0020($sp) -/* 01CA4 80986884 10000012 */ beq $zero, $zero, .L809868D0 -/* 01CA8 80986888 8FA60020 */ lw $a2, 0x0020($sp) -.L8098688C: -/* 01CAC 8098688C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CB0 80986890 0C2619C4 */ jal func_80986710 -/* 01CB4 80986894 AFA60020 */ sw $a2, 0x0020($sp) -/* 01CB8 80986898 1000000D */ beq $zero, $zero, .L809868D0 -/* 01CBC 8098689C 8FA60020 */ lw $a2, 0x0020($sp) -.L809868A0: -/* 01CC0 809868A0 0C2619E5 */ jal func_80986794 -/* 01CC4 809868A4 AFA60020 */ sw $a2, 0x0020($sp) -/* 01CC8 809868A8 10000009 */ beq $zero, $zero, .L809868D0 -/* 01CCC 809868AC 8FA60020 */ lw $a2, 0x0020($sp) -.L809868B0: -/* 01CD0 809868B0 0C00B55C */ jal Actor_Kill - -/* 01CD4 809868B4 AFA60020 */ sw $a2, 0x0020($sp) -/* 01CD8 809868B8 10000005 */ beq $zero, $zero, .L809868D0 -/* 01CDC 809868BC 8FA60020 */ lw $a2, 0x0020($sp) -.L809868C0: -/* 01CE0 809868C0 248488D0 */ addiu $a0, $a0, %lo(D_809888D0) ## $a0 = FFFF88D0 -/* 01CE4 809868C4 0C00084C */ jal osSyncPrintf - -/* 01CE8 809868C8 AFA60020 */ sw $a2, 0x0020($sp) -/* 01CEC 809868CC 8FA60020 */ lw $a2, 0x0020($sp) -.L809868D0: -/* 01CF0 809868D0 AE060274 */ sw $a2, 0x0274($s0) ## 00000274 -/* 01CF4 809868D4 8FBF001C */ lw $ra, 0x001C($sp) -.L809868D8: -/* 01CF8 809868D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01CFC 809868DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D00 809868E0 03E00008 */ jr $ra -/* 01D04 809868E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s deleted file mode 100644 index b4be5afdc2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809868E8 -/* 01D08 809868E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D0C 809868EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D10 809868F0 0C261A03 */ jal func_8098680C -/* 01D14 809868F4 00000000 */ nop -/* 01D18 809868F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D1C 809868FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D20 80986900 03E00008 */ jr $ra -/* 01D24 80986904 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s deleted file mode 100644 index 111fe3a0b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80986908 -/* 01D28 80986908 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D2C 8098690C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D30 80986910 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D34 80986914 0C261406 */ jal func_80985018 -/* 01D38 80986918 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D3C 8098691C 0C261418 */ jal func_80985060 -/* 01D40 80986920 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D44 80986924 0C2612F8 */ jal func_80984BE0 -/* 01D48 80986928 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D4C 8098692C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D50 80986930 0C261A03 */ jal func_8098680C -/* 01D54 80986934 8FA5001C */ lw $a1, 0x001C($sp) -/* 01D58 80986938 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D5C 8098693C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D60 80986940 03E00008 */ jr $ra -/* 01D64 80986944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s deleted file mode 100644 index 9e4b0eec35..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80986948 -/* 01D68 80986948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D6C 8098694C AFBF001C */ sw $ra, 0x001C($sp) -/* 01D70 80986950 AFB00018 */ sw $s0, 0x0018($sp) -/* 01D74 80986954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D78 80986958 0C261406 */ jal func_80985018 -/* 01D7C 8098695C AFA5002C */ sw $a1, 0x002C($sp) -/* 01D80 80986960 0C261418 */ jal func_80985060 -/* 01D84 80986964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D88 80986968 AFA20024 */ sw $v0, 0x0024($sp) -/* 01D8C 8098696C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D90 80986970 0C26195C */ jal func_80986570 -/* 01D94 80986974 8FA5002C */ lw $a1, 0x002C($sp) -/* 01D98 80986978 0C2612F8 */ jal func_80984BE0 -/* 01D9C 8098697C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DA0 80986980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DA4 80986984 8FA5002C */ lw $a1, 0x002C($sp) -/* 01DA8 80986988 0C26197E */ jal func_809865F8 -/* 01DAC 8098698C 8FA60024 */ lw $a2, 0x0024($sp) -/* 01DB0 80986990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DB4 80986994 0C261A03 */ jal func_8098680C -/* 01DB8 80986998 8FA5002C */ lw $a1, 0x002C($sp) -/* 01DBC 8098699C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DC0 809869A0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01DC4 809869A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01DC8 809869A8 03E00008 */ jr $ra -/* 01DCC 809869AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s deleted file mode 100644 index dff1e7c09c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_809869B0 -/* 01DD0 809869B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DD4 809869B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01DD8 809869B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DDC 809869BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01DE0 809869C0 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 01DE4 809869C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01DE8 809869C8 AFA40020 */ sw $a0, 0x0020($sp) -/* 01DEC 809869CC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DF0 809869D0 0C2614A0 */ jal func_80985280 -/* 01DF4 809869D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01DF8 809869D8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01DFC 809869DC 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01E00 809869E0 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 01E04 809869E4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 01E08 809869E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E0C 809869EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E10 809869F0 03E00008 */ jr $ra -/* 01E14 809869F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s deleted file mode 100644 index 4614fa8845..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809869F8 -/* 01E18 809869F8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01E1C 809869FC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01E20 80986A00 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01E24 80986A04 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01E28 80986A08 85CF1474 */ lh $t7, 0x1474($t6) ## 80161474 -/* 01E2C 80986A0C C4820024 */ lwc1 $f2, 0x0024($a0) ## 00000024 -/* 01E30 80986A10 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01E34 80986A14 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01E38 80986A18 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 01E3C 80986A1C 468021A0 */ cvt.s.w $f6, $f4 -/* 01E40 80986A20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01E44 80986A24 46083280 */ add.s $f10, $f6, $f8 -/* 01E48 80986A28 460A1401 */ sub.s $f16, $f2, $f10 -/* 01E4C 80986A2C 4610003C */ c.lt.s $f0, $f16 -/* 01E50 80986A30 00000000 */ nop -/* 01E54 80986A34 45000007 */ bc1f .L80986A54 -/* 01E58 80986A38 00000000 */ nop -/* 01E5C 80986A3C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 01E60 80986A40 33190040 */ andi $t9, $t8, 0x0040 ## $t9 = 00000000 -/* 01E64 80986A44 17200003 */ bne $t9, $zero, .L80986A54 -/* 01E68 80986A48 00000000 */ nop -/* 01E6C 80986A4C 03E00008 */ jr $ra -/* 01E70 80986A50 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80986A54: -/* 01E74 80986A54 03E00008 */ jr $ra -/* 01E78 80986A58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s deleted file mode 100644 index b2f1663fc1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80986A5C -/* 01E7C 80986A5C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01E80 80986A60 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01E84 80986A64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E88 80986A68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E8C 80986A6C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 01E90 80986A70 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 01E94 80986A74 44814000 */ mtc1 $at, $f8 ## $f8 = 130.00 -/* 01E98 80986A78 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01E9C 80986A7C C4820024 */ lwc1 $f2, 0x0024($a0) ## 00000024 -/* 01EA0 80986A80 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01EA4 80986A84 468021A0 */ cvt.s.w $f6, $f4 -/* 01EA8 80986A88 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 01EAC 80986A8C 46083280 */ add.s $f10, $f6, $f8 -/* 01EB0 80986A90 460A1401 */ sub.s $f16, $f2, $f10 -/* 01EB4 80986A94 4600803C */ c.lt.s $f16, $f0 -/* 01EB8 80986A98 00000000 */ nop -/* 01EBC 80986A9C 45020008 */ bc1fl .L80986AC0 -/* 01EC0 80986AA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01EC4 80986AA4 0C02FF21 */ jal Gameplay_InCsMode -/* 01EC8 80986AA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01ECC 80986AAC 54400004 */ bnel $v0, $zero, .L80986AC0 -/* 01ED0 80986AB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01ED4 80986AB4 10000002 */ beq $zero, $zero, .L80986AC0 -/* 01ED8 80986AB8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01EDC 80986ABC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80986AC0: -/* 01EE0 80986AC0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01EE4 80986AC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01EE8 80986AC8 03E00008 */ jr $ra -/* 01EEC 80986ACC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s deleted file mode 100644 index bab5071cc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80986AD0 -/* 01EF0 80986AD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EF4 80986AD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EF8 80986AD8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01EFC 80986ADC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 01F00 80986AE0 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 -/* 01F04 80986AE4 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 01F08 80986AE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01F0C 80986AEC 0C00BC65 */ jal func_8002F194 -/* 01F10 80986AF0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01F14 80986AF4 14400007 */ bne $v0, $zero, .L80986B14 -/* 01F18 80986AF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F1C 80986AFC 2418708E */ addiu $t8, $zero, 0x708E ## $t8 = 0000708E -/* 01F20 80986B00 A498010E */ sh $t8, 0x010E($a0) ## 0000010E -/* 01F24 80986B04 0C00BCBD */ jal func_8002F2F4 -/* 01F28 80986B08 8FA5001C */ lw $a1, 0x001C($sp) -/* 01F2C 80986B0C 10000003 */ beq $zero, $zero, .L80986B1C -/* 01F30 80986B10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80986B14: -/* 01F34 80986B14 10000001 */ beq $zero, $zero, .L80986B1C -/* 01F38 80986B18 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80986B1C: -/* 01F3C 80986B1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F40 80986B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F44 80986B24 03E00008 */ jr $ra -/* 01F48 80986B28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s deleted file mode 100644 index 0c7ce87739..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80986B2C -/* 01F4C 80986B2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F50 80986B30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F54 80986B34 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01F58 80986B38 AFA70018 */ sw $a3, 0x0018($sp) -/* 01F5C 80986B3C 0C042F6F */ jal func_8010BDBC -/* 01F60 80986B40 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01F64 80986B44 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01F68 80986B48 14410011 */ bne $v0, $at, .L80986B90 -/* 01F6C 80986B4C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01F70 80986B50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01F74 80986B54 8CE51C44 */ lw $a1, 0x1C44($a3) ## 00001C44 -/* 01F78 80986B58 00270821 */ addu $at, $at, $a3 -/* 01F7C 80986B5C 240E00CD */ addiu $t6, $zero, 0x00CD ## $t6 = 000000CD -/* 01F80 80986B60 A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A -/* 01F84 80986B64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01F88 80986B68 00270821 */ addu $at, $at, $a3 -/* 01F8C 80986B6C 240F0026 */ addiu $t7, $zero, 0x0026 ## $t7 = 00000026 -/* 01F90 80986B70 A02F1E5E */ sb $t7, 0x1E5E($at) ## 00011E5E -/* 01F94 80986B74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01F98 80986B78 00270821 */ addu $at, $at, $a3 -/* 01F9C 80986B7C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 01FA0 80986B80 A0381E15 */ sb $t8, 0x1E15($at) ## 00011E15 -/* 01FA4 80986B84 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01FA8 80986B88 0C00B7D5 */ jal func_8002DF54 -/* 01FAC 80986B8C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -.L80986B90: -/* 01FB0 80986B90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FB4 80986B94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FB8 80986B98 03E00008 */ jr $ra -/* 01FBC 80986B9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s deleted file mode 100644 index a55dc40bd5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80986BA0 -/* 01FC0 80986BA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FC4 80986BA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FC8 80986BA8 0C261A7E */ jal func_809869F8 -/* 01FCC 80986BAC AFA40018 */ sw $a0, 0x0018($sp) -/* 01FD0 80986BB0 10400008 */ beq $v0, $zero, .L80986BD4 -/* 01FD4 80986BB4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01FD8 80986BB8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01FDC 80986BBC 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 01FE0 80986BC0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01FE4 80986BC4 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 01FE8 80986BC8 AC820264 */ sw $v0, 0x0264($a0) ## 00000264 -/* 01FEC 80986BCC AC820280 */ sw $v0, 0x0280($a0) ## 00000280 -/* 01FF0 80986BD0 A08F00C8 */ sb $t7, 0x00C8($a0) ## 000000C8 -.L80986BD4: -/* 01FF4 80986BD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FF8 80986BD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FFC 80986BDC 03E00008 */ jr $ra -/* 02000 80986BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s deleted file mode 100644 index e28d59b307..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80986BE4 -/* 02004 80986BE4 10A00002 */ beq $a1, $zero, .L80986BF0 -/* 02008 80986BE8 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 0200C 80986BEC AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -.L80986BF0: -/* 02010 80986BF0 03E00008 */ jr $ra -/* 02014 80986BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s deleted file mode 100644 index 8abefc54c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80986BF8 -/* 02018 80986BF8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) -/* 0201C 80986BFC 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) -/* 02020 80986C00 AFA50004 */ sw $a1, 0x0004($sp) -/* 02024 80986C04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02028 80986C08 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 0202C 80986C0C 11E00006 */ beq $t7, $zero, .L80986C28 -/* 02030 80986C10 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 02034 80986C14 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02038 80986C18 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 0203C 80986C1C AC820264 */ sw $v0, 0x0264($a0) ## 00000264 -/* 02040 80986C20 AC820280 */ sw $v0, 0x0280($a0) ## 00000280 -/* 02044 80986C24 A09900C8 */ sb $t9, 0x00C8($a0) ## 000000C8 -.L80986C28: -/* 02048 80986C28 03E00008 */ jr $ra -/* 0204C 80986C2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s deleted file mode 100644 index ce3589a813..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80986C30 -/* 02050 80986C30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02054 80986C34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02058 80986C38 AFA40018 */ sw $a0, 0x0018($sp) -/* 0205C 80986C3C 0C261A97 */ jal func_80986A5C -/* 02060 80986C40 AFA5001C */ sw $a1, 0x001C($sp) -/* 02064 80986C44 1040001C */ beq $v0, $zero, .L80986CB8 -/* 02068 80986C48 8FA6001C */ lw $a2, 0x001C($sp) -/* 0206C 80986C4C 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 02070 80986C50 24422524 */ addiu $v0, $v0, 0x2524 ## $v0 = 02002524 -/* 02074 80986C54 00027100 */ sll $t6, $v0, 4 -/* 02078 80986C58 000E7F02 */ srl $t7, $t6, 28 -/* 0207C 80986C5C 000FC080 */ sll $t8, $t7, 2 -/* 02080 80986C60 3C198016 */ lui $t9, %hi(gSegments) -/* 02084 80986C64 0338C821 */ addu $t9, $t9, $t8 -/* 02088 80986C68 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0208C 80986C6C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 02090 80986C70 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02094 80986C74 00414024 */ and $t0, $v0, $at -/* 02098 80986C78 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0209C 80986C7C 03284821 */ addu $t1, $t9, $t0 -/* 020A0 80986C80 3C038016 */ lui $v1, %hi(gSaveContext) -/* 020A4 80986C84 01215021 */ addu $t2, $t1, $at -/* 020A8 80986C88 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 020AC 80986C8C ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 -/* 020B0 80986C90 946C0EDE */ lhu $t4, 0x0EDE($v1) ## 8015F53E -/* 020B4 80986C94 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 020B8 80986C98 A06B1414 */ sb $t3, 0x1414($v1) ## 8015FA74 -/* 020BC 80986C9C 358D0200 */ ori $t5, $t4, 0x0200 ## $t5 = 00000200 -/* 020C0 80986CA0 A46D0EDE */ sh $t5, 0x0EDE($v1) ## 8015F53E -/* 020C4 80986CA4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 020C8 80986CA8 0C021344 */ jal Item_Give -/* 020CC 80986CAC 24050060 */ addiu $a1, $zero, 0x0060 ## $a1 = 00000060 -/* 020D0 80986CB0 0C2617D5 */ jal func_80985F54 -/* 020D4 80986CB4 8FA40018 */ lw $a0, 0x0018($sp) -.L80986CB8: -/* 020D8 80986CB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 020DC 80986CBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 020E0 80986CC0 03E00008 */ jr $ra -/* 020E4 80986CC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s deleted file mode 100644 index a075ff5754..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80986CC8 -/* 020E8 80986CC8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) -/* 020EC 80986CCC 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) -/* 020F0 80986CD0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 020F4 80986CD4 2418001A */ addiu $t8, $zero, 0x001A ## $t8 = 0000001A -/* 020F8 80986CD8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 020FC 80986CDC 11E00005 */ beq $t7, $zero, .L80986CF4 -/* 02100 80986CE0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02104 80986CE4 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 02108 80986CE8 AC820264 */ sw $v0, 0x0264($a0) ## 00000264 -/* 0210C 80986CEC AC820280 */ sw $v0, 0x0280($a0) ## 00000280 -/* 02110 80986CF0 A09900C8 */ sb $t9, 0x00C8($a0) ## 000000C8 -.L80986CF4: -/* 02114 80986CF4 03E00008 */ jr $ra -/* 02118 80986CF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s deleted file mode 100644 index f68b8942cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80986CFC -/* 0211C 80986CFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02120 80986D00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02124 80986D04 0C261A97 */ jal func_80986A5C -/* 02128 80986D08 AFA40018 */ sw $a0, 0x0018($sp) -/* 0212C 80986D0C 10400008 */ beq $v0, $zero, .L80986D30 -/* 02130 80986D10 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02134 80986D14 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02138 80986D18 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 0213C 80986D1C 8FB90018 */ lw $t9, 0x0018($sp) -/* 02140 80986D20 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 02144 80986D24 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 02148 80986D28 A44F0EDC */ sh $t7, 0x0EDC($v0) ## 8015F53C -/* 0214C 80986D2C AF380260 */ sw $t8, 0x0260($t9) ## 00000260 -.L80986D30: -/* 02150 80986D30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02154 80986D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02158 80986D38 03E00008 */ jr $ra -/* 0215C 80986D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s deleted file mode 100644 index 5e26b11648..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80986D40 -/* 02160 80986D40 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02164 80986D44 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02168 80986D48 8C4E1360 */ lw $t6, 0x1360($v0) ## 8015F9C0 -/* 0216C 80986D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02170 80986D50 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 02174 80986D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02178 80986D58 15C10006 */ bne $t6, $at, .L80986D74 -/* 0217C 80986D5C AFA5001C */ sw $a1, 0x001C($sp) -/* 02180 80986D60 240F0013 */ addiu $t7, $zero, 0x0013 ## $t7 = 00000013 -/* 02184 80986D64 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02188 80986D68 AC8F0260 */ sw $t7, 0x0260($a0) ## 00000260 -/* 0218C 80986D6C 10000012 */ beq $zero, $zero, .L80986DB8 -/* 02190 80986D70 AC980264 */ sw $t8, 0x0264($a0) ## 00000264 -.L80986D74: -/* 02194 80986D74 94590EE4 */ lhu $t9, 0x0EE4($v0) ## 8015F544 -/* 02198 80986D78 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0219C 80986D7C 51000006 */ beql $t0, $zero, .L80986D98 -/* 021A0 80986D80 94490EDE */ lhu $t1, 0x0EDE($v0) ## 8015F53E -/* 021A4 80986D84 0C00B55C */ jal Actor_Kill - -/* 021A8 80986D88 00000000 */ nop -/* 021AC 80986D8C 1000000B */ beq $zero, $zero, .L80986DBC -/* 021B0 80986D90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 021B4 80986D94 94490EDE */ lhu $t1, 0x0EDE($v0) ## 00000EDE -.L80986D98: -/* 021B8 80986D98 240B0017 */ addiu $t3, $zero, 0x0017 ## $t3 = 00000017 -/* 021BC 80986D9C 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 021C0 80986DA0 312A0200 */ andi $t2, $t1, 0x0200 ## $t2 = 00000000 -/* 021C4 80986DA4 55400004 */ bnel $t2, $zero, .L80986DB8 -/* 021C8 80986DA8 AC8C0260 */ sw $t4, 0x0260($a0) ## 00000260 -/* 021CC 80986DAC 10000002 */ beq $zero, $zero, .L80986DB8 -/* 021D0 80986DB0 AC8B0260 */ sw $t3, 0x0260($a0) ## 00000260 -/* 021D4 80986DB4 AC8C0260 */ sw $t4, 0x0260($a0) ## 00000260 -.L80986DB8: -/* 021D8 80986DB8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80986DBC: -/* 021DC 80986DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 021E0 80986DC0 03E00008 */ jr $ra -/* 021E4 80986DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s deleted file mode 100644 index a6a2b79c70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80986DC8 -/* 021E8 80986DC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021EC 80986DCC AFBF001C */ sw $ra, 0x001C($sp) -/* 021F0 80986DD0 AFB00018 */ sw $s0, 0x0018($sp) -/* 021F4 80986DD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021F8 80986DD8 0C261406 */ jal func_80985018 -/* 021FC 80986DDC AFA50024 */ sw $a1, 0x0024($sp) -/* 02200 80986DE0 0C261418 */ jal func_80985060 -/* 02204 80986DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02208 80986DE8 0C2612F8 */ jal func_80984BE0 -/* 0220C 80986DEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02210 80986DF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02214 80986DF4 0C261396 */ jal func_80984E58 -/* 02218 80986DF8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0221C 80986DFC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 02220 80986E00 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02224 80986E04 01C17824 */ and $t7, $t6, $at -/* 02228 80986E08 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0222C 80986E0C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02230 80986E10 8FB00018 */ lw $s0, 0x0018($sp) -/* 02234 80986E14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02238 80986E18 03E00008 */ jr $ra -/* 0223C 80986E1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s deleted file mode 100644 index 21e4c3601d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80986E20 -/* 02240 80986E20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02244 80986E24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02248 80986E28 0C261AE8 */ jal func_80986BA0 -/* 0224C 80986E2C 00000000 */ nop -/* 02250 80986E30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02254 80986E34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02258 80986E38 03E00008 */ jr $ra -/* 0225C 80986E3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s deleted file mode 100644 index 4acf5218bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80986E40 -/* 02260 80986E40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02264 80986E44 AFBF001C */ sw $ra, 0x001C($sp) -/* 02268 80986E48 AFB00018 */ sw $s0, 0x0018($sp) -/* 0226C 80986E4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02270 80986E50 0C261406 */ jal func_80985018 -/* 02274 80986E54 AFA50024 */ sw $a1, 0x0024($sp) -/* 02278 80986E58 0C261418 */ jal func_80985060 -/* 0227C 80986E5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02280 80986E60 0C2612F8 */ jal func_80984BE0 -/* 02284 80986E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80986E68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0228C 80986E6C 0C261396 */ jal func_80984E58 -/* 02290 80986E70 8FA50024 */ lw $a1, 0x0024($sp) -/* 02294 80986E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02298 80986E78 0C26135D */ jal func_80984D74 -/* 0229C 80986E7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 022A0 80986E80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022A4 80986E84 0C261AB4 */ jal func_80986AD0 -/* 022A8 80986E88 8FA50024 */ lw $a1, 0x0024($sp) -/* 022AC 80986E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022B0 80986E90 0C261AF9 */ jal func_80986BE4 -/* 022B4 80986E94 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 022B8 80986E98 8FBF001C */ lw $ra, 0x001C($sp) -/* 022BC 80986E9C 8FB00018 */ lw $s0, 0x0018($sp) -/* 022C0 80986EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022C4 80986EA4 03E00008 */ jr $ra -/* 022C8 80986EA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s deleted file mode 100644 index 8982f75a57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80986EAC -/* 022CC 80986EAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022D0 80986EB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 022D4 80986EB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 022D8 80986EB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022DC 80986EBC 0C261406 */ jal func_80985018 -/* 022E0 80986EC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 022E4 80986EC4 0C261418 */ jal func_80985060 -/* 022E8 80986EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022EC 80986ECC 0C2612F8 */ jal func_80984BE0 -/* 022F0 80986ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F4 80986ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F8 80986ED8 0C2613E5 */ jal func_80984F94 -/* 022FC 80986EDC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02300 80986EE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02304 80986EE4 0C26135D */ jal func_80984D74 -/* 02308 80986EE8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0230C 80986EEC 0C261ACB */ jal func_80986B2C -/* 02310 80986EF0 8FA40024 */ lw $a0, 0x0024($sp) -/* 02314 80986EF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02318 80986EF8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0231C 80986EFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02320 80986F00 03E00008 */ jr $ra -/* 02324 80986F04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s deleted file mode 100644 index ef24434bd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80986F08 -/* 02328 80986F08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0232C 80986F0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02330 80986F10 0C261AFE */ jal func_80986BF8 -/* 02334 80986F14 00000000 */ nop -/* 02338 80986F18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0233C 80986F1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02340 80986F20 03E00008 */ jr $ra -/* 02344 80986F24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s deleted file mode 100644 index f491bd89ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80986F28 -/* 02348 80986F28 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0234C 80986F2C AFBF001C */ sw $ra, 0x001C($sp) -/* 02350 80986F30 AFB00018 */ sw $s0, 0x0018($sp) -/* 02354 80986F34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02358 80986F38 0C261406 */ jal func_80985018 -/* 0235C 80986F3C AFA50024 */ sw $a1, 0x0024($sp) -/* 02360 80986F40 0C261418 */ jal func_80985060 -/* 02364 80986F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02368 80986F48 0C2612F8 */ jal func_80984BE0 -/* 0236C 80986F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02370 80986F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02374 80986F54 0C261396 */ jal func_80984E58 -/* 02378 80986F58 8FA50024 */ lw $a1, 0x0024($sp) -/* 0237C 80986F5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02380 80986F60 0C26135D */ jal func_80984D74 -/* 02384 80986F64 8FA50024 */ lw $a1, 0x0024($sp) -/* 02388 80986F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0238C 80986F6C 0C261B0C */ jal func_80986C30 -/* 02390 80986F70 8FA50024 */ lw $a1, 0x0024($sp) -/* 02394 80986F74 8FBF001C */ lw $ra, 0x001C($sp) -/* 02398 80986F78 8FB00018 */ lw $s0, 0x0018($sp) -/* 0239C 80986F7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023A0 80986F80 03E00008 */ jr $ra -/* 023A4 80986F84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s deleted file mode 100644 index ba0ffb6104..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80986F88 -/* 023A8 80986F88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 023AC 80986F8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 023B0 80986F90 0C261B32 */ jal func_80986CC8 -/* 023B4 80986F94 AFA5001C */ sw $a1, 0x001C($sp) -/* 023B8 80986F98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023BC 80986F9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023C0 80986FA0 03E00008 */ jr $ra -/* 023C4 80986FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s deleted file mode 100644 index b74bf5449d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80986FA8 -/* 023C8 80986FA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023CC 80986FAC AFBF001C */ sw $ra, 0x001C($sp) -/* 023D0 80986FB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 023D4 80986FB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023D8 80986FB8 0C261406 */ jal func_80985018 -/* 023DC 80986FBC AFA50024 */ sw $a1, 0x0024($sp) -/* 023E0 80986FC0 0C261418 */ jal func_80985060 -/* 023E4 80986FC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023E8 80986FC8 0C2612F8 */ jal func_80984BE0 -/* 023EC 80986FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023F0 80986FD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023F4 80986FD4 0C261396 */ jal func_80984E58 -/* 023F8 80986FD8 8FA50024 */ lw $a1, 0x0024($sp) -/* 023FC 80986FDC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 02400 80986FE0 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02404 80986FE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02408 80986FE8 01C17824 */ and $t7, $t6, $at -/* 0240C 80986FEC AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 02410 80986FF0 0C26135D */ jal func_80984D74 -/* 02414 80986FF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02418 80986FF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0241C 80986FFC 0C261B3F */ jal func_80986CFC -/* 02420 80987000 8FA50024 */ lw $a1, 0x0024($sp) -/* 02424 80987004 8FBF001C */ lw $ra, 0x001C($sp) -/* 02428 80987008 8FB00018 */ lw $s0, 0x0018($sp) -/* 0242C 8098700C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02430 80987010 03E00008 */ jr $ra -/* 02434 80987014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s deleted file mode 100644 index a55e64ebce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80987018 -/* 02438 80987018 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0243C 8098701C AFA50024 */ sw $a1, 0x0024($sp) -/* 02440 80987020 AFBF001C */ sw $ra, 0x001C($sp) -/* 02444 80987024 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02448 80987028 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 -/* 0244C 8098702C AFA00010 */ sw $zero, 0x0010($sp) -/* 02450 80987030 AFA40020 */ sw $a0, 0x0020($sp) -/* 02454 80987034 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02458 80987038 0C2614A0 */ jal func_80985280 -/* 0245C 8098703C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02460 80987040 8FA40020 */ lw $a0, 0x0020($sp) -/* 02464 80987044 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 02468 80987048 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 0246C 8098704C AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 02470 80987050 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 02474 80987054 8FBF001C */ lw $ra, 0x001C($sp) -/* 02478 80987058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0247C 8098705C 03E00008 */ jr $ra -/* 02480 80987060 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s deleted file mode 100644 index 834a9bb14c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80987064 -/* 02484 80987064 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02488 80987068 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0248C 8098706C C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 02490 80987070 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 02494 80987074 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02498 80987078 46062200 */ add.s $f8, $f4, $f6 -/* 0249C 8098707C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 024A0 80987080 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 024A4 80987084 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 024A8 80987088 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 024AC 8098708C C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 024B0 80987090 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 024B4 80987094 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 024B8 80987098 00000000 */ nop -/* 024BC 8098709C 46805420 */ cvt.s.w $f16, $f10 -/* 024C0 809870A0 46128000 */ add.s $f0, $f16, $f18 -/* 024C4 809870A4 4604003E */ c.le.s $f0, $f4 -/* 024C8 809870A8 00000000 */ nop -/* 024CC 809870AC 45020005 */ bc1fl .L809870C4 -/* 024D0 809870B0 C4860268 */ lwc1 $f6, 0x0268($a0) ## 00000268 -/* 024D4 809870B4 AC82026C */ sw $v0, 0x026C($a0) ## 0000026C -/* 024D8 809870B8 03E00008 */ jr $ra -/* 024DC 809870BC A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L809870C0: -/* 024E0 809870C0 C4860268 */ lwc1 $f6, 0x0268($a0) ## 00000268 -.L809870C4: -/* 024E4 809870C4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 024E8 809870C8 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 024EC 809870CC 46003203 */ div.s $f8, $f6, $f0 -/* 024F0 809870D0 460A4402 */ mul.s $f16, $f8, $f10 -/* 024F4 809870D4 4600848D */ trunc.w.s $f18, $f16 -/* 024F8 809870D8 44029000 */ mfc1 $v0, $f18 -/* 024FC 809870DC 00000000 */ nop -/* 02500 809870E0 AC82026C */ sw $v0, 0x026C($a0) ## 0000026C -/* 02504 809870E4 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 02508 809870E8 03E00008 */ jr $ra -/* 0250C 809870EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s deleted file mode 100644 index 7075674332..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809870F0 -/* 02510 809870F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02514 809870F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02518 809870F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0251C 809870FC 0C261480 */ jal func_80985200 -/* 02520 80987100 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02524 80987104 8FA40018 */ lw $a0, 0x0018($sp) -/* 02528 80987108 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 0252C 8098710C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02530 80987110 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 02534 80987114 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 -/* 02538 80987118 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0253C 8098711C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02540 80987120 03E00008 */ jr $ra -/* 02544 80987124 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s deleted file mode 100644 index a1cdf6a36c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80987128 -/* 02548 80987128 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0254C 8098712C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 02550 80987130 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02554 80987134 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 02558 80987138 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 0255C 8098713C C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 02560 80987140 2418001D */ addiu $t8, $zero, 0x001D ## $t8 = 0000001D -/* 02564 80987144 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 02568 80987148 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0256C 8098714C 46803220 */ cvt.s.w $f8, $f6 -/* 02570 80987150 460A4400 */ add.s $f16, $f8, $f10 -/* 02574 80987154 4604803E */ c.le.s $f16, $f4 -/* 02578 80987158 00000000 */ nop -/* 0257C 8098715C 45000003 */ bc1f .L8098716C -/* 02580 80987160 00000000 */ nop -/* 02584 80987164 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 02588 80987168 AC990264 */ sw $t9, 0x0264($a0) ## 00000264 -.L8098716C: -/* 0258C 8098716C 03E00008 */ jr $ra -/* 02590 80987170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s deleted file mode 100644 index 24b9760e4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80987174 -/* 02594 80987174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02598 80987178 AFBF001C */ sw $ra, 0x001C($sp) -/* 0259C 8098717C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 025A0 80987180 AFA40020 */ sw $a0, 0x0020($sp) -/* 025A4 80987184 24A501C8 */ addiu $a1, $a1, 0x01C8 ## $a1 = 060101C8 -/* 025A8 80987188 AFA00010 */ sw $zero, 0x0010($sp) -/* 025AC 8098718C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 025B0 80987190 0C2614A0 */ jal func_80985280 -/* 025B4 80987194 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 025B8 80987198 8FAF0020 */ lw $t7, 0x0020($sp) -/* 025BC 8098719C 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 025C0 809871A0 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 025C4 809871A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 025C8 809871A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025CC 809871AC 03E00008 */ jr $ra -/* 025D0 809871B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s deleted file mode 100644 index dd37c42608..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809871B4 -/* 025D4 809871B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 025D8 809871B8 10A00007 */ beq $a1, $zero, .L809871D8 -/* 025DC 809871BC AFBF001C */ sw $ra, 0x001C($sp) -/* 025E0 809871C0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 025E4 809871C4 24A5FB10 */ addiu $a1, $a1, 0xFB10 ## $a1 = 0600FB10 -/* 025E8 809871C8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 025EC 809871CC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 025F0 809871D0 0C2614A0 */ jal func_80985280 -/* 025F4 809871D4 AFA00010 */ sw $zero, 0x0010($sp) -.L809871D8: -/* 025F8 809871D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 025FC 809871DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02600 809871E0 03E00008 */ jr $ra -/* 02604 809871E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s deleted file mode 100644 index a3de378aea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s +++ /dev/null @@ -1,54 +0,0 @@ -.rdata -glabel D_80988908 - .asciz "Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_809871E8 -/* 02608 809871E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0260C 809871EC AFA40020 */ sw $a0, 0x0020($sp) -/* 02610 809871F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02614 809871F4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02618 809871F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0261C 809871FC 0C261428 */ jal func_809850A0 -/* 02620 80987200 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 02624 80987204 1040001C */ beq $v0, $zero, .L80987278 -/* 02628 80987208 8FA70020 */ lw $a3, 0x0020($sp) -/* 0262C 8098720C 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 02630 80987210 8CE30274 */ lw $v1, 0x0274($a3) ## 00000274 -/* 02634 80987214 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02638 80987218 50C30018 */ beql $a2, $v1, .L8098727C -/* 0263C 8098721C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02640 80987220 10C10006 */ beq $a2, $at, .L8098723C -/* 02644 80987224 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02648 80987228 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0264C 8098722C 10C10008 */ beq $a2, $at, .L80987250 -/* 02650 80987230 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02654 80987234 1000000A */ beq $zero, $zero, .L80987260 -/* 02658 80987238 3C048099 */ lui $a0, %hi(D_80988908) ## $a0 = 80990000 -.L8098723C: -/* 0265C 8098723C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02660 80987240 0C261C3C */ jal func_809870F0 -/* 02664 80987244 AFA60018 */ sw $a2, 0x0018($sp) -/* 02668 80987248 10000009 */ beq $zero, $zero, .L80987270 -/* 0266C 8098724C 8FA60018 */ lw $a2, 0x0018($sp) -.L80987250: -/* 02670 80987250 0C261C5D */ jal func_80987174 -/* 02674 80987254 AFA60018 */ sw $a2, 0x0018($sp) -/* 02678 80987258 10000005 */ beq $zero, $zero, .L80987270 -/* 0267C 8098725C 8FA60018 */ lw $a2, 0x0018($sp) -.L80987260: -/* 02680 80987260 24848908 */ addiu $a0, $a0, %lo(D_80988908) ## $a0 = FFFF8908 -/* 02684 80987264 0C00084C */ jal osSyncPrintf - -/* 02688 80987268 AFA60018 */ sw $a2, 0x0018($sp) -/* 0268C 8098726C 8FA60018 */ lw $a2, 0x0018($sp) -.L80987270: -/* 02690 80987270 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02694 80987274 ADC60274 */ sw $a2, 0x0274($t6) ## 00000274 -.L80987278: -/* 02698 80987278 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098727C: -/* 0269C 8098727C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026A0 80987280 03E00008 */ jr $ra -/* 026A4 80987284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s deleted file mode 100644 index 560ee13c89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80987288 -/* 026A8 80987288 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026AC 8098728C AFBF0014 */ sw $ra, 0x0014($sp) -/* 026B0 80987290 0C261C7A */ jal func_809871E8 -/* 026B4 80987294 00000000 */ nop -/* 026B8 80987298 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026BC 8098729C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026C0 809872A0 03E00008 */ jr $ra -/* 026C4 809872A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s deleted file mode 100644 index 8bba5fc8b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_809872A8 -/* 026C8 809872A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 026CC 809872AC AFBF001C */ sw $ra, 0x001C($sp) -/* 026D0 809872B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 026D4 809872B4 0C261406 */ jal func_80985018 -/* 026D8 809872B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 026DC 809872BC 0C261418 */ jal func_80985060 -/* 026E0 809872C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026E4 809872C4 0C2612F8 */ jal func_80984BE0 -/* 026E8 809872C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026EC 809872CC 0C261C19 */ jal func_80987064 -/* 026F0 809872D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026F4 809872D4 0C261C4A */ jal func_80987128 -/* 026F8 809872D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026FC 809872DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02700 809872E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 02704 809872E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02708 809872E8 03E00008 */ jr $ra -/* 0270C 809872EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s deleted file mode 100644 index adc9b6d011..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809872F0 -/* 02710 809872F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02714 809872F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02718 809872F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0271C 809872FC 0C261406 */ jal func_80985018 -/* 02720 80987300 AFA5001C */ sw $a1, 0x001C($sp) -/* 02724 80987304 0C261418 */ jal func_80985060 -/* 02728 80987308 8FA40018 */ lw $a0, 0x0018($sp) -/* 0272C 8098730C 0C2612F8 */ jal func_80984BE0 -/* 02730 80987310 8FA40018 */ lw $a0, 0x0018($sp) -/* 02734 80987314 8FA40018 */ lw $a0, 0x0018($sp) -/* 02738 80987318 0C261C7A */ jal func_809871E8 -/* 0273C 8098731C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02740 80987320 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02744 80987324 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02748 80987328 03E00008 */ jr $ra -/* 0274C 8098732C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s deleted file mode 100644 index e765b5ac9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80987330 -/* 02750 80987330 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02754 80987334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02758 80987338 0C261406 */ jal func_80985018 -/* 0275C 8098733C AFA40020 */ sw $a0, 0x0020($sp) -/* 02760 80987340 0C261418 */ jal func_80985060 -/* 02764 80987344 8FA40020 */ lw $a0, 0x0020($sp) -/* 02768 80987348 AFA2001C */ sw $v0, 0x001C($sp) -/* 0276C 8098734C 0C2612F8 */ jal func_80984BE0 -/* 02770 80987350 8FA40020 */ lw $a0, 0x0020($sp) -/* 02774 80987354 8FA40020 */ lw $a0, 0x0020($sp) -/* 02778 80987358 0C261C6D */ jal func_809871B4 -/* 0277C 8098735C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02780 80987360 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02784 80987364 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02788 80987368 03E00008 */ jr $ra -/* 0278C 8098736C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s deleted file mode 100644 index 2e11250d61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80987514 -/* 02934 80987514 AFA40000 */ sw $a0, 0x0000($sp) -/* 02938 80987518 8FA40014 */ lw $a0, 0x0014($sp) -/* 0293C 8098751C AFA7000C */ sw $a3, 0x000C($sp) -/* 02940 80987520 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 02944 80987524 8C8E0280 */ lw $t6, 0x0280($a0) ## 00000280 -/* 02948 80987528 51C0001C */ beql $t6, $zero, .L8098759C -/* 0294C 8098752C 8C9902D0 */ lw $t9, 0x02D0($a0) ## 000002D0 -/* 02950 80987530 10A10006 */ beq $a1, $at, .L8098754C -/* 02954 80987534 8FA20010 */ lw $v0, 0x0010($sp) -/* 02958 80987538 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0295C 8098753C 10A1000D */ beq $a1, $at, .L80987574 -/* 02960 80987540 8FA20010 */ lw $v0, 0x0010($sp) -/* 02964 80987544 10000015 */ beq $zero, $zero, .L8098759C -/* 02968 80987548 8C9902D0 */ lw $t9, 0x02D0($a0) ## 000002D0 -.L8098754C: -/* 0296C 8098754C 248302E2 */ addiu $v1, $a0, 0x02E2 ## $v1 = 000002E2 -/* 02970 80987550 84780002 */ lh $t8, 0x0002($v1) ## 000002E4 -/* 02974 80987554 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 02978 80987558 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 0297C 8098755C 01F8C821 */ addu $t9, $t7, $t8 -/* 02980 80987560 A4590000 */ sh $t9, 0x0000($v0) ## 00000000 -/* 02984 80987564 84690000 */ lh $t1, 0x0000($v1) ## 000002E2 -/* 02988 80987568 01095023 */ subu $t2, $t0, $t1 -/* 0298C 8098756C 1000000A */ beq $zero, $zero, .L80987598 -/* 02990 80987570 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -.L80987574: -/* 02994 80987574 248302DC */ addiu $v1, $a0, 0x02DC ## $v1 = 000002DC -/* 02998 80987578 846C0002 */ lh $t4, 0x0002($v1) ## 000002DE -/* 0299C 8098757C 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 029A0 80987580 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 -/* 029A4 80987584 016C6821 */ addu $t5, $t3, $t4 -/* 029A8 80987588 A44D0000 */ sh $t5, 0x0000($v0) ## 00000000 -/* 029AC 8098758C 846F0000 */ lh $t7, 0x0000($v1) ## 000002DC -/* 029B0 80987590 01CFC021 */ addu $t8, $t6, $t7 -/* 029B4 80987594 A4580004 */ sh $t8, 0x0004($v0) ## 00000004 -.L80987598: -/* 029B8 80987598 8C9902D0 */ lw $t9, 0x02D0($a0) ## 000002D0 -.L8098759C: -/* 029BC 8098759C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 029C0 809875A0 13200005 */ beq $t9, $zero, .L809875B8 -/* 029C4 809875A4 00000000 */ nop -/* 029C8 809875A8 14A10003 */ bne $a1, $at, .L809875B8 -/* 029CC 809875AC 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 029D0 809875B0 2508EDE8 */ addiu $t0, $t0, 0xEDE8 ## $t0 = 0600EDE8 -/* 029D4 809875B4 ACC80000 */ sw $t0, 0x0000($a2) ## 00000000 -.L809875B8: -/* 029D8 809875B8 03E00008 */ jr $ra -/* 029DC 809875BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s deleted file mode 100644 index e3a2e3eb83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809875C0 -/* 029E0 809875C0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 029E4 809875C4 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 029E8 809875C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 029EC 809875CC AFA40038 */ sw $a0, 0x0038($sp) -/* 029F0 809875D0 AFA60040 */ sw $a2, 0x0040($sp) -/* 029F4 809875D4 14A10019 */ bne $a1, $at, .L8098763C -/* 029F8 809875D8 AFA70044 */ sw $a3, 0x0044($sp) -/* 029FC 809875DC 3C0E8099 */ lui $t6, %hi(D_809887D8) ## $t6 = 80990000 -/* 02A00 809875E0 25CE87D8 */ addiu $t6, $t6, %lo(D_809887D8) ## $t6 = 809887D8 -/* 02A04 809875E4 8DD80000 */ lw $t8, 0x0000($t6) ## 809887D8 -/* 02A08 809875E8 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 02A0C 809875EC 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -/* 02A10 809875F0 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 02A14 809875F4 8DCF0004 */ lw $t7, 0x0004($t6) ## 809887DC -/* 02A18 809875F8 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 02A1C 809875FC 8DD80008 */ lw $t8, 0x0008($t6) ## 809887E0 -/* 02A20 80987600 0C0346BD */ jal Matrix_MultVec3f -/* 02A24 80987604 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 02A28 80987608 8FA20048 */ lw $v0, 0x0048($sp) -/* 02A2C 8098760C C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 02A30 80987610 84590030 */ lh $t9, 0x0030($v0) ## 00000030 -/* 02A34 80987614 E4440038 */ swc1 $f4, 0x0038($v0) ## 00000038 -/* 02A38 80987618 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 02A3C 8098761C 84480032 */ lh $t0, 0x0032($v0) ## 00000032 -/* 02A40 80987620 84490034 */ lh $t1, 0x0034($v0) ## 00000034 -/* 02A44 80987624 E446003C */ swc1 $f6, 0x003C($v0) ## 0000003C -/* 02A48 80987628 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 02A4C 8098762C A4590044 */ sh $t9, 0x0044($v0) ## 00000044 -/* 02A50 80987630 A4480046 */ sh $t0, 0x0046($v0) ## 00000046 -/* 02A54 80987634 A4490048 */ sh $t1, 0x0048($v0) ## 00000048 -/* 02A58 80987638 E4480040 */ swc1 $f8, 0x0040($v0) ## 00000040 -.L8098763C: -/* 02A5C 8098763C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A60 80987640 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02A64 80987644 03E00008 */ jr $ra -/* 02A68 80987648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s deleted file mode 100644 index f974aef88e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8098764C -/* 02A6C 8098764C AFA40000 */ sw $a0, 0x0000($sp) -/* 02A70 80987650 03E00008 */ jr $ra -/* 02A74 80987654 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s deleted file mode 100644 index b9e7872287..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ /dev/null @@ -1,104 +0,0 @@ -.rdata -glabel D_80988980 - .asciz "../z_demo_im.c" - .balign 4 - -glabel D_80988990 - .asciz "../z_demo_im.c" - .balign 4 - -.text -glabel func_80987658 -/* 02A78 80987658 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02A80 80987660 AFA40070 */ sw $a0, 0x0070($sp) -/* 02A84 80987664 AFA50074 */ sw $a1, 0x0074($sp) -/* 02A88 80987668 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 02A8C 8098766C 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 -/* 02A90 80987670 3C068099 */ lui $a2, %hi(D_80988980) ## $a2 = 80990000 -/* 02A94 80987674 00027880 */ sll $t7, $v0, 2 -/* 02A98 80987678 030FC021 */ addu $t8, $t8, $t7 -/* 02A9C 8098767C 8F187830 */ lw $t8, %lo(D_80987830)($t8) -/* 02AA0 80987680 24C68980 */ addiu $a2, $a2, %lo(D_80988980) ## $a2 = 80988980 -/* 02AA4 80987684 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) -/* 02AAC 8098768C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02AB0 80987690 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 -/* 02AB4 80987694 0C031AB1 */ jal Graph_OpenDisps -/* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) -/* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) -/* 02AC0 809876A0 0C024F46 */ jal func_80093D18 -/* 02AC4 809876A4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 02AC8 809876A8 8FA80058 */ lw $t0, 0x0058($sp) -/* 02ACC 809876AC 8FA70060 */ lw $a3, 0x0060($sp) -/* 02AD0 809876B0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 02AD4 809876B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 -/* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 -/* 02AE0 809876C0 3C0F8016 */ lui $t7, %hi(gSegments) -/* 02AE4 809876C4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02AE8 809876C8 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 -/* 02AF0 809876D0 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 02AF4 809876D4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 02AF8 809876D8 01CF2021 */ addu $a0, $t6, $t7 -/* 02AFC 809876DC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02B00 809876E0 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 02B04 809876E4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02B08 809876E8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02B0C 809876EC 00E12824 */ and $a1, $a3, $at -/* 02B10 809876F0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 02B14 809876F4 0305C821 */ addu $t9, $t8, $a1 -/* 02B18 809876F8 03264821 */ addu $t1, $t9, $a2 -/* 02B1C 809876FC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02B20 80987700 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02B24 80987704 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 02B28 80987708 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 02B2C 8098770C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02B30 80987710 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 02B34 80987714 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02B38 80987718 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 02B3C 8098771C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02B40 80987720 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02B44 80987724 01856821 */ addu $t5, $t4, $a1 -/* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 -/* 02B4C 8098772C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02B50 80987730 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02B54 80987734 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 02B58 80987738 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 02B5C 8098773C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02B60 80987740 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 02B64 80987744 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02B68 80987748 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02B6C 8098774C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02B70 80987750 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 02B74 80987754 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 02B78 80987758 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 02B7C 8098775C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 02B80 80987760 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 02B84 80987764 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02B88 80987768 8FA30070 */ lw $v1, 0x0070($sp) -/* 02B8C 8098776C 3C0D8098 */ lui $t5, %hi(func_809875C0) ## $t5 = 80980000 -/* 02B90 80987770 3C0C8098 */ lui $t4, %hi(func_80987514) ## $t4 = 80980000 -/* 02B94 80987774 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 02B98 80987778 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 02B9C 8098777C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 02BA0 80987780 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 02BA4 80987784 258C7514 */ addiu $t4, $t4, %lo(func_80987514) ## $t4 = 80987514 -/* 02BA8 80987788 25AD75C0 */ addiu $t5, $t5, %lo(func_809875C0) ## $t5 = 809875C0 -/* 02BAC 8098778C AFAD0014 */ sw $t5, 0x0014($sp) -/* 02BB0 80987790 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02BB4 80987794 8FA40074 */ lw $a0, 0x0074($sp) -/* 02BB8 80987798 0C0286B2 */ jal SkelAnime_DrawSV -/* 02BBC 8098779C AFA30018 */ sw $v1, 0x0018($sp) -/* 02BC0 809877A0 8FAE0074 */ lw $t6, 0x0074($sp) -/* 02BC4 809877A4 3C068099 */ lui $a2, %hi(D_80988990) ## $a2 = 80990000 -/* 02BC8 809877A8 24C68990 */ addiu $a2, $a2, %lo(D_80988990) ## $a2 = 80988990 -/* 02BCC 809877AC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02BD0 809877B0 2407039D */ addiu $a3, $zero, 0x039D ## $a3 = 0000039D -/* 02BD4 809877B4 0C031AD5 */ jal Graph_CloseDisps -/* 02BD8 809877B8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02BE4 809877C4 03E00008 */ jr $ra -/* 02BE8 809877C8 00000000 */ nop diff --git a/data/overlays/actors/z_demo_im.data.s b/data/overlays/actors/z_demo_im.data.s deleted file mode 100644 index 14a5ec92fd..0000000000 --- a/data/overlays/actors/z_demo_im.data.s +++ /dev/null @@ -1,64 +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_80987830 - .word 0x06007210, 0x06007D50, 0x06008150 -glabel D_8098783C - .word 0x00000000 -glabel D_80987840 - .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 -glabel D_8098786C - .word 0x00000020, 0x00000BB8, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x02B90000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000202B9, 0x02BA0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000402BA, 0x03000000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020300, 0x03310000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030331, 0x0A6A0000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x000D0000, 0x012C0000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0005012C, 0x02950000, 0xEAAA0000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130295, 0x078E0000, 0x6AAA0000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, 0x00000003, 0x00010000, 0x00910000, 0x00000000, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0x00000000, 0x00000000, 0x00000000, 0x00020091, 0x02670000, 0x00000000, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0x00000000, 0x00000000, 0x00000000, 0x00030267, 0x07720000, 0x00000000, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0xFFFFFF9F, 0x00000006, 0x000000A9, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0xFFFFFFEA, 0x00000000, 0xFFFFFFC9, 0xFFFFFFEA, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x00020000, 0x000A0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x0002000A, 0x0BB80000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x000502B6, 0x02D402D4, 0x0000002D, 0x00000001, 0x000103C0, 0x03DE03DE, 0x0000002D, 0x00000001, 0x000102AB, 0x02B402B4, 0x0000003E, 0x00000002, 0x00010000, 0x000A0000, 0x00000000, 0x00000040, 0x00000050, 0x00000082, 0x00000040, 0x00000050, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x0004000A, 0x0BB80000, 0x00000000, 0x00000040, 0x00000050, 0x00000082, 0x00000040, 0x00000050, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x00440302, 0x03030000, 0x00000000, 0x00000000, 0xFFFFFFC9, 0x0000005C, 0x00000000, 0xFFFFFFC9, 0x0000005C, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x0000000E, 0xFFFF0000, 0x0154FFFF, 0xFFFFFFFF, 0x50220154, 0x01610000, 0x00000000, 0xFFFF0161, 0x0176FFFF, 0xFFFFFFFF, 0x50250176, 0x01940000, 0x00000000, 0xFFFF0194, 0x01A8FFFF, 0xFFFFFFFF, 0x502B01A8, 0x01DA0000, 0x00000000, 0xFFFF01DA, 0x01EEFFFF, 0xFFFFFFFF, 0x502C01EE, 0x021F0000, 0x00000000, 0xFFFF021F, 0x0234FFFF, 0xFFFFFFFF, 0x50260234, 0x02650000, 0x00000000, 0xFFFF0265, 0x03BBFFFF, 0xFFFFFFFF, 0x004103BB, 0x03BF0000, 0x00000000, 0xFFFF03BF, 0x03FCFFFF, 0xFFFFFFFF, 0x502303FC, 0x04050000, 0x00000000, 0x000003E8, 0x00000001, 0x00610424, 0x04250425, 0x0000007C, 0x00000001, 0x000402A1, 0x02D30000, 0x00000000, 0x00000000, 0xFFFFFFC1, 0x00000058, 0x00000000, 0xFFFFFFC1, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x01550000, 0x00000000, 0x42726667, 0x002100E1, 0xFFC620BA, 0x00000000, 0x42726667, 0x002100E1, 0xFFC6D5E0, 0x00000000, 0x42726667, 0x002100E1, 0xFFC60950, 0x00000000, 0x42726667, 0x0021006A, 0xFFC67C50, 0x00000000, 0x42726667, 0x00210017, 0xFFC60000, 0x00000000, 0x42726667, 0x000B000A, 0xFFEEFFFF, 0x00000000, 0x42726667, 0x000B000A, 0xFFEE0000, 0x00000000, 0x42726667, 0x000B000A, 0xFFEEE6A0, 0xFF000000, 0x42726667, 0x000B000A, 0xFFEE7C53, 0x00000001, 0x00010107, 0x01F80000, 0x00000000, 0x41B50402, 0xFFCF000D, 0x009E20BA, 0x00000000, 0x41B50402, 0xFFCF000D, 0x009ED5E0, 0x00000000, 0x41B50402, 0xFFCF000D, 0x009E0950, 0x00000000, 0x41B50402, 0xFFEB0016, 0x00967C50, 0x00000000, 0x4204E872, 0xFFEB0016, 0x00960000, 0x00000000, 0x4204E872, 0xFFEB0016, 0x0096FFFF, 0x00000000, 0x4204E872, 0xFFEB0016, 0x00960000, 0x00000000, 0x4204E872, 0xFFEB0016, 0x0096E6A0, 0xFF000000, 0x4204E872, 0xFFEB0016, 0x00967C53, 0x00000001, 0x0001016B, 0x03380000, 0x00000000, 0x42726667, 0xFFBD0008, 0x007520BA, 0x00000000, 0x42726667, 0xFFBD0008, 0x0075D5E0, 0x00000000, 0x42726667, 0xFFBD0008, 0x00750950, 0x00000000, 0x42726667, 0xFFBD0008, 0x00757C50, 0x00000000, 0x42726667, 0xFFBD0008, 0x00750000, 0x00000000, 0x42726667, 0xFFBD0008, 0x0075FFFF, 0x00000000, 0x428D998E, 0xFFBD0008, 0x00750000, 0x00000000, 0x428D998E, 0xFFBD0008, 0x0075E6A0, 0x00000000, 0x428D998E, 0xFFBD0008, 0x00757C53, 0x00000000, 0x428D998E, 0xFFBD0008, 0x00750000, 0xFF000000, 0x428D998E, 0xFFBD0008, 0x00750000, 0x00000005, 0x0001019D, 0x05E00000, 0x00000000, 0x419FFFB1, 0xFFCB001C, 0x002D20BA, 0x00000000, 0x419FFFB1, 0xFFCB001C, 0x002DD5E0, 0x00000000, 0x419FFFB1, 0xFFCB001C, 0x002D0950, 0x00000000, 0x419FFFB1, 0xFFCB001C, 0x002D7C50, 0xFF000000, 0x419FFFB1, 0xFFCB001C, 0x002D0000, 0x00000001, 0x000101E3, 0x06940000, 0x00000000, 0x4289D68F, 0xFFBD0008, 0x007520BA, 0x00000000, 0x4289D68F, 0xFFBD0008, 0x0075D5E0, 0x00000000, 0x4289D68F, 0xFFBD0008, 0x00750950, 0x00000000, 0x4289D68F, 0xFFB9000F, 0x007C7C50, 0x00000000, 0x4289D68F, 0xFFB7001D, 0x00830000, 0x00000000, 0x4289D68F, 0xFFB20028, 0x008CFFFF, 0x00000000, 0x4289D68F, 0xFFB20028, 0x008C0000, 0x00000000, 0x4289D68F, 0xFFB20028, 0x008CE6A0, 0xFF000000, 0x4289D68F, 0xFFB20028, 0x008C7C53, 0x00000001, 0x00010229, 0x066C0000, 0x00000000, 0x42366658, 0xFFD90022, 0x00C920BA, 0x00000000, 0x42366658, 0xFFD90022, 0x00C9D5E0, 0x00000000, 0x42366658, 0xFFD90022, 0x00C90950, 0x00000000, 0x42366658, 0xFFD90022, 0x00C97C50, 0xFF000000, 0x42366658, 0xFFD90022, 0x00C90000, 0x00000001, 0x0001026F, 0x03330000, 0x00000000, 0x428D3328, 0x0009000D, 0xFFEF20BA, 0x00000000, 0x428D3328, 0x0009000D, 0xFFEFD5E0, 0x00000000, 0x428D3328, 0x0009000D, 0xFFEF0950, 0x00000000, 0x428D3328, 0x00090047, 0xFFEF7C50, 0x00000000, 0x42FDFF84, 0x00090181, 0xFFEF0000, 0x00000000, 0x42FDFF84, 0x00090181, 0xFFEFFFFF, 0x00000000, 0x42FDFF84, 0x00090181, 0xFFEF0000, 0x00000000, 0x42FDFF84, 0x00090181, 0xFFEFE6A0, 0xFF000000, 0x42FDFF84, 0x00090181, 0xFFEF7C53, 0x00000001, 0x000102B5, 0x040B0000, 0x00000000, 0x42700000, 0x000D0356, 0x000220BA, 0x00000000, 0x42700000, 0x00090355, 0x0005D5E0, 0x00000000, 0x42700000, 0xFFFD0355, 0x00050950, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA7C50, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF0000, 0x00000000, 0x42700000, 0x00090354, 0xFFEFFFFF, 0x00000000, 0x42700000, 0x00100354, 0xFFFA0000, 0x00000000, 0x42700000, 0x00090354, 0x0005E6A0, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00057C53, 0x00000005, 0x00010301, 0x079E0000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE520BA, 0x00000000, 0x4289332C, 0x00000021, 0xFFE5D5E0, 0x00000000, 0x4289332C, 0x00000044, 0xFFE60950, 0x00000000, 0x4289332C, 0x00000067, 0xFFE67C50, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6FFFF, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE6E6A0, 0x00000002, 0x00010000, 0x01720000, 0x0000001E, 0x42726667, 0xFFEB0015, 0x002A20BA, 0x00000032, 0x42726667, 0xFFEB0015, 0x002AD5E0, 0x00000032, 0x42726667, 0xFFEB0015, 0x002A0950, 0x00000032, 0x42726667, 0xFFB20056, 0x00907C50, 0x00000032, 0x42726667, 0xFFB00015, 0x008E0000, 0x00000032, 0x42726667, 0xFF9D001F, 0x00B1FFFF, 0x0000001E, 0x42726667, 0xFF9D001F, 0x00B10000, 0x0000001E, 0x42726667, 0xFF9D001F, 0x00B1E6A0, 0xFF00001E, 0x42726667, 0xFF9D001F, 0x00B17C53, 0x00000002, 0x00010107, 0x02150000, 0x0000001E, 0x41B50402, 0xFECB000B, 0x00E520BA, 0x0000001E, 0x41B50402, 0xFECB000B, 0x00E5D5E0, 0x0000001E, 0x41B50402, 0xFECB000B, 0x00E50950, 0x0000001E, 0x4204E872, 0xFEFE0085, 0x00BF7C50, 0x0000001E, 0x4204E872, 0xFEFE0085, 0x00BF0000, 0x0000001E, 0x4204E872, 0xFEFE0085, 0x00BFFFFF, 0x0000001E, 0x4204E872, 0xFEFE0085, 0x00BF0000, 0x0000001E, 0x4204E872, 0xFEFE0085, 0x00BFE6A0, 0xFF00001E, 0x4204E872, 0xFEFE0085, 0x00BF7C53, 0x00000002, 0x0001016B, 0x03550000, 0x00000032, 0x42899992, 0x0044006D, 0xFF9920BA, 0x00000032, 0x4289FFF8, 0x0044006D, 0xFF99D5E0, 0x00000032, 0x42899992, 0x0043006D, 0xFF990950, 0x00000032, 0x4289332C, 0x00BD006D, 0x005C7C50, 0x00000032, 0x4289332C, 0x0039006C, 0x01550000, 0x00000032, 0x428D998E, 0xFF46006B, 0x0155FFFF, 0x00000032, 0x428D998E, 0xFF46006B, 0x01550000, 0x00000032, 0x428D998E, 0xFF46006B, 0x0155E6A0, 0x0000001E, 0x428D998E, 0xFF46006B, 0x01557C53, 0x0000001E, 0x428D998E, 0xFF46006B, 0x01550000, 0xFF00001E, 0x428D998E, 0xFF46006B, 0x01550000, 0x00000006, 0x0001019D, 0x05FD0000, 0x0000001E, 0x419FFFB1, 0x00AB007A, 0xFF9620BA, 0x0000001E, 0x419FFFB1, 0x00AB007A, 0xFF96D5E0, 0x000003E8, 0x419FFFB1, 0x00AB007A, 0xFF960950, 0x0000001E, 0x419FFFB1, 0x00AA007A, 0xFF967C50, 0xFF00001E, 0x419FFFB1, 0x00AA007A, 0xFF960000, 0x00000002, 0x000101E3, 0x06B10000, 0x00010014, 0x4289D68F, 0xFF410084, 0x014720BA, 0x00000014, 0x4289D68F, 0xFF410084, 0x0147D5E0, 0x00FF001E, 0x4289D68F, 0xFF420083, 0x01460950, 0x00000028, 0x4289D68F, 0xFF43009A, 0x01447C50, 0x0001001E, 0x4289D68F, 0xFF3E00A2, 0x014B0000, 0x0000001E, 0x4289D68F, 0xFF3900AC, 0x0153FFFF, 0x000003E8, 0x4289D68F, 0xFF3900AC, 0x01530000, 0x0000001E, 0x4289D68F, 0xFF3900AC, 0x0153E6A0, 0xFF00001E, 0x4289D68F, 0xFF3900AC, 0x01537C53, 0x00000002, 0x00010229, 0x06890000, 0x0000001E, 0x42366658, 0xFF16007B, 0x002520BA, 0x0000001E, 0x42366658, 0xFF16007B, 0x0025D5E0, 0x000003E8, 0x42366658, 0xFF16007B, 0x00250950, 0x0000001E, 0x42366658, 0xFF16007B, 0x00257C50, 0xFF00001E, 0x42366658, 0xFF17007B, 0x00250000, 0x00000002, 0x0001026F, 0x03500000, 0x0000001E, 0x428D3328, 0xFFCC0011, 0x005B20BA, 0x0000001E, 0x428D3328, 0xFFCC0011, 0x005BD5E0, 0x00000014, 0x428D3328, 0xFFCC0011, 0x005B0950, 0x0000000F, 0x428D3328, 0xFFCC004B, 0x005B7C50, 0x0000000A, 0x42FDFF84, 0xFFFB01F7, 0x00090000, 0x0000001E, 0x42FDFF84, 0xFFFB01F7, 0x0009FFFF, 0x0000001E, 0x42FDFF84, 0xFFFB01F7, 0x00090000, 0x0000001E, 0x42FDFF84, 0xFFFB01F7, 0x0009E6A0, 0xFF00001E, 0x42FDFF84, 0xFFFB01F7, 0x00097C53, 0x00000002, 0x000102B5, 0x043C0000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA20BA, 0x00000028, 0x42700000, 0x00030006, 0xFFFAD5E0, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFA0950, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA7C50, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA0000, 0x00000032, 0x412665BD, 0x00030006, 0xFFFAFFFF, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x4123328A, 0x00030006, 0xFFFAE6A0, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA7C53, 0x00000006, 0x00010301, 0x07BB0000, 0x0000001E, 0x4289332C, 0x00000064, 0x000520BA, 0x0000001E, 0x4289332C, 0x00000065, 0x0006D5E0, 0x0000001E, 0x4289332C, 0x00010063, 0x00290950, 0x0000001E, 0x4289332C, 0x0000002A, 0x00107C50, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0x000003E8, 0x4289332C, 0x0000002A, 0x0010FFFF, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0xFF00001E, 0x4289332C, 0x0000002A, 0x0010E6A0, 0xFFFFFFFF, 0x00000000 -glabel D_8098875C - .word func_809856F8 -.word func_80985718 -.word func_80985738 -.word func_80985770 -.word func_809857B0 -.word func_809857F0 -.word func_80985830 -.word func_80985C10 -.word func_80985C40 -.word func_80985C94 -.word func_809863BC -.word func_809863DC -.word func_80986430 -.word func_80986494 -.word func_809864D4 -.word func_809868E8 -.word func_80986908 -.word func_80986948 -.word func_80986D40 -.word func_80986DC8 -.word func_80986E20 -.word func_80986E40 -.word func_80986EAC -.word func_80986F08 -.word func_80986F28 -.word func_80986F88 -.word func_80986FA8 -.word func_80987288 -.word func_809872A8 -.word func_809872F0 -.word func_80987330 -glabel D_809887D8 - .word 0x00000000, 0x41200000, 0x00000000 -glabel D_809887E4 - .word func_8098764C -.word func_80987658 -.word func_80985CE8 -glabel Demo_Im_InitVars - .word 0x00A90400, 0x00000011, 0x00870000, 0x000002FC -.word DemoIm_Init -.word DemoIm_Destroy -.word DemoIm_Update -.word DemoIm_Draw - diff --git a/data/overlays/actors/z_demo_im.reloc.s b/data/overlays/actors/z_demo_im.reloc.s deleted file mode 100644 index d9930249dc..0000000000 --- a/data/overlays/actors/z_demo_im.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_80988A20 - .incbin "baserom/ovl_Demo_Im", 0x3E40, 0x00000460 diff --git a/spec b/spec index e61fb4f129..4d1845f235 100644 --- a/spec +++ b/spec @@ -1611,8 +1611,7 @@ endseg beginseg name "ovl_Demo_Im" include "build/src/overlays/actors/ovl_Demo_Im/z_demo_im.o" - include "build/data/overlays/actors/z_demo_im.data.o" - include "build/data/overlays/actors/z_demo_im.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Im/ovl_Demo_Im_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 4b51681bdb..164667de17 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -1,5 +1,13 @@ +/* + * File: z_demo_im.c + * Overlay: Demo_Im + * Description: Impa + */ + #include "z_demo_im.h" +#include + #define FLAGS 0x00000011 #define THIS ((DemoIm*)thisx) @@ -8,8 +16,73 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx); void DemoIm_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoIm_Update(Actor* thisx, GlobalContext* globalCtx); void DemoIm_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_809856F8(DemoIm* this, GlobalContext* globalCtx); +void func_80985718(DemoIm* this, GlobalContext* globalCtx); +void func_80985738(DemoIm* this, GlobalContext* globalCtx); +void func_80985770(DemoIm* this, GlobalContext* globalCtx); +void func_809857B0(DemoIm* this, GlobalContext* globalCtx); +void func_809857F0(DemoIm* this, GlobalContext* globalCtx); +void func_80985830(DemoIm* this, GlobalContext* globalCtx); +void func_80985C10(DemoIm* this, GlobalContext* globalCtx); +void func_80985C40(DemoIm* this, GlobalContext* globalCtx); +void func_80985C94(DemoIm* this, GlobalContext* globalCtx); +void func_80985CE8(DemoIm* this, GlobalContext* globalCtx); +void func_809863BC(DemoIm* this, GlobalContext* globalCtx); +void func_809863DC(DemoIm* this, GlobalContext* globalCtx); +void func_80986430(DemoIm* this, GlobalContext* globalCtx); +void func_80986494(DemoIm* this, GlobalContext* globalCtx); +void func_809864D4(DemoIm* this, GlobalContext* globalCtx); +void func_809868E8(DemoIm* this, GlobalContext* globalCtx); +void func_80986908(DemoIm* this, GlobalContext* globalCtx); +void func_80986948(DemoIm* this, GlobalContext* globalCtx); +void func_80986D40(DemoIm* this, GlobalContext* globalCtx); +void func_80986DC8(DemoIm* this, GlobalContext* globalCtx); +void func_80986E20(DemoIm* this, GlobalContext* globalCtx); +void func_80986E40(DemoIm* this, GlobalContext* globalCtx); +void func_80986EAC(DemoIm* this, GlobalContext* globalCtx); +void func_80986F08(DemoIm* this, GlobalContext* globalCtx); +void func_80986F28(DemoIm* this, GlobalContext* globalCtx); +void func_80986F88(DemoIm* this, GlobalContext* globalCtx); +void func_80986FA8(DemoIm* this, GlobalContext* globalCtx); +void func_80987288(DemoIm* this, GlobalContext* globalCtx); +void func_809872A8(DemoIm* this, GlobalContext* globalCtx); +void func_809872F0(DemoIm* this, GlobalContext* globalCtx); +void func_80987330(DemoIm* this, GlobalContext* globalCtx); +void func_8098764C(DemoIm* this, GlobalContext* globalCtx); +void func_80987658(DemoIm* this, GlobalContext* globalCtx); + +UNK_PTR D_80987830[] = { + 0x06007210, + 0x06007D50, + 0x06008150, +}; + +u32 D_8098783C = 0; + +static ColliderCylinderInit_Set3 sCylinderInit = { + { COLTYPE_UNK0, 0x00, 0x00, 0x09, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 25, 80, 0, { 0, 0, 0 } }, +}; + +#include "z_demo_im_cutscene_data.c" EARLY + +static DemoImActionFunc sActionFuncs[] = { + func_809856F8, func_80985718, func_80985738, func_80985770, func_809857B0, func_809857F0, func_80985830, + func_80985C10, func_80985C40, func_80985C94, func_809863BC, func_809863DC, func_80986430, func_80986494, + func_809864D4, func_809868E8, func_80986908, func_80986948, func_80986D40, func_80986DC8, func_80986E20, + func_80986E40, func_80986EAC, func_80986F08, func_80986F28, func_80986F88, func_80986FA8, func_80987288, + func_809872A8, func_809872F0, func_80987330, +}; + +Vec3f D_809887D8 = { 0.0f, 10.0f, 0.0f }; + +static DemoImDrawFunc sDrawFuncs[] = { + func_8098764C, + func_80987658, + func_80985CE8, +}; -/* const ActorInit Demo_Im_InitVars = { ACTOR_DEMO_IM, ACTORTYPE_NPC, @@ -21,229 +94,1122 @@ const ActorInit Demo_Im_InitVars = { (ActorFunc)DemoIm_Update, (ActorFunc)DemoIm_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984BE0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984C8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984DB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984E58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984F94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985018.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985060.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809850E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985134.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985180.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985200.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985310.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985358.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809853B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985430.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098544C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098557C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809856F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985718.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985738.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985770.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809857F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985830.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985860.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809858C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809859E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985C94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985E60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985EF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098629C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809862E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809863DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986430.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986494.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809864D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098652C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986570.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809865F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986700.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098680C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809868E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986908.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809869F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986A5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986AD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986B2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986BF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986C30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986CFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986D40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986DC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986E40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986EAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986F88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986FA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987018.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987064.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809870F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987128.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809871E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987288.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809872F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987330.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987514.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809875C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098764C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Draw.s") +extern UNK_PTR D_02002524; +extern AnimationHeader D_06000710; +extern AnimationHeader D_06000AFC; +extern Gfx D_0600EDE8[]; +extern AnimationHeader D_060014E4; +extern AnimationHeader D_06001868; +extern SkeletonHeader D_0600F788; +extern AnimationHeader D_0600FB10; +extern AnimationHeader D_060101C8; +extern AnimationHeader D_06010EE0; +extern AnimationHeader D_0601182C; +extern AnimationHeader D_06011C08; +extern AnimationHeader D_06012218; + +void func_80984BE0(DemoIm* this) { + s32 pad[3]; + s16* unk_25E = &this->unk_25E; + s16* unk_25C = &this->unk_25C; + + if (DECR(*unk_25E) == 0) { + *unk_25E = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_25C = *unk_25E; + if (*unk_25C >= 3) { + *unk_25C = 0; + } +} + +void func_80984C68(DemoIm* this) { + this->action = 7; + this->drawConfig = 0; + this->unk_26C = 0; + this->unk_270 = 0; + this->actor.shape.unk_14 = 0; + this->unk_268 = 0.0f; +} + +void func_80984C8C(DemoIm* this, GlobalContext* globalCtx) { + u32* something = &D_8098783C; + + if (globalCtx->csCtx.state == 0) { + if (*something != 0) { + if (this->actor.params == 2) { + func_80984C68(this); + } + *something = 0; + } + } else { + if (*something == 0) { + *something = 1; + } + } +} + +void func_80984D00(Actor* thisx, GlobalContext* globalCtx) { + DemoIm* this = THIS; + + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sCylinderInit); +} + +void func_80984D4C(Actor* thisx, GlobalContext* globalCtx) { + DemoIm* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void func_80984D74(DemoIm* this, GlobalContext* globalCtx) { + s32 pad[5]; + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void func_80984DB8(DemoIm* this) { + s32 pad[2]; + Vec3s* vec1 = &this->unk_2D4.unk_08; + Vec3s* vec2 = &this->unk_2D4.unk_0E; + + Math_SmoothScaleMaxMinS(&vec1->x, 0, 20, 6200, 100); + Math_SmoothScaleMaxMinS(&vec1->y, 0, 20, 6200, 100); + + Math_SmoothScaleMaxMinS(&vec2->x, 0, 20, 6200, 100); + Math_SmoothScaleMaxMinS(&vec2->y, 0, 20, 6200, 100); +} + +void func_80984E58(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 yawDiff; + s16 phi_a3; + + this->unk_2D4.unk_18 = player->actor.posRot.pos; + this->unk_2D4.unk_14 = kREG(16) + 4.0f; + + yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y; + phi_a3 = (ABS(yawDiff) < 0x18E3) ? 2 : 1; + func_80034A14(&this->actor, &this->unk_2D4, kREG(17) + 0xC, phi_a3); +} + +void func_80984F10(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_2D4.unk_18 = player->actor.posRot.pos; + this->unk_2D4.unk_14 = kREG(16) + 12.0f; + + func_80034A14(&this->actor, &this->unk_2D4, kREG(17) + 0xC, 2); +} + +void func_80984F94(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_2D4.unk_18 = player->actor.posRot.pos; + this->unk_2D4.unk_14 = kREG(16) + 4.0f; + func_80034A14(&this->actor, &this->unk_2D4, kREG(17) + 0xC, 4); +} + +void func_80985018(DemoIm* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 func_80985060(DemoIm* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +s32 func_80985080(GlobalContext* globalCtx) { + if (globalCtx->csCtx.state == 0) { + return 1; + } + return 0; +} + +CsCmdActorAction* func_809850A0(GlobalContext* globalCtx, s32 actionIdx) { + s32 pad[2]; + CsCmdActorAction* ret = NULL; + + if (!func_80985080(globalCtx)) { + ret = globalCtx->csCtx.npcActions[actionIdx]; + } + return ret; +} + +s32 func_809850E8(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx); + + if (npcAction != NULL) { + if (npcAction->action == action) { + return 1; + } + } + return 0; +} + +s32 func_80985134(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx); + + if (npcAction != NULL) { + if (npcAction->action != action) { + return 1; + } + } + return 0; +} + +void func_80985180(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) { + CsCmdActorAction* npcAction = func_809850A0(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_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) { + CsCmdActorAction* npcAction = func_809850A0(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_80985280(DemoIm* this, AnimationHeader* animationHeader, u8 arg2, f32 transitionRate, s32 arg4) { + f32 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_80985310(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->actor.shape.unk_08 = -10000.0f; +} + +void func_80985358(DemoIm* this, GlobalContext* globalCtx) { + f32 posX = this->actor.posRot.pos.x; + f32 posY = this->actor.posRot.pos.y; + f32 posZ = this->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +void func_809853B4(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 playerX = player->actor.posRot.pos.x; + f32 playerY = player->actor.posRot.pos.y + 80.0f; + f32 playerZ = player->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, playerX, playerY, playerZ, 0, + 0, 0, 0xD); + Item_Give(globalCtx, GI_BOMBCHUS_5); +} + +void func_80985430(DemoIm* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += 250.0f / 3.0f; +} + +void func_8098544C(DemoIm* this, GlobalContext* globalCtx) { + s32 pad[2]; + + if ((gSaveContext.chamberCutsceneNum == 4) && (gSaveContext.sceneSetupIndex < 4)) { + Player* player = PLAYER; + + this->action = 1; + globalCtx->csCtx.segment = D_8098786C; + gSaveContext.cutsceneTrigger = 2; + Item_Give(globalCtx, GI_BOMBCHUS_5); + player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + } +} + +void func_809854DC(DemoIm* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[5] != NULL) && + (globalCtx->csCtx.npcActions[5]->action == 2)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06001868.genericHeader), 0, 0.0f); + this->action = 2; + this->drawConfig = 1; + func_80985358(this, globalCtx); + } +} + +void func_8098557C(DemoIm* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} + +void func_809855A8(DemoIm* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[5] != NULL) && + (globalCtx->csCtx.npcActions[5]->action == 3)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000710, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000710.genericHeader), 2, 4.0f); + this->action = 4; + } +} + +void func_80985640(DemoIm* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000AFC, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000AFC.genericHeader), 0, 0.0f); + this->action = 5; + } +} + +void func_809856AC(DemoIm* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[6] != NULL) && + (globalCtx->csCtx.npcActions[6]->action == 2)) { + this->action = 6; + func_809853B4(this, globalCtx); + } +} + +void func_809856F8(DemoIm* this, GlobalContext* globalCtx) { + func_8098544C(this, globalCtx); +} + +void func_80985718(DemoIm* this, GlobalContext* globalCtx) { + func_809854DC(this, globalCtx); +} + +void func_80985738(DemoIm* this, GlobalContext* globalCtx) { + func_80985430(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_8098557C(this); +} + +void func_80985770(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_809855A8(this, globalCtx); +} + +void func_809857B0(DemoIm* this, GlobalContext* globalCtx) { + s32 sp1C; + + func_80985018(this, globalCtx); + sp1C = func_80985060(this); + func_80984BE0(this); + func_80985640(this, sp1C); +} + +void func_809857F0(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_809856AC(this, globalCtx); +} + +void func_80985830(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); +} + +void func_80985860(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->action = 7; + this->actor.shape.unk_14 = 0; +} + +void func_809858A8(void) { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +void func_809858C8(DemoIm* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + (kREG(17) + 24.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 6); +} + +void func_80985948(DemoIm* this, GlobalContext* globalCtx) { + if (func_809850E8(this, globalCtx, 4, 5)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06011C08, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06011C08.genericHeader), 2, 0.0f); + this->action = 8; + this->drawConfig = 2; + this->unk_26C = 0; + this->actor.shape.unk_14 = 0; + this->unk_268 = 0.0f; + func_809858A8(); + } +} + +void func_809859E0(DemoIm* this, GlobalContext* globalCtx) { + f32* unk_268 = &this->unk_268; + s32 alpha = 255; + + if (func_809850E8(this, globalCtx, 4, 5)) { + *unk_268 += 1.0f; + if (*unk_268 >= kREG(5) + 10.0f) { + this->action = 9; + this->drawConfig = 1; + *unk_268 = kREG(5) + 10.0f; + this->unk_26C = this->actor.shape.unk_14 = alpha; + return; + } + } else { + *unk_268 -= 1.0f; + if (*unk_268 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_268 = 0.0f; + this->unk_26C = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + this->actor.shape.unk_14 = this->unk_26C = (*unk_268 / (kREG(5) + 10.0f)) * 255.0f; +} + +void func_80985B34(DemoIm* this, GlobalContext* globalCtx) { + if (func_80985134(this, globalCtx, 4, 5)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06012218, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06012218.genericHeader), 2, -8.0f); + this->action = 8; + this->drawConfig = 2; + this->unk_268 = kREG(5) + 10.0f; + this->unk_26C = 255; + if (this->unk_270 == 0) { + func_809858C8(this, globalCtx); + this->unk_270 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80985C10(DemoIm* this, GlobalContext* globalCtx) { + func_80985948(this, globalCtx); + func_80984C8C(this, globalCtx); +} + +void func_80985C40(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_809859E0(this, globalCtx); + func_80984C8C(this, globalCtx); +} + +void func_80985C94(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80985B34(this, globalCtx); + func_80984C8C(this, globalCtx); +} + +void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_25C = this->unk_25C; + UNK_PTR sp68 = D_80987830[unk_25C]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 281); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->unk_26C); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + + 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_im_inKenjyanomaDemo02.c", 308); +} + +void func_80985E60(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->action = 10; + this->unk_280 = 1; +} + +void func_80985EAC(DemoIm* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.frames >= 80) && (globalCtx->csCtx.frames < 243)) { + func_80984F10(this, globalCtx); + } else { + func_80984DB8(this); + } +} + +void func_80985EF4(DemoIm* this) { + if (!func_800A56C8(&this->skelAnime, SkelAnime_GetFrameCount(&D_0601182C.genericHeader) - 1.0f)) { + func_80985060(this); + } +} + +void func_80985F54(DemoIm* this) { + this->action = 10; + this->drawConfig = 0; +} + +void func_80985F64(DemoIm* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868.genericHeader), + 0, 0.0f); + func_80985180(this, globalCtx, 5); + this->action = 11; + this->drawConfig = 1; +} + +void func_80985FE8(DemoIm* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0601182C.genericHeader), 0, -8.0f); + } +} + +void func_8098604C(DemoIm* this) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06010EE0.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06010EE0, 1.0f, 0.0f, frameCount, 2, -8.0f); + this->action = 12; + this->drawConfig = 1; + this->unk_2D0 = 1; +} + +void func_809860C8(DemoIm* this) { + this->action = 13; + this->drawConfig = 1; +} + +void func_809860DC(DemoIm* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06001868.genericHeader), 0, -8.0f); + this->unk_2D0 = 0; + } +} + +void func_80986148(DemoIm* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06010EE0, -1.0f, SkelAnime_GetFrameCount(&D_06010EE0.genericHeader), 0.0f, + 2, -8.0f); + this->action = 14; + this->drawConfig = 1; +} + +void func_809861C4(DemoIm* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5); + + if (npcAction != NULL) { + u32 action = npcAction->action; + u32 unk_274 = this->unk_274; + + if (action != unk_274) { + switch (action) { + case 9: + func_80986148(this); + break; + case 7: + SkelAnime_ChangeAnim(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0601182C.genericHeader), 0, -8.0f); + this->action = 12; + break; + default: + osSyncPrintf("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_274 = action; + } + } +} + +void func_8098629C(DemoIm* this, GlobalContext* globalCtx) { + if (func_80985080(globalCtx)) { + this->action = 21; + this->drawConfig = 1; + this->unk_280 = 1; + } +} + +void func_809862E0(DemoIm* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5); + + if (npcAction != NULL) { + u32 action = npcAction->action; + u32 unk_274 = this->unk_274; + if (action != unk_274) { + switch (action) { + case 1: + func_80985F54(this); + break; + case 2: + func_80985F64(this, globalCtx); + break; + case 7: + func_8098604C(this); + break; + case 8: + func_809860C8(this); + break; + case 9: + func_80986148(this); + break; + default: + osSyncPrintf("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_274 = action; + } + } +} + +void func_809863BC(DemoIm* this, GlobalContext* globalCtx) { + func_809862E0(this, globalCtx); +} + +void func_809863DC(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80985EAC(this, globalCtx); + func_80984BE0(this); + func_809862E0(this, globalCtx); +} + +void func_80986430(DemoIm* this, GlobalContext* globalCtx) { + s32 sp24; + + func_80985018(this, globalCtx); + sp24 = func_80985060(this); + func_80985EAC(this, globalCtx); + func_80984BE0(this); + func_80985FE8(this, sp24); + func_809862E0(this, globalCtx); +} + +void func_80986494(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985EF4(this); + func_80984BE0(this); + func_809861C4(this, globalCtx); +} + +void func_809864D4(DemoIm* this, GlobalContext* globalCtx) { + s32 sp24; + + func_80985018(this, globalCtx); + sp24 = func_80985060(this); + func_80984BE0(this); + func_809860DC(this, sp24); + func_8098629C(this, globalCtx); +} + +void func_8098652C(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->action = 15; +} + +void func_80986570(DemoIm* this, GlobalContext* globalCtx) { + if ((func_800A56C8(&this->skelAnime, 7.0f)) && (this->actor.bgCheckFlags & 1)) { + u32 sfxId = SFX_FLAG; + + sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + Audio_PlaySoundGeneral(sfxId, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } +} + +void func_809865F8(DemoIm* this, GlobalContext* globalCtx, s32 arg2) { + s32 pad[2]; + + if (arg2 != 0) { + f32* unk_278 = &this->unk_278; + + if (*unk_278 >= 0.0f) { + if (this->unk_27C == 0) { + Vec3f* thisPos = &this->actor.posRot.pos; + s16 shapeRotY = this->actor.shape.rot.y; + f32 spawnPosX = thisPos->x + (Math_Sins(shapeRotY) * 30.0f); + f32 spawnPosY = thisPos->y; + f32 spawnPosZ = thisPos->z + (Math_Coss(shapeRotY) * 30.0f); + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, spawnPosX, spawnPosY, spawnPosZ, 0xFA0, + this->actor.shape.rot.y, 0, 0xFFF6); + this->unk_27C = 1; + } + } else { + *unk_278 += 1.0f; + } + } +} + +void func_80986700(DemoIm* this) { + this->action = 15; + this->drawConfig = 0; +} + +void func_80986710(DemoIm* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06001868, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06001868.genericHeader), + 0, 0.0f); + func_80985180(this, globalCtx, 5); + this->action = 16; + this->drawConfig = 1; +} + +void func_80986794(DemoIm* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060014E4, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060014E4.genericHeader), + 2, -8.0f); + this->action = 17; + this->drawConfig = 1; +} + +void func_8098680C(DemoIm* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5); + + if (npcAction != NULL) { + u32 action = npcAction->action; + u32 unk_274 = this->unk_274; + + if (action != unk_274) { + switch (action) { + case 1: + func_80986700(this); + break; + case 2: + func_80986710(this, globalCtx); + break; + case 10: + func_80986794(this); + break; + case 11: + Actor_Kill(&this->actor); + break; + default: + osSyncPrintf("Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_274 = action; + } + } +} + +void func_809868E8(DemoIm* this, GlobalContext* globalCtx) { + func_8098680C(this, globalCtx); +} + +void func_80986908(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_8098680C(this, globalCtx); +} + +void func_80986948(DemoIm* this, GlobalContext* globalCtx) { + s32 sp24; + + func_80985018(this, globalCtx); + sp24 = func_80985060(this); + func_80986570(this, globalCtx); + func_80984BE0(this); + func_809865F8(this, globalCtx, sp24); + func_8098680C(this, globalCtx); +} + +void func_809869B0(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->action = 18; + this->actor.shape.unk_14 = 0; +} + +s32 func_809869F8(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 playerPosX = player->actor.posRot.pos.x; + f32 thisPosX = this->actor.posRot.pos.x; + + if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && (!(this->actor.flags & 0x40))) { + return 1; + } + return 0; +} + +s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 playerPosX = player->actor.posRot.pos.x; + f32 thisPosX = this->actor.posRot.pos.x; + + if ((thisPosX - (kREG(17) + 130.0f) < playerPosX) && (!Gameplay_InCsMode(globalCtx))) { + return 1; + } + return 0; +} + +s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) { + this->actor.flags |= 9; + if (!func_8002F194(&this->actor, globalCtx)) { + this->actor.textId = 0x708E; + func_8002F2F4(&this->actor, globalCtx); + } else { + return 1; + } + return 0; +} + +void func_80986B2C(GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + Player* player = PLAYER; + + globalCtx->nextEntranceIndex = 0xCD; + globalCtx->fadeTransition = 38; + globalCtx->sceneLoadFlag = 0x14; + func_8002DF54(globalCtx, &player->actor, 8); + } +} + +void func_80986BA0(DemoIm* this, GlobalContext* globalCtx) { + if (func_809869F8(this, globalCtx)) { + this->action = 21; + this->drawConfig = 1; + this->unk_280 = 1; + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80986BE4(DemoIm* this, s32 arg1) { + if (arg1 != 0) { + this->action = 22; + } +} + +void func_80986BF8(DemoIm* this, GlobalContext* globalCtx) { + if (gSaveContext.eventChkInf[4] & 1) { + this->action = 24; + this->drawConfig = 1; + this->unk_280 = 1; + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80986C30(DemoIm* this, GlobalContext* globalCtx) { + if (func_80986A5C(this, globalCtx)) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02002524); + gSaveContext.cutsceneTrigger = 1; + gSaveContext.eventChkInf[5] |= 0x200; + Item_Give(globalCtx, GI_BULLET_BAG_40); + func_80985F54(this); + } +} + +void func_80986CC8(DemoIm* this) { + if (gSaveContext.eventChkInf[4] & 1) { + this->action = 26; + this->drawConfig = 1; + this->unk_280 = 1; + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80986CFC(DemoIm* this, GlobalContext* globalCtx) { + if (func_80986A5C(this, globalCtx)) { + gSaveContext.eventChkInf[4] |= 0x1000; + this->action = 19; + } +} + +void func_80986D40(DemoIm* this, GlobalContext* globalCtx) { + if (gSaveContext.sceneSetupIndex == 6) { + this->action = 19; + this->drawConfig = 1; + } else if (gSaveContext.eventChkInf[8] & 1) { + Actor_Kill(&this->actor); + } else if (!(gSaveContext.eventChkInf[5] & 0x200)) { + this->action = 23; + } else { + this->action = 20; + } +} + +void func_80986DC8(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80984E58(this, globalCtx); + this->actor.flags &= ~0x9; +} + +void func_80986E20(DemoIm* this, GlobalContext* globalCtx) { + func_80986BA0(this, globalCtx); +} + +void func_80986E40(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80984E58(this, globalCtx); + func_80984D74(this, globalCtx); + func_80986BE4(this, func_80986AD0(this, globalCtx)); +} + +void func_80986EAC(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80984F94(this, globalCtx); + func_80984D74(this, globalCtx); + func_80986B2C(globalCtx); +} + +void func_80986F08(DemoIm* this, GlobalContext* globalCtx) { + func_80986BF8(this, globalCtx); +} + +void func_80986F28(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80984E58(this, globalCtx); + func_80984D74(this, globalCtx); + func_80986C30(this, globalCtx); +} + +void func_80986F88(DemoIm* this, GlobalContext* globalCtx) { + func_80986CC8(this); +} + +void func_80986FA8(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80984E58(this, globalCtx); + this->actor.flags &= ~0x9; + func_80984D74(this, globalCtx); + func_80986CFC(this, globalCtx); +} + +void func_80987018(DemoIm* this, GlobalContext* globalCtx) { + func_80985280(this, &D_06001868, 0, 0.0f, 0); + this->action = 27; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80987064(DemoIm* this) { + f32* unk_268 = &this->unk_268; + f32 temp; + s32 alpha = 255; + + *unk_268 += 1.0f; + temp = kREG(17) + 10.0f; + + if (*unk_268 >= temp) { + this->actor.shape.unk_14 = this->unk_26C = alpha; + } else { + this->actor.shape.unk_14 = this->unk_26C = (*unk_268 / temp) * 255.0f; + } +} + +void func_809870F0(DemoIm* this, GlobalContext* globalCtx) { + func_80985200(this, globalCtx, 5); + this->action = 28; + this->drawConfig = 2; +} + +void func_80987128(DemoIm* this) { + if (this->unk_268 >= kREG(17) + 10.0f) { + this->action = 29; + this->drawConfig = 1; + } +} + +void func_80987174(DemoIm* this) { + func_80985280(this, &D_060101C8, 2, -8.0f, 0); + this->action = 30; +} + +void func_809871B4(DemoIm* this, s32 arg1) { + if (arg1 != 0) { + func_80985280(this, &D_0600FB10, 0, 0.0f, 0); + } +} + +void func_809871E8(DemoIm* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5); + + if (npcAction != NULL) { + u32 action = npcAction->action; + u32 unk_274 = this->unk_274; + + if (action != unk_274) { + switch (action) { + case 12: + func_809870F0(this, globalCtx); + break; + case 13: + func_80987174(this); + break; + default: + osSyncPrintf("Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_274 = action; + } + } +} + +void func_80987288(DemoIm* this, GlobalContext* globalCtx) { + func_809871E8(this, globalCtx); +} + +void func_809872A8(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_80987064(this); + func_80987128(this); +} + +void func_809872F0(DemoIm* this, GlobalContext* globalCtx) { + func_80985018(this, globalCtx); + func_80985060(this); + func_80984BE0(this); + func_809871E8(this, globalCtx); +} + +void func_80987330(DemoIm* this, GlobalContext* globalCtx) { + s32 sp1C; + + func_80985018(this, globalCtx); + sp1C = func_80985060(this); + func_80984BE0(this); + func_809871B4(this, sp1C); +} + +void DemoIm_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoIm* this = THIS; + + if ((this->action < 0) || (this->action >= 31) || (sActionFuncs[this->action] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoIm* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + func_80984D00(thisx, globalCtx); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600F788, NULL, this->limbDrawTable, this->transitionDrawTable, + 17); + thisx->flags &= ~1; + + switch (this->actor.params) { + case 2: + func_80985860(this, globalCtx); + break; + case 3: + func_80985E60(this, globalCtx); + break; + case 4: + func_8098652C(this, globalCtx); + break; + case 5: + func_809869B0(this, globalCtx); + break; + case 6: + func_80987018(this, globalCtx); + break; + default: + func_80985310(this, globalCtx); + } +} + +void DemoIm_Destroy(Actor* thisx, GlobalContext* globalCtx) { + func_80984D4C(thisx, globalCtx); +} + +s32 func_80987514(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + DemoIm* this = THIS; + s32* unk_2D0 = &this->unk_2D0; + + if (this->unk_280 != 0) { + Vec3s* unk_2D4_unk_0E = &this->unk_2D4.unk_0E; + Vec3s* unk_2D4_unk_08 = &this->unk_2D4.unk_08; + + switch (limbIndex) { + case 9: + rot->x += unk_2D4_unk_0E->y; + rot->y -= unk_2D4_unk_0E->x; + break; + case 16: + rot->x += unk_2D4_unk_08->y; + rot->z += unk_2D4_unk_08->x; + break; + } + } + + if (*unk_2D0 != 0) { + if (limbIndex == 15) { + *dList = &D_0600EDE8; + } + } + return 0; +} + +void func_809875C0(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + s32 pad; + + if (limbIndex == 0x10) { + Vec3f sp28 = D_809887D8; + Vec3f dest; + + Matrix_MultVec3f(&sp28, &dest); + thisx->posRot2.pos.x = dest.x; + thisx->posRot2.pos.y = dest.y; + thisx->posRot2.pos.z = dest.z; + thisx->posRot2.rot.x = thisx->posRot.rot.x; + thisx->posRot2.rot.y = thisx->posRot.rot.y; + thisx->posRot2.rot.z = thisx->posRot.rot.z; + } +} + +void func_8098764C(DemoIm* this, GlobalContext* globalCtx) { +} + +void func_80987658(DemoIm* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_25C = this->unk_25C; + UNK_PTR sp68 = D_80987830[unk_25C]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_im.c", 904); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp68)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp68)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, func_80987514, + func_809875C0, &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_im.c", 925); +} + +void DemoIm_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoIm* 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_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h index 7aa60de2ac..f4f00fe254 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h @@ -6,9 +6,28 @@ struct DemoIm; +typedef void (*DemoImActionFunc)(struct DemoIm*, GlobalContext*); +typedef void (*DemoImDrawFunc)(struct DemoIm*, GlobalContext*); + typedef struct DemoIm { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1B0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[17]; + /* 0x01F6 */ Vec3s transitionDrawTable[17]; + /* 0x025C */ s16 unk_25C; + /* 0x025E */ s16 unk_25E; + /* 0x0260 */ s32 action; + /* 0x0264 */ s32 drawConfig; + /* 0x0268 */ f32 unk_268; + /* 0x026C */ s32 unk_26C; + /* 0x0270 */ s32 unk_270; + /* 0x0274 */ s32 unk_274; + /* 0x0278 */ f32 unk_278; + /* 0x027C */ s32 unk_27C; + /* 0x0280 */ s32 unk_280; + /* 0x0284 */ ColliderCylinder collider; + /* 0x02D0 */ s32 unk_2D0; + /* 0x02D4 */ struct_80034A14_arg1 unk_2D4; } DemoIm; // size = 0x02FC extern const ActorInit Demo_Im_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c new file mode 100644 index 0000000000..aa2ee5f028 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c @@ -0,0 +1,222 @@ +#include "z_demo_im.h" +#include + +// clang-format off +CutsceneData D_8098786C[] = { + CS_BEGIN_CUTSCENE(32, 3000), + CS_UNK_DATA_LIST(0x00000020, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(31, 5), + CS_NPC_ACTION(0x0001, 0, 697, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 697, 698, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 698, 768, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 768, 817, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 82, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0003, 817, 2666, 0x0000, 0x0000, 0x0000, 0, 82, 0, 0, 82, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION_LIST(3), + CS_PLAYER_ACTION(0x000D, 0, 300, 0x0000, 0x0000, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION(0x0005, 300, 661, 0x0000, 0xEAAA, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION(0x0013, 661, 1934, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(44, 3), + CS_NPC_ACTION(0x0001, 0, 145, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 145, 615, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0003, 615, 1906, 0x0000, 0x0000, 0x0000, -97, 6, 169, -97, 6, 169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(49, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, -22, 0, -55, -22, 0, -55, 0.0f, 0.0f, 0.0f), + CS_LIGHTING_LIST(2), + CS_LIGHTING(0x0002, 0, 10, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0xFFFFFFFE, 0x00000000, 0x0000000D), + CS_LIGHTING(0x0002, 10, 3000, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x0000000D, 0xFFFFFFFE, 0x00000000, 0x0000000D), + CS_SCENE_TRANS_FX(0x0005, 694, 724), + CS_SCENE_TRANS_FX(0x0001, 960, 990), + CS_SCENE_TRANS_FX(0x0001, 683, 692), + CS_NPC_ACTION_LIST(62, 2), + CS_NPC_ACTION(0x0001, 0, 10, 0x0000, 0x0000, 0x0000, 64, 80, 130, 64, 80, 130, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 10, 3000, 0x0000, 0x0000, 0x0000, 64, 80, 130, 64, 80, 130, 0.0f, 0.0f, 0.0f), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x0044, 770, 771, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC9, 0x0000005C, 0x00000000, 0xFFFFFFC9, 0x0000005C), + CS_TEXT_LIST(14), + CS_TEXT_NONE(0, 340), + CS_TEXT_DISPLAY_TEXTBOX(0x5022, 340, 353, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(353, 374), + CS_TEXT_DISPLAY_TEXTBOX(0x5025, 374, 404, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(404, 424), + CS_TEXT_DISPLAY_TEXTBOX(0x502B, 424, 474, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(474, 494), + CS_TEXT_DISPLAY_TEXTBOX(0x502C, 494, 543, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(543, 564), + CS_TEXT_DISPLAY_TEXTBOX(0x5026, 564, 613, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(613, 955), + CS_TEXT_DISPLAY_TEXTBOX(0x0041, 955, 959, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(959, 1020), + CS_TEXT_DISPLAY_TEXTBOX(0x5023, 1020, 1029, 0x0000, 0x0000, 0x0000), + CS_TERMINATOR(GRAVEYARD_AFTER_SHADOW_BLUE_WARP, 1060, 1061), + CS_FADE_BGM_LIST(1), + CS_FADE_BGM(0x0004, 673, 723, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC1, 0x00000058, 0x00000000, 0xFFFFFFC1, 0x00000058), + CS_CAM_POS_LIST(0, 341), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 33, 225, -58, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 33, 225, -58, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 33, 225, -58, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 33, 106, -58, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 33, 23, -58, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 11, 10, -18, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 11, 10, -18, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, 11, 10, -18, 0xE6A0), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.60000228881836f, 11, 10, -18, 0x7C53), + CS_CAM_POS_LIST(263, 504), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 22.626956939697266f, -49, 13, 158, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 22.626956939697266f, -49, 13, 158, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 22.626956939697266f, -49, 13, 158, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 22.626956939697266f, -21, 22, 150, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 33.22699737548828f, -21, 22, 150, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 33.22699737548828f, -21, 22, 150, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 33.22699737548828f, -21, 22, 150, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 33.22699737548828f, -21, 22, 150, 0xE6A0), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 33.22699737548828f, -21, 22, 150, 0x7C53), + CS_CAM_POS_LIST(363, 824), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -67, 8, 117, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.79991149902344f, -67, 8, 117, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.79991149902344f, -67, 8, 117, 0xE6A0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.79991149902344f, -67, 8, 117, 0x7C53), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.79991149902344f, -67, 8, 117, 0x0000), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 70.79991149902344f, -67, 8, 117, 0x0000), + CS_CAM_POS_PLAYER_LIST(413, 1504), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 19.999849319458008f, -53, 28, 45, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 19.999849319458008f, -53, 28, 45, 0xD5E0), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 19.999849319458008f, -53, 28, 45, 0x0950), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 19.999849319458008f, -53, 28, 45, 0x7C50), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 19.999849319458008f, -53, 28, 45, 0x0000), + CS_CAM_POS_LIST(483, 1684), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -67, 8, 117, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -67, 8, 117, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -67, 8, 117, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -71, 15, 124, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -73, 29, 131, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -78, 40, 140, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -78, 40, 140, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 68.91905975341797f, -78, 40, 140, 0xE6A0), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 68.91905975341797f, -78, 40, 140, 0x7C53), + CS_CAM_POS_LIST(553, 1644), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, -39, 34, 201, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, -39, 34, 201, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, -39, 34, 201, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, -39, 34, 201, 0x7C50), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.599945068359375f, -39, 34, 201, 0x0000), + CS_CAM_POS_LIST(623, 819), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 9, 13, -17, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 9, 13, -17, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 9, 13, -17, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 9, 71, -17, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 126.99905395507812f, 9, 385, -17, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 126.99905395507812f, 9, 385, -17, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 126.99905395507812f, 9, 385, -17, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 126.99905395507812f, 9, 385, -17, 0xE6A0), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 126.99905395507812f, 9, 385, -17, 0x7C53), + CS_CAM_POS_LIST(693, 1035), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 13, 854, 2, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 853, 5, 0xD5E0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -3, 853, 5, 0x0950), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 853, -6, 0x7C50), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -2, 852, -17, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, -17, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 16, 852, -6, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, 5, 0xE6A0), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -3, 851, 5, 0x7C53), + CS_CAM_POS_PLAYER_LIST(769, 1950), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0xD5E0), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 68, -26, 0x0950), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x7C50), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0xFFFF), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0xE6A0), + CS_CAM_FOCUS_POINT_LIST(0, 370), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -21, 21, 42, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.60000228881836f, -21, 21, 42, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.60000228881836f, -21, 21, 42, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.60000228881836f, -78, 86, 144, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.60000228881836f, -80, 21, 142, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.60000228881836f, -99, 31, 177, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -99, 31, 177, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -99, 31, 177, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.60000228881836f, -99, 31, 177, 0x7C53), + CS_CAM_FOCUS_POINT_LIST(263, 533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 22.626956939697266f, -309, 11, 229, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 22.626956939697266f, -309, 11, 229, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 22.626956939697266f, -309, 11, 229, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 33.22699737548828f, -258, 133, 191, 0x7C53), + CS_CAM_FOCUS_POINT_LIST(363, 853), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 68.79994201660156f, 68, 109, -103, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 68.99993896484375f, 68, 109, -103, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 68.79994201660156f, 67, 109, -103, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 68.59994506835938f, 189, 109, 92, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 68.59994506835938f, 57, 108, 341, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 70.79991149902344f, -186, 107, 341, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 70.79991149902344f, -186, 107, 341, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 70.79991149902344f, -186, 107, 341, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.79991149902344f, -186, 107, 341, 0x7C53), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.79991149902344f, -186, 107, 341, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 70.79991149902344f, -186, 107, 341, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER_LIST(413, 1533), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 19.999849319458008f, 171, 122, -106, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 19.999849319458008f, 171, 122, -106, 0xD5E0), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 19.999849319458008f, 171, 122, -106, 0x0950), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 19.999849319458008f, 170, 122, -106, 0x7C50), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 19.999849319458008f, 170, 122, -106, 0x0000), + CS_CAM_FOCUS_POINT_LIST(483, 1713), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x01, 20, 68.91905975341797f, -191, 132, 327, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 68.91905975341797f, -191, 132, 327, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0xFF, 30, 68.91905975341797f, -190, 131, 326, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 68.91905975341797f, -189, 154, 324, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x01, 30, 68.91905975341797f, -194, 162, 331, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 68.91905975341797f, -199, 172, 339, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 68.91905975341797f, -199, 172, 339, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 68.91905975341797f, -199, 172, 339, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 68.91905975341797f, -199, 172, 339, 0x7C53), + CS_CAM_FOCUS_POINT_LIST(553, 1673), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -234, 123, 37, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -234, 123, 37, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.599945068359375f, -234, 123, 37, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -234, 123, 37, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.599945068359375f, -233, 123, 37, 0x0000), + CS_CAM_FOCUS_POINT_LIST(623, 848), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, -52, 17, 91, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, -52, 17, 91, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 70.59991455078125f, -52, 17, 91, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 70.59991455078125f, -52, 75, 91, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 126.99905395507812f, -5, 503, 9, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 126.99905395507812f, -5, 503, 9, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 126.99905395507812f, -5, 503, 9, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 126.99905395507812f, -5, 503, 9, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 126.99905395507812f, -5, 503, 9, 0x7C53), + CS_CAM_FOCUS_POINT_LIST(693, 1084), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.0f, 3, 6, -6, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.0f, 3, 6, -6, 0xD5E0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.99996566772461f, 3, 6, -6, 0x0950), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 20.599849700927734f, 3, 6, -6, 0x7C50), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 51, 10.799838066101074f, 3, 6, -6, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.199838638305664f, 3, 6, -6, 0xE6A0), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 50, 10.999837875366211f, 3, 6, -6, 0x7C53), + CS_CAM_FOCUS_POINT_PLAYER_LIST(769, 1979), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 100, 5, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 101, 6, 0xD5E0), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 1, 99, 41, 0x0950), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x7C50), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 68.59994506835938f, 0, 42, 16, 0xFFFF), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0xE6A0), + CS_END(), +}; +// clang-format on diff --git a/undefined_syms.txt b/undefined_syms.txt index b2f3dcb37a..751c91496a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -383,6 +383,21 @@ D_06004930 = 0x06004930; D_0600E680 = 0x0600E680; D_0600FEF0 = 0x0600FEF0; +// z_demo_im +D_02002524 = 0x02002524; +D_06000710 = 0x06000710; +D_06000AFC = 0x06000AFC; +D_0600EDE8 = 0x0600EDE8; +D_060014E4 = 0x060014E4; +D_06001868 = 0x06001868; +D_0600FB10 = 0x0600FB10; +D_0600F788 = 0x0600F788; +D_060101C8 = 0x060101C8; +D_06010EE0 = 0x06010EE0; +D_0601182C = 0x0601182C; +D_06011C08 = 0x06011C08; +D_06012218 = 0x06012218; + // z_demo_sa D_06001334 = 0x06001334; D_060021D8 = 0x060021D8;