From 9834f5517e5a3c4e560c20f35eb078ba1895e773 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sat, 3 Apr 2021 13:15:16 -0300 Subject: [PATCH] EnDivingGame OK (#745) * update * EnDivingGame_Draw OK * dont feel like working on this function today * fixed build errors * fixing some merge conflicts Signed-off-by: Angie * more conflict fixing Signed-off-by: Angie * all merge conflicts fixed Signed-off-by: Angie * EnDivingGame_Update OK Signed-off-by: Angie * remove DECR Signed-off-by: Angie * format and unused_asm Signed-off-by: Angie * change reloc in spec Signed-off-by: Angie * damn reloc Signed-off-by: Angie * Apply suggestions from code review Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * use OPEN_DISPS macro Signed-off-by: Angie * batch of suggestions Signed-off-by: Angie * more suggestions Signed-off-by: Angie * more changes, but this isn't ready yet Signed-off-by: Angie * rename two timers Signed-off-by: angie * Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * grabbedRuppiesCounter Signed-off-by: angie * a lot of vec Signed-off-by: angie * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * fix some typos Signed-off-by: angie * allRupeesThrowed Signed-off-by: angie * rupeesLeftToThrow Signed-off-by: Angie * boolean changes and minor comments Signed-off-by: Angie * and more renaming Signed-off-by: Angie * renaiming and chained assign Signed-off-by: Angie * rename 3 functions Signed-off-by: Angie * final rename and add two enums Signed-off-by: angie * format Signed-off-by: angie * enum naming Signed-off-by: angie Co-authored-by: Lucas Shaw Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> --- .../ovl_En_Diving_Game/EnDivingGame_Destroy.s | 18 - .../ovl_En_Diving_Game/EnDivingGame_Draw.s | 94 --- .../ovl_En_Diving_Game/EnDivingGame_Init.s | 109 ---- .../ovl_En_Diving_Game/EnDivingGame_Update.s | 151 ----- .../actors/ovl_En_Diving_Game/func_809ED9E0.s | 86 --- .../actors/ovl_En_Diving_Game/func_809EDB08.s | 113 ---- .../actors/ovl_En_Diving_Game/func_809EDCB0.s | 42 -- .../actors/ovl_En_Diving_Game/func_809EDD4C.s | 116 ---- .../actors/ovl_En_Diving_Game/func_809EDEDC.s | 101 ---- .../actors/ovl_En_Diving_Game/func_809EE048.s | 50 -- .../actors/ovl_En_Diving_Game/func_809EE0FC.s | 41 -- .../actors/ovl_En_Diving_Game/func_809EE194.s | 27 - .../actors/ovl_En_Diving_Game/func_809EE1F4.s | 144 ----- .../actors/ovl_En_Diving_Game/func_809EE408.s | 192 ------- .../actors/ovl_En_Diving_Game/func_809EE6C8.s | 49 -- .../actors/ovl_En_Diving_Game/func_809EE780.s | 35 -- .../actors/ovl_En_Diving_Game/func_809EE800.s | 65 --- .../actors/ovl_En_Diving_Game/func_809EE8F0.s | 35 -- .../actors/ovl_En_Diving_Game/func_809EE96C.s | 40 -- .../actors/ovl_En_Diving_Game/func_809EEA00.s | 39 -- .../actors/ovl_En_Diving_Game/func_809EEA90.s | 30 - .../actors/ovl_En_Diving_Game/func_809EEAF8.s | 51 -- .../actors/ovl_En_Diving_Game/func_809EEDB8.s | 13 - .../actors/ovl_En_Diving_Game/func_809EEDE4.s | 95 --- data/overlays/actors/z_en_diving_game.data.s | 24 - data/overlays/actors/z_en_diving_game.reloc.s | 13 - include/functions.h | 3 +- spec | 3 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 544 +++++++++++++++++- .../ovl_En_Diving_Game/z_en_diving_game.h | 78 +-- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 10 +- undefined_syms.txt | 5 + 32 files changed, 565 insertions(+), 1851 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s delete mode 100644 data/overlays/actors/z_en_diving_game.data.s delete mode 100644 data/overlays/actors/z_en_diving_game.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s deleted file mode 100644 index 02a25cf602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel EnDivingGame_Destroy -/* 00134 809ED9A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00138 809ED9A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0013C 809ED9AC 908E031F */ lbu $t6, 0x031F($a0) ## 0000031F -/* 00140 809ED9B0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00144 809ED9B4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00148 809ED9B8 15C00003 */ bne $t6, $zero, .L809ED9C8 -/* 0014C 809ED9BC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00150 809ED9C0 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 00154 809ED9C4 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) -.L809ED9C8: -/* 00158 809ED9C8 0C0170EB */ jal Collider_DestroyCylinder - -/* 0015C 809ED9CC 24C5034C */ addiu $a1, $a2, 0x034C ## $a1 = 0000034C -/* 00160 809ED9D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00164 809ED9D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00168 809ED9D8 03E00008 */ jr $ra -/* 0016C 809ED9DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s deleted file mode 100644 index d27686f0c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_809EF17C - .asciz "../z_en_diving_game.c" - .balign 4 - -glabel D_809EF194 - .asciz "../z_en_diving_game.c" - .balign 4 - -.text -glabel EnDivingGame_Draw -/* 016D4 809EEF44 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) -/* 016DC 809EEF4C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 016E0 809EEF50 AFBF0034 */ sw $ra, 0x0034($sp) -/* 016E4 809EEF54 AFB1002C */ sw $s1, 0x002C($sp) -/* 016E8 809EEF58 AFB00028 */ sw $s0, 0x0028($sp) -/* 016EC 809EEF5C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 016F0 809EEF60 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 016F4 809EEF64 3C06809F */ lui $a2, %hi(D_809EF17C) ## $a2 = 809F0000 -/* 016F8 809EEF68 24C6F17C */ addiu $a2, $a2, %lo(D_809EF17C) ## $a2 = 809EF17C -/* 016FC 809EEF6C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 01700 809EEF70 240704BC */ addiu $a3, $zero, 0x04BC ## $a3 = 000004BC -/* 01704 809EEF74 0C031AB1 */ jal Graph_OpenDisps -/* 01708 809EEF78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 -/* 01710 809EEF80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 01714 809EEF84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01718 809EEF88 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 0171C 809EEF8C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01720 809EEF90 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01724 809EEF94 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 01728 809EEF98 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0172C 809EEF9C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 01730 809EEFA0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01734 809EEFA4 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 01738 809EEFA8 35080030 */ ori $t0, $t0, 0x0030 ## $t0 = DB060030 -/* 0173C 809EEFAC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01740 809EEFB0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01744 809EEFB4 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01748 809EEFB8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0174C 809EEFBC 0C27BB6E */ jal func_809EEDB8 -/* 01750 809EEFC0 AFA20044 */ sw $v0, 0x0044($sp) -/* 01754 809EEFC4 8FA30044 */ lw $v1, 0x0044($sp) -/* 01758 809EEFC8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0175C 809EEFCC 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 01760 809EEFD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01764 809EEFD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01768 809EEFD8 3C04809F */ lui $a0, %hi(D_809EF0E0) ## $a0 = 809F0000 -/* 0176C 809EEFDC 3C198016 */ lui $t9, %hi(gSegments) -/* 01770 809EEFE0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01774 809EEFE4 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 01778 809EEFE8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0177C 809EEFEC 862B029E */ lh $t3, 0x029E($s1) ## 0000029E -/* 01780 809EEFF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01784 809EEFF4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01788 809EEFF8 000B6080 */ sll $t4, $t3, 2 -/* 0178C 809EEFFC 008C2021 */ addu $a0, $a0, $t4 -/* 01790 809EF000 8C84F0E0 */ lw $a0, %lo(D_809EF0E0)($a0) -/* 01794 809EF004 3C0A809F */ lui $t2, %hi(func_809EEDE4) ## $t2 = 809F0000 -/* 01798 809EF008 254AEDE4 */ addiu $t2, $t2, %lo(func_809EEDE4) ## $t2 = 809EEDE4 -/* 0179C 809EF00C 00047100 */ sll $t6, $a0, 4 -/* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 -/* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 -/* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 -/* 017AC 809EF01C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 017B0 809EF020 00816824 */ and $t5, $a0, $at -/* 017B4 809EF024 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 -/* 017BC 809EF02C 01014821 */ addu $t1, $t0, $at -/* 017C0 809EF030 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 017C4 809EF034 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 017C8 809EF038 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 017CC 809EF03C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 017D0 809EF040 AFB10018 */ sw $s1, 0x0018($sp) -/* 017D4 809EF044 AFA00014 */ sw $zero, 0x0014($sp) -/* 017D8 809EF048 AFAA0010 */ sw $t2, 0x0010($sp) -/* 017DC 809EF04C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 017E0 809EF050 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 017E4 809EF054 3C06809F */ lui $a2, %hi(D_809EF194) ## $a2 = 809F0000 -/* 017E8 809EF058 24C6F194 */ addiu $a2, $a2, %lo(D_809EF194) ## $a2 = 809EF194 -/* 017EC 809EF05C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 017F0 809EF060 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017F4 809EF064 0C031AD5 */ jal Graph_CloseDisps -/* 017F8 809EF068 240704D0 */ addiu $a3, $zero, 0x04D0 ## $a3 = 000004D0 -/* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) -/* 01804 809EF074 8FB1002C */ lw $s1, 0x002C($sp) -/* 01808 809EF078 8FB20030 */ lw $s2, 0x0030($sp) -/* 0180C 809EF07C 03E00008 */ jr $ra -/* 01810 809EF080 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 01814 809EF084 00000000 */ nop -/* 01818 809EF088 00000000 */ nop -/* 0181C 809EF08C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s deleted file mode 100644 index 3770cd772c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ /dev/null @@ -1,109 +0,0 @@ -.rdata -glabel D_809EF0F0 - .asciz "\x1b[32m☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.balign 4 - -glabel D_809EF120 - .asciz "\x1b[32m☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.balign 4 - -.late_rodata -glabel D_809EF1AC - .float 0.01 - -glabel D_809EF1B0 - .word 0x3C54FDF3 -glabel D_809EF1B4 - .word 0x3C656041 - -.text -glabel EnDivingGame_Init -/* 00000 809ED870 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809ED874 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00008 809ED878 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 0000C 809ED87C AFB00028 */ sw $s0, 0x0028($sp) -/* 00010 809ED880 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) -/* 0001C 809ED88C 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00020 809ED890 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00024 809ED894 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00028 809ED898 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 0002C 809ED89C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00030 809ED8A0 0C00AC78 */ jal ActorShape_Init - -/* 00034 809ED8A4 E484FFB8 */ swc1 $f4, -0x0048($a0) ## 0000006C -/* 00038 809ED8A8 3C060601 */ lui $a2, %hi(D_0600BFA8) ## $a2 = 06010000 -/* 0003C 809ED8AC 3C070600 */ lui $a3, %hi(D_06002FE8) ## $a3 = 06000000 -/* 00040 809ED8B0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 00044 809ED8B4 260F0208 */ addiu $t7, $s0, 0x0208 ## $t7 = 00000208 -/* 00048 809ED8B8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 809ED8C8 24E72FE8 */ addiu $a3, $a3, %lo(D_06002FE8) ## $a3 = 06002FE8 -/* 0005C 809ED8CC 24C6BFA8 */ addiu $a2, $a2, %lo(D_0600BFA8) ## $a2 = 0600BFA8 -/* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 809ED8D4 0C0291BE */ jal SkelAnime_InitFlex -/* 00068 809ED8D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0006C 809ED8DC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C -/* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00074 809ED8E4 0C0170D9 */ jal Collider_InitCylinder - -/* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 809ED8EC 3C07809F */ lui $a3, %hi(D_809EF0B4) ## $a3 = 809F0000 -/* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) -/* 00084 809ED8F4 24E7F0B4 */ addiu $a3, $a3, %lo(D_809EF0B4) ## $a3 = 809EF0B4 -/* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0008C 809ED8FC 0C01712B */ jal Collider_SetCylinder - -/* 00090 809ED900 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00094 809ED904 3C04809F */ lui $a0, %hi(D_809EF0F0) ## $a0 = 809F0000 -/* 00098 809ED908 0C00084C */ jal osSyncPrintf - -/* 0009C 809ED90C 2484F0F0 */ addiu $a0, $a0, %lo(D_809EF0F0) ## $a0 = 809EF0F0 -/* 000A0 809ED910 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 000A4 809ED914 A2190003 */ sb $t9, 0x0003($s0) ## 00000003 -/* 000A8 809ED918 3C01809F */ lui $at, %hi(D_809EF1AC) ## $at = 809F0000 -/* 000AC 809ED91C C426F1AC */ lwc1 $f6, %lo(D_809EF1AC)($at) -/* 000B0 809ED920 3C01809F */ lui $at, %hi(D_809EF1B0) ## $at = 809F0000 -/* 000B4 809ED924 3C02809F */ lui $v0, %hi(D_809EF0B0) ## $v0 = 809F0000 -/* 000B8 809ED928 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 000BC 809ED92C C428F1B0 */ lwc1 $f8, %lo(D_809EF1B0)($at) -/* 000C0 809ED930 3C01809F */ lui $at, %hi(D_809EF1B4) ## $at = 809F0000 -/* 000C4 809ED934 2442F0B0 */ addiu $v0, $v0, %lo(D_809EF0B0) ## $v0 = 809EF0B0 -/* 000C8 809ED938 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 000CC 809ED93C C42AF1B4 */ lwc1 $f10, %lo(D_809EF1B4)($at) -/* 000D0 809ED940 3C0C809F */ lui $t4, %hi(func_809EDCB0) ## $t4 = 809F0000 -/* 000D4 809ED944 3C04809F */ lui $a0, %hi(D_809EF120) ## $a0 = 809F0000 -/* 000D8 809ED948 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 -/* 000DC 809ED94C 90480000 */ lbu $t0, 0x0000($v0) ## 809EF0B0 -/* 000E0 809ED950 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 000E4 809ED954 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000E8 809ED958 11000009 */ beq $t0, $zero, .L809ED980 -/* 000EC 809ED95C 258CDCB0 */ addiu $t4, $t4, %lo(func_809EDCB0) ## $t4 = 809EDCB0 -/* 000F0 809ED960 0C00084C */ jal osSyncPrintf - -/* 000F4 809ED964 2484F120 */ addiu $a0, $a0, %lo(D_809EF120) ## $a0 = 809EF120 -/* 000F8 809ED968 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 000FC 809ED96C A209031F */ sb $t1, 0x031F($s0) ## 0000031F -/* 00100 809ED970 0C00B55C */ jal Actor_Kill - -/* 00104 809ED974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 809ED978 10000006 */ beq $zero, $zero, .L809ED994 -/* 0010C 809ED97C 8FBF002C */ lw $ra, 0x002C($sp) -.L809ED980: -/* 00110 809ED980 A04A0000 */ sb $t2, 0x0000($v0) ## 00000000 -/* 00114 809ED984 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 00118 809ED988 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE -/* 0011C 809ED98C AE0C0280 */ sw $t4, 0x0280($s0) ## 00000280 -/* 00120 809ED990 8FBF002C */ lw $ra, 0x002C($sp) -.L809ED994: -/* 00124 809ED994 8FB00028 */ lw $s0, 0x0028($sp) -/* 00128 809ED998 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0012C 809ED99C 03E00008 */ jr $ra -/* 00130 809ED9A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s deleted file mode 100644 index 9b845e993b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ /dev/null @@ -1,151 +0,0 @@ -glabel EnDivingGame_Update -/* 01320 809EEB90 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01324 809EEB94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01328 809EEB98 AFB00020 */ sw $s0, 0x0020($sp) -/* 0132C 809EEB9C AFA5004C */ sw $a1, 0x004C($sp) -/* 01330 809EEBA0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01334 809EEBA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01338 809EEBA8 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13d0) -/* 0133C 809EEBAC AFAF003C */ sw $t7, 0x003C($sp) -/* 01340 809EEBB0 84820294 */ lh $v0, 0x0294($a0) ## 00000294 -/* 01344 809EEBB4 10400002 */ beq $v0, $zero, .L809EEBC0 -/* 01348 809EEBB8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0134C 809EEBBC A4980294 */ sh $t8, 0x0294($a0) ## 00000294 -.L809EEBC0: -/* 01350 809EEBC0 86020296 */ lh $v0, 0x0296($s0) ## 00000296 -/* 01354 809EEBC4 10400002 */ beq $v0, $zero, .L809EEBD0 -/* 01358 809EEBC8 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 0135C 809EEBCC A6190296 */ sh $t9, 0x0296($s0) ## 00000296 -.L809EEBD0: -/* 01360 809EEBD0 86020298 */ lh $v0, 0x0298($s0) ## 00000298 -/* 01364 809EEBD4 10400002 */ beq $v0, $zero, .L809EEBE0 -/* 01368 809EEBD8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 0136C 809EEBDC A6080298 */ sh $t0, 0x0298($s0) ## 00000298 -.L809EEBE0: -/* 01370 809EEBE0 8602029A */ lh $v0, 0x029A($s0) ## 0000029A -/* 01374 809EEBE4 10400002 */ beq $v0, $zero, .L809EEBF0 -/* 01378 809EEBE8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 0137C 809EEBEC A609029A */ sh $t1, 0x029A($s0) ## 0000029A -.L809EEBF0: -/* 01380 809EEBF0 854AFA30 */ lh $t2, %lo(gSaveContext+0x13d0)($t2) -/* 01384 809EEBF4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01388 809EEBF8 55410004 */ bnel $t2, $at, .L809EEC0C -/* 0138C 809EEBFC 860B0298 */ lh $t3, 0x0298($s0) ## 00000298 -/* 01390 809EEC00 0C03D646 */ jal func_800F5918 -/* 01394 809EEC04 00000000 */ nop -/* 01398 809EEC08 860B0298 */ lh $t3, 0x0298($s0) ## 00000298 -.L809EEC0C: -/* 0139C 809EEC0C 55600013 */ bnel $t3, $zero, .L809EEC5C -/* 013A0 809EEC10 8E190280 */ lw $t9, 0x0280($s0) ## 00000280 -/* 013A4 809EEC14 860D029E */ lh $t5, 0x029E($s0) ## 0000029E -/* 013A8 809EEC18 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 013AC 809EEC1C A60C0298 */ sh $t4, 0x0298($s0) ## 00000298 -/* 013B0 809EEC20 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 013B4 809EEC24 A60E029E */ sh $t6, 0x029E($s0) ## 0000029E -/* 013B8 809EEC28 860F029E */ lh $t7, 0x029E($s0) ## 0000029E -/* 013BC 809EEC2C 29E10003 */ slti $at, $t7, 0x0003 -/* 013C0 809EEC30 14200009 */ bne $at, $zero, .L809EEC58 -/* 013C4 809EEC34 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 013C8 809EEC38 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 013CC 809EEC3C 0C00CFBE */ jal Rand_ZeroFloat - -/* 013D0 809EEC40 A600029E */ sh $zero, 0x029E($s0) ## 0000029E -/* 013D4 809EEC44 4600010D */ trunc.w.s $f4, $f0 -/* 013D8 809EEC48 44092000 */ mfc1 $t1, $f4 -/* 013DC 809EEC4C 00000000 */ nop -/* 013E0 809EEC50 252A0014 */ addiu $t2, $t1, 0x0014 ## $t2 = 00000014 -/* 013E4 809EEC54 A60A0298 */ sh $t2, 0x0298($s0) ## 00000298 -.L809EEC58: -/* 013E8 809EEC58 8E190280 */ lw $t9, 0x0280($s0) ## 00000280 -.L809EEC5C: -/* 013EC 809EEC5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013F0 809EEC60 8FA5004C */ lw $a1, 0x004C($sp) -/* 013F4 809EEC64 0320F809 */ jalr $ra, $t9 -/* 013F8 809EEC68 00000000 */ nop -/* 013FC 809EEC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01400 809EEC70 0C00B56E */ jal Actor_SetFocus - -/* 01404 809EEC74 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 -/* 01408 809EEC78 8FAB003C */ lw $t3, 0x003C($sp) -/* 0140C 809EEC7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01410 809EEC80 26050324 */ addiu $a1, $s0, 0x0324 ## $a1 = 00000324 -/* 01414 809EEC84 8D6D0024 */ lw $t5, 0x0024($t3) ## 00000024 -/* 01418 809EEC88 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0141C 809EEC8C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01420 809EEC90 AE0D033C */ sw $t5, 0x033C($s0) ## 0000033C -/* 01424 809EEC94 8D6C0028 */ lw $t4, 0x0028($t3) ## 00000028 -/* 01428 809EEC98 AE0C0340 */ sw $t4, 0x0340($s0) ## 00000340 -/* 0142C 809EEC9C 8D6D002C */ lw $t5, 0x002C($t3) ## 0000002C -/* 01430 809EECA0 AE0D0344 */ sw $t5, 0x0344($s0) ## 00000344 -/* 01434 809EECA4 8FAE003C */ lw $t6, 0x003C($sp) -/* 01438 809EECA8 C5C60028 */ lwc1 $f6, 0x0028($t6) ## 00000028 -/* 0143C 809EECAC 0C00D285 */ jal func_80034A14 -/* 01440 809EECB0 E6060340 */ swc1 $f6, 0x0340($s0) ## 00000340 -/* 01444 809EECB4 8A18032C */ lwl $t8, 0x032C($s0) ## 0000032C -/* 01448 809EECB8 8A090332 */ lwl $t1, 0x0332($s0) ## 00000332 -/* 0144C 809EECBC 9A18032F */ lwr $t8, 0x032F($s0) ## 0000032F -/* 01450 809EECC0 9A090335 */ lwr $t1, 0x0335($s0) ## 00000335 -/* 01454 809EECC4 8FA4004C */ lw $a0, 0x004C($sp) -/* 01458 809EECC8 AA180284 */ swl $t8, 0x0284($s0) ## 00000284 -/* 0145C 809EECCC AA09028A */ swl $t1, 0x028A($s0) ## 0000028A -/* 01460 809EECD0 BA180287 */ swr $t8, 0x0287($s0) ## 00000287 -/* 01464 809EECD4 BA09028D */ swr $t1, 0x028D($s0) ## 0000028D -/* 01468 809EECD8 96180330 */ lhu $t8, 0x0330($s0) ## 00000330 -/* 0146C 809EECDC 96090336 */ lhu $t1, 0x0336($s0) ## 00000336 -/* 01470 809EECE0 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 01474 809EECE4 01445021 */ addu $t2, $t2, $a0 -/* 01478 809EECE8 A6180288 */ sh $t8, 0x0288($s0) ## 00000288 -/* 0147C 809EECEC A609028E */ sh $t1, 0x028E($s0) ## 0000028E -/* 01480 809EECF0 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 -/* 01484 809EECF4 3159000F */ andi $t9, $t2, 0x000F ## $t9 = 00000000 -/* 01488 809EECF8 57200014 */ bnel $t9, $zero, .L809EED4C -/* 0148C 809EECFC 860E0290 */ lh $t6, 0x0290($s0) ## 00000290 -/* 01490 809EED00 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 -/* 01494 809EED04 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFE8 -/* 01498 809EED08 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0149C 809EED0C ACAC0000 */ sw $t4, 0x0000($a1) ## FFFFFFE8 -/* 014A0 809EED10 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 014A4 809EED14 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 014A8 809EED18 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 014AC 809EED1C ACAB0004 */ sw $t3, 0x0004($a1) ## FFFFFFEC -/* 014B0 809EED20 8E0C002C */ lw $t4, 0x002C($s0) ## 0000002C -/* 014B4 809EED24 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 014B8 809EED28 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 014BC 809EED2C ACAC0008 */ sw $t4, 0x0008($a1) ## FFFFFFF0 -/* 014C0 809EED30 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 014C4 809EED34 AFAD0010 */ sw $t5, 0x0010($sp) -/* 014C8 809EED38 460A4400 */ add.s $f16, $f8, $f10 -/* 014CC 809EED3C 0C00A511 */ jal EffectSsGRipple_Spawn -/* 014D0 809EED40 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 014D4 809EED44 8FA4004C */ lw $a0, 0x004C($sp) -/* 014D8 809EED48 860E0290 */ lh $t6, 0x0290($s0) ## 00000290 -.L809EED4C: -/* 014DC 809EED4C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 014E0 809EED50 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 -/* 014E4 809EED54 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 014E8 809EED58 A60F0290 */ sh $t7, 0x0290($s0) ## 00000290 -/* 014EC 809EED5C 2418001D */ addiu $t8, $zero, 0x001D ## $t8 = 0000001D -/* 014F0 809EED60 AFB80014 */ sw $t8, 0x0014($sp) -/* 014F4 809EED64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014F8 809EED68 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 014FC 809EED6C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 01500 809EED70 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 01504 809EED74 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01508 809EED78 2606034C */ addiu $a2, $s0, 0x034C ## $a2 = 0000034C -/* 0150C 809EED7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000034C -/* 01510 809EED80 AFA6002C */ sw $a2, 0x002C($sp) -/* 01514 809EED84 0C0189B7 */ jal Collider_UpdateCylinder - -/* 01518 809EED88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0151C 809EED8C 8FA4004C */ lw $a0, 0x004C($sp) -/* 01520 809EED90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01524 809EED94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01528 809EED98 8FA6002C */ lw $a2, 0x002C($sp) -/* 0152C 809EED9C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01530 809EEDA0 00812821 */ addu $a1, $a0, $at -/* 01534 809EEDA4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01538 809EEDA8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0153C 809EEDAC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01540 809EEDB0 03E00008 */ jr $ra -/* 01544 809EEDB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s deleted file mode 100644 index 08a0d282b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s +++ /dev/null @@ -1,86 +0,0 @@ -.late_rodata -glabel D_809EF1B8 - .word 0x455AC000 - -.text -glabel func_809ED9E0 -/* 00170 809ED9E0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00174 809ED9E4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00178 809ED9E8 AFB00038 */ sw $s0, 0x0038($sp) -/* 0017C 809ED9EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00180 809ED9F0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00184 809ED9F4 AFA50054 */ sw $a1, 0x0054($sp) -/* 00188 809ED9F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0018C 809ED9FC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00190 809EDA00 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00194 809EDA04 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 00198 809EDA08 46040181 */ sub.s $f6, $f0, $f4 -/* 0019C 809EDA0C C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 001A0 809EDA10 46083282 */ mul.s $f10, $f6, $f8 -/* 001A4 809EDA14 46105480 */ add.s $f18, $f10, $f16 -/* 001A8 809EDA18 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001AC 809EDA1C E7B20040 */ swc1 $f18, 0x0040($sp) -/* 001B0 809EDA20 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 001B4 809EDA24 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 001B8 809EDA28 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 001BC 809EDA2C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 001C0 809EDA30 46040181 */ sub.s $f6, $f0, $f4 -/* 001C4 809EDA34 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001C8 809EDA38 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 001CC 809EDA3C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 001D0 809EDA40 46083282 */ mul.s $f10, $f6, $f8 -/* 001D4 809EDA44 46128100 */ add.s $f4, $f16, $f18 -/* 001D8 809EDA48 46045180 */ add.s $f6, $f10, $f4 -/* 001DC 809EDA4C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001E0 809EDA50 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 001E4 809EDA54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 001E8 809EDA58 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 001EC 809EDA5C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 001F0 809EDA60 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 001F4 809EDA64 46080401 */ sub.s $f16, $f0, $f8 -/* 001F8 809EDA68 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 001FC 809EDA6C 3C01809F */ lui $at, %hi(D_809EF1B8) ## $at = 809F0000 -/* 00200 809EDA70 C42CF1B8 */ lwc1 $f12, %lo(D_809EF1B8)($at) -/* 00204 809EDA74 46128282 */ mul.s $f10, $f16, $f18 -/* 00208 809EDA78 46045180 */ add.s $f6, $f10, $f4 -/* 0020C 809EDA7C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00210 809EDA80 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 00214 809EDA84 4600028D */ trunc.w.s $f10, $f0 -/* 00218 809EDA88 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 0021C 809EDA8C C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 00220 809EDA90 C7B20048 */ lwc1 $f18, 0x0048($sp) -/* 00224 809EDA94 440F5000 */ mfc1 $t7, $f10 -/* 00228 809EDA98 AFA0001C */ sw $zero, 0x001C($sp) -/* 0022C 809EDA9C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00230 809EDAA0 000FC400 */ sll $t8, $t7, 16 -/* 00234 809EDAA4 0018CC03 */ sra $t9, $t8, 16 -/* 00238 809EDAA8 2728FC18 */ addiu $t0, $t9, 0xFC18 ## $t0 = FFFFFC18 -/* 0023C 809EDAAC AFA80020 */ sw $t0, 0x0020($sp) -/* 00240 809EDAB0 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00244 809EDAB4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00248 809EDAB8 860902A6 */ lh $t1, 0x02A6($s0) ## 000002A6 -/* 0024C 809EDABC 8FA60054 */ lw $a2, 0x0054($sp) -/* 00250 809EDAC0 AFA00028 */ sw $zero, 0x0028($sp) -/* 00254 809EDAC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00258 809EDAC8 24070131 */ addiu $a3, $zero, 0x0131 ## $a3 = 00000131 -/* 0025C 809EDACC AFA90024 */ sw $t1, 0x0024($sp) -/* 00260 809EDAD0 0C00C916 */ jal Actor_SpawnAsChild - -/* 00264 809EDAD4 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00268 809EDAD8 10400006 */ beq $v0, $zero, .L809EDAF4 -/* 0026C 809EDADC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00270 809EDAE0 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 00274 809EDAE4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00278 809EDAE8 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 0027C 809EDAEC E4440068 */ swc1 $f4, 0x0068($v0) ## 00000068 -/* 00280 809EDAF0 E4460060 */ swc1 $f6, 0x0060($v0) ## 00000060 -.L809EDAF4: -/* 00284 809EDAF4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00288 809EDAF8 8FB00038 */ lw $s0, 0x0038($sp) -/* 0028C 809EDAFC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00290 809EDB00 03E00008 */ jr $ra -/* 00294 809EDB04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s deleted file mode 100644 index 14c0d9510f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s +++ /dev/null @@ -1,113 +0,0 @@ -glabel func_809EDB08 -/* 00298 809EDB08 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0029C 809EDB0C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 002A0 809EDB10 846E13CE */ lh $t6, 0x13CE($v1) ## 8015FA2E -/* 002A4 809EDB14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002A8 809EDB18 AFB00018 */ sw $s0, 0x0018($sp) -/* 002AC 809EDB1C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 002B0 809EDB20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 809EDB24 AFBF001C */ sw $ra, 0x001C($sp) -/* 002B8 809EDB28 15C10020 */ bne $t6, $at, .L809EDBAC -/* 002BC 809EDB2C AFA50024 */ sw $a1, 0x0024($sp) -/* 002C0 809EDB30 0C02FF21 */ jal Gameplay_InCsMode -/* 002C4 809EDB34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002C8 809EDB38 1440001C */ bne $v0, $zero, .L809EDBAC -/* 002CC 809EDB3C 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 002D0 809EDB40 0C03D6D6 */ jal func_800F5B58 -/* 002D4 809EDB44 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) -/* 002D8 809EDB48 0C01E221 */ jal func_80078884 -/* 002DC 809EDB4C 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C -/* 002E0 809EDB50 240F71AD */ addiu $t7, $zero, 0x71AD ## $t7 = 000071AD -/* 002E4 809EDB54 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 002E8 809EDB58 8FA40024 */ lw $a0, 0x0024($sp) -/* 002EC 809EDB5C 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 000071AD -/* 002F0 809EDB60 0C042DA0 */ jal func_8010B680 -/* 002F4 809EDB64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002F8 809EDB68 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -/* 002FC 809EDB6C 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 00300 809EDB70 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00304 809EDB74 A6180292 */ sh $t8, 0x0292($s0) ## 00000292 -/* 00308 809EDB78 A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 -/* 0030C 809EDB7C A602029C */ sh $v0, 0x029C($s0) ## 0000029C -/* 00310 809EDB80 A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 -/* 00314 809EDB84 A202031E */ sb $v0, 0x031E($s0) ## 0000031E -/* 00318 809EDB88 8FA40024 */ lw $a0, 0x0024($sp) -/* 0031C 809EDB8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00320 809EDB90 0C00B7D5 */ jal func_8002DF54 -/* 00324 809EDB94 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00328 809EDB98 3C19809F */ lui $t9, %hi(func_809EE048) ## $t9 = 809F0000 -/* 0032C 809EDB9C 2739E048 */ addiu $t9, $t9, %lo(func_809EE048) ## $t9 = 809EE048 -/* 00330 809EDBA0 AE190280 */ sw $t9, 0x0280($s0) ## 00000280 -/* 00334 809EDBA4 1000003D */ beq $zero, $zero, .L809EDC9C -/* 00338 809EDBA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809EDBAC: -/* 0033C 809EDBAC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00340 809EDBB0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00344 809EDBB4 94680EDA */ lhu $t0, 0x0EDA($v1) ## 8015F53A -/* 00348 809EDBB8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -/* 0034C 809EDBBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00350 809EDBC0 31090100 */ andi $t1, $t0, 0x0100 ## $t1 = 00000000 -/* 00354 809EDBC4 51200003 */ beql $t1, $zero, .L809EDBD4 -/* 00358 809EDBC8 860A02A4 */ lh $t2, 0x02A4($s0) ## 000002A4 -/* 0035C 809EDBCC 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 00360 809EDBD0 860A02A4 */ lh $t2, 0x02A4($s0) ## 000002A4 -.L809EDBD4: -/* 00364 809EDBD4 0142082A */ slt $at, $t2, $v0 -/* 00368 809EDBD8 14200030 */ bne $at, $zero, .L809EDC9C -/* 0036C 809EDBDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00370 809EDBE0 A46013CE */ sh $zero, 0x13CE($v1) ## 8015FA2E -/* 00374 809EDBE4 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -/* 00378 809EDBE8 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 0037C 809EDBEC 240D4055 */ addiu $t5, $zero, 0x4055 ## $t5 = 00004055 -/* 00380 809EDBF0 A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 -/* 00384 809EDBF4 A602029C */ sh $v0, 0x029C($s0) ## 0000029C -/* 00388 809EDBF8 A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 -/* 0038C 809EDBFC A202031E */ sb $v0, 0x031E($s0) ## 0000031E -/* 00390 809EDC00 946B0EDA */ lhu $t3, 0x0EDA($v1) ## 8015F53A -/* 00394 809EDC04 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 00398 809EDC08 55800004 */ bnel $t4, $zero, .L809EDC1C -/* 0039C 809EDC0C 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA -/* 003A0 809EDC10 10000008 */ beq $zero, $zero, .L809EDC34 -/* 003A4 809EDC14 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 003A8 809EDC18 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA -.L809EDC1C: -/* 003AC 809EDC1C 240E405D */ addiu $t6, $zero, 0x405D ## $t6 = 0000405D -/* 003B0 809EDC20 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 003B4 809EDC24 28410064 */ slti $at, $v0, 0x0064 -/* 003B8 809EDC28 10200002 */ beq $at, $zero, .L809EDC34 -/* 003BC 809EDC2C 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 -/* 003C0 809EDC30 A60F02AA */ sh $t7, 0x02AA($s0) ## 000002AA -.L809EDC34: -/* 003C4 809EDC34 8FA40024 */ lw $a0, 0x0024($sp) -/* 003C8 809EDC38 0C042DA0 */ jal func_8010B680 -/* 003CC 809EDC3C 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 003D0 809EDC40 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 003D4 809EDC44 0C03D6D6 */ jal func_800F5B58 -/* 003D8 809EDC48 A6180292 */ sh $t8, 0x0292($s0) ## 00000292 -/* 003DC 809EDC4C 0C03D719 */ jal func_800F5C64 -/* 003E0 809EDC50 24040039 */ addiu $a0, $zero, 0x0039 ## $a0 = 00000039 -/* 003E4 809EDC54 8FA40024 */ lw $a0, 0x0024($sp) -/* 003E8 809EDC58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003EC 809EDC5C 0C00B7D5 */ jal func_8002DF54 -/* 003F0 809EDC60 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 003F4 809EDC64 3C198016 */ lui $t9, %hi(gSaveContext+0xeda) -/* 003F8 809EDC68 9739F53A */ lhu $t9, %lo(gSaveContext+0xeda)($t9) -/* 003FC 809EDC6C 3C0A809F */ lui $t2, %hi(func_809EE048) ## $t2 = 809F0000 -/* 00400 809EDC70 3C09809F */ lui $t1, %hi(func_809EE96C) ## $t1 = 809F0000 -/* 00404 809EDC74 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 00408 809EDC78 15000005 */ bne $t0, $zero, .L809EDC90 -/* 0040C 809EDC7C 254AE048 */ addiu $t2, $t2, %lo(func_809EE048) ## $t2 = 809EE048 -/* 00410 809EDC80 2529E96C */ addiu $t1, $t1, %lo(func_809EE96C) ## $t1 = 809EE96C -/* 00414 809EDC84 AE090280 */ sw $t1, 0x0280($s0) ## 00000280 -/* 00418 809EDC88 10000004 */ beq $zero, $zero, .L809EDC9C -/* 0041C 809EDC8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809EDC90: -/* 00420 809EDC90 AE0A0280 */ sw $t2, 0x0280($s0) ## 00000280 -/* 00424 809EDC94 10000001 */ beq $zero, $zero, .L809EDC9C -/* 00428 809EDC98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809EDC9C: -/* 0042C 809EDC9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00430 809EDCA0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00434 809EDCA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00438 809EDCA8 03E00008 */ jr $ra -/* 0043C 809EDCAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s deleted file mode 100644 index 65ddcab283..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_809EDCB0 -/* 00440 809EDCB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00444 809EDCB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00448 809EDCB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0044C 809EDCBC 3C040600 */ lui $a0, %hi(D_06002FE8) ## $a0 = 06000000 -/* 00450 809EDCC0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00454 809EDCC4 0C028800 */ jal Animation_GetLastFrame - -/* 00458 809EDCC8 24842FE8 */ addiu $a0, $a0, %lo(D_06002FE8) ## $a0 = 06002FE8 -/* 0045C 809EDCCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00460 809EDCD0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00464 809EDCD4 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00468 809EDCD8 468021A0 */ cvt.s.w $f6, $f4 -/* 0046C 809EDCDC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00470 809EDCE0 3C050600 */ lui $a1, %hi(D_06002FE8) ## $a1 = 06000000 -/* 00474 809EDCE4 24A52FE8 */ addiu $a1, $a1, %lo(D_06002FE8) ## $a1 = 06002FE8 -/* 00478 809EDCE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0047C 809EDCEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00480 809EDCF0 4600320D */ trunc.w.s $f8, $f6 -/* 00484 809EDCF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00488 809EDCF8 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0048C 809EDCFC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00490 809EDD00 440F4000 */ mfc1 $t7, $f8 -/* 00494 809EDD04 00000000 */ nop -/* 00498 809EDD08 000FC400 */ sll $t8, $t7, 16 -/* 0049C 809EDD0C 0018CC03 */ sra $t9, $t8, 16 -/* 004A0 809EDD10 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 004A4 809EDD14 00000000 */ nop -/* 004A8 809EDD18 46805420 */ cvt.s.w $f16, $f10 -/* 004AC 809EDD1C 0C029468 */ jal Animation_Change - -/* 004B0 809EDD20 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 004B4 809EDD24 8FA20028 */ lw $v0, 0x0028($sp) -/* 004B8 809EDD28 3C09809F */ lui $t1, %hi(func_809EDD4C) ## $t1 = 809F0000 -/* 004BC 809EDD2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 004C0 809EDD30 2529DD4C */ addiu $t1, $t1, %lo(func_809EDD4C) ## $t1 = 809EDD4C -/* 004C4 809EDD34 A048031D */ sb $t0, 0x031D($v0) ## 0000031D -/* 004C8 809EDD38 AC490280 */ sw $t1, 0x0280($v0) ## 00000280 -/* 004CC 809EDD3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004D0 809EDD40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004D4 809EDD44 03E00008 */ jr $ra -/* 004D8 809EDD48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s deleted file mode 100644 index 742aaf68b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_809EDD4C -/* 004DC 809EDD4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004E0 809EDD50 AFB00018 */ sw $s0, 0x0018($sp) -/* 004E4 809EDD54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004E8 809EDD58 AFBF001C */ sw $ra, 0x001C($sp) -/* 004EC 809EDD5C AFA50024 */ sw $a1, 0x0024($sp) -/* 004F0 809EDD60 0C02927F */ jal SkelAnime_Update - -/* 004F4 809EDD64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004F8 809EDD68 860E02A8 */ lh $t6, 0x02A8($s0) ## 000002A8 -/* 004FC 809EDD6C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00500 809EDD70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00504 809EDD74 55C10005 */ bnel $t6, $at, .L809EDD8C -/* 00508 809EDD78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0050C 809EDD7C 0C27B6C2 */ jal func_809EDB08 -/* 00510 809EDD80 8FA50024 */ lw $a1, 0x0024($sp) -/* 00514 809EDD84 14400050 */ bne $v0, $zero, .L809EDEC8 -/* 00518 809EDD88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809EDD8C: -/* 0051C 809EDD8C 0C00BC65 */ jal func_8002F194 -/* 00520 809EDD90 8FA50024 */ lw $a1, 0x0024($sp) -/* 00524 809EDD94 1040001D */ beq $v0, $zero, .L809EDE0C -/* 00528 809EDD98 8FA40024 */ lw $a0, 0x0024($sp) -/* 0052C 809EDD9C 860F0292 */ lh $t7, 0x0292($s0) ## 00000292 -/* 00530 809EDDA0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00534 809EDDA4 51E10049 */ beql $t7, $at, .L809EDECC -/* 00538 809EDDA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0053C 809EDDAC 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 00540 809EDDB0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00544 809EDDB4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00548 809EDDB8 10400008 */ beq $v0, $zero, .L809EDDDC -/* 0054C 809EDDBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00550 809EDDC0 1041000C */ beq $v0, $at, .L809EDDF4 -/* 00554 809EDDC4 3C19809F */ lui $t9, %hi(func_809EEA00) ## $t9 = 809F0000 -/* 00558 809EDDC8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0055C 809EDDCC 1041000C */ beq $v0, $at, .L809EDE00 -/* 00560 809EDDD0 3C08809F */ lui $t0, %hi(func_809EE8F0) ## $t0 = 809F0000 -/* 00564 809EDDD4 1000003D */ beq $zero, $zero, .L809EDECC -/* 00568 809EDDD8 8FBF001C */ lw $ra, 0x001C($sp) -.L809EDDDC: -/* 0056C 809EDDDC 0C00B7D5 */ jal func_8002DF54 -/* 00570 809EDDE0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00574 809EDDE4 3C18809F */ lui $t8, %hi(func_809EDEDC) ## $t8 = 809F0000 -/* 00578 809EDDE8 2718DEDC */ addiu $t8, $t8, %lo(func_809EDEDC) ## $t8 = 809EDEDC -/* 0057C 809EDDEC 10000036 */ beq $zero, $zero, .L809EDEC8 -/* 00580 809EDDF0 AE180280 */ sw $t8, 0x0280($s0) ## 00000280 -.L809EDDF4: -/* 00584 809EDDF4 2739EA00 */ addiu $t9, $t9, %lo(func_809EEA00) ## $t9 = FFFFEA00 -/* 00588 809EDDF8 10000033 */ beq $zero, $zero, .L809EDEC8 -/* 0058C 809EDDFC AE190280 */ sw $t9, 0x0280($s0) ## 00000280 -.L809EDE00: -/* 00590 809EDE00 2508E8F0 */ addiu $t0, $t0, %lo(func_809EE8F0) ## $t0 = FFFFE8F0 -/* 00594 809EDE04 10000030 */ beq $zero, $zero, .L809EDEC8 -/* 00598 809EDE08 AE080280 */ sw $t0, 0x0280($s0) ## 00000280 -.L809EDE0C: -/* 0059C 809EDE0C 0C01B0D8 */ jal Text_GetFaceReaction -/* 005A0 809EDE10 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 005A4 809EDE14 10400007 */ beq $v0, $zero, .L809EDE34 -/* 005A8 809EDE18 8FA40024 */ lw $a0, 0x0024($sp) -/* 005AC 809EDE1C 0C01B0D8 */ jal Text_GetFaceReaction -/* 005B0 809EDE20 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 005B4 809EDE24 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 005B8 809EDE28 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 005BC 809EDE2C 10000022 */ beq $zero, $zero, .L809EDEB8 -/* 005C0 809EDE30 A6090292 */ sh $t1, 0x0292($s0) ## 00000292 -.L809EDE34: -/* 005C4 809EDE34 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 005C8 809EDE38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 005CC 809EDE3C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 005D0 809EDE40 10400008 */ beq $v0, $zero, .L809EDE64 -/* 005D4 809EDE44 3C0B8016 */ lui $t3, %hi(gSaveContext+0xeda) -/* 005D8 809EDE48 10410014 */ beq $v0, $at, .L809EDE9C -/* 005DC 809EDE4C 24194056 */ addiu $t9, $zero, 0x4056 ## $t9 = 00004056 -/* 005E0 809EDE50 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 005E4 809EDE54 10410015 */ beq $v0, $at, .L809EDEAC -/* 005E8 809EDE58 2409405B */ addiu $t1, $zero, 0x405B ## $t1 = 0000405B -/* 005EC 809EDE5C 10000017 */ beq $zero, $zero, .L809EDEBC -/* 005F0 809EDE60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809EDE64: -/* 005F4 809EDE64 A60A0292 */ sh $t2, 0x0292($s0) ## 00000292 -/* 005F8 809EDE68 956BF53A */ lhu $t3, %lo(gSaveContext+0xeda)($t3) -/* 005FC 809EDE6C 240D4053 */ addiu $t5, $zero, 0x4053 ## $t5 = 00004053 -/* 00600 809EDE70 240F405C */ addiu $t7, $zero, 0x405C ## $t7 = 0000405C -/* 00604 809EDE74 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 00608 809EDE78 15800005 */ bne $t4, $zero, .L809EDE90 -/* 0060C 809EDE7C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00610 809EDE80 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00614 809EDE84 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 00618 809EDE88 1000000B */ beq $zero, $zero, .L809EDEB8 -/* 0061C 809EDE8C A60E029C */ sh $t6, 0x029C($s0) ## 0000029C -.L809EDE90: -/* 00620 809EDE90 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 00624 809EDE94 10000008 */ beq $zero, $zero, .L809EDEB8 -/* 00628 809EDE98 A618029C */ sh $t8, 0x029C($s0) ## 0000029C -.L809EDE9C: -/* 0062C 809EDE9C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 00630 809EDEA0 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00634 809EDEA4 10000004 */ beq $zero, $zero, .L809EDEB8 -/* 00638 809EDEA8 A6080292 */ sh $t0, 0x0292($s0) ## 00000292 -.L809EDEAC: -/* 0063C 809EDEAC 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 00640 809EDEB0 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00644 809EDEB4 A60A0292 */ sh $t2, 0x0292($s0) ## 00000292 -.L809EDEB8: -/* 00648 809EDEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809EDEBC: -/* 0064C 809EDEBC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00650 809EDEC0 0C00BCB3 */ jal func_8002F2CC -/* 00654 809EDEC4 3C0642A0 */ lui $a2, 0x42A0 ## $a2 = 42A00000 -.L809EDEC8: -/* 00658 809EDEC8 8FBF001C */ lw $ra, 0x001C($sp) -.L809EDECC: -/* 0065C 809EDECC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00660 809EDED0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00664 809EDED4 03E00008 */ jr $ra -/* 00668 809EDED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s deleted file mode 100644 index 122e22e6ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_809EDEDC -/* 0066C 809EDEDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00670 809EDEE0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00674 809EDEE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00678 809EDEE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0067C 809EDEEC AFA50024 */ sw $a1, 0x0024($sp) -/* 00680 809EDEF0 0C02927F */ jal SkelAnime_Update - -/* 00684 809EDEF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00688 809EDEF8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0068C 809EDEFC 0C042F6F */ jal func_8010BDBC -/* 00690 809EDF00 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00694 809EDF04 860E0292 */ lh $t6, 0x0292($s0) ## 00000292 -/* 00698 809EDF08 8FA70024 */ lw $a3, 0x0024($sp) -/* 0069C 809EDF0C 55C2004A */ bnel $t6, $v0, .L809EE038 -/* 006A0 809EDF10 8FBF001C */ lw $ra, 0x001C($sp) -/* 006A4 809EDF14 0C041AF2 */ jal func_80106BC8 -/* 006A8 809EDF18 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 006AC 809EDF1C 10400045 */ beq $v0, $zero, .L809EE034 -/* 006B0 809EDF20 8FA70024 */ lw $a3, 0x0024($sp) -/* 006B4 809EDF24 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 006B8 809EDF28 00471021 */ addu $v0, $v0, $a3 -/* 006BC 809EDF2C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 006C0 809EDF30 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006C4 809EDF34 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) -/* 006C8 809EDF38 10400005 */ beq $v0, $zero, .L809EDF50 -/* 006CC 809EDF3C 00000000 */ nop -/* 006D0 809EDF40 50410017 */ beql $v0, $at, .L809EDFA0 -/* 006D4 809EDF44 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -/* 006D8 809EDF48 1000001C */ beq $zero, $zero, .L809EDFBC -/* 006DC 809EDF4C 00000000 */ nop -.L809EDF50: -/* 006E0 809EDF50 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) -/* 006E4 809EDF54 29E10014 */ slti $at, $t7, 0x0014 -/* 006E8 809EDF58 54200008 */ bnel $at, $zero, .L809EDF7C -/* 006EC 809EDF5C A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -/* 006F0 809EDF60 0C021CC3 */ jal Rupees_ChangeBy -/* 006F4 809EDF64 2404FFEC */ addiu $a0, $zero, 0xFFEC ## $a0 = FFFFFFEC -/* 006F8 809EDF68 8FA70024 */ lw $a3, 0x0024($sp) -/* 006FC 809EDF6C 24184054 */ addiu $t8, $zero, 0x4054 ## $t8 = 00004054 -/* 00700 809EDF70 10000012 */ beq $zero, $zero, .L809EDFBC -/* 00704 809EDF74 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00708 809EDF78 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -.L809EDF7C: -/* 0070C 809EDF7C 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 00710 809EDF80 24190085 */ addiu $t9, $zero, 0x0085 ## $t9 = 00000085 -/* 00714 809EDF84 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00718 809EDF88 A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 -/* 0071C 809EDF8C A602029C */ sh $v0, 0x029C($s0) ## 0000029C -/* 00720 809EDF90 A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 -/* 00724 809EDF94 10000009 */ beq $zero, $zero, .L809EDFBC -/* 00728 809EDF98 A202031E */ sb $v0, 0x031E($s0) ## 0000031E -/* 0072C 809EDF9C A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -.L809EDFA0: -/* 00730 809EDFA0 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 00734 809EDFA4 2408002D */ addiu $t0, $zero, 0x002D ## $t0 = 0000002D -/* 00738 809EDFA8 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 0073C 809EDFAC A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 -/* 00740 809EDFB0 A602029C */ sh $v0, 0x029C($s0) ## 0000029C -/* 00744 809EDFB4 A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 -/* 00748 809EDFB8 A202031E */ sb $v0, 0x031E($s0) ## 0000031E -.L809EDFBC: -/* 0074C 809EDFBC 3C098016 */ lui $t1, %hi(gSaveContext+0xeda) -/* 00750 809EDFC0 9529F53A */ lhu $t1, %lo(gSaveContext+0xeda)($t1) -/* 00754 809EDFC4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00758 809EDFC8 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 -/* 0075C 809EDFCC 11400007 */ beq $t2, $zero, .L809EDFEC -/* 00760 809EDFD0 00000000 */ nop -/* 00764 809EDFD4 9602010E */ lhu $v0, 0x010E($s0) ## 0000010E -/* 00768 809EDFD8 24010085 */ addiu $at, $zero, 0x0085 ## $at = 00000085 -/* 0076C 809EDFDC 10410003 */ beq $v0, $at, .L809EDFEC -/* 00770 809EDFE0 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 00774 809EDFE4 14410009 */ bne $v0, $at, .L809EE00C -/* 00778 809EDFE8 240D0037 */ addiu $t5, $zero, 0x0037 ## $t5 = 00000037 -.L809EDFEC: -/* 0077C 809EDFEC 0C042DC8 */ jal func_8010B720 -/* 00780 809EDFF0 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 00784 809EDFF4 3C0C809F */ lui $t4, %hi(func_809EE048) ## $t4 = 809F0000 -/* 00788 809EDFF8 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 -/* 0078C 809EDFFC 258CE048 */ addiu $t4, $t4, %lo(func_809EE048) ## $t4 = 809EE048 -/* 00790 809EE000 A60B0292 */ sh $t3, 0x0292($s0) ## 00000292 -/* 00794 809EE004 1000000B */ beq $zero, $zero, .L809EE034 -/* 00798 809EE008 AE0C0280 */ sw $t4, 0x0280($s0) ## 00000280 -.L809EE00C: -/* 0079C 809EE00C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007A0 809EE010 00270821 */ addu $at, $at, $a3 -/* 007A4 809EE014 A02D03DC */ sb $t5, 0x03DC($at) ## 000103DC -/* 007A8 809EE018 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007AC 809EE01C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007B0 809EE020 0C00B7D5 */ jal func_8002DF54 -/* 007B4 809EE024 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 007B8 809EE028 3C0E809F */ lui $t6, %hi(func_809EE0FC) ## $t6 = 809F0000 -/* 007BC 809EE02C 25CEE0FC */ addiu $t6, $t6, %lo(func_809EE0FC) ## $t6 = 809EE0FC -/* 007C0 809EE030 AE0E0280 */ sw $t6, 0x0280($s0) ## 00000280 -.L809EE034: -/* 007C4 809EE034 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE038: -/* 007C8 809EE038 8FB00018 */ lw $s0, 0x0018($sp) -/* 007CC 809EE03C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 007D0 809EE040 03E00008 */ jr $ra -/* 007D4 809EE044 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s deleted file mode 100644 index 13da762973..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809EE048 -/* 007D8 809EE048 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007DC 809EE04C AFB10018 */ sw $s1, 0x0018($sp) -/* 007E0 809EE050 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 007E4 809EE054 AFBF001C */ sw $ra, 0x001C($sp) -/* 007E8 809EE058 AFB00014 */ sw $s0, 0x0014($sp) -/* 007EC 809EE05C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007F0 809EE060 0C02927F */ jal SkelAnime_Update - -/* 007F4 809EE064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007F8 809EE068 0C042F6F */ jal func_8010BDBC -/* 007FC 809EE06C 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00800 809EE070 862E0292 */ lh $t6, 0x0292($s1) ## 00000292 -/* 00804 809EE074 55C2001D */ bnel $t6, $v0, .L809EE0EC -/* 00808 809EE078 8FBF001C */ lw $ra, 0x001C($sp) -/* 0080C 809EE07C 0C041AF2 */ jal func_80106BC8 -/* 00810 809EE080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00814 809EE084 50400019 */ beql $v0, $zero, .L809EE0EC -/* 00818 809EE088 8FBF001C */ lw $ra, 0x001C($sp) -/* 0081C 809EE08C 862F029C */ lh $t7, 0x029C($s1) ## 0000029C -/* 00820 809EE090 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00824 809EE094 00300821 */ addu $at, $at, $s0 -/* 00828 809EE098 15E0000B */ bne $t7, $zero, .L809EE0C8 -/* 0082C 809EE09C 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 00830 809EE0A0 0C041B33 */ jal func_80106CCC -/* 00834 809EE0A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00838 809EE0A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0083C 809EE0AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00840 809EE0B0 0C00B7D5 */ jal func_8002DF54 -/* 00844 809EE0B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00848 809EE0B8 3C18809F */ lui $t8, %hi(func_809EDCB0) ## $t8 = 809F0000 -/* 0084C 809EE0BC 2718DCB0 */ addiu $t8, $t8, %lo(func_809EDCB0) ## $t8 = 809EDCB0 -/* 00850 809EE0C0 10000009 */ beq $zero, $zero, .L809EE0E8 -/* 00854 809EE0C4 AE380280 */ sw $t8, 0x0280($s1) ## 00000280 -.L809EE0C8: -/* 00858 809EE0C8 A03903DC */ sb $t9, 0x03DC($at) ## 000003DC -/* 0085C 809EE0CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00860 809EE0D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00864 809EE0D4 0C00B7D5 */ jal func_8002DF54 -/* 00868 809EE0D8 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 0086C 809EE0DC 3C08809F */ lui $t0, %hi(func_809EE0FC) ## $t0 = 809F0000 -/* 00870 809EE0E0 2508E0FC */ addiu $t0, $t0, %lo(func_809EE0FC) ## $t0 = 809EE0FC -/* 00874 809EE0E4 AE280280 */ sw $t0, 0x0280($s1) ## 00000280 -.L809EE0E8: -/* 00878 809EE0E8 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE0EC: -/* 0087C 809EE0EC 8FB00014 */ lw $s0, 0x0014($sp) -/* 00880 809EE0F0 8FB10018 */ lw $s1, 0x0018($sp) -/* 00884 809EE0F4 03E00008 */ jr $ra -/* 00888 809EE0F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s deleted file mode 100644 index d2ba6e3be5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_809EE0FC -/* 0088C 809EE0FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00890 809EE100 AFA40028 */ sw $a0, 0x0028($sp) -/* 00894 809EE104 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00898 809EE108 3C040600 */ lui $a0, %hi(D_0600219C) ## $a0 = 06000000 -/* 0089C 809EE10C AFA5002C */ sw $a1, 0x002C($sp) -/* 008A0 809EE110 0C028800 */ jal Animation_GetLastFrame - -/* 008A4 809EE114 2484219C */ addiu $a0, $a0, %lo(D_0600219C) ## $a0 = 0600219C -/* 008A8 809EE118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008AC 809EE11C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 008B0 809EE120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B4 809EE124 468021A0 */ cvt.s.w $f6, $f4 -/* 008B8 809EE128 8FA40028 */ lw $a0, 0x0028($sp) -/* 008BC 809EE12C 3C050600 */ lui $a1, %hi(D_0600219C) ## $a1 = 06000000 -/* 008C0 809EE130 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 008C4 809EE134 AFA80014 */ sw $t0, 0x0014($sp) -/* 008C8 809EE138 24A5219C */ addiu $a1, $a1, %lo(D_0600219C) ## $a1 = 0600219C -/* 008CC 809EE13C 4600320D */ trunc.w.s $f8, $f6 -/* 008D0 809EE140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008D4 809EE144 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D8 809EE148 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008DC 809EE14C 440F4000 */ mfc1 $t7, $f8 -/* 008E0 809EE150 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E4 809EE154 000FC400 */ sll $t8, $t7, 16 -/* 008E8 809EE158 0018CC03 */ sra $t9, $t8, 16 -/* 008EC 809EE15C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 008F0 809EE160 00000000 */ nop -/* 008F4 809EE164 46805420 */ cvt.s.w $f16, $f10 -/* 008F8 809EE168 0C029468 */ jal Animation_Change - -/* 008FC 809EE16C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00900 809EE170 8FA20028 */ lw $v0, 0x0028($sp) -/* 00904 809EE174 3C09809F */ lui $t1, %hi(func_809EE194) ## $t1 = 809F0000 -/* 00908 809EE178 2529E194 */ addiu $t1, $t1, %lo(func_809EE194) ## $t1 = 809EE194 -/* 0090C 809EE17C A040031D */ sb $zero, 0x031D($v0) ## 0000031D -/* 00910 809EE180 AC490280 */ sw $t1, 0x0280($v0) ## 00000280 -/* 00914 809EE184 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00918 809EE188 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0091C 809EE18C 03E00008 */ jr $ra -/* 00920 809EE190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s deleted file mode 100644 index bf53797742..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809EE194 -/* 00924 809EE194 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00928 809EE198 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0092C 809EE19C AFA40020 */ sw $a0, 0x0020($sp) -/* 00930 809EE1A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00934 809EE1A4 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00938 809EE1A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0093C 809EE1AC AFA50020 */ sw $a1, 0x0020($sp) -/* 00940 809EE1B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00944 809EE1B4 0C02927F */ jal SkelAnime_Update - -/* 00948 809EE1B8 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 0094C 809EE1BC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00950 809EE1C0 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 00954 809EE1C4 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00958 809EE1C8 3C0E809F */ lui $t6, %hi(func_809EE1F4) ## $t6 = 809F0000 -/* 0095C 809EE1CC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00960 809EE1D0 4606403E */ c.le.s $f8, $f6 -/* 00964 809EE1D4 25CEE1F4 */ addiu $t6, $t6, %lo(func_809EE1F4) ## $t6 = 809EE1F4 -/* 00968 809EE1D8 45020003 */ bc1fl .L809EE1E8 -/* 0096C 809EE1DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00970 809EE1E0 ACAE0280 */ sw $t6, 0x0280($a1) ## 00000280 -/* 00974 809EE1E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809EE1E8: -/* 00978 809EE1E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0097C 809EE1EC 03E00008 */ jr $ra -/* 00980 809EE1F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s deleted file mode 100644 index d4e4369427..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s +++ /dev/null @@ -1,144 +0,0 @@ -.late_rodata -glabel D_809EF1BC - .float 0.1 - -glabel D_809EF1C0 - .float 0.04 - -.text -glabel func_809EE1F4 -/* 00984 809EE1F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00988 809EE1F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0098C 809EE1FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00990 809EE200 AFBF001C */ sw $ra, 0x001C($sp) -/* 00994 809EE204 AFB10018 */ sw $s1, 0x0018($sp) -/* 00998 809EE208 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0099C 809EE20C 0C02927F */ jal SkelAnime_Update - -/* 009A0 809EE210 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009A4 809EE214 0C03008C */ jal Gameplay_CreateSubCamera -/* 009A8 809EE218 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009AC 809EE21C A60202A0 */ sh $v0, 0x02A0($s0) ## 000002A0 -/* 009B0 809EE220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009B4 809EE224 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B8 809EE228 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 009BC 809EE22C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 009C0 809EE230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009C4 809EE234 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 009C8 809EE238 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 009CC 809EE23C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 009D0 809EE240 3C01C352 */ lui $at, 0xC352 ## $at = C3520000 -/* 009D4 809EE244 44812000 */ mtc1 $at, $f4 ## $f4 = -210.00 -/* 009D8 809EE248 3C01C2A0 */ lui $at, 0xC2A0 ## $at = C2A00000 -/* 009DC 809EE24C 44813000 */ mtc1 $at, $f6 ## $f6 = -80.00 -/* 009E0 809EE250 3C01C47F */ lui $at, 0xC47F ## $at = C47F0000 -/* 009E4 809EE254 44814000 */ mtc1 $at, $f8 ## $f8 = -1020.00 -/* 009E8 809EE258 3C01C38C */ lui $at, 0xC38C ## $at = C38C0000 -/* 009EC 809EE25C 44815000 */ mtc1 $at, $f10 ## $f10 = -280.00 -/* 009F0 809EE260 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 009F4 809EE264 44818000 */ mtc1 $at, $f16 ## $f16 = -20.00 -/* 009F8 809EE268 3C01C370 */ lui $at, 0xC370 ## $at = C3700000 -/* 009FC 809EE26C 44819000 */ mtc1 $at, $f18 ## $f18 = -240.00 -/* 00A00 809EE270 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A -/* 00A04 809EE274 A603029A */ sh $v1, 0x029A($s0) ## 0000029A -/* 00A08 809EE278 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeda) -/* 00A0C 809EE27C E60402F4 */ swc1 $f4, 0x02F4($s0) ## 000002F4 -/* 00A10 809EE280 E60602F8 */ swc1 $f6, 0x02F8($s0) ## 000002F8 -/* 00A14 809EE284 E60802FC */ swc1 $f8, 0x02FC($s0) ## 000002FC -/* 00A18 809EE288 E60A02D0 */ swc1 $f10, 0x02D0($s0) ## 000002D0 -/* 00A1C 809EE28C E61002D4 */ swc1 $f16, 0x02D4($s0) ## 000002D4 -/* 00A20 809EE290 E61202D8 */ swc1 $f18, 0x02D8($s0) ## 000002D8 -/* 00A24 809EE294 95CEF53A */ lhu $t6, %lo(gSaveContext+0xeda)($t6) -/* 00A28 809EE298 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00A2C 809EE29C 3C01809F */ lui $at, %hi(D_809EF1BC) ## $at = 809F0000 -/* 00A30 809EE2A0 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 00A34 809EE2A4 55E00004 */ bnel $t7, $zero, .L809EE2B8 -/* 00A38 809EE2A8 A60302A6 */ sh $v1, 0x02A6($s0) ## 000002A6 -/* 00A3C 809EE2AC 10000002 */ beq $zero, $zero, .L809EE2B8 -/* 00A40 809EE2B0 A61802A6 */ sh $t8, 0x02A6($s0) ## 000002A6 -/* 00A44 809EE2B4 A60302A6 */ sh $v1, 0x02A6($s0) ## 000002A6 -.L809EE2B8: -/* 00A48 809EE2B8 C422F1BC */ lwc1 $f2, %lo(D_809EF1BC)($at) -/* 00A4C 809EE2BC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00A50 809EE2C0 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 00A54 809EE2C4 E6020308 */ swc1 $f2, 0x0308($s0) ## 00000308 -/* 00A58 809EE2C8 E6020304 */ swc1 $f2, 0x0304($s0) ## 00000304 -/* 00A5C 809EE2CC E6020300 */ swc1 $f2, 0x0300($s0) ## 00000300 -/* 00A60 809EE2D0 E60202E4 */ swc1 $f2, 0x02E4($s0) ## 000002E4 -/* 00A64 809EE2D4 E60202E0 */ swc1 $f2, 0x02E0($s0) ## 000002E0 -/* 00A68 809EE2D8 E60202DC */ swc1 $f2, 0x02DC($s0) ## 000002DC -/* 00A6C 809EE2DC C62400EC */ lwc1 $f4, 0x00EC($s1) ## 000000EC -/* 00A70 809EE2E0 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 00A74 809EE2E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A78 809EE2E8 E60402B8 */ swc1 $f4, 0x02B8($s0) ## 000002B8 -/* 00A7C 809EE2EC C62600F0 */ lwc1 $f6, 0x00F0($s1) ## 000000F0 -/* 00A80 809EE2F0 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 00A84 809EE2F4 260602B8 */ addiu $a2, $s0, 0x02B8 ## $a2 = 000002B8 -/* 00A88 809EE2F8 E60602BC */ swc1 $f6, 0x02BC($s0) ## 000002BC -/* 00A8C 809EE2FC C62800F4 */ lwc1 $f8, 0x00F4($s1) ## 000000F4 -/* 00A90 809EE300 260702C4 */ addiu $a3, $s0, 0x02C4 ## $a3 = 000002C4 -/* 00A94 809EE304 E60802C0 */ swc1 $f8, 0x02C0($s0) ## 000002C0 -/* 00A98 809EE308 C62A00E0 */ lwc1 $f10, 0x00E0($s1) ## 000000E0 -/* 00A9C 809EE30C 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 -/* 00AA0 809EE310 3C01809F */ lui $at, %hi(D_809EF1C0) ## $at = 809F0000 -/* 00AA4 809EE314 E60A02C4 */ swc1 $f10, 0x02C4($s0) ## 000002C4 -/* 00AA8 809EE318 C63000E4 */ lwc1 $f16, 0x00E4($s1) ## 000000E4 -/* 00AAC 809EE31C 46128100 */ add.s $f4, $f16, $f18 -/* 00AB0 809EE320 C61202D0 */ lwc1 $f18, 0x02D0($s0) ## 000002D0 -/* 00AB4 809EE324 C61002C4 */ lwc1 $f16, 0x02C4($s0) ## 000002C4 -/* 00AB8 809EE328 E60402C8 */ swc1 $f4, 0x02C8($s0) ## 000002C8 -/* 00ABC 809EE32C C62600E8 */ lwc1 $f6, 0x00E8($s1) ## 000000E8 -/* 00AC0 809EE330 46128001 */ sub.s $f0, $f16, $f18 -/* 00AC4 809EE334 C61202D8 */ lwc1 $f18, 0x02D8($s0) ## 000002D8 -/* 00AC8 809EE338 46083280 */ add.s $f10, $f6, $f8 -/* 00ACC 809EE33C C60802D4 */ lwc1 $f8, 0x02D4($s0) ## 000002D4 -/* 00AD0 809EE340 C60602C8 */ lwc1 $f6, 0x02C8($s0) ## 000002C8 -/* 00AD4 809EE344 46000005 */ abs.s $f0, $f0 -/* 00AD8 809EE348 E60A02CC */ swc1 $f10, 0x02CC($s0) ## 000002CC -/* 00ADC 809EE34C C422F1C0 */ lwc1 $f2, %lo(D_809EF1C0)($at) -/* 00AE0 809EE350 C61002CC */ lwc1 $f16, 0x02CC($s0) ## 000002CC -/* 00AE4 809EE354 46020102 */ mul.s $f4, $f0, $f2 -/* 00AE8 809EE358 46083001 */ sub.s $f0, $f6, $f8 -/* 00AEC 809EE35C C60802F4 */ lwc1 $f8, 0x02F4($s0) ## 000002F4 -/* 00AF0 809EE360 C60602B8 */ lwc1 $f6, 0x02B8($s0) ## 000002B8 -/* 00AF4 809EE364 46000005 */ abs.s $f0, $f0 -/* 00AF8 809EE368 E60402E8 */ swc1 $f4, 0x02E8($s0) ## 000002E8 -/* 00AFC 809EE36C 46020282 */ mul.s $f10, $f0, $f2 -/* 00B00 809EE370 46128001 */ sub.s $f0, $f16, $f18 -/* 00B04 809EE374 C61202F8 */ lwc1 $f18, 0x02F8($s0) ## 000002F8 -/* 00B08 809EE378 C61002BC */ lwc1 $f16, 0x02BC($s0) ## 000002BC -/* 00B0C 809EE37C 46000005 */ abs.s $f0, $f0 -/* 00B10 809EE380 E60A02EC */ swc1 $f10, 0x02EC($s0) ## 000002EC -/* 00B14 809EE384 46020102 */ mul.s $f4, $f0, $f2 -/* 00B18 809EE388 46083001 */ sub.s $f0, $f6, $f8 -/* 00B1C 809EE38C C60802FC */ lwc1 $f8, 0x02FC($s0) ## 000002FC -/* 00B20 809EE390 C60602C0 */ lwc1 $f6, 0x02C0($s0) ## 000002C0 -/* 00B24 809EE394 46000005 */ abs.s $f0, $f0 -/* 00B28 809EE398 E60402F0 */ swc1 $f4, 0x02F0($s0) ## 000002F0 -/* 00B2C 809EE39C 46020282 */ mul.s $f10, $f0, $f2 -/* 00B30 809EE3A0 46128001 */ sub.s $f0, $f16, $f18 -/* 00B34 809EE3A4 46000005 */ abs.s $f0, $f0 -/* 00B38 809EE3A8 E60A030C */ swc1 $f10, 0x030C($s0) ## 0000030C -/* 00B3C 809EE3AC 46020102 */ mul.s $f4, $f0, $f2 -/* 00B40 809EE3B0 46083001 */ sub.s $f0, $f6, $f8 -/* 00B44 809EE3B4 46000005 */ abs.s $f0, $f0 -/* 00B48 809EE3B8 E6040310 */ swc1 $f4, 0x0310($s0) ## 00000310 -/* 00B4C 809EE3BC 46020282 */ mul.s $f10, $f0, $f2 -/* 00B50 809EE3C0 0C030136 */ jal Gameplay_CameraSetAtEye -/* 00B54 809EE3C4 E60A0314 */ swc1 $f10, 0x0314($s0) ## 00000314 -/* 00B58 809EE3C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B5C 809EE3CC 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 00B60 809EE3D0 0C0301C1 */ jal Gameplay_CameraSetFov -/* 00B64 809EE3D4 8E2602DC */ lw $a2, 0x02DC($s1) ## 000002DC -/* 00B68 809EE3D8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00B6C 809EE3DC 3C08809F */ lui $t0, %hi(func_809EE408) ## $t0 = 809F0000 -/* 00B70 809EE3E0 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 00B74 809EE3E4 2508E408 */ addiu $t0, $t0, %lo(func_809EE408) ## $t0 = 809EE408 -/* 00B78 809EE3E8 A6190294 */ sh $t9, 0x0294($s0) ## 00000294 -/* 00B7C 809EE3EC AE080280 */ sw $t0, 0x0280($s0) ## 00000280 -/* 00B80 809EE3F0 E6100318 */ swc1 $f16, 0x0318($s0) ## 00000318 -/* 00B84 809EE3F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B88 809EE3F8 8FB10018 */ lw $s1, 0x0018($sp) -/* 00B8C 809EE3FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 00B90 809EE400 03E00008 */ jr $ra -/* 00B94 809EE404 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s deleted file mode 100644 index a9360f14a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s +++ /dev/null @@ -1,192 +0,0 @@ -glabel func_809EE408 -/* 00B98 809EE408 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B9C 809EE40C AFB00018 */ sw $s0, 0x0018($sp) -/* 00BA0 809EE410 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BA4 809EE414 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BA8 809EE418 AFA50024 */ sw $a1, 0x0024($sp) -/* 00BAC 809EE41C 0C02927F */ jal SkelAnime_Update - -/* 00BB0 809EE420 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00BB4 809EE424 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BB8 809EE428 0C03036D */ jal func_800C0DB4 -/* 00BBC 809EE42C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00BC0 809EE430 50400004 */ beql $v0, $zero, .L809EE444 -/* 00BC4 809EE434 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 00BC8 809EE438 0C03DA0A */ jal func_800F6828 -/* 00BCC 809EE43C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00BD0 809EE440 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -.L809EE444: -/* 00BD4 809EE444 50A00038 */ beql $a1, $zero, .L809EE528 -/* 00BD8 809EE448 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BDC 809EE44C C60402E8 */ lwc1 $f4, 0x02E8($s0) ## 000002E8 -/* 00BE0 809EE450 C6060318 */ lwc1 $f6, 0x0318($s0) ## 00000318 -/* 00BE4 809EE454 260402C4 */ addiu $a0, $s0, 0x02C4 ## $a0 = 000002C4 -/* 00BE8 809EE458 8E0502D0 */ lw $a1, 0x02D0($s0) ## 000002D0 -/* 00BEC 809EE45C 46062202 */ mul.s $f8, $f4, $f6 -/* 00BF0 809EE460 8E0602DC */ lw $a2, 0x02DC($s0) ## 000002DC -/* 00BF4 809EE464 44074000 */ mfc1 $a3, $f8 -/* 00BF8 809EE468 0C01E107 */ jal Math_ApproachF - -/* 00BFC 809EE46C 00000000 */ nop -/* 00C00 809EE470 C60A02F0 */ lwc1 $f10, 0x02F0($s0) ## 000002F0 -/* 00C04 809EE474 C6100318 */ lwc1 $f16, 0x0318($s0) ## 00000318 -/* 00C08 809EE478 260402CC */ addiu $a0, $s0, 0x02CC ## $a0 = 000002CC -/* 00C0C 809EE47C 8E0502D8 */ lw $a1, 0x02D8($s0) ## 000002D8 -/* 00C10 809EE480 46105482 */ mul.s $f18, $f10, $f16 -/* 00C14 809EE484 8E0602E4 */ lw $a2, 0x02E4($s0) ## 000002E4 -/* 00C18 809EE488 44079000 */ mfc1 $a3, $f18 -/* 00C1C 809EE48C 0C01E107 */ jal Math_ApproachF - -/* 00C20 809EE490 00000000 */ nop -/* 00C24 809EE494 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C -/* 00C28 809EE498 C6060318 */ lwc1 $f6, 0x0318($s0) ## 00000318 -/* 00C2C 809EE49C 260402B8 */ addiu $a0, $s0, 0x02B8 ## $a0 = 000002B8 -/* 00C30 809EE4A0 8E0502F4 */ lw $a1, 0x02F4($s0) ## 000002F4 -/* 00C34 809EE4A4 46062202 */ mul.s $f8, $f4, $f6 -/* 00C38 809EE4A8 8E060300 */ lw $a2, 0x0300($s0) ## 00000300 -/* 00C3C 809EE4AC 44074000 */ mfc1 $a3, $f8 -/* 00C40 809EE4B0 0C01E107 */ jal Math_ApproachF - -/* 00C44 809EE4B4 00000000 */ nop -/* 00C48 809EE4B8 C60A0310 */ lwc1 $f10, 0x0310($s0) ## 00000310 -/* 00C4C 809EE4BC C6100318 */ lwc1 $f16, 0x0318($s0) ## 00000318 -/* 00C50 809EE4C0 260402BC */ addiu $a0, $s0, 0x02BC ## $a0 = 000002BC -/* 00C54 809EE4C4 8E0502F8 */ lw $a1, 0x02F8($s0) ## 000002F8 -/* 00C58 809EE4C8 46105482 */ mul.s $f18, $f10, $f16 -/* 00C5C 809EE4CC 8E060304 */ lw $a2, 0x0304($s0) ## 00000304 -/* 00C60 809EE4D0 44079000 */ mfc1 $a3, $f18 -/* 00C64 809EE4D4 0C01E107 */ jal Math_ApproachF - -/* 00C68 809EE4D8 00000000 */ nop -/* 00C6C 809EE4DC C6040314 */ lwc1 $f4, 0x0314($s0) ## 00000314 -/* 00C70 809EE4E0 C6060318 */ lwc1 $f6, 0x0318($s0) ## 00000318 -/* 00C74 809EE4E4 260402C0 */ addiu $a0, $s0, 0x02C0 ## $a0 = 000002C0 -/* 00C78 809EE4E8 8E0502FC */ lw $a1, 0x02FC($s0) ## 000002FC -/* 00C7C 809EE4EC 46062202 */ mul.s $f8, $f4, $f6 -/* 00C80 809EE4F0 8E060308 */ lw $a2, 0x0308($s0) ## 00000308 -/* 00C84 809EE4F4 44074000 */ mfc1 $a3, $f8 -/* 00C88 809EE4F8 0C01E107 */ jal Math_ApproachF - -/* 00C8C 809EE4FC 00000000 */ nop -/* 00C90 809EE500 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00C94 809EE504 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00C98 809EE508 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 00C9C 809EE50C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 00CA0 809EE510 44050000 */ mfc1 $a1, $f0 -/* 00CA4 809EE514 44060000 */ mfc1 $a2, $f0 -/* 00CA8 809EE518 0C01E107 */ jal Math_ApproachF - -/* 00CAC 809EE51C 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 -/* 00CB0 809EE520 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 00CB4 809EE524 8FA40024 */ lw $a0, 0x0024($sp) -.L809EE528: -/* 00CB8 809EE528 260602B8 */ addiu $a2, $s0, 0x02B8 ## $a2 = 000002B8 -/* 00CBC 809EE52C 0C030136 */ jal Gameplay_CameraSetAtEye -/* 00CC0 809EE530 260702C4 */ addiu $a3, $s0, 0x02C4 ## $a3 = 000002C4 -/* 00CC4 809EE534 920E031E */ lbu $t6, 0x031E($s0) ## 0000031E -/* 00CC8 809EE538 55C0001D */ bnel $t6, $zero, .L809EE5B0 -/* 00CCC 809EE53C 860F0294 */ lh $t7, 0x0294($s0) ## 00000294 -/* 00CD0 809EE540 860F029A */ lh $t7, 0x029A($s0) ## 0000029A -/* 00CD4 809EE544 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00CD8 809EE548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CDC 809EE54C 55E00018 */ bnel $t7, $zero, .L809EE5B0 -/* 00CE0 809EE550 860F0294 */ lh $t7, 0x0294($s0) ## 00000294 -/* 00CE4 809EE554 A618029A */ sh $t8, 0x029A($s0) ## 0000029A -/* 00CE8 809EE558 0C27B678 */ jal func_809ED9E0 -/* 00CEC 809EE55C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CF0 809EE560 861902A6 */ lh $t9, 0x02A6($s0) ## 000002A6 -/* 00CF4 809EE564 3C098016 */ lui $t1, %hi(gSaveContext+0xeda) -/* 00CF8 809EE568 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E -/* 00CFC 809EE56C 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF -/* 00D00 809EE570 A60802A6 */ sh $t0, 0x02A6($s0) ## 000002A6 -/* 00D04 809EE574 9529F53A */ lhu $t1, %lo(gSaveContext+0xeda)($t1) -/* 00D08 809EE578 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 00D0C 809EE57C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00D10 809EE580 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 -/* 00D14 809EE584 55400004 */ bnel $t2, $zero, .L809EE598 -/* 00D18 809EE588 A60C0296 */ sh $t4, 0x0296($s0) ## 00000296 -/* 00D1C 809EE58C 10000002 */ beq $zero, $zero, .L809EE598 -/* 00D20 809EE590 A60B0296 */ sh $t3, 0x0296($s0) ## 00000296 -/* 00D24 809EE594 A60C0296 */ sh $t4, 0x0296($s0) ## 00000296 -.L809EE598: -/* 00D28 809EE598 860D02A6 */ lh $t5, 0x02A6($s0) ## 000002A6 -/* 00D2C 809EE59C 5DA00004 */ bgtzl $t5, .L809EE5B0 -/* 00D30 809EE5A0 860F0294 */ lh $t7, 0x0294($s0) ## 00000294 -/* 00D34 809EE5A4 A60002A6 */ sh $zero, 0x02A6($s0) ## 000002A6 -/* 00D38 809EE5A8 A20E031E */ sb $t6, 0x031E($s0) ## 0000031E -/* 00D3C 809EE5AC 860F0294 */ lh $t7, 0x0294($s0) ## 00000294 -.L809EE5B0: -/* 00D40 809EE5B0 51E00034 */ beql $t7, $zero, .L809EE684 -/* 00D44 809EE5B4 861802A2 */ lh $t8, 0x02A2($s0) ## 000002A2 -/* 00D48 809EE5B8 C60A02C4 */ lwc1 $f10, 0x02C4($s0) ## 000002C4 -/* 00D4C 809EE5BC C61002D0 */ lwc1 $f16, 0x02D0($s0) ## 000002D0 -/* 00D50 809EE5C0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00D54 809EE5C4 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 00D58 809EE5C8 46105001 */ sub.s $f0, $f10, $f16 -/* 00D5C 809EE5CC 46000005 */ abs.s $f0, $f0 -/* 00D60 809EE5D0 4602003C */ c.lt.s $f0, $f2 -/* 00D64 809EE5D4 00000000 */ nop -/* 00D68 809EE5D8 45020037 */ bc1fl .L809EE6B8 -/* 00D6C 809EE5DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D70 809EE5E0 C61202C8 */ lwc1 $f18, 0x02C8($s0) ## 000002C8 -/* 00D74 809EE5E4 C60402D4 */ lwc1 $f4, 0x02D4($s0) ## 000002D4 -/* 00D78 809EE5E8 46049001 */ sub.s $f0, $f18, $f4 -/* 00D7C 809EE5EC 46000005 */ abs.s $f0, $f0 -/* 00D80 809EE5F0 4602003C */ c.lt.s $f0, $f2 -/* 00D84 809EE5F4 00000000 */ nop -/* 00D88 809EE5F8 4502002F */ bc1fl .L809EE6B8 -/* 00D8C 809EE5FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D90 809EE600 C60602CC */ lwc1 $f6, 0x02CC($s0) ## 000002CC -/* 00D94 809EE604 C60802D8 */ lwc1 $f8, 0x02D8($s0) ## 000002D8 -/* 00D98 809EE608 46083001 */ sub.s $f0, $f6, $f8 -/* 00D9C 809EE60C 46000005 */ abs.s $f0, $f0 -/* 00DA0 809EE610 4602003C */ c.lt.s $f0, $f2 -/* 00DA4 809EE614 00000000 */ nop -/* 00DA8 809EE618 45020027 */ bc1fl .L809EE6B8 -/* 00DAC 809EE61C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DB0 809EE620 C60A02B8 */ lwc1 $f10, 0x02B8($s0) ## 000002B8 -/* 00DB4 809EE624 C61002F4 */ lwc1 $f16, 0x02F4($s0) ## 000002F4 -/* 00DB8 809EE628 46105001 */ sub.s $f0, $f10, $f16 -/* 00DBC 809EE62C 46000005 */ abs.s $f0, $f0 -/* 00DC0 809EE630 4602003C */ c.lt.s $f0, $f2 -/* 00DC4 809EE634 00000000 */ nop -/* 00DC8 809EE638 4502001F */ bc1fl .L809EE6B8 -/* 00DCC 809EE63C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DD0 809EE640 C61202BC */ lwc1 $f18, 0x02BC($s0) ## 000002BC -/* 00DD4 809EE644 C60402F8 */ lwc1 $f4, 0x02F8($s0) ## 000002F8 -/* 00DD8 809EE648 46049001 */ sub.s $f0, $f18, $f4 -/* 00DDC 809EE64C 46000005 */ abs.s $f0, $f0 -/* 00DE0 809EE650 4602003C */ c.lt.s $f0, $f2 -/* 00DE4 809EE654 00000000 */ nop -/* 00DE8 809EE658 45020017 */ bc1fl .L809EE6B8 -/* 00DEC 809EE65C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DF0 809EE660 C60602C0 */ lwc1 $f6, 0x02C0($s0) ## 000002C0 -/* 00DF4 809EE664 C60802FC */ lwc1 $f8, 0x02FC($s0) ## 000002FC -/* 00DF8 809EE668 46083001 */ sub.s $f0, $f6, $f8 -/* 00DFC 809EE66C 46000005 */ abs.s $f0, $f0 -/* 00E00 809EE670 4602003C */ c.lt.s $f0, $f2 -/* 00E04 809EE674 00000000 */ nop -/* 00E08 809EE678 4502000F */ bc1fl .L809EE6B8 -/* 00E0C 809EE67C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E10 809EE680 861802A2 */ lh $t8, 0x02A2($s0) ## 000002A2 -.L809EE684: -/* 00E14 809EE684 3C0A809F */ lui $t2, %hi(func_809EE6C8) ## $t2 = 809F0000 -/* 00E18 809EE688 24190046 */ addiu $t9, $zero, 0x0046 ## $t9 = 00000046 -/* 00E1C 809EE68C 13000008 */ beq $t8, $zero, .L809EE6B0 -/* 00E20 809EE690 254AE6C8 */ addiu $t2, $t2, %lo(func_809EE6C8) ## $t2 = 809EE6C8 -/* 00E24 809EE694 3C09809F */ lui $t1, %hi(func_809EE780) ## $t1 = 809F0000 -/* 00E28 809EE698 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00E2C 809EE69C 2529E780 */ addiu $t1, $t1, %lo(func_809EE780) ## $t1 = 809EE780 -/* 00E30 809EE6A0 A6190294 */ sh $t9, 0x0294($s0) ## 00000294 -/* 00E34 809EE6A4 A60802A2 */ sh $t0, 0x02A2($s0) ## 000002A2 -/* 00E38 809EE6A8 10000002 */ beq $zero, $zero, .L809EE6B4 -/* 00E3C 809EE6AC AE090280 */ sw $t1, 0x0280($s0) ## 00000280 -.L809EE6B0: -/* 00E40 809EE6B0 AE0A0280 */ sw $t2, 0x0280($s0) ## 00000280 -.L809EE6B4: -/* 00E44 809EE6B4 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE6B8: -/* 00E48 809EE6B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E4C 809EE6BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E50 809EE6C0 03E00008 */ jr $ra -/* 00E54 809EE6C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s deleted file mode 100644 index 6a7d3267e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809EE6C8 -/* 00E58 809EE6C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E5C 809EE6CC AFA5001C */ sw $a1, 0x001C($sp) -/* 00E60 809EE6D0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00E64 809EE6D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E68 809EE6D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E6C 809EE6DC AFA50018 */ sw $a1, 0x0018($sp) -/* 00E70 809EE6E0 0C02927F */ jal SkelAnime_Update - -/* 00E74 809EE6E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E78 809EE6E8 8FA50018 */ lw $a1, 0x0018($sp) -/* 00E7C 809EE6EC 3C19809F */ lui $t9, %hi(func_809EE408) ## $t9 = 809F0000 -/* 00E80 809EE6F0 3C01C352 */ lui $at, 0xC352 ## $at = C3520000 -/* 00E84 809EE6F4 84AE0296 */ lh $t6, 0x0296($a1) ## 00000296 -/* 00E88 809EE6F8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00E8C 809EE6FC 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00E90 809EE700 15C0001B */ bne $t6, $zero, .L809EE770 -/* 00E94 809EE704 2739E408 */ addiu $t9, $t9, %lo(func_809EE408) ## $t9 = 809EE408 -/* 00E98 809EE708 44810000 */ mtc1 $at, $f0 ## $f0 = -210.00 -/* 00E9C 809EE70C 3C01C2A0 */ lui $at, 0xC2A0 ## $at = C2A00000 -/* 00EA0 809EE710 44811000 */ mtc1 $at, $f2 ## $f2 = -80.00 -/* 00EA4 809EE714 3C01C47F */ lui $at, 0xC47F ## $at = C47F0000 -/* 00EA8 809EE718 44816000 */ mtc1 $at, $f12 ## $f12 = -1020.00 -/* 00EAC 809EE71C 3C01C38C */ lui $at, 0xC38C ## $at = C38C0000 -/* 00EB0 809EE720 44817000 */ mtc1 $at, $f14 ## $f14 = -280.00 -/* 00EB4 809EE724 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 00EB8 809EE728 44818000 */ mtc1 $at, $f16 ## $f16 = -20.00 -/* 00EBC 809EE72C 3C01C370 */ lui $at, 0xC370 ## $at = C3700000 -/* 00EC0 809EE730 44819000 */ mtc1 $at, $f18 ## $f18 = -240.00 -/* 00EC4 809EE734 A4AF02A2 */ sh $t7, 0x02A2($a1) ## 000002A2 -/* 00EC8 809EE738 A4B80294 */ sh $t8, 0x0294($a1) ## 00000294 -/* 00ECC 809EE73C ACB90280 */ sw $t9, 0x0280($a1) ## 00000280 -/* 00ED0 809EE740 E4A002F4 */ swc1 $f0, 0x02F4($a1) ## 000002F4 -/* 00ED4 809EE744 E4A002B8 */ swc1 $f0, 0x02B8($a1) ## 000002B8 -/* 00ED8 809EE748 E4A202F8 */ swc1 $f2, 0x02F8($a1) ## 000002F8 -/* 00EDC 809EE74C E4A202BC */ swc1 $f2, 0x02BC($a1) ## 000002BC -/* 00EE0 809EE750 E4AC02FC */ swc1 $f12, 0x02FC($a1) ## 000002FC -/* 00EE4 809EE754 E4AC02C0 */ swc1 $f12, 0x02C0($a1) ## 000002C0 -/* 00EE8 809EE758 E4AE02D0 */ swc1 $f14, 0x02D0($a1) ## 000002D0 -/* 00EEC 809EE75C E4AE02C4 */ swc1 $f14, 0x02C4($a1) ## 000002C4 -/* 00EF0 809EE760 E4B002D4 */ swc1 $f16, 0x02D4($a1) ## 000002D4 -/* 00EF4 809EE764 E4B002C8 */ swc1 $f16, 0x02C8($a1) ## 000002C8 -/* 00EF8 809EE768 E4B202D8 */ swc1 $f18, 0x02D8($a1) ## 000002D8 -/* 00EFC 809EE76C E4B202CC */ swc1 $f18, 0x02CC($a1) ## 000002CC -.L809EE770: -/* 00F00 809EE770 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F04 809EE774 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F08 809EE778 03E00008 */ jr $ra -/* 00F0C 809EE77C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s deleted file mode 100644 index a3a796d5b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809EE780 -/* 00F10 809EE780 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F14 809EE784 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F18 809EE788 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F1C 809EE78C AFBF001C */ sw $ra, 0x001C($sp) -/* 00F20 809EE790 AFA50024 */ sw $a1, 0x0024($sp) -/* 00F24 809EE794 0C02927F */ jal SkelAnime_Update - -/* 00F28 809EE798 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F2C 809EE79C 860E0294 */ lh $t6, 0x0294($s0) ## 00000294 -/* 00F30 809EE7A0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F34 809EE7A4 55C00012 */ bnel $t6, $zero, .L809EE7F0 -/* 00F38 809EE7A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F3C 809EE7AC 0C0300E1 */ jal Gameplay_ClearCamera -/* 00F40 809EE7B0 860502A0 */ lh $a1, 0x02A0($s0) ## 000002A0 -/* 00F44 809EE7B4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F48 809EE7B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F4C 809EE7BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00F50 809EE7C0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00F54 809EE7C4 240F405A */ addiu $t7, $zero, 0x405A ## $t7 = 0000405A -/* 00F58 809EE7C8 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 00F5C 809EE7CC 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F60 809EE7D0 0C042DC8 */ jal func_8010B720 -/* 00F64 809EE7D4 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 0000405A -/* 00F68 809EE7D8 3C19809F */ lui $t9, %hi(func_809EE800) ## $t9 = 809F0000 -/* 00F6C 809EE7DC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00F70 809EE7E0 2739E800 */ addiu $t9, $t9, %lo(func_809EE800) ## $t9 = 809EE800 -/* 00F74 809EE7E4 A6180292 */ sh $t8, 0x0292($s0) ## 00000292 -/* 00F78 809EE7E8 AE190280 */ sw $t9, 0x0280($s0) ## 00000280 -/* 00F7C 809EE7EC 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE7F0: -/* 00F80 809EE7F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F84 809EE7F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F88 809EE7F8 03E00008 */ jr $ra -/* 00F8C 809EE7FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s deleted file mode 100644 index eb4938c3e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_809EE800 -/* 00F90 809EE800 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F94 809EE804 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F98 809EE808 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F9C 809EE80C AFBF001C */ sw $ra, 0x001C($sp) -/* 00FA0 809EE810 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FA4 809EE814 0C02927F */ jal SkelAnime_Update - -/* 00FA8 809EE818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FAC 809EE81C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FB0 809EE820 0C042F6F */ jal func_8010BDBC -/* 00FB4 809EE824 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00FB8 809EE828 860E0292 */ lh $t6, 0x0292($s0) ## 00000292 -/* 00FBC 809EE82C 55C2002C */ bnel $t6, $v0, .L809EE8E0 -/* 00FC0 809EE830 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FC4 809EE834 0C041AF2 */ jal func_80106BC8 -/* 00FC8 809EE838 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FCC 809EE83C 50400028 */ beql $v0, $zero, .L809EE8E0 -/* 00FD0 809EE840 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FD4 809EE844 0C041B33 */ jal func_80106CCC -/* 00FD8 809EE848 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FDC 809EE84C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xeda) -/* 00FE0 809EE850 95EFF53A */ lhu $t7, %lo(gSaveContext+0xeda)($t7) -/* 00FE4 809EE854 3C198016 */ lui $t9, %hi(gGameInfo) -/* 00FE8 809EE858 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00FEC 809EE85C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 00FF0 809EE860 17000009 */ bne $t8, $zero, .L809EE888 -/* 00FF4 809EE864 00000000 */ nop -/* 00FF8 809EE868 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 00FFC 809EE86C 872412D8 */ lh $a0, 0x12D8($t9) ## 801612D8 -/* 01000 809EE870 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 01004 809EE874 00042400 */ sll $a0, $a0, 16 -/* 01008 809EE878 0C0222CD */ jal func_80088B34 -/* 0100C 809EE87C 00042403 */ sra $a0, $a0, 16 -/* 01010 809EE880 10000007 */ beq $zero, $zero, .L809EE8A0 -/* 01014 809EE884 00000000 */ nop -.L809EE888: -/* 01018 809EE888 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 0101C 809EE88C 850412D8 */ lh $a0, 0x12D8($t0) ## 000012D8 -/* 01020 809EE890 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 01024 809EE894 00042400 */ sll $a0, $a0, 16 -/* 01028 809EE898 0C0222CD */ jal func_80088B34 -/* 0102C 809EE89C 00042403 */ sra $a0, $a0, 16 -.L809EE8A0: -/* 01030 809EE8A0 0C03D6B3 */ jal func_800F5ACC -/* 01034 809EE8A4 2404006C */ addiu $a0, $zero, 0x006C ## $a0 = 0000006C -/* 01038 809EE8A8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0103C 809EE8AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01040 809EE8B0 0C00B7D5 */ jal func_8002DF54 -/* 01044 809EE8B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01048 809EE8B8 3C0C809F */ lui $t4, %hi(func_809EDD4C) ## $t4 = 809F0000 -/* 0104C 809EE8BC 2409405B */ addiu $t1, $zero, 0x405B ## $t1 = 0000405B -/* 01050 809EE8C0 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 01054 809EE8C4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01058 809EE8C8 258CDD4C */ addiu $t4, $t4, %lo(func_809EDD4C) ## $t4 = 809EDD4C -/* 0105C 809EE8CC A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 01060 809EE8D0 A60A0292 */ sh $t2, 0x0292($s0) ## 00000292 -/* 01064 809EE8D4 A60B02A8 */ sh $t3, 0x02A8($s0) ## 000002A8 -/* 01068 809EE8D8 AE0C0280 */ sw $t4, 0x0280($s0) ## 00000280 -/* 0106C 809EE8DC 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE8E0: -/* 01070 809EE8E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01074 809EE8E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01078 809EE8E8 03E00008 */ jr $ra -/* 0107C 809EE8EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s deleted file mode 100644 index 2f415e61dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809EE8F0 -/* 01080 809EE8F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01084 809EE8F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01088 809EE8F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0108C 809EE8FC AFA5001C */ sw $a1, 0x001C($sp) -/* 01090 809EE900 0C02927F */ jal SkelAnime_Update - -/* 01094 809EE904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01098 809EE908 8FA4001C */ lw $a0, 0x001C($sp) -/* 0109C 809EE90C 0C042F6F */ jal func_8010BDBC -/* 010A0 809EE910 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 010A4 809EE914 8FAE0018 */ lw $t6, 0x0018($sp) -/* 010A8 809EE918 85CF0292 */ lh $t7, 0x0292($t6) ## 00000292 -/* 010AC 809EE91C 55E2000D */ bnel $t7, $v0, .L809EE954 -/* 010B0 809EE920 8FA40018 */ lw $a0, 0x0018($sp) -/* 010B4 809EE924 0C041AF2 */ jal func_80106BC8 -/* 010B8 809EE928 8FA4001C */ lw $a0, 0x001C($sp) -/* 010BC 809EE92C 50400009 */ beql $v0, $zero, .L809EE954 -/* 010C0 809EE930 8FA40018 */ lw $a0, 0x0018($sp) -/* 010C4 809EE934 0C041B33 */ jal func_80106CCC -/* 010C8 809EE938 8FA4001C */ lw $a0, 0x001C($sp) -/* 010CC 809EE93C 8FB90018 */ lw $t9, 0x0018($sp) -/* 010D0 809EE940 3C18809F */ lui $t8, %hi(func_809EDD4C) ## $t8 = 809F0000 -/* 010D4 809EE944 2718DD4C */ addiu $t8, $t8, %lo(func_809EDD4C) ## $t8 = 809EDD4C -/* 010D8 809EE948 10000004 */ beq $zero, $zero, .L809EE95C -/* 010DC 809EE94C AF380280 */ sw $t8, 0x0280($t9) ## 00000280 -/* 010E0 809EE950 8FA40018 */ lw $a0, 0x0018($sp) -.L809EE954: -/* 010E4 809EE954 0C27B6C2 */ jal func_809EDB08 -/* 010E8 809EE958 8FA5001C */ lw $a1, 0x001C($sp) -.L809EE95C: -/* 010EC 809EE95C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010F0 809EE960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010F4 809EE964 03E00008 */ jr $ra -/* 010F8 809EE968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s deleted file mode 100644 index d932d5100b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_809EE96C -/* 010FC 809EE96C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01100 809EE970 AFB00018 */ sw $s0, 0x0018($sp) -/* 01104 809EE974 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01108 809EE978 AFBF001C */ sw $ra, 0x001C($sp) -/* 0110C 809EE97C AFA50024 */ sw $a1, 0x0024($sp) -/* 01110 809EE980 0C02927F */ jal SkelAnime_Update - -/* 01114 809EE984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01118 809EE988 8FA40024 */ lw $a0, 0x0024($sp) -/* 0111C 809EE98C 0C042F6F */ jal func_8010BDBC -/* 01120 809EE990 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01124 809EE994 860E0292 */ lh $t6, 0x0292($s0) ## 00000292 -/* 01128 809EE998 55C20015 */ bnel $t6, $v0, .L809EE9F0 -/* 0112C 809EE99C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01130 809EE9A0 0C041AF2 */ jal func_80106BC8 -/* 01134 809EE9A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01138 809EE9A8 50400011 */ beql $v0, $zero, .L809EE9F0 -/* 0113C 809EE9AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01140 809EE9B0 0C041B33 */ jal func_80106CCC -/* 01144 809EE9B4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01148 809EE9B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0114C 809EE9BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01150 809EE9C0 0C00B7D5 */ jal func_8002DF54 -/* 01154 809EE9C4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01158 809EE9C8 3C08809F */ lui $t0, %hi(func_809EDD4C) ## $t0 = 809F0000 -/* 0115C 809EE9CC 240F4056 */ addiu $t7, $zero, 0x4056 ## $t7 = 00004056 -/* 01160 809EE9D0 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 01164 809EE9D4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01168 809EE9D8 2508DD4C */ addiu $t0, $t0, %lo(func_809EDD4C) ## $t0 = 809EDD4C -/* 0116C 809EE9DC A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 01170 809EE9E0 A6180292 */ sh $t8, 0x0292($s0) ## 00000292 -/* 01174 809EE9E4 A61902A8 */ sh $t9, 0x02A8($s0) ## 000002A8 -/* 01178 809EE9E8 AE080280 */ sw $t0, 0x0280($s0) ## 00000280 -/* 0117C 809EE9EC 8FBF001C */ lw $ra, 0x001C($sp) -.L809EE9F0: -/* 01180 809EE9F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01184 809EE9F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01188 809EE9F8 03E00008 */ jr $ra -/* 0118C 809EE9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s deleted file mode 100644 index e6be2da003..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809EEA00 -/* 01190 809EEA00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01194 809EEA04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01198 809EEA08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0119C 809EEA0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 011A0 809EEA10 AFA5002C */ sw $a1, 0x002C($sp) -/* 011A4 809EEA14 0C02927F */ jal SkelAnime_Update - -/* 011A8 809EEA18 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 011AC 809EEA1C 8FA4002C */ lw $a0, 0x002C($sp) -/* 011B0 809EEA20 0C042F6F */ jal func_8010BDBC -/* 011B4 809EEA24 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 011B8 809EEA28 860E0292 */ lh $t6, 0x0292($s0) ## 00000292 -/* 011BC 809EEA2C 55C20014 */ bnel $t6, $v0, .L809EEA80 -/* 011C0 809EEA30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 011C4 809EEA34 0C041AF2 */ jal func_80106BC8 -/* 011C8 809EEA38 8FA4002C */ lw $a0, 0x002C($sp) -/* 011CC 809EEA3C 50400010 */ beql $v0, $zero, .L809EEA80 -/* 011D0 809EEA40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 011D4 809EEA44 0C041B33 */ jal func_80106CCC -/* 011D8 809EEA48 8FA4002C */ lw $a0, 0x002C($sp) -/* 011DC 809EEA4C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 011E0 809EEA50 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 011E4 809EEA54 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 011E8 809EEA58 8FA5002C */ lw $a1, 0x002C($sp) -/* 011EC 809EEA5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011F0 809EEA60 24060037 */ addiu $a2, $zero, 0x0037 ## $a2 = 00000037 -/* 011F4 809EEA64 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 -/* 011F8 809EEA68 0C00BD0D */ jal func_8002F434 -/* 011FC 809EEA6C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01200 809EEA70 3C0F809F */ lui $t7, %hi(func_809EEA90) ## $t7 = 809F0000 -/* 01204 809EEA74 25EFEA90 */ addiu $t7, $t7, %lo(func_809EEA90) ## $t7 = 809EEA90 -/* 01208 809EEA78 AE0F0280 */ sw $t7, 0x0280($s0) ## 00000280 -/* 0120C 809EEA7C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809EEA80: -/* 01210 809EEA80 8FB00020 */ lw $s0, 0x0020($sp) -/* 01214 809EEA84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01218 809EEA88 03E00008 */ jr $ra -/* 0121C 809EEA8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s deleted file mode 100644 index 2352c8e2a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809EEA90 -/* 01220 809EEA90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01224 809EEA94 AFBF001C */ sw $ra, 0x001C($sp) -/* 01228 809EEA98 AFA40020 */ sw $a0, 0x0020($sp) -/* 0122C 809EEA9C AFA50024 */ sw $a1, 0x0024($sp) -/* 01230 809EEAA0 0C02927F */ jal SkelAnime_Update - -/* 01234 809EEAA4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01238 809EEAA8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0123C 809EEAAC 0C00BD04 */ jal Actor_HasParent -/* 01240 809EEAB0 8FA50024 */ lw $a1, 0x0024($sp) -/* 01244 809EEAB4 10400005 */ beq $v0, $zero, .L809EEACC -/* 01248 809EEAB8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0124C 809EEABC 3C0E809F */ lui $t6, %hi(func_809EEAF8) ## $t6 = 809F0000 -/* 01250 809EEAC0 25CEEAF8 */ addiu $t6, $t6, %lo(func_809EEAF8) ## $t6 = 809EEAF8 -/* 01254 809EEAC4 10000008 */ beq $zero, $zero, .L809EEAE8 -/* 01258 809EEAC8 AC8E0280 */ sw $t6, 0x0280($a0) ## 00000280 -.L809EEACC: -/* 0125C 809EEACC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01260 809EEAD0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 01264 809EEAD4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01268 809EEAD8 24060037 */ addiu $a2, $zero, 0x0037 ## $a2 = 00000037 -/* 0126C 809EEADC 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 -/* 01270 809EEAE0 0C00BD0D */ jal func_8002F434 -/* 01274 809EEAE4 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809EEAE8: -/* 01278 809EEAE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0127C 809EEAEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01280 809EEAF0 03E00008 */ jr $ra -/* 01284 809EEAF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s deleted file mode 100644 index ca94a01192..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s +++ /dev/null @@ -1,51 +0,0 @@ -.rdata -glabel D_809EF150 - .asciz "\x1b[32m☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.balign 4 - -.text -glabel func_809EEAF8 -/* 01288 809EEAF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0128C 809EEAFC AFB00018 */ sw $s0, 0x0018($sp) -/* 01290 809EEB00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01294 809EEB04 AFBF001C */ sw $ra, 0x001C($sp) -/* 01298 809EEB08 AFA50024 */ sw $a1, 0x0024($sp) -/* 0129C 809EEB0C 0C02927F */ jal SkelAnime_Update - -/* 012A0 809EEB10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012A4 809EEB14 8FA40024 */ lw $a0, 0x0024($sp) -/* 012A8 809EEB18 0C042F6F */ jal func_8010BDBC -/* 012AC 809EEB1C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 012B0 809EEB20 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 012B4 809EEB24 54410016 */ bnel $v0, $at, .L809EEB80 -/* 012B8 809EEB28 8FBF001C */ lw $ra, 0x001C($sp) -/* 012BC 809EEB2C 0C041AF2 */ jal func_80106BC8 -/* 012C0 809EEB30 8FA40024 */ lw $a0, 0x0024($sp) -/* 012C4 809EEB34 10400011 */ beq $v0, $zero, .L809EEB7C -/* 012C8 809EEB38 3C04809F */ lui $a0, %hi(D_809EF150) ## $a0 = 809F0000 -/* 012CC 809EEB3C 0C00084C */ jal osSyncPrintf - -/* 012D0 809EEB40 2484F150 */ addiu $a0, $a0, %lo(D_809EF150) ## $a0 = 809EF150 -/* 012D4 809EEB44 A60002A4 */ sh $zero, 0x02A4($s0) ## 000002A4 -/* 012D8 809EEB48 860202A4 */ lh $v0, 0x02A4($s0) ## 000002A4 -/* 012DC 809EEB4C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 012E0 809EEB50 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 012E4 809EEB54 A60202A2 */ sh $v0, 0x02A2($s0) ## 000002A2 -/* 012E8 809EEB58 A602029C */ sh $v0, 0x029C($s0) ## 0000029C -/* 012EC 809EEB5C A60202A8 */ sh $v0, 0x02A8($s0) ## 000002A8 -/* 012F0 809EEB60 A202031E */ sb $v0, 0x031E($s0) ## 0000031E -/* 012F4 809EEB64 946E0EDA */ lhu $t6, 0x0EDA($v1) ## 8015F53A -/* 012F8 809EEB68 3C18809F */ lui $t8, %hi(func_809EDCB0) ## $t8 = 809F0000 -/* 012FC 809EEB6C 2718DCB0 */ addiu $t8, $t8, %lo(func_809EDCB0) ## $t8 = 809EDCB0 -/* 01300 809EEB70 35CF0100 */ ori $t7, $t6, 0x0100 ## $t7 = 00000100 -/* 01304 809EEB74 A46F0EDA */ sh $t7, 0x0EDA($v1) ## 8015F53A -/* 01308 809EEB78 AE180280 */ sw $t8, 0x0280($s0) ## 00000280 -.L809EEB7C: -/* 0130C 809EEB7C 8FBF001C */ lw $ra, 0x001C($sp) -.L809EEB80: -/* 01310 809EEB80 8FB00018 */ lw $s0, 0x0018($sp) -/* 01314 809EEB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01318 809EEB88 03E00008 */ jr $ra -/* 0131C 809EEB8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s deleted file mode 100644 index b5bbfd3d2f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_809EEDB8 -/* 01548 809EEDB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0154C 809EEDBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01550 809EEDC0 0C031A73 */ jal Graph_Alloc - -/* 01554 809EEDC4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01558 809EEDC8 3C0EDF00 */ lui $t6, 0xDF00 ## $t6 = DF000000 -/* 0155C 809EEDCC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01560 809EEDD0 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01564 809EEDD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01568 809EEDD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0156C 809EEDDC 03E00008 */ jr $ra -/* 01570 809EEDE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s deleted file mode 100644 index 2171d4b370..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_809EEDE4 -/* 01574 809EEDE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01578 809EEDE8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0157C 809EEDEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01580 809EEDF0 AFA40028 */ sw $a0, 0x0028($sp) -/* 01584 809EEDF4 AFA60030 */ sw $a2, 0x0030($sp) -/* 01588 809EEDF8 14A10007 */ bne $a1, $at, .L809EEE18 -/* 0158C 809EEDFC AFA70034 */ sw $a3, 0x0034($sp) -/* 01590 809EEE00 8FA20038 */ lw $v0, 0x0038($sp) -/* 01594 809EEE04 8FA3003C */ lw $v1, 0x003C($sp) -/* 01598 809EEE08 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 0159C 809EEE0C 846F028C */ lh $t7, 0x028C($v1) ## 0000028C -/* 015A0 809EEE10 01CFC021 */ addu $t8, $t6, $t7 -/* 015A4 809EEE14 A4580000 */ sh $t8, 0x0000($v0) ## 00000000 -.L809EEE18: -/* 015A8 809EEE18 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 015AC 809EEE1C 8FA20038 */ lw $v0, 0x0038($sp) -/* 015B0 809EEE20 14A10009 */ bne $a1, $at, .L809EEE48 -/* 015B4 809EEE24 8FA3003C */ lw $v1, 0x003C($sp) -/* 015B8 809EEE28 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 015BC 809EEE2C 84680286 */ lh $t0, 0x0286($v1) ## 00000286 -/* 015C0 809EEE30 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 -/* 015C4 809EEE34 03284821 */ addu $t1, $t9, $t0 -/* 015C8 809EEE38 A4490000 */ sh $t1, 0x0000($v0) ## 00000000 -/* 015CC 809EEE3C 846B0288 */ lh $t3, 0x0288($v1) ## 00000288 -/* 015D0 809EEE40 014B6021 */ addu $t4, $t2, $t3 -/* 015D4 809EEE44 A44C0004 */ sh $t4, 0x0004($v0) ## 00000004 -.L809EEE48: -/* 015D8 809EEE48 906D031D */ lbu $t5, 0x031D($v1) ## 0000031D -/* 015DC 809EEE4C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 015E0 809EEE50 51A00038 */ beql $t5, $zero, .L809EEF34 -/* 015E4 809EEE54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015E8 809EEE58 10A10006 */ beq $a1, $at, .L809EEE74 -/* 015EC 809EEE5C 00051880 */ sll $v1, $a1, 2 -/* 015F0 809EEE60 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 015F4 809EEE64 10A10003 */ beq $a1, $at, .L809EEE74 -/* 015F8 809EEE68 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 015FC 809EEE6C 54A10031 */ bnel $a1, $at, .L809EEF34 -/* 01600 809EEE70 8FBF0014 */ lw $ra, 0x0014($sp) -.L809EEE74: -/* 01604 809EEE74 8FAE0028 */ lw $t6, 0x0028($sp) -/* 01608 809EEE78 00651823 */ subu $v1, $v1, $a1 -/* 0160C 809EEE7C 000318C0 */ sll $v1, $v1, 3 -/* 01610 809EEE80 8DCF009C */ lw $t7, 0x009C($t6) ## 0000009C -/* 01614 809EEE84 00651821 */ addu $v1, $v1, $a1 -/* 01618 809EEE88 00031840 */ sll $v1, $v1, 1 -/* 0161C 809EEE8C 24780814 */ addiu $t8, $v1, 0x0814 ## $t8 = 00000814 -/* 01620 809EEE90 01F80019 */ multu $t7, $t8 -/* 01624 809EEE94 AFA30018 */ sw $v1, 0x0018($sp) -/* 01628 809EEE98 00002012 */ mflo $a0 -/* 0162C 809EEE9C 00042400 */ sll $a0, $a0, 16 -/* 01630 809EEEA0 0C01DE1C */ jal Math_SinS - ## sins? -/* 01634 809EEEA4 00042403 */ sra $a0, $a0, 16 -/* 01638 809EEEA8 8FA20038 */ lw $v0, 0x0038($sp) -/* 0163C 809EEEAC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01640 809EEEB0 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 01644 809EEEB4 84590002 */ lh $t9, 0x0002($v0) ## 00000002 -/* 01648 809EEEB8 8FA30018 */ lw $v1, 0x0018($sp) -/* 0164C 809EEEBC 46080282 */ mul.s $f10, $f0, $f8 -/* 01650 809EEEC0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01654 809EEEC4 246C0940 */ addiu $t4, $v1, 0x0940 ## $t4 = 00000940 -/* 01658 809EEEC8 468021A0 */ cvt.s.w $f6, $f4 -/* 0165C 809EEECC 460A3400 */ add.s $f16, $f6, $f10 -/* 01660 809EEED0 4600848D */ trunc.w.s $f18, $f16 -/* 01664 809EEED4 44099000 */ mfc1 $t1, $f18 -/* 01668 809EEED8 00000000 */ nop -/* 0166C 809EEEDC A4490002 */ sh $t1, 0x0002($v0) ## 00000002 -/* 01670 809EEEE0 8FAA0028 */ lw $t2, 0x0028($sp) -/* 01674 809EEEE4 8D4B009C */ lw $t3, 0x009C($t2) ## 0000009C -/* 01678 809EEEE8 016C0019 */ multu $t3, $t4 -/* 0167C 809EEEEC 00002012 */ mflo $a0 -/* 01680 809EEEF0 00042400 */ sll $a0, $a0, 16 -/* 01684 809EEEF4 0C01DE0D */ jal Math_CosS - ## coss? -/* 01688 809EEEF8 00042403 */ sra $a0, $a0, 16 -/* 0168C 809EEEFC 8FA20038 */ lw $v0, 0x0038($sp) -/* 01690 809EEF00 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01694 809EEF04 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 01698 809EEF08 844D0004 */ lh $t5, 0x0004($v0) ## 00000004 -/* 0169C 809EEF0C 46060282 */ mul.s $f10, $f0, $f6 -/* 016A0 809EEF10 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 016A4 809EEF14 00000000 */ nop -/* 016A8 809EEF18 46802220 */ cvt.s.w $f8, $f4 -/* 016AC 809EEF1C 460A4400 */ add.s $f16, $f8, $f10 -/* 016B0 809EEF20 4600848D */ trunc.w.s $f18, $f16 -/* 016B4 809EEF24 440F9000 */ mfc1 $t7, $f18 -/* 016B8 809EEF28 00000000 */ nop -/* 016BC 809EEF2C A44F0004 */ sh $t7, 0x0004($v0) ## 00000004 -/* 016C0 809EEF30 8FBF0014 */ lw $ra, 0x0014($sp) -.L809EEF34: -/* 016C4 809EEF34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016C8 809EEF38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 016CC 809EEF3C 03E00008 */ jr $ra -/* 016D0 809EEF40 00000000 */ nop diff --git a/data/overlays/actors/z_en_diving_game.data.s b/data/overlays/actors/z_en_diving_game.data.s deleted file mode 100644 index fc835a8674..0000000000 --- a/data/overlays/actors/z_en_diving_game.data.s +++ /dev/null @@ -1,24 +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 En_Diving_Game_InitVars - .word 0x01240400, 0x00000019, 0x00FE0000, 0x00000398 -.word EnDivingGame_Init -.word EnDivingGame_Destroy -.word EnDivingGame_Update -.word EnDivingGame_Draw -glabel D_809EF0B0 - .word 0x00000000 -glabel D_809EF0B4 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x000A000A, 0x00000000, 0x00000000 -glabel D_809EF0E0 - .word 0x06003E40, 0x06004640, 0x06004E40, 0x00000000 - diff --git a/data/overlays/actors/z_en_diving_game.reloc.s b/data/overlays/actors/z_en_diving_game.reloc.s deleted file mode 100644 index 25651654fd..0000000000 --- a/data/overlays/actors/z_en_diving_game.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_809EF1D0 - .incbin "baserom/ovl_En_Diving_Game", 0x1960, 0x00000180 diff --git a/include/functions.h b/include/functions.h index b97fdec25a..71e4fc75fa 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1582,7 +1582,7 @@ s16 Gameplay_ChangeCameraStatus(GlobalContext* globalCtx, s16 camId, s16 status) void Gameplay_ClearCamera(GlobalContext* globalCtx, s16 camId); void Gameplay_ClearAllSubCameras(GlobalContext* globalCtx); Camera* Gameplay_GetCamera(GlobalContext* globalCtx, s16 camId); -s32 Gameplay_CameraSetAtEye(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3); +s32 Gameplay_CameraSetAtEye(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye); s32 Gameplay_CameraSetAtEyeUp(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye, Vec3f* up); s32 Gameplay_CameraSetFov(GlobalContext* globalCtx, s16 camId, f32 fov); s32 Gameplay_SetCameraRoll(GlobalContext* globalCtx, s16 camId, s16 roll); @@ -1597,6 +1597,7 @@ void Gameplay_TriggerRespawn(GlobalContext* globalCtx); s32 func_800C0CB8(GlobalContext* globalCtx); s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx); s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw); +s32 func_800C0DB4(GlobalContext* globalCtx, Vec3f* pos); void PreRender_SetValuesSave(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg); void PreRender_Init(PreRenderContext* this); void PreRender_SetValues(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf); diff --git a/spec b/spec index 9da0b420dd..5a5f093fae 100644 --- a/spec +++ b/spec @@ -2078,8 +2078,7 @@ endseg beginseg name "ovl_En_Diving_Game" include "build/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.o" - include "build/data/overlays/actors/z_en_diving_game.data.o" - include "build/data/overlays/actors/z_en_diving_game.reloc.o" + include "build/src/overlays/actors/ovl_En_Diving_Game/ovl_En_Diving_Game_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 15cbd35437..8280e3a6a2 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -1,4 +1,12 @@ +/* + * File: z_en_diving_game.c + * Overlay: ovl_En_Diving_Game + * Description: Diving minigame + */ + #include "z_en_diving_game.h" +#include "vt.h" +#include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #define FLAGS 0x00000019 @@ -9,11 +17,23 @@ void EnDivingGame_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDivingGame_Update(Actor* thisx, GlobalContext* globalCtx); void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_0600219C; -extern UNK_TYPE D_06002FE8; -extern UNK_TYPE D_0600BFA8; +void func_809EDCB0(EnDivingGame* this, GlobalContext* globalCtx); +void EnDivingGame_Talk(EnDivingGame* this, GlobalContext* globalCtx); +void EnDivingGame_HandlePlayChoice(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE048(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE0FC(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE194(EnDivingGame* this, GlobalContext* globalCtx); +void EnDivingGame_SetupRupeeThrow(EnDivingGame* this, GlobalContext* globalCtx); +void EnDivingGame_RupeeThrow(EnDivingGame* this, GlobalContext* globalCtx); +void EnDivingGame_SetupUnderwaterViewCs(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE780(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE800(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE8F0(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EE96C(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EEA00(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EEA90(EnDivingGame* this, GlobalContext* globalCtx); +void func_809EEAF8(EnDivingGame* this, GlobalContext* globalCtx); -/* const ActorInit En_Diving_Game_InitVars = { ACTOR_EN_DIVING_GAME, ACTORCAT_NPC, @@ -26,7 +46,10 @@ const ActorInit En_Diving_Game_InitVars = { (ActorFunc)EnDivingGame_Draw, }; -static ColliderCylinderInit D_809EF0B4 = { +// used to ensure there's only one instance of this actor. +static u8 D_809EF0B0 = false; + +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -39,57 +62,516 @@ static ColliderCylinderInit D_809EF0B4 = { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE, + TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, }, { 10, 10, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s") +static u64* sEyeTextures[] = { + 0x06003E40, + 0x06004640, + 0x06004E40, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809ED9E0.s") +extern FlexSkeletonHeader D_0600BFA8; +extern AnimationHeader D_06002FE8; // Stand/static. +extern AnimationHeader D_0600219C; // Throw rupees animation. -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDB08.s") +void EnDivingGame_Init(Actor* thisx, GlobalContext* globalCtx) { + EnDivingGame* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s") + this->actor.gravity = -3.0f; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600BFA8, &D_06002FE8, this->jointTable, this->morphTable, 20); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" VT_RST); + this->actor.room = -1; + this->actor.scale.x = 0.01f; + this->actor.scale.y = 0.012999999f; + this->actor.scale.z = 0.0139999995f; + if (D_809EF0B0) { + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); + this->unk_31F = 1; + Actor_Kill(&this->actor); + } else { + D_809EF0B0 = true; + this->actor.targetMode = 0; + this->actor.colChkInfo.mass = MASS_IMMOVABLE; + this->actionFunc = func_809EDCB0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s") +void EnDivingGame_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnDivingGame* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDEDC.s") + if (this->unk_31F == 0) { + gSaveContext.timer1State = 0; + } + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE048.s") +void EnDivingGame_SpawnRuppy(EnDivingGame* this, GlobalContext* globalCtx) { + EnExRuppy* rupee; + Vec3f rupeePos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s") + rupeePos.x = (Rand_ZeroOne() - 0.5f) * 30.0f + this->actor.world.pos.x; + rupeePos.y = (Rand_ZeroOne() - 0.5f) * 20.0f + (this->actor.world.pos.y + 30.0f); + rupeePos.z = (Rand_ZeroOne() - 0.5f) * 20.0f + this->actor.world.pos.z; + rupee = (EnExRuppy*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_RUPPY, rupeePos.x, + rupeePos.y, rupeePos.z, 0, (s16)Rand_CenteredFloat(3500.0f) - 1000, + this->rupeesLeftToThrow, 0); + if (rupee != NULL) { + rupee->actor.speedXZ = 12.0f; + rupee->actor.velocity.y = 6.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE194.s") +s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, GlobalContext* globalCtx) { + if (gSaveContext.timer1State == 10 && !Gameplay_InCsMode(globalCtx)) { + // Failed. + gSaveContext.timer1State = 0; + func_800F5B58(); + func_80078884(NA_SE_SY_FOUND); + this->actor.textId = 0x71AD; + func_8010B680(globalCtx, this->actor.textId, NULL); + this->unk_292 = 5; + this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_809EE048; + return true; + } else { + s32 rupeesNeeded = 5; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE1F4.s") + if (gSaveContext.eventChkInf[3] & 0x100) { + rupeesNeeded = 10; + } + if (this->grabbedRupeesCounter >= rupeesNeeded) { + // Won. + gSaveContext.timer1State = 0; + this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + this->actor.textId = 0x4055; + } else { + this->actor.textId = 0x405D; + if (this->extraWinCount < 100) { + this->extraWinCount++; + } + } + func_8010B680(globalCtx, this->actor.textId, NULL); + this->unk_292 = 5; + func_800F5B58(); + func_800F5C64(0x39); + func_8002DF54(globalCtx, NULL, 8); + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + this->actionFunc = func_809EE96C; + } else { + this->actionFunc = func_809EE048; + } + return true; + } + } + return false; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE408.s") +// EnDivingGame_FinishMinigame ? // Reset probably +void func_809EDCB0(EnDivingGame* this, GlobalContext* globalCtx) { + f32 frameCount = Animation_GetLastFrame(&D_06002FE8); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE6C8.s") + Animation_Change(&this->skelAnime, &D_06002FE8, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->notPlayingMinigame = true; + this->actionFunc = EnDivingGame_Talk; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE780.s") +void EnDivingGame_Talk(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->state != ENDIVINGGAME_STATE_PLAYING || !EnDivingGame_HasMinigameFinished(this, globalCtx)) { + if (func_8002F194(&this->actor, globalCtx)) { + if (this->unk_292 != 6) { + switch (this->state) { + case ENDIVINGGAME_STATE_NOTPLAYING: + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = EnDivingGame_HandlePlayChoice; + break; + case ENDIVINGGAME_STATE_AWARDPRIZE: + this->actionFunc = func_809EEA00; + break; + case ENDIVINGGAME_STATE_PLAYING: + this->actionFunc = func_809EE8F0; + break; + } + } + } else { + if (Text_GetFaceReaction(globalCtx, 0x1D) != 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1D); + this->unk_292 = 6; + } else { + switch (this->state) { + case ENDIVINGGAME_STATE_NOTPLAYING: + this->unk_292 = 4; + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + this->actor.textId = 0x4053; + this->phase = ENDIVINGGAME_PHASE_1; + } else { + this->actor.textId = 0x405C; + this->phase = ENDIVINGGAME_PHASE_2; + } + break; + case ENDIVINGGAME_STATE_AWARDPRIZE: + this->actor.textId = 0x4056; + this->unk_292 = 5; + break; + case ENDIVINGGAME_STATE_PLAYING: + this->actor.textId = 0x405B; + this->unk_292 = 5; + break; + } + } + func_8002F2CC(&this->actor, globalCtx, 80.0f); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE800.s") +void EnDivingGame_HandlePlayChoice(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && + func_80106BC8(globalCtx)) { // Did player selected an answer? + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // Yes + if (gSaveContext.rupees >= 20) { + Rupees_ChangeBy(-20); + this->actor.textId = 0x4054; + } else { + this->actor.textId = 0x85; + this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; + } + break; + case 1: // No + this->actor.textId = 0x2D; + this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; + break; + } + if (!(gSaveContext.eventChkInf[3] & 0x100) || this->actor.textId == 0x85 || this->actor.textId == 0x2D) { + func_8010B720(globalCtx, this->actor.textId); + this->unk_292 = 5; + this->actionFunc = func_809EE048; + } else { + globalCtx->msgCtx.msgMode = 0x37; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_809EE0FC; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE8F0.s") +// Waits for the message to close +void func_809EE048(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + if (this->phase == ENDIVINGGAME_PHASE_ENDED) { + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, NULL, 7); + this->actionFunc = func_809EDCB0; + } else { + globalCtx->msgCtx.msgMode = 0x37; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_809EE0FC; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE96C.s") +// another "start minigame" step +void func_809EE0FC(EnDivingGame* this, GlobalContext* globalCtx) { + f32 frameCount = Animation_GetLastFrame(&D_0600219C); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA00.s") + Animation_Change(&this->skelAnime, &D_0600219C, 1.0f, 0.0f, (s16)frameCount, 2, -10.0f); + this->notPlayingMinigame = false; + this->actionFunc = func_809EE194; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEA90.s") +// Wait a bit before start throwing the rupees. +void func_809EE194(EnDivingGame* this, GlobalContext* globalCtx) { + f32 currentFrame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEAF8.s") + SkelAnime_Update(&this->skelAnime); + if (currentFrame >= 15.0f) { + this->actionFunc = EnDivingGame_SetupRupeeThrow; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s") +void EnDivingGame_SetupRupeeThrow(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + this->subCamId = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, this->subCamId, CAM_STAT_ACTIVE); + this->spawnRuppyTimer = 10; + this->unk_2F4.x = -210.0f; + this->unk_2F4.y = -80.0f; + this->unk_2F4.z = -1020.0f; + this->unk_2D0.x = -280.0f; + this->unk_2D0.y = -20.0f; + this->unk_2D0.z = -240.0f; + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + this->rupeesLeftToThrow = 5; + } else { + this->rupeesLeftToThrow = 10; + } + this->unk_2DC.x = this->unk_2DC.y = this->unk_2DC.z = this->unk_300.x = this->unk_300.y = this->unk_300.z = 0.1f; + this->camLookAt.x = globalCtx->view.lookAt.x; + this->camLookAt.y = globalCtx->view.lookAt.y; + this->camLookAt.z = globalCtx->view.lookAt.z; + this->camEye.x = globalCtx->view.eye.x; + this->camEye.y = globalCtx->view.eye.y + 80.0f; + this->camEye.z = globalCtx->view.eye.z + 250.0f; + this->unk_2E8.x = fabsf(this->camEye.x - this->unk_2D0.x) * 0.04f; + this->unk_2E8.y = fabsf(this->camEye.y - this->unk_2D0.y) * 0.04f; + this->unk_2E8.z = fabsf(this->camEye.z - this->unk_2D0.z) * 0.04f; + this->unk_30C.x = fabsf(this->camLookAt.x - this->unk_2F4.x) * 0.04f; + this->unk_30C.y = fabsf(this->camLookAt.y - this->unk_2F4.y) * 0.04f; + this->unk_30C.z = fabsf(this->camLookAt.z - this->unk_2F4.z) * 0.04f; + Gameplay_CameraSetAtEye(globalCtx, this->subCamId, &this->camLookAt, &this->camEye); + Gameplay_CameraSetFov(globalCtx, this->subCamId, globalCtx->mainCamera.fov); + this->csCameraTimer = 60; + this->actionFunc = EnDivingGame_RupeeThrow; + this->unk_318 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDB8.s") +// Throws rupee when this->spawnRuppyTimer == 0 +void EnDivingGame_RupeeThrow(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (func_800C0DB4(globalCtx, &this->actor.projectedPos)) { + func_800F6828(0); + } + if (this->subCamId != 0) { + Math_ApproachF(&this->camEye.x, this->unk_2D0.x, this->unk_2DC.x, this->unk_2E8.x * this->unk_318); + Math_ApproachF(&this->camEye.z, this->unk_2D0.z, this->unk_2DC.z, this->unk_2E8.z * this->unk_318); + Math_ApproachF(&this->camLookAt.x, this->unk_2F4.x, this->unk_300.x, this->unk_30C.x * this->unk_318); + Math_ApproachF(&this->camLookAt.y, this->unk_2F4.y, this->unk_300.y, this->unk_30C.y * this->unk_318); + Math_ApproachF(&this->camLookAt.z, this->unk_2F4.z, this->unk_300.z, this->unk_30C.z * this->unk_318); + Math_ApproachF(&this->unk_318, 1.0f, 1.0f, 0.02f); + } + Gameplay_CameraSetAtEye(globalCtx, this->subCamId, &this->camLookAt, &this->camEye); + if (!this->allRupeesThrown && this->spawnRuppyTimer == 0) { + this->spawnRuppyTimer = 5; + EnDivingGame_SpawnRuppy(this, globalCtx); + this->rupeesLeftToThrow--; + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + this->unk_296 = 30; + } else { + this->unk_296 = 5; + } + if (this->rupeesLeftToThrow <= 0) { + this->rupeesLeftToThrow = 0; + this->allRupeesThrown = true; + } + } + if (this->csCameraTimer == 0 || + ((fabsf(this->camEye.x - this->unk_2D0.x) < 2.0f) && (fabsf(this->camEye.y - this->unk_2D0.y) < 2.0f) && + (fabsf(this->camEye.z - this->unk_2D0.z) < 2.0f) && (fabsf(this->camLookAt.x - this->unk_2F4.x) < 2.0f) && + (fabsf(this->camLookAt.y - this->unk_2F4.y) < 2.0f) && (fabsf(this->camLookAt.z - this->unk_2F4.z) < 2.0f))) { + if (this->unk_2A2 != 0) { + this->csCameraTimer = 70; + this->unk_2A2 = 2; + this->actionFunc = func_809EE780; + } else { + this->actionFunc = EnDivingGame_SetupUnderwaterViewCs; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EEDE4.s") +// Called just before changing the camera to focus the underwater rupees. +void EnDivingGame_SetupUnderwaterViewCs(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_296 == 0) { + this->unk_2A2 = 1; + this->csCameraTimer = 100; + this->actionFunc = EnDivingGame_RupeeThrow; + this->camLookAt.x = this->unk_2F4.x = -210.0f; + this->camLookAt.y = this->unk_2F4.y = -80.0f; + this->camLookAt.z = this->unk_2F4.z = -1020.0f; + this->camEye.x = this->unk_2D0.x = -280.0f; + this->camEye.y = this->unk_2D0.y = -20.0f; + this->camEye.z = this->unk_2D0.z = -240.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s") +// EnDivingGame_SayStartAndWait ? +void func_809EE780(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->csCameraTimer == 0) { + Gameplay_ClearCamera(globalCtx, this->subCamId); + Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_ACTIVE); + this->actor.textId = 0x405A; + func_8010B720(globalCtx, this->actor.textId); + this->unk_292 = 5; + this->actionFunc = func_809EE800; + } +} + +// EnDivingGame_TalkDuringMinigame +void func_809EE800(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + func_80106CCC(globalCtx); + if (!(gSaveContext.eventChkInf[3] & 0x100)) { + func_80088B34(BREG(2) + 50); + } else { + func_80088B34(BREG(2) + 50); + } + func_800F5ACC(0x6C); + func_8002DF54(globalCtx, NULL, 7); + this->actor.textId = 0x405B; + this->unk_292 = 5; + this->state = ENDIVINGGAME_STATE_PLAYING; + this->actionFunc = EnDivingGame_Talk; + } +} + +void func_809EE8F0(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx))) { + func_80106CCC(globalCtx); + this->actionFunc = EnDivingGame_Talk; + } else { + EnDivingGame_HasMinigameFinished(this, globalCtx); + } +} + +// EnDivingGame_SayCongratsAndWait ? // EnDivingGame_PlayerWonPhase1 +void func_809EE96C(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx))) { + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, NULL, 7); + this->actor.textId = 0x4056; + this->unk_292 = 5; + this->state = ENDIVINGGAME_STATE_AWARDPRIZE; + this->actionFunc = EnDivingGame_Talk; + } +} + +void func_809EEA00(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((this->unk_292 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx))) { + func_80106CCC(globalCtx); + this->actor.parent = NULL; + func_8002F434(&this->actor, globalCtx, GI_SCALE_SILVER, 90.0f, 10.0f); + this->actionFunc = func_809EEA90; + } +} + +void func_809EEA90(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actionFunc = func_809EEAF8; + } else { + func_8002F434(&this->actor, globalCtx, GI_SCALE_SILVER, 90.0f, 10.0f); + } +} + +// Award the scale? +void func_809EEAF8(EnDivingGame* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (func_8010BDBC(&globalCtx->msgCtx) == 6 && func_80106BC8(globalCtx)) { + // "Successful completion" + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; + gSaveContext.eventChkInf[3] |= 0x100; + this->actionFunc = func_809EDCB0; + } +} + +void EnDivingGame_Update(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + EnDivingGame* this = THIS; + Player* player = PLAYER; + Vec3f pos; + + if (this->csCameraTimer != 0) { + this->csCameraTimer--; + } + if (this->unk_296 != 0) { + this->unk_296--; + } + if (this->eyeTimer != 0) { + this->eyeTimer--; + } + if (this->spawnRuppyTimer != 0) { + this->spawnRuppyTimer--; + } + + if (1) {} + + if (gSaveContext.timer1Value == 10) { + func_800F5918(); + } + if (this->eyeTimer == 0) { + this->eyeTimer = 2; + this->eyeTexIndex++; + if (this->eyeTexIndex >= 3) { + this->eyeTexIndex = 0; + this->eyeTimer = (s16)Rand_ZeroFloat(60.0f) + 20; + } + } + this->actionFunc(this, globalCtx); + Actor_SetFocus(&this->actor, 80.0f); + this->unk_324.unk_18 = player->actor.world.pos; + this->unk_324.unk_18.y = player->actor.world.pos.y; + func_80034A14(&this->actor, &this->unk_324, 2, 4); + this->vec_284 = this->unk_324.unk_08; + this->vec_28A = this->unk_324.unk_0E; + if ((globalCtx->gameplayFrames % 16) == 0) { + pos = this->actor.world.pos; + pos.y += 20.0f; + EffectSsGRipple_Spawn(globalCtx, &pos, 100, 500, 30); + } + this->unk_290++; + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 29); + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +Gfx* EnDivingGame_EmptyDList(GraphicsContext* gfxCtx) { + Gfx* displayList = Graph_Alloc(gfxCtx, sizeof(Gfx)); + + gSPEndDisplayList(displayList); + return displayList; +} + +s32 EnDivingGame_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnDivingGame* this = THIS; + s32 pad; + + if (limbIndex == 6) { + rot->x += this->vec_28A.y; + } + + if (limbIndex == 15) { + rot->x += this->vec_284.y; + rot->z += this->vec_284.z; + } + + if (this->notPlayingMinigame && (limbIndex == 8 || limbIndex == 9 || limbIndex == 12)) { + rot->y += Math_SinS((globalCtx->state.frames * (limbIndex * 50 + 0x814))) * 200.0f; + rot->z += Math_CosS((globalCtx->state.frames * (limbIndex * 50 + 0x940))) * 200.0f; + } + + return 0; +} + +void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnDivingGame* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_diving_game.c", 1212); + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, EnDivingGame_EmptyDList(globalCtx->state.gfxCtx)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex])); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnDivingGame_OverrideLimbDraw, NULL, this); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_diving_game.c", 1232); +} diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index a868a18d7a..74f1c42d4f 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -16,51 +16,51 @@ typedef struct EnDivingGame { /* 0x0280 */ EnDivingGameActionFunc actionFunc; /* 0x0284 */ Vec3s vec_284; /* 0x028A */ Vec3s vec_28A; - /* 0x0290 */ s16 unk_290; + /* 0x0290 */ s16 unk_290; // counter that only goes up /* 0x0292 */ s16 unk_292; - /* 0x0294 */ s16 unk_294; - /* 0x0296 */ s16 unk_296; - /* 0x0298 */ s16 unk_298; - /* 0x029A */ s16 unk_29A; - /* 0x029C */ s16 unk_29C; - /* 0x029E */ s16 unk_29E; - /* 0x02A0 */ s16 camId; - /* 0x02A2 */ s16 unk_2A2; - /* 0x02A4 */ s16 unk_2A4; - /* 0x02A6 */ s16 unk_2A6; - /* 0x02A8 */ s16 unk_2A8; - /* 0x02AA */ s16 unk_2AA; - /* 0x02AC */ char unk_2AC[0xC]; - /* 0x02B8 */ Vec3f vec_2B8; - /* 0x02C4 */ Vec3f vec_2C4; - /* 0x02D0 */ f32 unk_2D0; - /* 0x02D4 */ f32 unk_2D4; - /* 0x02D8 */ f32 unk_2D8; - /* 0x02DC */ f32 unk_2DC; - /* 0x02E0 */ f32 unk_2E0; - /* 0x02E4 */ f32 unk_2E4; - /* 0x02E8 */ f32 unk_2E8; - /* 0x02EC */ f32 unk_2EC; - /* 0x02F0 */ f32 unk_2F0; - /* 0x02F4 */ f32 unk_2F4; - /* 0x02F8 */ f32 unk_2F8; - /* 0x02FC */ f32 unk_2FC; - /* 0x0300 */ f32 unk_300; - /* 0x0304 */ f32 unk_304; - /* 0x0308 */ f32 unk_308; - /* 0x030C */ f32 unk_30C; - /* 0x0310 */ f32 unk_310; - /* 0x0314 */ f32 unk_314; + /* 0x0294 */ s16 csCameraTimer; + /* 0x0296 */ s16 unk_296; // read by ExRuppy // timer? + /* 0x0298 */ s16 eyeTimer; + /* 0x029A */ s16 spawnRuppyTimer; + /* 0x029C */ s16 phase; + /* 0x029E */ s16 eyeTexIndex; + /* 0x02A0 */ s16 subCamId; + /* 0x02A2 */ s16 unk_2A2; // 0: , 1: , 2: Tells rupees to sink in water + /* 0x02A4 */ s16 grabbedRupeesCounter; + /* 0x02A6 */ s16 rupeesLeftToThrow; + /* 0x02A8 */ s16 state; // minigameState? 0: default, 1: waiting to give the scale, 2: minigame started + /* 0x02AA */ s16 extraWinCount; // counts how many times you have beaten the minigame **after** you got the scale. ExRuppy will reset it to zero if a 500 rupee is spawned. + /* 0x02AC */ char unk_2AC[0xC]; // probably another Vec3f, but unused. + /* 0x02B8 */ Vec3f camLookAt; + /* 0x02C4 */ Vec3f camEye; + /* 0x02D0 */ Vec3f unk_2D0; + /* 0x02DC */ Vec3f unk_2DC; + /* 0x02E8 */ Vec3f unk_2E8; + /* 0x02F4 */ Vec3f unk_2F4; + /* 0x0300 */ Vec3f unk_300; + /* 0x030C */ Vec3f unk_30C; /* 0x0318 */ f32 unk_318; - /* 0x031C */ char unk_31C; - /* 0x031D */ u8 unk_31D; - /* 0x031E */ char unk_31E; - /* 0x031F */ u8 unk_31F; - /* 0x0320 */ char unk_320[0x4]; + /* 0x031C */ char unk_31C; // unused + /* 0x031D */ u8 notPlayingMinigame; // flag + /* 0x031E */ u8 allRupeesThrown; // flag + /* 0x031F */ u8 unk_31F; // flag + /* 0x0320 */ char unk_320[0x4]; // unused /* 0x0324 */ struct_80034A14_arg1 unk_324; /* 0x034C */ ColliderCylinder collider; } EnDivingGame; // size = 0x0398 extern const ActorInit En_Diving_Game_InitVars; +typedef enum { + /* 0 */ ENDIVINGGAME_PHASE_ENDED, + /* 1 */ ENDIVINGGAME_PHASE_1, // Player has not received the scale. + /* 2 */ ENDIVINGGAME_PHASE_2 // Player got the scale and there are 10 rupees thrown. +} EnDivingGamePhase; + +typedef enum { + /* 0 */ ENDIVINGGAME_STATE_NOTPLAYING, + /* 1 */ ENDIVINGGAME_STATE_AWARDPRIZE, // Waiting to give the scale to player. + /* 2 */ ENDIVINGGAME_STATE_PLAYING +} EnDivingGameState; + #endif diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index f336c36654..b0b7e75e3d 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -70,7 +70,7 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.parent != NULL) { divingGame = (EnDivingGame*)this->actor.parent; if (divingGame->actor.update != NULL) { - temp2 = divingGame->unk_2AA * 10.0f; + temp2 = divingGame->extraWinCount * 10.0f; temp1 += temp2; } } @@ -96,7 +96,7 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.parent != NULL) { divingGame = (EnDivingGame*)this->actor.parent; if (divingGame->actor.update != NULL) { - divingGame->unk_2AA = 0; + divingGame->extraWinCount = 0; } } } @@ -261,7 +261,7 @@ void EnExRuppy_Sink(EnExRuppy* this, GlobalContext* globalCtx) { this->actionFunc = EnExRuppy_WaitInGame; } divingGame = (EnDivingGame*)this->actor.parent; - if ((divingGame != NULL) && (divingGame->actor.update != NULL) && (divingGame->unk_29C == 0)) { + if ((divingGame != NULL) && (divingGame->actor.update != NULL) && (divingGame->phase == ENDIVINGGAME_PHASE_ENDED)) { this->timer = 20; this->actionFunc = EnExRuppy_Kill; } @@ -280,14 +280,14 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, GlobalContext* globalCtx) { if (this->actor.parent != NULL) { divingGame = (EnDivingGame*)this->actor.parent; if (divingGame->actor.update != NULL) { - if (divingGame->unk_29C == 0) { + if (divingGame->phase == ENDIVINGGAME_PHASE_ENDED) { this->timer = 20; this->actionFunc = EnExRuppy_Kill; if (1) {} } else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { Rupees_ChangeBy(this->rupeeValue); func_80078884(NA_SE_SY_GET_RUPY); - divingGame->unk_2A4++; + divingGame->grabbedRupeesCounter++; Actor_Kill(&this->actor); } } else { diff --git a/undefined_syms.txt b/undefined_syms.txt index 5630c195ed..70477d5132 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -900,6 +900,11 @@ D_060009E0 = 0x060009E0; D_06000660 = 0x06000660; D_06000FC0 = 0x06000FC0; +// z_en_diving_game +D_0600BFA8 = 0x0600BFA8; +D_06002FE8 = 0x06002FE8; +D_0600219C = 0x0600219C; + // z_en_poh D_060001A8 = 0x060001A8; D_0600020C = 0x0600020C;