diff --git a/Makefile b/Makefile index c117f0edd2..bee349a96d 100644 --- a/Makefile +++ b/Makefile @@ -143,6 +143,7 @@ build/src/libultra_code_O1/%.o: OPTFLAGS := -O1 build/src/libultra_code_O2/%.o: OPTFLAGS := -O2 build/src/libultra_code_O2_g3/%.o: OPTFLAGS := -O2 -g3 +build/src/libultra_boot_O1/ll.o: MIPS_VERSION := -mips3 -32 build/src/libultra_code_O1/llcvt.o: MIPS_VERSION := -mips3 -32 build/src/code/fault.o: CFLAGS += -trapuv @@ -232,6 +233,12 @@ build/src/%.o: src/%.c $(CC_CHECK) $^ @$(OBJDUMP) -d $@ > $(@:.o=.s) +build/src/libultra_boot_O1/ll.o: src/libultra_boot_O1/ll.c + $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^ + $(CC_CHECK) $^ + python3 tools/set_o32abi_bit.py $@ + @$(OBJDUMP) -d $@ > $(@:.o=.s) + build/src/libultra_code_O1/llcvt.o: src/libultra_code_O1/llcvt.c $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^ $(CC_CHECK) $^ diff --git a/asm/libm.s b/asm/libm.s deleted file mode 100644 index 91b31fcd80..0000000000 --- a/asm/libm.s +++ /dev/null @@ -1,218 +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 .text - -.balign 16 - -glabel __ull_rshift -/* 004310 80003710 AFA40000 */ sw $a0, ($sp) -/* 004314 80003714 AFA50004 */ sw $a1, 4($sp) -/* 004318 80003718 AFA60008 */ sw $a2, 8($sp) -/* 00431C 8000371C AFA7000C */ sw $a3, 0xc($sp) -/* 004320 80003720 DFAF0008 */ ld $t7, 8($sp) -/* 004324 80003724 DFAE0000 */ ld $t6, ($sp) -/* 004328 80003728 01EE1016 */ dsrlv $v0, $t6, $t7 -/* 00432C 8000372C 0002183C */ dsll32 $v1, $v0, 0 -/* 004330 80003730 0003183F */ dsra32 $v1, $v1, 0 -/* 004334 80003734 03E00008 */ jr $ra -/* 004338 80003738 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ull_rem -/* 00433C 8000373C AFA40000 */ sw $a0, ($sp) -/* 004340 80003740 AFA50004 */ sw $a1, 4($sp) -/* 004344 80003744 AFA60008 */ sw $a2, 8($sp) -/* 004348 80003748 AFA7000C */ sw $a3, 0xc($sp) -/* 00434C 8000374C DFAF0008 */ ld $t7, 8($sp) -/* 004350 80003750 DFAE0000 */ ld $t6, ($sp) -/* 004354 80003754 01CF001F */ ddivu $zero, $t6, $t7 -/* 004358 80003758 15E00002 */ bnez $t7, .L80003764 -/* 00435C 8000375C 00000000 */ nop -/* 004360 80003760 0007000D */ break 7 -.L80003764: -/* 004364 80003764 00001010 */ mfhi $v0 -/* 004368 80003768 0002183C */ dsll32 $v1, $v0, 0 -/* 00436C 8000376C 0003183F */ dsra32 $v1, $v1, 0 -/* 004370 80003770 03E00008 */ jr $ra -/* 004374 80003774 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ull_div -/* 004378 80003778 AFA40000 */ sw $a0, ($sp) -/* 00437C 8000377C AFA50004 */ sw $a1, 4($sp) -/* 004380 80003780 AFA60008 */ sw $a2, 8($sp) -/* 004384 80003784 AFA7000C */ sw $a3, 0xc($sp) -/* 004388 80003788 DFAF0008 */ ld $t7, 8($sp) -/* 00438C 8000378C DFAE0000 */ ld $t6, ($sp) -/* 004390 80003790 01CF001F */ ddivu $zero, $t6, $t7 -/* 004394 80003794 15E00002 */ bnez $t7, .L800037A0 -/* 004398 80003798 00000000 */ nop -/* 00439C 8000379C 0007000D */ break 7 -.L800037A0: -/* 0043A0 800037A0 00001012 */ mflo $v0 -/* 0043A4 800037A4 0002183C */ dsll32 $v1, $v0, 0 -/* 0043A8 800037A8 0003183F */ dsra32 $v1, $v1, 0 -/* 0043AC 800037AC 03E00008 */ jr $ra -/* 0043B0 800037B0 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ll_lshift -/* 0043B4 800037B4 AFA40000 */ sw $a0, ($sp) -/* 0043B8 800037B8 AFA50004 */ sw $a1, 4($sp) -/* 0043BC 800037BC AFA60008 */ sw $a2, 8($sp) -/* 0043C0 800037C0 AFA7000C */ sw $a3, 0xc($sp) -/* 0043C4 800037C4 DFAF0008 */ ld $t7, 8($sp) -/* 0043C8 800037C8 DFAE0000 */ ld $t6, ($sp) -/* 0043CC 800037CC 01EE1014 */ dsllv $v0, $t6, $t7 -/* 0043D0 800037D0 0002183C */ dsll32 $v1, $v0, 0 -/* 0043D4 800037D4 0003183F */ dsra32 $v1, $v1, 0 -/* 0043D8 800037D8 03E00008 */ jr $ra -/* 0043DC 800037DC 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ll_rem -/* 0043E0 800037E0 AFA40000 */ sw $a0, ($sp) -/* 0043E4 800037E4 AFA50004 */ sw $a1, 4($sp) -/* 0043E8 800037E8 AFA60008 */ sw $a2, 8($sp) -/* 0043EC 800037EC AFA7000C */ sw $a3, 0xc($sp) -/* 0043F0 800037F0 DFAF0008 */ ld $t7, 8($sp) -/* 0043F4 800037F4 DFAE0000 */ ld $t6, ($sp) -/* 0043F8 800037F8 01CF001F */ ddivu $zero, $t6, $t7 -/* 0043FC 800037FC 15E00002 */ bnez $t7, .L80003808 -/* 004400 80003800 00000000 */ nop -/* 004404 80003804 0007000D */ break 7 -.L80003808: -/* 004408 80003808 00001010 */ mfhi $v0 -/* 00440C 8000380C 0002183C */ dsll32 $v1, $v0, 0 -/* 004410 80003810 0003183F */ dsra32 $v1, $v1, 0 -/* 004414 80003814 03E00008 */ jr $ra -/* 004418 80003818 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ll_div -/* 00441C 8000381C AFA40000 */ sw $a0, ($sp) -/* 004420 80003820 AFA50004 */ sw $a1, 4($sp) -/* 004424 80003824 AFA60008 */ sw $a2, 8($sp) -/* 004428 80003828 AFA7000C */ sw $a3, 0xc($sp) -/* 00442C 8000382C DFAF0008 */ ld $t7, 8($sp) -/* 004430 80003830 DFAE0000 */ ld $t6, ($sp) -/* 004434 80003834 01CF001E */ ddiv $zero, $t6, $t7 -/* 004438 80003838 00000000 */ nop -/* 00443C 8000383C 15E00002 */ bnez $t7, .L80003848 -/* 004440 80003840 00000000 */ nop -/* 004444 80003844 0007000D */ break 7 -.L80003848: -/* 004448 80003848 6401FFFF */ daddiu $at, $zero, -1 -/* 00444C 8000384C 15E10005 */ bne $t7, $at, .L80003864 -/* 004450 80003850 64010001 */ daddiu $at, $zero, 1 -/* 004454 80003854 00010FFC */ dsll32 $at, $at, 0x1f -/* 004458 80003858 15C10002 */ bne $t6, $at, .L80003864 -/* 00445C 8000385C 00000000 */ nop -/* 004460 80003860 0006000D */ break 6 -.L80003864: -/* 004464 80003864 00001012 */ mflo $v0 -/* 004468 80003868 0002183C */ dsll32 $v1, $v0, 0 -/* 00446C 8000386C 0003183F */ dsra32 $v1, $v1, 0 -/* 004470 80003870 03E00008 */ jr $ra -/* 004474 80003874 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ll_mul -/* 004478 80003878 AFA40000 */ sw $a0, ($sp) -/* 00447C 8000387C AFA50004 */ sw $a1, 4($sp) -/* 004480 80003880 AFA60008 */ sw $a2, 8($sp) -/* 004484 80003884 AFA7000C */ sw $a3, 0xc($sp) -/* 004488 80003888 DFAF0008 */ ld $t7, 8($sp) -/* 00448C 8000388C DFAE0000 */ ld $t6, ($sp) -/* 004490 80003890 01CF001D */ dmultu $t6, $t7 -/* 004494 80003894 00001012 */ mflo $v0 -/* 004498 80003898 0002183C */ dsll32 $v1, $v0, 0 -/* 00449C 8000389C 0003183F */ dsra32 $v1, $v1, 0 -/* 0044A0 800038A0 03E00008 */ jr $ra -/* 0044A4 800038A4 0002103F */ dsra32 $v0, $v0, 0 - -glabel __ull_divremi -/* 0044A8 800038A8 87AF0012 */ lh $t7, 0x12($sp) -/* 0044AC 800038AC AFA60008 */ sw $a2, 8($sp) -/* 0044B0 800038B0 AFA7000C */ sw $a3, 0xc($sp) -/* 0044B4 800038B4 DFAE0008 */ ld $t6, 8($sp) -/* 0044B8 800038B8 01E0C025 */ move $t8, $t7 -/* 0044BC 800038BC 0300C825 */ move $t9, $t8 -/* 0044C0 800038C0 01D9001F */ ddivu $zero, $t6, $t9 -/* 0044C4 800038C4 17200002 */ bnez $t9, .L800038D0 -/* 0044C8 800038C8 00000000 */ nop -/* 0044CC 800038CC 0007000D */ break 7 -.L800038D0: -/* 0044D0 800038D0 00004012 */ mflo $t0 -/* 0044D4 800038D4 FC880000 */ sd $t0, ($a0) -/* 0044D8 800038D8 87AA0012 */ lh $t2, 0x12($sp) -/* 0044DC 800038DC DFA90008 */ ld $t1, 8($sp) -/* 0044E0 800038E0 01405825 */ move $t3, $t2 -/* 0044E4 800038E4 01606025 */ move $t4, $t3 -/* 0044E8 800038E8 012C001F */ ddivu $zero, $t1, $t4 -/* 0044EC 800038EC 15800002 */ bnez $t4, .L800038F8 -/* 0044F0 800038F0 00000000 */ nop -/* 0044F4 800038F4 0007000D */ break 7 -.L800038F8: -/* 0044F8 800038F8 00006810 */ mfhi $t5 -/* 0044FC 800038FC FCAD0000 */ sd $t5, ($a1) -/* 004500 80003900 03E00008 */ jr $ra -/* 004504 80003904 00000000 */ nop - -glabel __ll_mod -/* 004508 80003908 27BDFFF8 */ addiu $sp, $sp, -8 -/* 00450C 8000390C AFA40008 */ sw $a0, 8($sp) -/* 004510 80003910 AFA5000C */ sw $a1, 0xc($sp) -/* 004514 80003914 AFA60010 */ sw $a2, 0x10($sp) -/* 004518 80003918 AFA70014 */ sw $a3, 0x14($sp) -/* 00451C 8000391C DFAF0010 */ ld $t7, 0x10($sp) -/* 004520 80003920 DFAE0008 */ ld $t6, 8($sp) -/* 004524 80003924 01CF001E */ ddiv $zero, $t6, $t7 -/* 004528 80003928 00000000 */ nop -/* 00452C 8000392C 15E00002 */ bnez $t7, .L80003938 -/* 004530 80003930 00000000 */ nop -/* 004534 80003934 0007000D */ break 7 -.L80003938: -/* 004538 80003938 6401FFFF */ daddiu $at, $zero, -1 -/* 00453C 8000393C 15E10005 */ bne $t7, $at, .L80003954 -/* 004540 80003940 64010001 */ daddiu $at, $zero, 1 -/* 004544 80003944 00010FFC */ dsll32 $at, $at, 0x1f -/* 004548 80003948 15C10002 */ bne $t6, $at, .L80003954 -/* 00454C 8000394C 00000000 */ nop -/* 004550 80003950 0006000D */ break 6 -.L80003954: -/* 004554 80003954 0000C010 */ mfhi $t8 -/* 004558 80003958 FFB80000 */ sd $t8, ($sp) -/* 00455C 8000395C 07010003 */ bgez $t8, .L8000396C -/* 004560 80003960 00000000 */ nop -/* 004564 80003964 1DE00007 */ bgtz $t7, .L80003984 -/* 004568 80003968 00000000 */ nop -.L8000396C: -/* 00456C 8000396C DFB90000 */ ld $t9, ($sp) -/* 004570 80003970 1B200008 */ blez $t9, .L80003994 -/* 004574 80003974 00000000 */ nop -/* 004578 80003978 DFA80010 */ ld $t0, 0x10($sp) -/* 00457C 8000397C 05010005 */ bgez $t0, .L80003994 -/* 004580 80003980 00000000 */ nop -.L80003984: -/* 004584 80003984 DFA90000 */ ld $t1, ($sp) -/* 004588 80003988 DFAA0010 */ ld $t2, 0x10($sp) -/* 00458C 8000398C 012A582D */ daddu $t3, $t1, $t2 -/* 004590 80003990 FFAB0000 */ sd $t3, ($sp) -.L80003994: -/* 004594 80003994 8FA20000 */ lw $v0, ($sp) -/* 004598 80003998 8FA30004 */ lw $v1, 4($sp) -/* 00459C 8000399C 03E00008 */ jr $ra -/* 0045A0 800039A0 27BD0008 */ addiu $sp, $sp, 8 - -glabel __ll_rshift -/* 0045A4 800039A4 AFA40000 */ sw $a0, ($sp) -/* 0045A8 800039A8 AFA50004 */ sw $a1, 4($sp) -/* 0045AC 800039AC AFA60008 */ sw $a2, 8($sp) -/* 0045B0 800039B0 AFA7000C */ sw $a3, 0xc($sp) -/* 0045B4 800039B4 DFAF0008 */ ld $t7, 8($sp) -/* 0045B8 800039B8 DFAE0000 */ ld $t6, ($sp) -/* 0045BC 800039BC 01EE1017 */ dsrav $v0, $t6, $t7 -/* 0045C0 800039C0 0002183C */ dsll32 $v1, $v0, 0 -/* 0045C4 800039C4 0003183F */ dsra32 $v1, $v1, 0 -/* 0045C8 800039C8 03E00008 */ jr $ra -/* 0045CC 800039CC 0002103F */ dsra32 $v0, $v0, 0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s deleted file mode 100644 index 9a3ca4a51d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel BgSpot00Hanebasi_Destroy -/* 0040C 808A9B8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00410 808A9B90 AFA40018 */ sw $a0, 0x0018($sp) -/* 00414 808A9B94 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00418 808A9B98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0041C 808A9B9C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00420 808A9BA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00424 808A9BA4 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00428 808A9BA8 AFA7001C */ sw $a3, 0x001C($sp) -/* 0042C 808A9BAC 0C00FB56 */ jal DynaPoly_DeleteBgActor - ## DynaPoly_DeleteBgActor -/* 00430 808A9BB0 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00434 808A9BB4 8FA20018 */ lw $v0, 0x0018($sp) -/* 00438 808A9BB8 8FA7001C */ lw $a3, 0x001C($sp) -/* 0043C 808A9BBC 844F001C */ lh $t7, 0x001C($v0) ## 0000001C -/* 00440 808A9BC0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00444 808A9BC4 24E507A8 */ addiu $a1, $a3, 0x07A8 ## $a1 = 000007A8 -/* 00448 808A9BC8 05E20004 */ bltzl $t7, .L808A9BDC -/* 0044C 808A9BCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00450 808A9BD0 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00454 808A9BD4 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C -/* 00458 808A9BD8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9BDC: -/* 0045C 808A9BDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00460 808A9BE0 03E00008 */ jr $ra -/* 00464 808A9BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s deleted file mode 100644 index e16b9364fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s +++ /dev/null @@ -1,150 +0,0 @@ -.rdata -glabel D_808AA824 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA840 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA85C - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -.text -glabel BgSpot00Hanebasi_Draw -/* 00E08 808AA588 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00E0C 808AA58C 3C0F808B */ lui $t7, %hi(D_808AA7C4) ## $t7 = 808B0000 -/* 00E10 808AA590 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E14 808AA594 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E18 808AA598 AFA50064 */ sw $a1, 0x0064($sp) -/* 00E1C 808AA59C 25EFA7C4 */ addiu $t7, $t7, %lo(D_808AA7C4) ## $t7 = 808AA7C4 -/* 00E20 808AA5A0 8DF90000 */ lw $t9, 0x0000($t7) ## 808AA7C4 -/* 00E24 808AA5A4 27AE0054 */ addiu $t6, $sp, 0x0054 ## $t6 = FFFFFFF4 -/* 00E28 808AA5A8 8DF80004 */ lw $t8, 0x0004($t7) ## 808AA7C8 -/* 00E2C 808AA5AC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00E30 808AA5B0 8DF90008 */ lw $t9, 0x0008($t7) ## 808AA7CC -/* 00E34 808AA5B4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 00E38 808AA5B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E3C 808AA5BC ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 00E40 808AA5C0 8FA90064 */ lw $t1, 0x0064($sp) -/* 00E44 808AA5C4 3C06808B */ lui $a2, %hi(D_808AA824) ## $a2 = 808B0000 -/* 00E48 808AA5C8 24C6A824 */ addiu $a2, $a2, %lo(D_808AA824) ## $a2 = 808AA824 -/* 00E4C 808AA5CC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00E50 808AA5D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 -/* 00E54 808AA5D4 240702BA */ addiu $a3, $zero, 0x02BA ## $a3 = 000002BA -/* 00E58 808AA5D8 0C031AB1 */ jal Graph_OpenDisps -/* 00E5C 808AA5DC AFA50044 */ sw $a1, 0x0044($sp) -/* 00E60 808AA5E0 8FAA0064 */ lw $t2, 0x0064($sp) -/* 00E64 808AA5E4 0C024F46 */ jal func_80093D18 -/* 00E68 808AA5E8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00E6C 808AA5EC 8FA80044 */ lw $t0, 0x0044($sp) -/* 00E70 808AA5F0 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00E74 808AA5F4 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 00E78 808AA5F8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E7C 808AA5FC 3C05808B */ lui $a1, %hi(D_808AA840) ## $a1 = 808B0000 -/* 00E80 808AA600 24A5A840 */ addiu $a1, $a1, %lo(D_808AA840) ## $a1 = 808AA840 -/* 00E84 808AA604 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00E88 808AA608 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 00E8C 808AA60C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00E90 808AA610 8FAD0064 */ lw $t5, 0x0064($sp) -/* 00E94 808AA614 240602BE */ addiu $a2, $zero, 0x02BE ## $a2 = 000002BE -/* 00E98 808AA618 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00E9C 808AA61C AFA80044 */ sw $t0, 0x0044($sp) -/* 00EA0 808AA620 0C0346A2 */ jal Matrix_NewMtx -/* 00EA4 808AA624 AFA20030 */ sw $v0, 0x0030($sp) -/* 00EA8 808AA628 8FA30030 */ lw $v1, 0x0030($sp) -/* 00EAC 808AA62C 8FA80044 */ lw $t0, 0x0044($sp) -/* 00EB0 808AA630 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00EB4 808AA634 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00EB8 808AA638 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00EBC 808AA63C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 00EC0 808AA640 3C190600 */ lui $t9, %hi(D_06000430) ## $t9 = 06000000 -/* 00EC4 808AA644 15C1003E */ bne $t6, $at, .L808AA740 -/* 00EC8 808AA648 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00ECC 808AA64C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00ED0 808AA650 27390430 */ addiu $t9, $t9, %lo(D_06000430) ## $t9 = 06000430 -/* 00ED4 808AA654 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 -/* 00ED8 808AA658 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00EDC 808AA65C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00EE0 808AA660 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFE8 -/* 00EE4 808AA664 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00EE8 808AA668 0C0346BD */ jal Matrix_MultVec3f -/* 00EEC 808AA66C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00EF0 808AA670 C7A40048 */ lwc1 $f4, 0x0048($sp) -/* 00EF4 808AA674 8E09011C */ lw $t1, 0x011C($s0) ## 0000011C -/* 00EF8 808AA678 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00EFC 808AA67C 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 00F00 808AA680 E5240024 */ swc1 $f4, 0x0024($t1) ## 00000024 -/* 00F04 808AA684 8E0A011C */ lw $t2, 0x011C($s0) ## 0000011C -/* 00F08 808AA688 C7A6004C */ lwc1 $f6, 0x004C($sp) -/* 00F0C 808AA68C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 -/* 00F10 808AA690 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFE8 -/* 00F14 808AA694 E5460028 */ swc1 $f6, 0x0028($t2) ## 00000028 -/* 00F18 808AA698 8E0B011C */ lw $t3, 0x011C($s0) ## 0000011C -/* 00F1C 808AA69C C7A80050 */ lwc1 $f8, 0x0050($sp) -/* 00F20 808AA6A0 E568002C */ swc1 $f8, 0x002C($t3) ## 0000002C -/* 00F24 808AA6A4 C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 00F28 808AA6A8 46105482 */ mul.s $f18, $f10, $f16 -/* 00F2C 808AA6AC 0C0346BD */ jal Matrix_MultVec3f -/* 00F30 808AA6B0 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 00F34 808AA6B4 8E0C011C */ lw $t4, 0x011C($s0) ## 0000011C -/* 00F38 808AA6B8 C7A40048 */ lwc1 $f4, 0x0048($sp) -/* 00F3C 808AA6BC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00F40 808AA6C0 8D8D011C */ lw $t5, 0x011C($t4) ## 0000011C -/* 00F44 808AA6C4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00F48 808AA6C8 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00F4C 808AA6CC E5A40024 */ swc1 $f4, 0x0024($t5) ## 00000024 -/* 00F50 808AA6D0 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 00F54 808AA6D4 C7A6004C */ lwc1 $f6, 0x004C($sp) -/* 00F58 808AA6D8 8DCF011C */ lw $t7, 0x011C($t6) ## 0000011C -/* 00F5C 808AA6DC E5E60028 */ swc1 $f6, 0x0028($t7) ## 00000028 -/* 00F60 808AA6E0 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 00F64 808AA6E4 C7A80050 */ lwc1 $f8, 0x0050($sp) -/* 00F68 808AA6E8 8F19011C */ lw $t9, 0x011C($t8) ## 0000011C -/* 00F6C 808AA6EC E728002C */ swc1 $f8, 0x002C($t9) ## 0000002C -/* 00F70 808AA6F0 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 00F74 808AA6F4 10410019 */ beq $v0, $at, .L808AA75C -/* 00F78 808AA6F8 28410004 */ slti $at, $v0, 0x0004 -/* 00F7C 808AA6FC 10200008 */ beq $at, $zero, .L808AA720 -/* 00F80 808AA700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F84 808AA704 8C690004 */ lw $t1, 0x0004($v1) ## 8015E664 -/* 00F88 808AA708 5120000A */ beql $t1, $zero, .L808AA734 -/* 00F8C 808AA70C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F90 808AA710 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 -/* 00F94 808AA714 2941E000 */ slti $at, $t2, 0xE000 -/* 00F98 808AA718 50200006 */ beql $at, $zero, .L808AA734 -/* 00F9C 808AA71C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L808AA720: -/* 00FA0 808AA720 0C22A8AC */ jal func_808AA2B0 -/* 00FA4 808AA724 8FA50064 */ lw $a1, 0x0064($sp) -/* 00FA8 808AA728 1000000D */ beq $zero, $zero, .L808AA760 -/* 00FAC 808AA72C 8FAE0064 */ lw $t6, 0x0064($sp) -/* 00FB0 808AA730 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L808AA734: -/* 00FB4 808AA734 3C01808B */ lui $at, %hi(D_808AA7B0) ## $at = 808B0000 -/* 00FB8 808AA738 10000008 */ beq $zero, $zero, .L808AA75C -/* 00FBC 808AA73C E42AA7B0 */ swc1 $f10, %lo(D_808AA7B0)($at) -.L808AA740: -/* 00FC0 808AA740 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00FC4 808AA744 3C0D0600 */ lui $t5, %hi(D_060000C0) ## $t5 = 06000000 -/* 00FC8 808AA748 25AD00C0 */ addiu $t5, $t5, %lo(D_060000C0) ## $t5 = 060000C0 -/* 00FCC 808AA74C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00FD0 808AA750 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 00FD4 808AA754 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00FD8 808AA758 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L808AA75C: -/* 00FDC 808AA75C 8FAE0064 */ lw $t6, 0x0064($sp) -.L808AA760: -/* 00FE0 808AA760 3C06808B */ lui $a2, %hi(D_808AA85C) ## $a2 = 808B0000 -/* 00FE4 808AA764 24C6A85C */ addiu $a2, $a2, %lo(D_808AA85C) ## $a2 = 808AA85C -/* 00FE8 808AA768 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 -/* 00FEC 808AA76C 240702DD */ addiu $a3, $zero, 0x02DD ## $a3 = 000002DD -/* 00FF0 808AA770 0C031AD5 */ jal Graph_CloseDisps -/* 00FF4 808AA774 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00FF8 808AA778 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FFC 808AA77C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01000 808AA780 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01004 808AA784 03E00008 */ jr $ra -/* 01008 808AA788 00000000 */ nop -/* 0100C 808AA78C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s deleted file mode 100644 index 17a44020d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s +++ /dev/null @@ -1,300 +0,0 @@ -glabel BgSpot00Hanebasi_Init -/* 00000 808A9780 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00004 808A9784 AFA50074 */ sw $a1, 0x0074($sp) -/* 00008 808A9788 AFBF003C */ sw $ra, 0x003C($sp) -/* 0000C 808A978C AFB00038 */ sw $s0, 0x0038($sp) -/* 00010 808A9790 3C05808B */ lui $a1, %hi(D_808AA7B4) ## $a1 = 808B0000 -/* 00014 808A9794 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 808A9798 AFA00058 */ sw $zero, 0x0058($sp) -/* 0001C 808A979C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 808A97A0 24A5A7B4 */ addiu $a1, $a1, %lo(D_808AA7B4) ## $a1 = 808AA7B4 -/* 00024 808A97A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00028 808A97A8 0C010D20 */ jal DynaPolyActor_Init - -/* 0002C 808A97AC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00030 808A97B0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00034 808A97B4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00038 808A97B8 3C040600 */ lui $a0, %hi(D_06000280) ## $a0 = 06000000 -/* 0003C 808A97BC 15C10007 */ bne $t6, $at, .L808A97DC -/* 00040 808A97C0 24840280 */ addiu $a0, $a0, %lo(D_06000280) ## $a0 = 06000280 -/* 00044 808A97C4 3C040600 */ lui $a0, %hi(D_060005E0) ## $a0 = 06000000 -/* 00048 808A97C8 248405E0 */ addiu $a0, $a0, %lo(D_060005E0) ## $a0 = 060005E0 -/* 0004C 808A97CC 0C010620 */ jal CollisionHeader_GetVirtual - -/* 00050 808A97D0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 -/* 00054 808A97D4 10000004 */ beq $zero, $zero, .L808A97E8 -/* 00058 808A97D8 8FA40074 */ lw $a0, 0x0074($sp) -.L808A97DC: -/* 0005C 808A97DC 0C010620 */ jal CollisionHeader_GetVirtual - -/* 00060 808A97E0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 -/* 00064 808A97E4 8FA40074 */ lw $a0, 0x0074($sp) -.L808A97E8: -/* 00068 808A97E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0006C 808A97EC 8FA70058 */ lw $a3, 0x0058($sp) -/* 00070 808A97F0 0C00FA9D */ jal DynaPoly_SetBgActor - ## DynaPoly_SetBgActor -/* 00074 808A97F4 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00078 808A97F8 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 0007C 808A97FC 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00080 808A9800 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00084 808A9804 14610091 */ bne $v1, $at, .L808A9A4C -/* 00088 808A9808 00000000 */ nop -/* 0008C 808A980C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00090 808A9810 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00094 808A9814 8C640004 */ lw $a0, 0x0004($v1) ## 8015E664 -/* 00098 808A9818 5480000A */ bnel $a0, $zero, .L808A9844 -/* 0009C 808A981C 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 000A0 808A9820 8C6F1360 */ lw $t7, 0x1360($v1) ## 8015F9C0 -/* 000A4 808A9824 29E10004 */ slti $at, $t7, 0x0004 -/* 000A8 808A9828 50200006 */ beql $at, $zero, .L808A9844 -/* 000AC 808A982C 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 000B0 808A9830 0C00B55C */ jal Actor_Kill - -/* 000B4 808A9834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B8 808A9838 100000D0 */ beq $zero, $zero, .L808A9B7C -/* 000BC 808A983C 8FBF003C */ lw $ra, 0x003C($sp) -/* 000C0 808A9840 8C621360 */ lw $v0, 0x1360($v1) ## 00001360 -.L808A9844: -/* 000C4 808A9844 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 000C8 808A9848 10A2000D */ beq $a1, $v0, .L808A9880 -/* 000CC 808A984C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 000D0 808A9850 10410009 */ beq $v0, $at, .L808A9878 -/* 000D4 808A9854 2419C000 */ addiu $t9, $zero, 0xC000 ## $t9 = FFFFC000 -/* 000D8 808A9858 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 000DC 808A985C 10410006 */ beq $v0, $at, .L808A9878 -/* 000E0 808A9860 00000000 */ nop -/* 000E4 808A9864 50800007 */ beql $a0, $zero, .L808A9884 -/* 000E8 808A9868 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 000EC 808A986C 8C780010 */ lw $t8, 0x0010($v1) ## 00000010 -/* 000F0 808A9870 53000004 */ beql $t8, $zero, .L808A9884 -/* 000F4 808A9874 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -.L808A9878: -/* 000F8 808A9878 10000002 */ beq $zero, $zero, .L808A9884 -/* 000FC 808A987C A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 -.L808A9880: -/* 00100 808A9880 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -.L808A9884: -/* 00104 808A9884 8C681360 */ lw $t0, 0x1360($v1) ## 00001360 -/* 00108 808A9888 10A80015 */ beq $a1, $t0, .L808A98E0 -/* 0010C 808A988C 3C048012 */ lui $a0, %hi(gBitFlags) -/* 00110 808A9890 24847120 */ addiu $a0, %lo(gBitFlags) -/* 00114 808A9894 8C890048 */ lw $t1, 0x0048($a0) ## 80127168 -/* 00118 808A9898 8C6200A4 */ lw $v0, 0x00A4($v1) ## 000000A4 -/* 0011C 808A989C 01225024 */ and $t2, $t1, $v0 -/* 00120 808A98A0 1140000F */ beq $t2, $zero, .L808A98E0 -/* 00124 808A98A4 00000000 */ nop -/* 00128 808A98A8 8C8B004C */ lw $t3, 0x004C($a0) ## 8012716C -/* 0012C 808A98AC 01626024 */ and $t4, $t3, $v0 -/* 00130 808A98B0 1180000B */ beq $t4, $zero, .L808A98E0 -/* 00134 808A98B4 00000000 */ nop -/* 00138 808A98B8 8C8D0050 */ lw $t5, 0x0050($a0) ## 80127170 -/* 0013C 808A98BC 01A27024 */ and $t6, $t5, $v0 -/* 00140 808A98C0 11C00007 */ beq $t6, $zero, .L808A98E0 -/* 00144 808A98C4 00000000 */ nop -/* 00148 808A98C8 946F0EE4 */ lhu $t7, 0x0EE4($v1) ## 00000EE4 -/* 0014C 808A98CC 2419C000 */ addiu $t9, $zero, 0xC000 ## $t9 = FFFFC000 -/* 00150 808A98D0 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00154 808A98D4 17000002 */ bne $t8, $zero, .L808A98E0 -/* 00158 808A98D8 00000000 */ nop -/* 0015C 808A98DC A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 -.L808A98E0: -/* 00160 808A98E0 0C01DE0D */ jal Math_CosS - ## coss? -/* 00164 808A98E4 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 00168 808A98E8 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 0016C 808A98EC 0C01DE1C */ jal Math_SinS - ## sins? -/* 00170 808A98F0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 00174 808A98F4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00178 808A98F8 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 0017C 808A98FC C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 00180 808A9900 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00184 808A9904 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 00188 808A9908 46022182 */ mul.s $f6, $f4, $f2 -/* 0018C 808A990C 00000000 */ nop -/* 00190 808A9910 46080282 */ mul.s $f10, $f0, $f8 -/* 00194 808A9914 460A3401 */ sub.s $f16, $f6, $f10 -/* 00198 808A9918 E7B00060 */ swc1 $f16, 0x0060($sp) -/* 0019C 808A991C 0C01DE1C */ jal Math_SinS - ## sins? -/* 001A0 808A9920 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001A4 808A9924 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 001A8 808A9928 0C01DE0D */ jal Math_CosS - ## coss? -/* 001AC 808A992C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001B0 808A9930 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 001B4 808A9934 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 001B8 808A9938 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 001BC 808A993C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 001C0 808A9940 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 001C4 808A9944 46029102 */ mul.s $f4, $f18, $f2 -/* 001C8 808A9948 00000000 */ nop -/* 001CC 808A994C 46080182 */ mul.s $f6, $f0, $f8 -/* 001D0 808A9950 46062281 */ sub.s $f10, $f4, $f6 -/* 001D4 808A9954 E7AA0064 */ swc1 $f10, 0x0064($sp) -/* 001D8 808A9958 0C01DE0D */ jal Math_CosS - ## coss? -/* 001DC 808A995C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001E0 808A9960 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 001E4 808A9964 0C01DE1C */ jal Math_SinS - ## sins? -/* 001E8 808A9968 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001EC 808A996C C7B00064 */ lwc1 $f16, 0x0064($sp) -/* 001F0 808A9970 3C01431E */ lui $at, 0x431E ## $at = 431E0000 -/* 001F4 808A9974 44814000 */ mtc1 $at, $f8 ## $f8 = 158.00 -/* 001F8 808A9978 46100482 */ mul.s $f18, $f0, $f16 -/* 001FC 808A997C C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 00200 808A9980 46024102 */ mul.s $f4, $f8, $f2 -/* 00204 808A9984 46049180 */ add.s $f6, $f18, $f4 -/* 00208 808A9988 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 0020C 808A998C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00210 808A9990 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00214 808A9994 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00218 808A9998 0C01DE0D */ jal Math_CosS - ## coss? -/* 0021C 808A999C E7A00054 */ swc1 $f0, 0x0054($sp) -/* 00220 808A99A0 C7AC0064 */ lwc1 $f12, 0x0064($sp) -/* 00224 808A99A4 3C01C31E */ lui $at, 0xC31E ## $at = C31E0000 -/* 00228 808A99A8 44818000 */ mtc1 $at, $f16 ## $f16 = -158.00 -/* 0022C 808A99AC 460C0282 */ mul.s $f10, $f0, $f12 -/* 00230 808A99B0 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 00234 808A99B4 860800B4 */ lh $t0, 0x00B4($s0) ## 000000B4 -/* 00238 808A99B8 C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 0023C 808A99BC 46028202 */ mul.s $f8, $f16, $f2 -/* 00240 808A99C0 3402F020 */ ori $v0, $zero, 0xF020 ## $v0 = 0000F020 -/* 00244 808A99C4 15000003 */ bne $t0, $zero, .L808A99D4 -/* 00248 808A99C8 46085300 */ add.s $f12, $f10, $f8 -/* 0024C 808A99CC 10000001 */ beq $zero, $zero, .L808A99D4 -/* 00250 808A99D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808A99D4: -/* 00254 808A99D4 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 00258 808A99D8 C7AA0060 */ lwc1 $f10, 0x0060($sp) -/* 0025C 808A99DC 8FA60074 */ lw $a2, 0x0074($sp) -/* 00260 808A99E0 46049180 */ add.s $f6, $f18, $f4 -/* 00264 808A99E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00268 808A99E8 2407004A */ addiu $a3, $zero, 0x004A ## $a3 = 0000004A -/* 0026C 808A99EC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00270 808A99F0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00274 808A99F4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00278 808A99F8 460A8200 */ add.s $f8, $f16, $f10 -/* 0027C 808A99FC E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00280 808A9A00 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00284 808A9A04 AFA2001C */ sw $v0, 0x001C($sp) -/* 00288 808A9A08 460C9100 */ add.s $f4, $f18, $f12 -/* 0028C 808A9A0C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 00290 808A9A10 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 00294 808A9A14 AFA00028 */ sw $zero, 0x0028($sp) -/* 00298 808A9A18 AFA00024 */ sw $zero, 0x0024($sp) -/* 0029C 808A9A1C 0C00C916 */ jal Actor_SpawnAsChild - -/* 002A0 808A9A20 AFA90020 */ sw $t1, 0x0020($sp) -/* 002A4 808A9A24 14400003 */ bne $v0, $zero, .L808A9A34 -/* 002A8 808A9A28 00000000 */ nop -/* 002AC 808A9A2C 0C00B55C */ jal Actor_Kill - -/* 002B0 808A9A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808A9A34: -/* 002B4 808A9A34 3C0A808B */ lui $t2, %hi(func_808A9BE8) ## $t2 = 808B0000 -/* 002B8 808A9A38 254A9BE8 */ addiu $t2, $t2, %lo(func_808A9BE8) ## $t2 = 808A9BE8 -/* 002BC 808A9A3C 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 002C0 808A9A40 AE0A0164 */ sw $t2, 0x0164($s0) ## 00000164 -/* 002C4 808A9A44 1000002D */ beq $zero, $zero, .L808A9AFC -/* 002C8 808A9A48 A60B0168 */ sh $t3, 0x0168($s0) ## 00000168 -.L808A9A4C: -/* 002CC 808A9A4C 14600029 */ bne $v1, $zero, .L808A9AF4 -/* 002D0 808A9A50 3C19808B */ lui $t9, %hi(func_808A9E58) ## $t9 = 808B0000 -/* 002D4 808A9A54 0C01DE0D */ jal Math_CosS - ## coss? -/* 002D8 808A9A58 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 002DC 808A9A5C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 002E0 808A9A60 0C01DE1C */ jal Math_SinS - ## sins? -/* 002E4 808A9A64 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 002E8 808A9A68 3C01439E */ lui $at, 0x439E ## $at = 439E0000 -/* 002EC 808A9A6C 44811000 */ mtc1 $at, $f2 ## $f2 = 316.00 -/* 002F0 808A9A70 C7B0004C */ lwc1 $f16, 0x004C($sp) -/* 002F4 808A9A74 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 002F8 808A9A78 8FA60074 */ lw $a2, 0x0074($sp) -/* 002FC 808A9A7C 46028282 */ mul.s $f10, $f16, $f2 -/* 00300 808A9A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00304 808A9A84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00308 808A9A88 46020102 */ mul.s $f4, $f0, $f2 -/* 0030C 808A9A8C 2407004A */ addiu $a3, $zero, 0x004A ## $a3 = 0000004A -/* 00310 808A9A90 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00314 808A9A94 460A3201 */ sub.s $f8, $f6, $f10 -/* 00318 808A9A98 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0031C 808A9A9C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00320 808A9AA0 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00324 808A9AA4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00328 808A9AA8 46102180 */ add.s $f6, $f4, $f16 -/* 0032C 808A9AAC E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00330 808A9AB0 860D00B4 */ lh $t5, 0x00B4($s0) ## 000000B4 -/* 00334 808A9AB4 AFAD001C */ sw $t5, 0x001C($sp) -/* 00338 808A9AB8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0033C 808A9ABC AFAF0028 */ sw $t7, 0x0028($sp) -/* 00340 808A9AC0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00344 808A9AC4 0C00C916 */ jal Actor_SpawnAsChild - -/* 00348 808A9AC8 AFAE0020 */ sw $t6, 0x0020($sp) -/* 0034C 808A9ACC 14400005 */ bne $v0, $zero, .L808A9AE4 -/* 00350 808A9AD0 00000000 */ nop -/* 00354 808A9AD4 0C00B55C */ jal Actor_Kill - -/* 00358 808A9AD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0035C 808A9ADC 0C00B55C */ jal Actor_Kill - -/* 00360 808A9AE0 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -.L808A9AE4: -/* 00364 808A9AE4 3C18808B */ lui $t8, %hi(func_808A9E58) ## $t8 = 808B0000 -/* 00368 808A9AE8 27189E58 */ addiu $t8, $t8, %lo(func_808A9E58) ## $t8 = 808A9E58 -/* 0036C 808A9AEC 10000003 */ beq $zero, $zero, .L808A9AFC -/* 00370 808A9AF0 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -.L808A9AF4: -/* 00374 808A9AF4 27399E58 */ addiu $t9, $t9, %lo(func_808A9E58) ## $t9 = FFFF9E58 -/* 00378 808A9AF8 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -.L808A9AFC: -/* 0037C 808A9AFC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00380 808A9B00 8FA40074 */ lw $a0, 0x0074($sp) -/* 00384 808A9B04 26060170 */ addiu $a2, $s0, 0x0170 ## $a2 = 00000170 -/* 00388 808A9B08 0500001B */ bltz $t0, .L808A9B78 -/* 0038C 808A9B0C 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 00390 808A9B10 0C01E9D9 */ jal LightContext_InsertLight - -/* 00394 808A9B14 AFA60048 */ sw $a2, 0x0048($sp) -/* 00398 808A9B18 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 0039C 808A9B1C AE02016C */ sw $v0, 0x016C($s0) ## 0000016C -/* 003A0 808A9B20 8FA40048 */ lw $a0, 0x0048($sp) -/* 003A4 808A9B24 15200005 */ bne $t1, $zero, .L808A9B3C -/* 003A8 808A9B28 240600A8 */ addiu $a2, $zero, 0x00A8 ## $a2 = 000000A8 -/* 003AC 808A9B2C 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 003B0 808A9B30 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 -/* 003B4 808A9B34 10000005 */ beq $zero, $zero, .L808A9B4C -/* 003B8 808A9B38 4600128D */ trunc.w.s $f10, $f2 -.L808A9B3C: -/* 003BC 808A9B3C 3C01C382 */ lui $at, 0xC382 ## $at = C3820000 -/* 003C0 808A9B40 44811000 */ mtc1 $at, $f2 ## $f2 = -260.00 -/* 003C4 808A9B44 00000000 */ nop -/* 003C8 808A9B48 4600128D */ trunc.w.s $f10, $f2 -.L808A9B4C: -/* 003CC 808A9B4C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 003D0 808A9B50 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 003D4 808A9B54 AFAC0014 */ sw $t4, 0x0014($sp) -/* 003D8 808A9B58 44055000 */ mfc1 $a1, $f10 -/* 003DC 808A9B5C AFAB0010 */ sw $t3, 0x0010($sp) -/* 003E0 808A9B60 240702B2 */ addiu $a3, $zero, 0x02B2 ## $a3 = 000002B2 -/* 003E4 808A9B64 00052C00 */ sll $a1, $a1, 16 -/* 003E8 808A9B68 00052C03 */ sra $a1, $a1, 16 -/* 003EC 808A9B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 003F0 808A9B70 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 003F4 808A9B74 AFA0001C */ sw $zero, 0x001C($sp) -.L808A9B78: -/* 003F8 808A9B78 8FBF003C */ lw $ra, 0x003C($sp) -.L808A9B7C: -/* 003FC 808A9B7C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00400 808A9B80 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00404 808A9B84 03E00008 */ jr $ra -/* 00408 808A9B88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s deleted file mode 100644 index 556a4ff7f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s +++ /dev/null @@ -1,212 +0,0 @@ -.late_rodata -glabel D_808AA884 - .word 0x44D48000 -glabel D_808AA888 - .word 0x3B3B3EE7 - -.text -glabel BgSpot00Hanebasi_Update -/* 0082C 808A9FAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00830 808A9FB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00834 808A9FB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00838 808A9FB8 AFA40030 */ sw $a0, 0x0030($sp) -/* 0083C 808A9FBC 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00840 808A9FC0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00844 808A9FC4 0320F809 */ jalr $ra, $t9 -/* 00848 808A9FC8 00000000 */ nop -/* 0084C 808A9FCC 8FA70030 */ lw $a3, 0x0030($sp) -/* 00850 808A9FD0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00854 808A9FD4 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 00858 808A9FD8 55C100B1 */ bnel $t6, $at, .L808AA2A0 -/* 0085C 808A9FDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00860 808A9FE0 860F00A4 */ lh $t7, 0x00A4($s0) ## 000000A4 -/* 00864 808A9FE4 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 00868 808A9FE8 3C038012 */ lui $v1, %hi(gBitFlags) -/* 0086C 808A9FEC 15E10066 */ bne $t7, $at, .L808AA188 -/* 00870 808A9FF0 24637120 */ addiu $v1, %lo(gBitFlags) -/* 00874 808A9FF4 3C088016 */ lui $t0, %hi(gSaveContext) -/* 00878 808A9FF8 2508E660 */ addiu $t0, %lo(gSaveContext) -/* 0087C 808A9FFC 8D0200A4 */ lw $v0, 0x00A4($t0) ## 8015E704 -/* 00880 808AA000 8C780048 */ lw $t8, 0x0048($v1) ## 80127168 -/* 00884 808AA004 03024824 */ and $t1, $t8, $v0 -/* 00888 808AA008 1120005F */ beq $t1, $zero, .L808AA188 -/* 0088C 808AA00C 00000000 */ nop -/* 00890 808AA010 8C6A004C */ lw $t2, 0x004C($v1) ## 8012716C -/* 00894 808AA014 01425824 */ and $t3, $t2, $v0 -/* 00898 808AA018 1160005B */ beq $t3, $zero, .L808AA188 -/* 0089C 808AA01C 00000000 */ nop -/* 008A0 808AA020 8C6C0050 */ lw $t4, 0x0050($v1) ## 80127170 -/* 008A4 808AA024 01826824 */ and $t5, $t4, $v0 -/* 008A8 808AA028 11A00057 */ beq $t5, $zero, .L808AA188 -/* 008AC 808AA02C 00000000 */ nop -/* 008B0 808AA030 95190EE4 */ lhu $t9, 0x0EE4($t0) ## 8015F544 -/* 008B4 808AA034 332E0001 */ andi $t6, $t9, 0x0001 ## $t6 = 00000000 -/* 008B8 808AA038 15C00053 */ bne $t6, $zero, .L808AA188 -/* 008BC 808AA03C 00000000 */ nop -/* 008C0 808AA040 8D0F0004 */ lw $t7, 0x0004($t0) ## 8015E664 -/* 008C4 808AA044 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008C8 808AA048 15E1004F */ bne $t7, $at, .L808AA188 -/* 008CC 808AA04C 00000000 */ nop -/* 008D0 808AA050 8E051C44 */ lw $a1, 0x1C44($s0) ## 00001C44 -/* 008D4 808AA054 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 -/* 008D8 808AA058 44812000 */ mtc1 $at, $f4 ## $f4 = -450.00 -/* 008DC 808AA05C C4A00024 */ lwc1 $f0, 0x0024($a1) ## 00000024 -/* 008E0 808AA060 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 008E4 808AA064 4600203C */ c.lt.s $f4, $f0 -/* 008E8 808AA068 00000000 */ nop -/* 008EC 808AA06C 4502003D */ bc1fl .L808AA164 -/* 008F0 808AA070 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 008F4 808AA074 44813000 */ mtc1 $at, $f6 ## $f6 = 450.00 -/* 008F8 808AA078 3C014487 */ lui $at, 0x4487 ## $at = 44870000 -/* 008FC 808AA07C 4606003C */ c.lt.s $f0, $f6 -/* 00900 808AA080 00000000 */ nop -/* 00904 808AA084 45020037 */ bc1fl .L808AA164 -/* 00908 808AA088 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 0090C 808AA08C C4A0002C */ lwc1 $f0, 0x002C($a1) ## 453B002C -/* 00910 808AA090 44814000 */ mtc1 $at, $f8 ## $f8 = 1080.00 -/* 00914 808AA094 3C01808B */ lui $at, %hi(D_808AA884) ## $at = 808B0000 -/* 00918 808AA098 4600403C */ c.lt.s $f8, $f0 -/* 0091C 808AA09C 00000000 */ nop -/* 00920 808AA0A0 45020030 */ bc1fl .L808AA164 -/* 00924 808AA0A4 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 00928 808AA0A8 C42AA884 */ lwc1 $f10, %lo(D_808AA884)($at) -/* 0092C 808AA0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00930 808AA0B0 460A003C */ c.lt.s $f0, $f10 -/* 00934 808AA0B4 00000000 */ nop -/* 00938 808AA0B8 4502002A */ bc1fl .L808AA164 -/* 0093C 808AA0BC 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 00940 808AA0C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00944 808AA0C4 0C02FF21 */ jal Gameplay_InCsMode -/* 00948 808AA0C8 AFA70030 */ sw $a3, 0x0030($sp) -/* 0094C 808AA0CC 3C088016 */ lui $t0, %hi(gSaveContext) -/* 00950 808AA0D0 2508E660 */ addiu $t0, %lo(gSaveContext) -/* 00954 808AA0D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00958 808AA0D8 14400021 */ bne $v0, $zero, .L808AA160 -/* 0095C 808AA0DC 8FA70030 */ lw $a3, 0x0030($sp) -/* 00960 808AA0E0 95180EE4 */ lhu $t8, 0x0EE4($t0) ## 8015F544 -/* 00964 808AA0E4 24040082 */ addiu $a0, $zero, 0x0082 ## $a0 = 00000082 -/* 00968 808AA0E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0096C 808AA0EC 37090001 */ ori $t1, $t8, 0x0001 ## $t1 = 00000001 -/* 00970 808AA0F0 A5090EE4 */ sh $t1, 0x0EE4($t0) ## 8015F544 -/* 00974 808AA0F4 0C00D6DD */ jal Flags_SetEventChkInf - -/* 00978 808AA0F8 AFA70030 */ sw $a3, 0x0030($sp) -/* 0097C 808AA0FC 8FA70030 */ lw $a3, 0x0030($sp) -/* 00980 808AA100 3C0A808B */ lui $t2, %hi(func_808A9D18) ## $t2 = 808B0000 -/* 00984 808AA104 8FA50024 */ lw $a1, 0x0024($sp) -/* 00988 808AA108 254A9D18 */ addiu $t2, $t2, %lo(func_808A9D18) ## $t2 = 808A9D18 -/* 0098C 808AA10C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00990 808AA110 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00994 808AA114 0C00B7D5 */ jal func_8002DF54 -/* 00998 808AA118 ACEA0164 */ sw $t2, 0x0164($a3) ## 00000164 -/* 0099C 808AA11C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009A0 808AA120 00300821 */ addu $at, $at, $s0 -/* 009A4 808AA124 240B00CD */ addiu $t3, $zero, 0x00CD ## $t3 = 000000CD -/* 009A8 808AA128 3C088016 */ lui $t0, %hi(gSaveContext) -/* 009AC 808AA12C A42B1E1A */ sh $t3, 0x1E1A($at) ## 00011E1A -/* 009B0 808AA130 2508E660 */ addiu $t0, %lo(gSaveContext) -/* 009B4 808AA134 340CFFF1 */ ori $t4, $zero, 0xFFF1 ## $t4 = 0000FFF1 -/* 009B8 808AA138 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009BC 808AA13C A50C1412 */ sh $t4, 0x1412($t0) ## 8015FA72 -/* 009C0 808AA140 00300821 */ addu $at, $at, $s0 -/* 009C4 808AA144 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 -/* 009C8 808AA148 A02D1E15 */ sb $t5, 0x1E15($at) ## 00011E15 -/* 009CC 808AA14C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009D0 808AA150 00300821 */ addu $at, $at, $s0 -/* 009D4 808AA154 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 009D8 808AA158 1000000B */ beq $zero, $zero, .L808AA188 -/* 009DC 808AA15C A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E -.L808AA160: -/* 009E0 808AA160 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -.L808AA164: -/* 009E4 808AA164 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 009E8 808AA168 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 009EC 808AA16C 0C00B84B */ jal func_8002E12C -/* 009F0 808AA170 24067530 */ addiu $a2, $zero, 0x7530 ## $a2 = 00007530 -/* 009F4 808AA174 10400004 */ beq $v0, $zero, .L808AA188 -/* 009F8 808AA178 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 009FC 808AA17C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A00 808AA180 00300821 */ addu $at, $at, $s0 -/* 00A04 808AA184 A02E0B01 */ sb $t6, 0x0B01($at) ## 00010B01 -.L808AA188: -/* 00A08 808AA188 3C088016 */ lui $t0, %hi(gSaveContext) -/* 00A0C 808AA18C 2508E660 */ addiu $t0, %lo(gSaveContext) -/* 00A10 808AA190 8D041360 */ lw $a0, 0x1360($t0) ## 8015F9C0 -/* 00A14 808AA194 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00A18 808AA198 3C058012 */ lui $a1, %hi(D_8011FB40) -/* 00A1C 808AA19C 14C4003F */ bne $a2, $a0, .L808AA29C -/* 00A20 808AA1A0 24A5FB40 */ addiu $a1, %lo(D_8011FB40) -/* 00A24 808AA1A4 94AF0000 */ lhu $t7, 0x0000($a1) ## 8011FB40 -/* 00A28 808AA1A8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00A2C 808AA1AC 55E10033 */ bnel $t7, $at, .L808AA27C -/* 00A30 808AA1B0 9502000C */ lhu $v0, 0x000C($t0) ## 8015E66C -/* 00A34 808AA1B4 9503000C */ lhu $v1, 0x000C($t0) ## 8015E66C -/* 00A38 808AA1B8 3401D557 */ ori $at, $zero, 0xD557 ## $at = 0000D557 -/* 00A3C 808AA1BC 3402D556 */ ori $v0, $zero, 0xD556 ## $v0 = 0000D556 -/* 00A40 808AA1C0 0061082A */ slt $at, $v1, $at -/* 00A44 808AA1C4 54200004 */ bnel $at, $zero, .L808AA1D8 -/* 00A48 808AA1C8 0043C023 */ subu $t8, $v0, $v1 -/* 00A4C 808AA1CC 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00A50 808AA1D0 3442D556 */ ori $v0, $v0, 0xD556 ## $v0 = 0001D556 -/* 00A54 808AA1D4 0043C023 */ subu $t8, $v0, $v1 -.L808AA1D8: -/* 00A58 808AA1D8 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00A5C 808AA1DC 3C01808B */ lui $at, %hi(D_808AA888) ## $at = 808B0000 -/* 00A60 808AA1E0 C424A888 */ lwc1 $f4, %lo(D_808AA888)($at) -/* 00A64 808AA1E4 468084A0 */ cvt.s.w $f18, $f16 -/* 00A68 808AA1E8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00A6C 808AA1EC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00A70 808AA1F0 46049182 */ mul.s $f6, $f18, $f4 -/* 00A74 808AA1F4 4449F800 */ cfc1 $t1, $31 -/* 00A78 808AA1F8 44CAF800 */ ctc1 $t2, $31 -/* 00A7C 808AA1FC 00000000 */ nop -/* 00A80 808AA200 46003224 */ cvt.w.s $f8, $f6 -/* 00A84 808AA204 444AF800 */ cfc1 $t2, $31 -/* 00A88 808AA208 00000000 */ nop -/* 00A8C 808AA20C 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 00A90 808AA210 51400013 */ beql $t2, $zero, .L808AA260 -/* 00A94 808AA214 440A4000 */ mfc1 $t2, $f8 -/* 00A98 808AA218 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 00A9C 808AA21C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00AA0 808AA220 46083201 */ sub.s $f8, $f6, $f8 -/* 00AA4 808AA224 44CAF800 */ ctc1 $t2, $31 -/* 00AA8 808AA228 00000000 */ nop -/* 00AAC 808AA22C 46004224 */ cvt.w.s $f8, $f8 -/* 00AB0 808AA230 444AF800 */ cfc1 $t2, $31 -/* 00AB4 808AA234 00000000 */ nop -/* 00AB8 808AA238 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 00ABC 808AA23C 15400005 */ bne $t2, $zero, .L808AA254 -/* 00AC0 808AA240 00000000 */ nop -/* 00AC4 808AA244 440A4000 */ mfc1 $t2, $f8 -/* 00AC8 808AA248 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ACC 808AA24C 10000007 */ beq $zero, $zero, .L808AA26C -/* 00AD0 808AA250 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L808AA254: -/* 00AD4 808AA254 10000005 */ beq $zero, $zero, .L808AA26C -/* 00AD8 808AA258 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00ADC 808AA25C 440A4000 */ mfc1 $t2, $f8 -.L808AA260: -/* 00AE0 808AA260 00000000 */ nop -/* 00AE4 808AA264 0540FFFB */ bltz $t2, .L808AA254 -/* 00AE8 808AA268 00000000 */ nop -.L808AA26C: -/* 00AEC 808AA26C 44C9F800 */ ctc1 $t1, $31 -/* 00AF0 808AA270 A4AA0000 */ sh $t2, 0x0000($a1) ## 8011FB40 -/* 00AF4 808AA274 00000000 */ nop -/* 00AF8 808AA278 9502000C */ lhu $v0, 0x000C($t0) ## 8015E66C -.L808AA27C: -/* 00AFC 808AA27C 28412AAC */ slti $at, $v0, 0x2AAC -/* 00B00 808AA280 14200006 */ bne $at, $zero, .L808AA29C -/* 00B04 808AA284 28413000 */ slti $at, $v0, 0x3000 -/* 00B08 808AA288 50200005 */ beql $at, $zero, .L808AA2A0 -/* 00B0C 808AA28C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B10 808AA290 54C40003 */ bnel $a2, $a0, .L808AA2A0 -/* 00B14 808AA294 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B18 808AA298 A4A00000 */ sh $zero, 0x0000($a1) ## 8011FB40 -.L808AA29C: -/* 00B1C 808AA29C 8FBF001C */ lw $ra, 0x001C($sp) -.L808AA2A0: -/* 00B20 808AA2A0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B24 808AA2A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B28 808AA2A8 03E00008 */ jr $ra -/* 00B2C 808AA2AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s deleted file mode 100644 index f9df2fd198..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_808A9BE8 -/* 00468 808A9BE8 3C078016 */ lui $a3, %hi(gSaveContext) -/* 0046C 808A9BEC 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 00470 808A9BF0 8CE31360 */ lw $v1, 0x1360($a3) ## 8015F9C0 -/* 00474 808A9BF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00478 808A9BF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0047C 808A9BFC AFA50024 */ sw $a1, 0x0024($sp) -/* 00480 808A9C00 28610004 */ slti $at, $v1, 0x0004 -/* 00484 808A9C04 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00488 808A9C08 10200014 */ beq $at, $zero, .L808A9C5C -/* 0048C 808A9C0C 8C88011C */ lw $t0, 0x011C($a0) ## 0000011C -/* 00490 808A9C10 3C048012 */ lui $a0, %hi(gBitFlags) -/* 00494 808A9C14 24847120 */ addiu $a0, %lo(gBitFlags) -/* 00498 808A9C18 8C8E0048 */ lw $t6, 0x0048($a0) ## 80127168 -/* 0049C 808A9C1C 8CE200A4 */ lw $v0, 0x00A4($a3) ## 8015E704 -/* 004A0 808A9C20 01C27824 */ and $t7, $t6, $v0 -/* 004A4 808A9C24 51E0000E */ beql $t7, $zero, .L808A9C60 -/* 004A8 808A9C28 84CD00B4 */ lh $t5, 0x00B4($a2) ## 000000B4 -/* 004AC 808A9C2C 8C98004C */ lw $t8, 0x004C($a0) ## 8012716C -/* 004B0 808A9C30 0302C824 */ and $t9, $t8, $v0 -/* 004B4 808A9C34 5320000A */ beql $t9, $zero, .L808A9C60 -/* 004B8 808A9C38 84CD00B4 */ lh $t5, 0x00B4($a2) ## 000000B4 -/* 004BC 808A9C3C 8C890050 */ lw $t1, 0x0050($a0) ## 80127170 -/* 004C0 808A9C40 01225024 */ and $t2, $t1, $v0 -/* 004C4 808A9C44 51400006 */ beql $t2, $zero, .L808A9C60 -/* 004C8 808A9C48 84CD00B4 */ lh $t5, 0x00B4($a2) ## 000000B4 -/* 004CC 808A9C4C 94EB0EE4 */ lhu $t3, 0x0EE4($a3) ## 8015F544 -/* 004D0 808A9C50 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 004D4 808A9C54 5180002D */ beql $t4, $zero, .L808A9D0C -/* 004D8 808A9C58 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9C5C: -/* 004DC 808A9C5C 84CD00B4 */ lh $t5, 0x00B4($a2) ## 000000B4 -.L808A9C60: -/* 004E0 808A9C60 8FA40024 */ lw $a0, 0x0024($sp) -/* 004E4 808A9C64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004E8 808A9C68 51A00016 */ beql $t5, $zero, .L808A9CC4 -/* 004EC 808A9C6C 84D800B4 */ lh $t8, 0x00B4($a2) ## 000000B4 -/* 004F0 808A9C70 AFA60020 */ sw $a2, 0x0020($sp) -/* 004F4 808A9C74 0C01B129 */ jal Flags_GetEnv -/* 004F8 808A9C78 AFA8001C */ sw $t0, 0x001C($sp) -/* 004FC 808A9C7C 3C078016 */ lui $a3, %hi(gSaveContext) -/* 00500 808A9C80 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 00504 808A9C84 8FA60020 */ lw $a2, 0x0020($sp) -/* 00508 808A9C88 14400007 */ bne $v0, $zero, .L808A9CA8 -/* 0050C 808A9C8C 8FA8001C */ lw $t0, 0x001C($sp) -/* 00510 808A9C90 8CE31360 */ lw $v1, 0x1360($a3) ## 8015F9C0 -/* 00514 808A9C94 28610004 */ slti $at, $v1, 0x0004 -/* 00518 808A9C98 5020000A */ beql $at, $zero, .L808A9CC4 -/* 0051C 808A9C9C 84D800B4 */ lh $t8, 0x00B4($a2) ## 000000B4 -/* 00520 808A9CA0 8CEE0010 */ lw $t6, 0x0010($a3) ## 8015E670 -/* 00524 808A9CA4 15C00006 */ bne $t6, $zero, .L808A9CC0 -.L808A9CA8: -/* 00528 808A9CA8 3C0F808B */ lui $t7, %hi(func_808A9D24) ## $t7 = 808B0000 -/* 0052C 808A9CAC 25EF9D24 */ addiu $t7, $t7, %lo(func_808A9D24) ## $t7 = 808A9D24 -/* 00530 808A9CB0 ACCF0164 */ sw $t7, 0x0164($a2) ## 00000164 -/* 00534 808A9CB4 A4C00168 */ sh $zero, 0x0168($a2) ## 00000168 -/* 00538 808A9CB8 10000013 */ beq $zero, $zero, .L808A9D08 -/* 0053C 808A9CBC A5000168 */ sh $zero, 0x0168($t0) ## 00000168 -.L808A9CC0: -/* 00540 808A9CC0 84D800B4 */ lh $t8, 0x00B4($a2) ## 000000B4 -.L808A9CC4: -/* 00544 808A9CC4 28610004 */ slti $at, $v1, 0x0004 -/* 00548 808A9CC8 57000010 */ bnel $t8, $zero, .L808A9D0C -/* 0054C 808A9CCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00550 808A9CD0 5020000E */ beql $at, $zero, .L808A9D0C -/* 00554 808A9CD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00558 808A9CD8 8CF90004 */ lw $t9, 0x0004($a3) ## 8015E664 -/* 0055C 808A9CDC 5320000B */ beql $t9, $zero, .L808A9D0C -/* 00560 808A9CE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00564 808A9CE4 8CE90010 */ lw $t1, 0x0010($a3) ## 8015E670 -/* 00568 808A9CE8 3C0A808B */ lui $t2, %hi(func_808A9D24) ## $t2 = 808B0000 -/* 0056C 808A9CEC 254A9D24 */ addiu $t2, $t2, %lo(func_808A9D24) ## $t2 = 808A9D24 -/* 00570 808A9CF0 11200005 */ beq $t1, $zero, .L808A9D08 -/* 00574 808A9CF4 240BC000 */ addiu $t3, $zero, 0xC000 ## $t3 = FFFFC000 -/* 00578 808A9CF8 ACCA0164 */ sw $t2, 0x0164($a2) ## 00000164 -/* 0057C 808A9CFC A4CB0168 */ sh $t3, 0x0168($a2) ## 00000168 -/* 00580 808A9D00 240CF020 */ addiu $t4, $zero, 0xF020 ## $t4 = FFFFF020 -/* 00584 808A9D04 A50C0168 */ sh $t4, 0x0168($t0) ## 00000168 -.L808A9D08: -/* 00588 808A9D08 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9D0C: -/* 0058C 808A9D0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00590 808A9D10 03E00008 */ jr $ra -/* 00594 808A9D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s deleted file mode 100644 index 3c368132ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_808A9D18 -/* 00598 808A9D18 AFA40000 */ sw $a0, 0x0000($sp) -/* 0059C 808A9D1C 03E00008 */ jr $ra -/* 005A0 808A9D20 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s deleted file mode 100644 index 8a997944ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s +++ /dev/null @@ -1,94 +0,0 @@ -.late_rodata -glabel D_808AA878 - .float 0.4 - -.text -glabel func_808A9D24 -/* 005A4 808A9D24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005A8 808A9D28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 808A9D2C AFA5002C */ sw $a1, 0x002C($sp) -/* 005B0 808A9D30 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005B4 808A9D34 84E50168 */ lh $a1, 0x0168($a3) ## 00000168 -/* 005B8 808A9D38 AFA70028 */ sw $a3, 0x0028($sp) -/* 005BC 808A9D3C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 005C0 808A9D40 0C01DE2B */ jal Math_ScaledStepToS - -/* 005C4 808A9D44 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 005C8 808A9D48 10400004 */ beq $v0, $zero, .L808A9D5C -/* 005CC 808A9D4C 8FA70028 */ lw $a3, 0x0028($sp) -/* 005D0 808A9D50 3C0E808B */ lui $t6, %hi(func_808A9BE8) ## $t6 = 808B0000 -/* 005D4 808A9D54 25CE9BE8 */ addiu $t6, $t6, %lo(func_808A9BE8) ## $t6 = 808A9BE8 -/* 005D8 808A9D58 ACEE0164 */ sw $t6, 0x0164($a3) ## 00000164 -.L808A9D5C: -/* 005DC 808A9D5C 84EF00B4 */ lh $t7, 0x00B4($a3) ## 000000B4 -/* 005E0 808A9D60 3C09808B */ lui $t1, %hi(func_808A9BE8) ## $t1 = 808B0000 -/* 005E4 808A9D64 25299BE8 */ addiu $t1, $t1, %lo(func_808A9BE8) ## $t1 = 808A9BE8 -/* 005E8 808A9D68 29E1D828 */ slti $at, $t7, 0xD828 -/* 005EC 808A9D6C 1420001B */ bne $at, $zero, .L808A9DDC -/* 005F0 808A9D70 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 005F4 808A9D74 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 005F8 808A9D78 3C01808B */ lui $at, %hi(D_808AA878) ## $at = 808B0000 -/* 005FC 808A9D7C C428A878 */ lwc1 $f8, %lo(D_808AA878)($at) -/* 00600 808A9D80 468021A0 */ cvt.s.w $f6, $f4 -/* 00604 808A9D84 8CE3011C */ lw $v1, 0x011C($a3) ## 0000011C -/* 00608 808A9D88 84650168 */ lh $a1, 0x0168($v1) ## 00000168 -/* 0060C 808A9D8C AFA90018 */ sw $t1, 0x0018($sp) -/* 00610 808A9D90 46083282 */ mul.s $f10, $f6, $f8 -/* 00614 808A9D94 AFA70028 */ sw $a3, 0x0028($sp) -/* 00618 808A9D98 AFA30024 */ sw $v1, 0x0024($sp) -/* 0061C 808A9D9C 246400B4 */ addiu $a0, $v1, 0x00B4 ## $a0 = 000000B4 -/* 00620 808A9DA0 4600540D */ trunc.w.s $f16, $f10 -/* 00624 808A9DA4 44068000 */ mfc1 $a2, $f16 -/* 00628 808A9DA8 00000000 */ nop -/* 0062C 808A9DAC 00063400 */ sll $a2, $a2, 16 -/* 00630 808A9DB0 00063403 */ sra $a2, $a2, 16 -/* 00634 808A9DB4 0C01DE2B */ jal Math_ScaledStepToS - -/* 00638 808A9DB8 A7A6001E */ sh $a2, 0x001E($sp) -/* 0063C 808A9DBC 8FA30024 */ lw $v1, 0x0024($sp) -/* 00640 808A9DC0 87A6001E */ lh $a2, 0x001E($sp) -/* 00644 808A9DC4 8C68011C */ lw $t0, 0x011C($v1) ## 0000011C -/* 00648 808A9DC8 84650168 */ lh $a1, 0x0168($v1) ## 00000168 -/* 0064C 808A9DCC 0C01DE2B */ jal Math_ScaledStepToS - -/* 00650 808A9DD0 250400B4 */ addiu $a0, $t0, 0x00B4 ## $a0 = 000000B4 -/* 00654 808A9DD4 8FA70028 */ lw $a3, 0x0028($sp) -/* 00658 808A9DD8 8FA90018 */ lw $t1, 0x0018($sp) -.L808A9DDC: -/* 0065C 808A9DDC 84EA0168 */ lh $t2, 0x0168($a3) ## 00000168 -/* 00660 808A9DE0 0543000F */ bgezl $t2, .L808A9E20 -/* 00664 808A9DE4 8CEC0164 */ lw $t4, 0x0164($a3) ## 00000164 -/* 00668 808A9DE8 8CEB0164 */ lw $t3, 0x0164($a3) ## 00000164 -/* 0066C 808A9DEC 2405280F */ addiu $a1, $zero, 0x280F ## $a1 = 0000280F -/* 00670 808A9DF0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00674 808A9DF4 152B0005 */ bne $t1, $t3, .L808A9E0C -/* 00678 808A9DF8 00000000 */ nop -/* 0067C 808A9DFC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00680 808A9E00 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00684 808A9E04 10000011 */ beq $zero, $zero, .L808A9E4C -/* 00688 808A9E08 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9E0C: -/* 0068C 808A9E0C 0C00BE5D */ jal func_8002F974 -/* 00690 808A9E10 2405200D */ addiu $a1, $zero, 0x200D ## $a1 = 0000200D -/* 00694 808A9E14 1000000D */ beq $zero, $zero, .L808A9E4C -/* 00698 808A9E18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0069C 808A9E1C 8CEC0164 */ lw $t4, 0x0164($a3) ## 00000164 -.L808A9E20: -/* 006A0 808A9E20 2405280E */ addiu $a1, $zero, 0x280E ## $a1 = 0000280E -/* 006A4 808A9E24 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 006A8 808A9E28 152C0005 */ bne $t1, $t4, .L808A9E40 -/* 006AC 808A9E2C 00000000 */ nop -/* 006B0 808A9E30 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006B4 808A9E34 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 006B8 808A9E38 10000004 */ beq $zero, $zero, .L808A9E4C -/* 006BC 808A9E3C 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9E40: -/* 006C0 808A9E40 0C00BE5D */ jal func_8002F974 -/* 006C4 808A9E44 2405200C */ addiu $a1, $zero, 0x200C ## $a1 = 0000200C -/* 006C8 808A9E48 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A9E4C: -/* 006CC 808A9E4C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006D0 808A9E50 03E00008 */ jr $ra -/* 006D4 808A9E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s deleted file mode 100644 index 33b9439ae6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s +++ /dev/null @@ -1,101 +0,0 @@ -.late_rodata -glabel D_808AA87C - .float 5000.0 - -glabel D_808AA880 - .word 0x47127C00 - -.text -glabel func_808A9E58 -/* 006D8 808A9E58 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006DC 808A9E5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 006E0 808A9E60 AFA40028 */ sw $a0, 0x0028($sp) -/* 006E4 808A9E64 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 006E8 808A9E68 AFA5002C */ sw $a1, 0x002C($sp) -/* 006EC 808A9E6C 3C0142FE */ lui $at, 0x42FE ## $at = 42FE0000 -/* 006F0 808A9E70 44812000 */ mtc1 $at, $f4 ## $f4 = 127.00 -/* 006F4 808A9E74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 006F8 808A9E78 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 006FC 808A9E7C 46040182 */ mul.s $f6, $f0, $f4 -/* 00700 808A9E80 8FA30028 */ lw $v1, 0x0028($sp) -/* 00704 808A9E84 444EF800 */ cfc1 $t6, $31 -/* 00708 808A9E88 44C2F800 */ ctc1 $v0, $31 -/* 0070C 808A9E8C 00000000 */ nop -/* 00710 808A9E90 46003224 */ cvt.w.s $f8, $f6 -/* 00714 808A9E94 4442F800 */ cfc1 $v0, $31 -/* 00718 808A9E98 00000000 */ nop -/* 0071C 808A9E9C 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 00720 808A9EA0 50400013 */ beql $v0, $zero, .L808A9EF0 -/* 00724 808A9EA4 44024000 */ mfc1 $v0, $f8 -/* 00728 808A9EA8 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 0072C 808A9EAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00730 808A9EB0 46083201 */ sub.s $f8, $f6, $f8 -/* 00734 808A9EB4 44C2F800 */ ctc1 $v0, $31 -/* 00738 808A9EB8 00000000 */ nop -/* 0073C 808A9EBC 46004224 */ cvt.w.s $f8, $f8 -/* 00740 808A9EC0 4442F800 */ cfc1 $v0, $31 -/* 00744 808A9EC4 00000000 */ nop -/* 00748 808A9EC8 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 0074C 808A9ECC 14400005 */ bne $v0, $zero, .L808A9EE4 -/* 00750 808A9ED0 00000000 */ nop -/* 00754 808A9ED4 44024000 */ mfc1 $v0, $f8 -/* 00758 808A9ED8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0075C 808A9EDC 10000007 */ beq $zero, $zero, .L808A9EFC -/* 00760 808A9EE0 00411025 */ or $v0, $v0, $at ## $v0 = 80000000 -.L808A9EE4: -/* 00764 808A9EE4 10000005 */ beq $zero, $zero, .L808A9EFC -/* 00768 808A9EE8 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 0076C 808A9EEC 44024000 */ mfc1 $v0, $f8 -.L808A9EF0: -/* 00770 808A9EF0 00000000 */ nop -/* 00774 808A9EF4 0440FFFB */ bltz $v0, .L808A9EE4 -/* 00778 808A9EF8 00000000 */ nop -.L808A9EFC: -/* 0077C 808A9EFC 846F001C */ lh $t7, 0x001C($v1) ## 0000001C -/* 00780 808A9F00 44CEF800 */ ctc1 $t6, $31 -/* 00784 808A9F04 24420080 */ addiu $v0, $v0, 0x0080 ## $v0 = 0000007F -/* 00788 808A9F08 15E00005 */ bne $t7, $zero, .L808A9F20 -/* 0078C 808A9F0C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 0000007F -/* 00790 808A9F10 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 00794 808A9F14 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 -/* 00798 808A9F18 10000004 */ beq $zero, $zero, .L808A9F2C -/* 0079C 808A9F1C 00000000 */ nop -.L808A9F20: -/* 007A0 808A9F20 3C01C382 */ lui $at, 0xC382 ## $at = C3820000 -/* 007A4 808A9F24 44811000 */ mtc1 $at, $f2 ## $f2 = -260.00 -/* 007A8 808A9F28 00000000 */ nop -.L808A9F2C: -/* 007AC 808A9F2C 3C01808B */ lui $at, %hi(D_808AA7B0) ## $at = 808B0000 -/* 007B0 808A9F30 C420A7B0 */ lwc1 $f0, %lo(D_808AA7B0)($at) -/* 007B4 808A9F34 3C01808B */ lui $at, %hi(D_808AA87C) ## $at = 808B0000 -/* 007B8 808A9F38 C430A87C */ lwc1 $f16, %lo(D_808AA87C)($at) -/* 007BC 808A9F3C 4600128D */ trunc.w.s $f10, $f2 -/* 007C0 808A9F40 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 007C4 808A9F44 46008482 */ mul.s $f18, $f16, $f0 -/* 007C8 808A9F48 44812000 */ mtc1 $at, $f4 ## $f4 = 128.00 -/* 007CC 808A9F4C 44055000 */ mfc1 $a1, $f10 -/* 007D0 808A9F50 3C01808B */ lui $at, %hi(D_808AA880) ## $at = 808B0000 -/* 007D4 808A9F54 C42AA880 */ lwc1 $f10, %lo(D_808AA880)($at) -/* 007D8 808A9F58 00052C00 */ sll $a1, $a1, 16 -/* 007DC 808A9F5C 00052C03 */ sra $a1, $a1, 16 -/* 007E0 808A9F60 460A0402 */ mul.s $f16, $f0, $f10 -/* 007E4 808A9F64 46049180 */ add.s $f6, $f18, $f4 -/* 007E8 808A9F68 24640170 */ addiu $a0, $v1, 0x0170 ## $a0 = 00000170 -/* 007EC 808A9F6C 240702B2 */ addiu $a3, $zero, 0x02B2 ## $a3 = 000002B2 -/* 007F0 808A9F70 AFA20010 */ sw $v0, 0x0010($sp) -/* 007F4 808A9F74 AFA20014 */ sw $v0, 0x0014($sp) -/* 007F8 808A9F78 4600320D */ trunc.w.s $f8, $f6 -/* 007FC 808A9F7C AFA00018 */ sw $zero, 0x0018($sp) -/* 00800 808A9F80 4600848D */ trunc.w.s $f18, $f16 -/* 00804 808A9F84 44064000 */ mfc1 $a2, $f8 -/* 00808 808A9F88 44099000 */ mfc1 $t1, $f18 -/* 0080C 808A9F8C 00063400 */ sll $a2, $a2, 16 -/* 00810 808A9F90 00063403 */ sra $a2, $a2, 16 -/* 00814 808A9F94 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 00818 808A9F98 AFA9001C */ sw $t1, 0x001C($sp) -/* 0081C 808A9F9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00820 808A9FA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00824 808A9FA4 03E00008 */ jr $ra -/* 00828 808A9FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s deleted file mode 100644 index a7dc0b2fcd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ /dev/null @@ -1,214 +0,0 @@ -.rdata -glabel D_808AA7D0 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA7EC - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -glabel D_808AA808 - .asciz "../z_bg_spot00_hanebasi.c" - .balign 4 - -.late_rodata -glabel D_808AA88C - .float 0.008 - -glabel D_808AA890 - .word 0x3583126F -glabel D_808AA894 - .float 9.58738019108e-05 - -glabel D_808AA898 - .word 0x442C8000, 0x00000000 - -.text -glabel func_808AA2B0 -/* 00B30 808AA2B0 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00B34 808AA2B4 AFB3006C */ sw $s3, 0x006C($sp) -/* 00B38 808AA2B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 00B3C 808AA2BC AFBF0084 */ sw $ra, 0x0084($sp) -/* 00B40 808AA2C0 AFBE0080 */ sw $s8, 0x0080($sp) -/* 00B44 808AA2C4 AFB7007C */ sw $s7, 0x007C($sp) -/* 00B48 808AA2C8 AFB60078 */ sw $s6, 0x0078($sp) -/* 00B4C 808AA2CC AFB50074 */ sw $s5, 0x0074($sp) -/* 00B50 808AA2D0 AFB40070 */ sw $s4, 0x0070($sp) -/* 00B54 808AA2D4 AFB20068 */ sw $s2, 0x0068($sp) -/* 00B58 808AA2D8 AFB10064 */ sw $s1, 0x0064($sp) -/* 00B5C 808AA2DC AFB00060 */ sw $s0, 0x0060($sp) -/* 00B60 808AA2E0 F7BC0058 */ sdc1 $f28, 0x0058($sp) -/* 00B64 808AA2E4 F7BA0050 */ sdc1 $f26, 0x0050($sp) -/* 00B68 808AA2E8 F7B80048 */ sdc1 $f24, 0x0048($sp) -/* 00B6C 808AA2EC F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 00B70 808AA2F0 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 00B74 808AA2F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00B78 808AA2F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B7C 808AA2FC 3C06808B */ lui $a2, %hi(D_808AA7D0) ## $a2 = 808B0000 -/* 00B80 808AA300 24C6A7D0 */ addiu $a2, $a2, %lo(D_808AA7D0) ## $a2 = 808AA7D0 -/* 00B84 808AA304 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 -/* 00B88 808AA308 24070279 */ addiu $a3, $zero, 0x0279 ## $a3 = 00000279 -/* 00B8C 808AA30C 0C031AB1 */ jal Graph_OpenDisps -/* 00B90 808AA310 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00B94 808AA314 0C024F61 */ jal func_80093D84 -/* 00B98 808AA318 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 00B9C 808AA31C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 00BA0 808AA320 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 00BA4 808AA324 29C10004 */ slti $at, $t6, 0x0004 -/* 00BA8 808AA328 14200005 */ bne $at, $zero, .L808AA340 -/* 00BAC 808AA32C 3C01808B */ lui $at, %hi(D_808AA88C) ## $at = 808B0000 -/* 00BB0 808AA330 C424A88C */ lwc1 $f4, %lo(D_808AA88C)($at) -/* 00BB4 808AA334 3C01808B */ lui $at, %hi(D_808AA7B0) ## $at = 808B0000 -/* 00BB8 808AA338 1000000B */ beq $zero, $zero, .L808AA368 -/* 00BBC 808AA33C E424A7B0 */ swc1 $f4, %lo(D_808AA7B0)($at) -.L808AA340: -/* 00BC0 808AA340 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 -/* 00BC4 808AA344 3C01808B */ lui $at, %hi(D_808AA890) ## $at = 808B0000 -/* 00BC8 808AA348 C42AA890 */ lwc1 $f10, %lo(D_808AA890)($at) -/* 00BCC 808AA34C 000FC023 */ subu $t8, $zero, $t7 -/* 00BD0 808AA350 2719E000 */ addiu $t9, $t8, 0xE000 ## $t9 = FFFFE000 -/* 00BD4 808AA354 44993000 */ mtc1 $t9, $f6 ## $f6 = NaN -/* 00BD8 808AA358 3C01808B */ lui $at, %hi(D_808AA7B0) ## $at = 808B0000 -/* 00BDC 808AA35C 46803220 */ cvt.s.w $f8, $f6 -/* 00BE0 808AA360 460A4402 */ mul.s $f16, $f8, $f10 -/* 00BE4 808AA364 E430A7B0 */ swc1 $f16, %lo(D_808AA7B0)($at) -.L808AA368: -/* 00BE8 808AA368 866807A0 */ lh $t0, 0x07A0($s3) ## 000007A0 -/* 00BEC 808AA36C 00084880 */ sll $t1, $t0, 2 -/* 00BF0 808AA370 02695021 */ addu $t2, $s3, $t1 -/* 00BF4 808AA374 0C016A7D */ jal Camera_GetCamDirYaw -/* 00BF8 808AA378 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 -/* 00BFC 808AA37C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00C00 808AA380 00415821 */ addu $t3, $v0, $at -/* 00C04 808AA384 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00C08 808AA388 3C01808B */ lui $at, %hi(D_808AA894) ## $at = 808B0000 -/* 00C0C 808AA38C C426A894 */ lwc1 $f6, %lo(D_808AA894)($at) -/* 00C10 808AA390 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00C14 808AA394 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 00C18 808AA398 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00C1C 808AA39C 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 -/* 00C20 808AA3A0 371800FF */ ori $t8, $t8, 0x00FF ## $t8 = FFFF00FF -/* 00C24 808AA3A4 35EF8080 */ ori $t7, $t7, 0x8080 ## $t7 = FA008080 -/* 00C28 808AA3A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00C2C 808AA3AC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00C30 808AA3B0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00C34 808AA3B4 000B6400 */ sll $t4, $t3, 16 -/* 00C38 808AA3B8 000C6C03 */ sra $t5, $t4, 16 -/* 00C3C 808AA3BC 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 00C40 808AA3C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C44 808AA3C4 0261A821 */ addu $s5, $s3, $at -/* 00C48 808AA3C8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00C4C 808AA3CC AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 00C50 808AA3D0 3C01C382 */ lui $at, 0xC382 ## $at = C3820000 -/* 00C54 808AA3D4 46809120 */ cvt.s.w $f4, $f18 -/* 00C58 808AA3D8 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 00C5C 808AA3DC 3C09FF00 */ lui $t1, 0xFF00 ## $t1 = FF000000 -/* 00C60 808AA3E0 4481D000 */ mtc1 $at, $f26 ## $f26 = -260.00 -/* 00C64 808AA3E4 3C01808B */ lui $at, %hi(D_808AA898) ## $at = 808B0000 -/* 00C68 808AA3E8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00C6C 808AA3EC AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00C70 808AA3F0 C438A898 */ lwc1 $f24, %lo(D_808AA898)($at) -/* 00C74 808AA3F4 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 00C78 808AA3F8 4481B000 */ mtc1 $at, $f22 ## $f22 = 128.00 -/* 00C7C 808AA3FC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 00C80 808AA400 3C140405 */ lui $s4, %hi(gEffFire1DL) ## $s4 = 04050000 -/* 00C84 808AA404 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 -/* 00C88 808AA408 3C16DB06 */ lui $s6, 0xDB06 ## $s6 = DB060000 -/* 00C8C 808AA40C 4481A000 */ mtc1 $at, $f20 ## $f20 = 260.00 -/* 00C90 808AA410 46062702 */ mul.s $f28, $f4, $f6 -/* 00C94 808AA414 36D60020 */ ori $s6, $s6, 0x0020 ## $s6 = DB060020 -/* 00C98 808AA418 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 00C9C 808AA41C 2694D4E0 */ addiu $s4, $s4, %lo(gEffFire1DL) ## $s4 = 0404D4E0 -/* 00CA0 808AA420 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00CA4 808AA424 2417FFEC */ addiu $s7, $zero, 0xFFEC ## $s7 = FFFFFFEC -.L808AA428: -/* 00CA8 808AA428 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00CAC 808AA42C 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00CB0 808AA430 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 00CB4 808AA434 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00CB8 808AA438 AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 -/* 00CBC 808AA43C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -/* 00CC0 808AA440 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 00CC4 808AA444 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00CC8 808AA448 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00CCC 808AA44C AFA0001C */ sw $zero, 0x001C($sp) -/* 00CD0 808AA450 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00CD4 808AA454 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00CD8 808AA458 8EAE1DE4 */ lw $t6, 0x1DE4($s5) ## 00001DE4 -/* 00CDC 808AA45C 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 00CE0 808AA460 24090080 */ addiu $t1, $zero, 0x0080 ## $t1 = 00000080 -/* 00CE4 808AA464 01D17821 */ addu $t7, $t6, $s1 -/* 00CE8 808AA468 01F70019 */ multu $t7, $s7 -/* 00CEC 808AA46C AFA90028 */ sw $t1, 0x0028($sp) -/* 00CF0 808AA470 AFA80024 */ sw $t0, 0x0024($sp) -/* 00CF4 808AA474 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CF8 808AA478 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CFC 808AA47C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00D00 808AA480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00D04 808AA484 0000C012 */ mflo $t8 -/* 00D08 808AA488 331901FF */ andi $t9, $t8, 0x01FF ## $t9 = 000000FF -/* 00D0C 808AA48C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00D10 808AA490 AFB90020 */ sw $t9, 0x0020($sp) -/* 00D14 808AA494 16200003 */ bne $s1, $zero, .L808AA4A4 -/* 00D18 808AA498 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00D1C 808AA49C 10000002 */ beq $zero, $zero, .L808AA4A8 -/* 00D20 808AA4A0 4600A306 */ mov.s $f12, $f20 -.L808AA4A4: -/* 00D24 808AA4A4 4600D306 */ mov.s $f12, $f26 -.L808AA4A8: -/* 00D28 808AA4A8 4406C000 */ mfc1 $a2, $f24 -/* 00D2C 808AA4AC 4600B386 */ mov.s $f14, $f22 -/* 00D30 808AA4B0 0C034261 */ jal Matrix_Translate -/* 00D34 808AA4B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00D38 808AA4B8 4600E306 */ mov.s $f12, $f28 -/* 00D3C 808AA4BC 0C034348 */ jal Matrix_RotateY -/* 00D40 808AA4C0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00D44 808AA4C4 3C01808B */ lui $at, %hi(D_808AA7B0) ## $at = 808B0000 -/* 00D48 808AA4C8 C42CA7B0 */ lwc1 $f12, %lo(D_808AA7B0)($at) -/* 00D4C 808AA4CC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D50 808AA4D0 44066000 */ mfc1 $a2, $f12 -/* 00D54 808AA4D4 0C0342A3 */ jal Matrix_Scale -/* 00D58 808AA4D8 46006386 */ mov.s $f14, $f12 -/* 00D5C 808AA4DC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00D60 808AA4E0 3C05808B */ lui $a1, %hi(D_808AA7EC) ## $a1 = 808B0000 -/* 00D64 808AA4E4 24A5A7EC */ addiu $a1, $a1, %lo(D_808AA7EC) ## $a1 = 808AA7EC -/* 00D68 808AA4E8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D6C 808AA4EC AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 -/* 00D70 808AA4F0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 00D74 808AA4F4 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 00D78 808AA4F8 240602A2 */ addiu $a2, $zero, 0x02A2 ## $a2 = 000002A2 -/* 00D7C 808AA4FC 0C0346A2 */ jal Matrix_NewMtx -/* 00D80 808AA500 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00D84 808AA504 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00D88 808AA508 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00D8C 808AA50C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00D90 808AA510 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00D94 808AA514 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00D98 808AA518 AE4B02D0 */ sw $t3, 0x02D0($s2) ## 000002D0 -/* 00D9C 808AA51C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00DA0 808AA520 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00DA4 808AA524 1621FFC0 */ bne $s1, $at, .L808AA428 -/* 00DA8 808AA528 AC540004 */ sw $s4, 0x0004($v0) ## 00000004 -/* 00DAC 808AA52C 3C06808B */ lui $a2, %hi(D_808AA808) ## $a2 = 808B0000 -/* 00DB0 808AA530 24C6A808 */ addiu $a2, $a2, %lo(D_808AA808) ## $a2 = 808AA808 -/* 00DB4 808AA534 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 -/* 00DB8 808AA538 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 00DBC 808AA53C 0C031AD5 */ jal Graph_CloseDisps -/* 00DC0 808AA540 240702A9 */ addiu $a3, $zero, 0x02A9 ## $a3 = 000002A9 -/* 00DC4 808AA544 8FBF0084 */ lw $ra, 0x0084($sp) -/* 00DC8 808AA548 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 00DCC 808AA54C D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 00DD0 808AA550 D7B80048 */ ldc1 $f24, 0x0048($sp) -/* 00DD4 808AA554 D7BA0050 */ ldc1 $f26, 0x0050($sp) -/* 00DD8 808AA558 D7BC0058 */ ldc1 $f28, 0x0058($sp) -/* 00DDC 808AA55C 8FB00060 */ lw $s0, 0x0060($sp) -/* 00DE0 808AA560 8FB10064 */ lw $s1, 0x0064($sp) -/* 00DE4 808AA564 8FB20068 */ lw $s2, 0x0068($sp) -/* 00DE8 808AA568 8FB3006C */ lw $s3, 0x006C($sp) -/* 00DEC 808AA56C 8FB40070 */ lw $s4, 0x0070($sp) -/* 00DF0 808AA570 8FB50074 */ lw $s5, 0x0074($sp) -/* 00DF4 808AA574 8FB60078 */ lw $s6, 0x0078($sp) -/* 00DF8 808AA578 8FB7007C */ lw $s7, 0x007C($sp) -/* 00DFC 808AA57C 8FBE0080 */ lw $s8, 0x0080($sp) -/* 00E00 808AA580 03E00008 */ jr $ra -/* 00E04 808AA584 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s deleted file mode 100644 index 9d130718f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel DemoIk_Destroy -/* 00000 80983300 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 80983304 03E00008 */ jr $ra -/* 00008 80983308 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s deleted file mode 100644 index 860bcc938b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_809849A8 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoIk_Draw -/* 0131C 8098461C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01320 80984620 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01324 80984624 8C8201AC */ lw $v0, 0x01AC($a0) ## 000001AC -/* 01328 80984628 04400008 */ bltz $v0, .L8098464C -/* 0132C 8098462C 28410003 */ slti $at, $v0, 0x0003 -/* 01330 80984630 10200006 */ beq $at, $zero, .L8098464C -/* 01334 80984634 00027080 */ sll $t6, $v0, 2 -/* 01338 80984638 3C038098 */ lui $v1, %hi(D_80984778) ## $v1 = 80980000 -/* 0133C 8098463C 006E1821 */ addu $v1, $v1, $t6 -/* 01340 80984640 8C634778 */ lw $v1, %lo(D_80984778)($v1) -/* 01344 80984644 14600006 */ bne $v1, $zero, .L80984660 -/* 01348 80984648 00000000 */ nop -.L8098464C: -/* 0134C 8098464C 3C048098 */ lui $a0, %hi(D_809849A8) ## $a0 = 80980000 -/* 01350 80984650 0C00084C */ jal osSyncPrintf - -/* 01354 80984654 248449A8 */ addiu $a0, $a0, %lo(D_809849A8) ## $a0 = 809849A8 -/* 01358 80984658 10000004 */ beq $zero, $zero, .L8098466C -/* 0135C 8098465C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80984660: -/* 01360 80984660 0060F809 */ jalr $ra, $v1 -/* 01364 80984664 00000000 */ nop -/* 01368 80984668 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098466C: -/* 0136C 8098466C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01370 80984670 03E00008 */ jr $ra -/* 01374 80984674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s deleted file mode 100644 index a8b6f4f19e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel DemoIk_Init -/* 01378 80984678 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0137C 8098467C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01380 80984680 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01384 80984684 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01388 80984688 10400005 */ beq $v0, $zero, .L809846A0 -/* 0138C 8098468C 00000000 */ nop -/* 01390 80984690 10410003 */ beq $v0, $at, .L809846A0 -/* 01394 80984694 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01398 80984698 14410005 */ bne $v0, $at, .L809846B0 -/* 0139C 8098469C 00000000 */ nop -.L809846A0: -/* 013A0 809846A0 0C260E08 */ jal func_80983820 -/* 013A4 809846A4 00000000 */ nop -/* 013A8 809846A8 10000004 */ beq $zero, $zero, .L809846BC -/* 013AC 809846AC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809846B0: -/* 013B0 809846B0 0C260F8A */ jal func_80983E28 -/* 013B4 809846B4 00000000 */ nop -/* 013B8 809846B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809846BC: -/* 013BC 809846BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013C0 809846C0 03E00008 */ jr $ra -/* 013C4 809846C4 00000000 */ nop -/* 013C8 809846C8 00000000 */ nop -/* 013CC 809846CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s deleted file mode 100644 index 5afe60cb7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_8098496C - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.balign 4 - -.text -glabel DemoIk_Update -/* 012B4 809845B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012B8 809845B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012BC 809845BC 8C8201A8 */ lw $v0, 0x01A8($a0) ## 000001A8 -/* 012C0 809845C0 04400008 */ bltz $v0, .L809845E4 -/* 012C4 809845C4 28410006 */ slti $at, $v0, 0x0006 -/* 012C8 809845C8 10200006 */ beq $at, $zero, .L809845E4 -/* 012CC 809845CC 00027080 */ sll $t6, $v0, 2 -/* 012D0 809845D0 3C038098 */ lui $v1, %hi(D_80984760) ## $v1 = 80980000 -/* 012D4 809845D4 006E1821 */ addu $v1, $v1, $t6 -/* 012D8 809845D8 8C634760 */ lw $v1, %lo(D_80984760)($v1) -/* 012DC 809845DC 14600006 */ bne $v1, $zero, .L809845F8 -/* 012E0 809845E0 00000000 */ nop -.L809845E4: -/* 012E4 809845E4 3C048098 */ lui $a0, %hi(D_8098496C) ## $a0 = 80980000 -/* 012E8 809845E8 0C00084C */ jal osSyncPrintf - -/* 012EC 809845EC 2484496C */ addiu $a0, $a0, %lo(D_8098496C) ## $a0 = 8098496C -/* 012F0 809845F0 10000004 */ beq $zero, $zero, .L80984604 -/* 012F4 809845F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809845F8: -/* 012F8 809845F8 0060F809 */ jalr $ra, $v1 -/* 012FC 809845FC 00000000 */ nop -/* 01300 80984600 8FBF0014 */ lw $ra, 0x0014($sp) -.L80984604: -/* 01304 80984604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01308 80984608 03E00008 */ jr $ra -/* 0130C 8098460C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s deleted file mode 100644 index eab685dcfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098330C -/* 0000C 8098330C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00010 80983310 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00014 80983314 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00018 80983318 AFA50024 */ sw $a1, 0x0024($sp) -/* 0001C 8098331C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00020 80983320 AFBF001C */ sw $ra, 0x001C($sp) -/* 00024 80983324 AFA40020 */ sw $a0, 0x0020($sp) -/* 00028 80983328 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0002C 8098332C 44070000 */ mfc1 $a3, $f0 -/* 00030 80983330 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00034 80983334 8FA40024 */ lw $a0, 0x0024($sp) -/* 00038 80983338 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 0003C 8098333C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00040 80983340 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00044 80983344 8FBF001C */ lw $ra, 0x001C($sp) -/* 00048 80983348 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0004C 8098334C 03E00008 */ jr $ra -/* 00050 80983350 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s deleted file mode 100644 index 04d0b0a09f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80983354 -/* 00054 80983354 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00058 80983358 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0005C 8098335C 0C02927F */ jal SkelAnime_Update - -/* 00060 80983360 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00064 80983364 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00068 80983368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0006C 8098336C 03E00008 */ jr $ra -/* 00070 80983370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s deleted file mode 100644 index a1b16037b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80983374 -/* 00074 80983374 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00078 80983378 00057880 */ sll $t7, $a1, 2 -/* 0007C 8098337C 008FC021 */ addu $t8, $a0, $t7 -/* 00080 80983380 11C00003 */ beq $t6, $zero, .L80983390 -/* 00084 80983384 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00088 80983388 03E00008 */ jr $ra -/* 0008C 8098338C 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80983390: -/* 00090 80983390 03E00008 */ jr $ra -/* 00094 80983394 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s deleted file mode 100644 index 5280981b1f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80983398 -/* 00098 80983398 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0009C 8098339C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000A0 809833A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 000A4 809833A4 0C260CDD */ jal func_80983374 -/* 000A8 809833A8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 000AC 809833AC 10400007 */ beq $v0, $zero, .L809833CC -/* 000B0 809833B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000B4 809833B4 97AE001E */ lhu $t6, 0x001E($sp) -/* 000B8 809833B8 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 000BC 809833BC 55CF0004 */ bnel $t6, $t7, .L809833D0 -/* 000C0 809833C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000C4 809833C4 10000002 */ beq $zero, $zero, .L809833D0 -/* 000C8 809833C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809833CC: -/* 000CC 809833CC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809833D0: -/* 000D0 809833D0 03E00008 */ jr $ra -/* 000D4 809833D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s deleted file mode 100644 index edaf41bb0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809833D8 -/* 000D8 809833D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000DC 809833DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E0 809833E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 000E4 809833E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 000E8 809833E8 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 000EC 809833EC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 000F0 809833F0 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 000F4 809833F4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 000F8 809833F8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 000FC 809833FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00100 80983400 0C028D88 */ jal AnimationContext_SetMoveActor -/* 00104 80983404 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0010C 8098340C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00110 80983410 03E00008 */ jr $ra -/* 00114 80983414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s deleted file mode 100644 index 0fdb312d52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80983418 -/* 00118 80983418 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 0011C 8098341C 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 00120 80983420 03E00008 */ jr $ra -/* 00124 80983424 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s deleted file mode 100644 index cad682bf0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80983428 -/* 00128 80983428 03E00008 */ jr $ra -/* 0012C 8098342C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s deleted file mode 100644 index bba0b05011..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80983430 -/* 00130 80983430 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00134 80983434 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00138 80983438 AFA5001C */ sw $a1, 0x001C($sp) -/* 0013C 8098343C AFA60020 */ sw $a2, 0x0020($sp) -/* 00140 80983440 AFA70024 */ sw $a3, 0x0024($sp) -/* 00144 80983444 0C031A73 */ jal Graph_Alloc - -/* 00148 80983448 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 0014C 8098344C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 00150 80983450 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00154 80983454 93A90023 */ lbu $t1, 0x0023($sp) -/* 00158 80983458 93B8001F */ lbu $t8, 0x001F($sp) -/* 0015C 8098345C 93AD0027 */ lbu $t5, 0x0027($sp) -/* 00160 80983460 00095400 */ sll $t2, $t1, 16 -/* 00164 80983464 0018CE00 */ sll $t9, $t8, 24 -/* 00168 80983468 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000000 -/* 0016C 8098346C 000D7200 */ sll $t6, $t5, 8 -/* 00170 80983470 016E7825 */ or $t7, $t3, $t6 ## $t7 = FA000000 -/* 00174 80983474 35F800FF */ ori $t8, $t7, 0x00FF ## $t8 = FA0000FF -/* 00178 80983478 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0017C 8098347C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00180 80983480 24440008 */ addiu $a0, $v0, 0x0008 ## $a0 = 00000008 -/* 00184 80983484 00801025 */ or $v0, $a0, $zero ## $v0 = 00000008 -/* 00188 80983488 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 0018C 8098348C AC480000 */ sw $t0, 0x0000($v0) ## 00000008 -/* 00190 80983490 93AD002F */ lbu $t5, 0x002F($sp) -/* 00194 80983494 93B9002B */ lbu $t9, 0x002B($sp) -/* 00198 80983498 93B80033 */ lbu $t8, 0x0033($sp) -/* 0019C 8098349C 000D5C00 */ sll $t3, $t5, 16 -/* 001A0 809834A0 00195600 */ sll $t2, $t9, 24 -/* 001A4 809834A4 014B7025 */ or $t6, $t2, $t3 ## $t6 = 00000000 -/* 001A8 809834A8 00184200 */ sll $t0, $t8, 8 -/* 001AC 809834AC 01C84825 */ or $t1, $t6, $t0 ## $t1 = FB000000 -/* 001B0 809834B0 353900FF */ ori $t9, $t1, 0x00FF ## $t9 = FB0000FF -/* 001B4 809834B4 AC590004 */ sw $t9, 0x0004($v0) ## 0000000C -/* 001B8 809834B8 3C0CDF00 */ lui $t4, 0xDF00 ## $t4 = DF000000 -/* 001BC 809834BC AC8C0008 */ sw $t4, 0x0008($a0) ## 00000010 -/* 001C0 809834C0 AC80000C */ sw $zero, 0x000C($a0) ## 00000014 -/* 001C4 809834C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C8 809834C8 24840008 */ addiu $a0, $a0, 0x0008 ## $a0 = 00000010 -/* 001CC 809834CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001D0 809834D0 03E00008 */ jr $ra -/* 001D4 809834D4 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s deleted file mode 100644 index 2234d033f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_809834D8 -/* 001D8 809834D8 14800003 */ bne $a0, $zero, .L809834E8 -/* 001DC 809834DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001E0 809834E0 03E00008 */ jr $ra -/* 001E4 809834E4 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L809834E8: -/* 001E8 809834E8 14810003 */ bne $a0, $at, .L809834F8 -/* 001EC 809834EC 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 -/* 001F0 809834F0 03E00008 */ jr $ra -/* 001F4 809834F4 24020006 */ addiu $v0, $zero, 0x0006 ## $v0 = 00000006 -.L809834F8: -/* 001F8 809834F8 03E00008 */ jr $ra -/* 001FC 809834FC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000007 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s deleted file mode 100644 index 6b8fa4b602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80983500 -/* 00200 80983500 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00204 80983504 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00208 80983508 AFB00020 */ sw $s0, 0x0020($sp) -/* 0020C 8098350C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00210 80983510 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00214 80983514 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00218 80983518 10400008 */ beq $v0, $zero, .L8098353C -/* 0021C 8098351C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00220 80983520 10410015 */ beq $v0, $at, .L80983578 -/* 00224 80983524 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00228 80983528 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0022C 8098352C 10410021 */ beq $v0, $at, .L809835B4 -/* 00230 80983530 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00234 80983534 1000002D */ beq $zero, $zero, .L809835EC -/* 00238 80983538 8FBF0024 */ lw $ra, 0x0024($sp) -.L8098353C: -/* 0023C 8098353C 0C0295B2 */ jal Animation_OnFrame -/* 00240 80983540 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 00244 80983544 10400028 */ beq $v0, $zero, .L809835E8 -/* 00248 80983548 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0024C 8098354C 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 00250 80983550 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00254 80983554 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00258 80983558 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0025C 8098355C AFA70010 */ sw $a3, 0x0010($sp) -/* 00260 80983560 2404392D */ addiu $a0, $zero, 0x392D ## $a0 = 0000392D -/* 00264 80983564 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00268 80983568 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0026C 8098356C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00270 80983570 1000001E */ beq $zero, $zero, .L809835EC -/* 00274 80983574 8FBF0024 */ lw $ra, 0x0024($sp) -.L80983578: -/* 00278 80983578 0C0295B2 */ jal Animation_OnFrame -/* 0027C 8098357C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 00280 80983580 10400019 */ beq $v0, $zero, .L809835E8 -/* 00284 80983584 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00288 80983588 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 0028C 8098358C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00290 80983590 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 00294 80983594 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00298 80983598 AFA70010 */ sw $a3, 0x0010($sp) -/* 0029C 8098359C 2404392F */ addiu $a0, $zero, 0x392F ## $a0 = 0000392F -/* 002A0 809835A0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 002A4 809835A4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 002A8 809835A8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 002AC 809835AC 1000000F */ beq $zero, $zero, .L809835EC -/* 002B0 809835B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809835B4: -/* 002B4 809835B4 0C0295B2 */ jal Animation_OnFrame -/* 002B8 809835B8 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 002BC 809835BC 1040000A */ beq $v0, $zero, .L809835E8 -/* 002C0 809835C0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 002C4 809835C4 3C188013 */ lui $t8, %hi(D_801333E8) -/* 002C8 809835C8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 002CC 809835CC 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 002D0 809835D0 AFB80014 */ sw $t8, 0x0014($sp) -/* 002D4 809835D4 AFA70010 */ sw $a3, 0x0010($sp) -/* 002D8 809835D8 2404392E */ addiu $a0, $zero, 0x392E ## $a0 = 0000392E -/* 002DC 809835DC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 002E0 809835E0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 002E4 809835E4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L809835E8: -/* 002E8 809835E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809835EC: -/* 002EC 809835EC 8FB00020 */ lw $s0, 0x0020($sp) -/* 002F0 809835F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002F4 809835F4 03E00008 */ jr $ra -/* 002F8 809835F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s deleted file mode 100644 index a43884b257..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel func_809835FC -/* 002FC 809835FC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00300 80983600 AFB1004C */ sw $s1, 0x004C($sp) -/* 00304 80983604 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00308 80983608 AFBF0064 */ sw $ra, 0x0064($sp) -/* 0030C 8098360C AFB60060 */ sw $s6, 0x0060($sp) -/* 00310 80983610 AFB5005C */ sw $s5, 0x005C($sp) -/* 00314 80983614 AFB40058 */ sw $s4, 0x0058($sp) -/* 00318 80983618 AFB30054 */ sw $s3, 0x0054($sp) -/* 0031C 8098361C AFB20050 */ sw $s2, 0x0050($sp) -/* 00320 80983620 AFB00048 */ sw $s0, 0x0048($sp) -/* 00324 80983624 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 00328 80983628 0C260D36 */ jal func_809834D8 -/* 0032C 8098362C 8484001C */ lh $a0, 0x001C($a0) ## 0000001C -/* 00330 80983630 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00334 80983634 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00338 80983638 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 0033C 8098363C 0C260CE6 */ jal func_80983398 -/* 00340 80983640 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 00344 80983644 1040004C */ beq $v0, $zero, .L80983778 -/* 00348 80983648 3C0E8098 */ lui $t6, %hi(D_809846D0) ## $t6 = 80980000 -/* 0034C 8098364C 25CE46D0 */ addiu $t6, $t6, %lo(D_809846D0) ## $t6 = 809846D0 -/* 00350 80983650 8DD80000 */ lw $t8, 0x0000($t6) ## 809846D0 -/* 00354 80983654 27B20078 */ addiu $s2, $sp, 0x0078 ## $s2 = FFFFFFE0 -/* 00358 80983658 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0035C 8098365C AE580000 */ sw $t8, 0x0000($s2) ## FFFFFFE0 -/* 00360 80983660 8DCF0004 */ lw $t7, 0x0004($t6) ## 809846D4 -/* 00364 80983664 3C088098 */ lui $t0, %hi(D_809846DC) ## $t0 = 80980000 -/* 00368 80983668 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0036C 8098366C AE4F0004 */ sw $t7, 0x0004($s2) ## FFFFFFE4 -/* 00370 80983670 8DD80008 */ lw $t8, 0x0008($t6) ## 809846D8 -/* 00374 80983674 250846DC */ addiu $t0, $t0, %lo(D_809846DC) ## $t0 = 809846DC -/* 00378 80983678 16010003 */ bne $s0, $at, .L80983688 -/* 0037C 8098367C AE580008 */ sw $t8, 0x0008($s2) ## FFFFFFE8 -/* 00380 80983680 10000008 */ beq $zero, $zero, .L809836A4 -/* 00384 80983684 24140004 */ addiu $s4, $zero, 0x0004 ## $s4 = 00000004 -.L80983688: -/* 00388 80983688 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0038C 8098368C 16010004 */ bne $s0, $at, .L809836A0 -/* 00390 80983690 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -/* 00394 80983694 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 00398 80983698 10000002 */ beq $zero, $zero, .L809836A4 -/* 0039C 8098369C 24140008 */ addiu $s4, $zero, 0x0008 ## $s4 = 00000008 -.L809836A0: -/* 003A0 809836A0 2414000B */ addiu $s4, $zero, 0x000B ## $s4 = 0000000B -.L809836A4: -/* 003A4 809836A4 0054082A */ slt $at, $v0, $s4 -/* 003A8 809836A8 10200033 */ beq $at, $zero, .L80983778 -/* 003AC 809836AC 0002C880 */ sll $t9, $v0, 2 -/* 003B0 809836B0 00144880 */ sll $t1, $s4, 2 -/* 003B4 809836B4 01344823 */ subu $t1, $t1, $s4 -/* 003B8 809836B8 0322C823 */ subu $t9, $t9, $v0 -/* 003BC 809836BC 0019C880 */ sll $t9, $t9, 2 -/* 003C0 809836C0 00094880 */ sll $t1, $t1, 2 -/* 003C4 809836C4 01289821 */ addu $s3, $t1, $t0 -/* 003C8 809836C8 03288021 */ addu $s0, $t9, $t0 -/* 003CC 809836CC 27B50084 */ addiu $s5, $sp, 0x0084 ## $s5 = FFFFFFEC -/* 003D0 809836D0 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000000 -.L809836D4: -/* 003D4 809836D4 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 003D8 809836D8 C60A0004 */ lwc1 $f10, 0x0004($s0) ## 00000004 -/* 003DC 809836DC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 003E0 809836E0 46062200 */ add.s $f8, $f4, $f6 -/* 003E4 809836E4 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 003E8 809836E8 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 -/* 003EC 809836EC 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 003F0 809836F0 E7A80084 */ swc1 $f8, 0x0084($sp) -/* 003F4 809836F4 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 003F8 809836F8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 003FC 809836FC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00400 80983700 46105480 */ add.s $f18, $f10, $f16 -/* 00404 80983704 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00408 80983708 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 0040C 8098370C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00410 80983710 E7B20088 */ swc1 $f18, 0x0088($sp) -/* 00414 80983714 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 00418 80983718 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 0041C 8098371C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00420 80983720 46062200 */ add.s $f8, $f4, $f6 -/* 00424 80983724 AFA8003C */ sw $t0, 0x003C($sp) -/* 00428 80983728 AFA90038 */ sw $t1, 0x0038($sp) -/* 0042C 8098372C AFB90034 */ sw $t9, 0x0034($sp) -/* 00430 80983730 E7A8008C */ swc1 $f8, 0x008C($sp) -/* 00434 80983734 AFB80030 */ sw $t8, 0x0030($sp) -/* 00438 80983738 AFA0002C */ sw $zero, 0x002C($sp) -/* 0043C 8098373C AFA00028 */ sw $zero, 0x0028($sp) -/* 00440 80983740 AFAF0024 */ sw $t7, 0x0024($sp) -/* 00444 80983744 AFAE0020 */ sw $t6, 0x0020($sp) -/* 00448 80983748 AFAD001C */ sw $t5, 0x001C($sp) -/* 0044C 8098374C AFAC0018 */ sw $t4, 0x0018($sp) -/* 00450 80983750 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00454 80983754 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00458 80983758 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 0045C 8098375C 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFEC -/* 00460 80983760 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE0 -/* 00464 80983764 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00468 80983768 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE0 -/* 0046C 8098376C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 00470 80983770 5613FFD8 */ bnel $s0, $s3, .L809836D4 -/* 00474 80983774 C6040000 */ lwc1 $f4, 0x0000($s0) ## 0000000C -.L80983778: -/* 00478 80983778 8FBF0064 */ lw $ra, 0x0064($sp) -/* 0047C 8098377C 8FB00048 */ lw $s0, 0x0048($sp) -/* 00480 80983780 8FB1004C */ lw $s1, 0x004C($sp) -/* 00484 80983784 8FB20050 */ lw $s2, 0x0050($sp) -/* 00488 80983788 8FB30054 */ lw $s3, 0x0054($sp) -/* 0048C 8098378C 8FB40058 */ lw $s4, 0x0058($sp) -/* 00490 80983790 8FB5005C */ lw $s5, 0x005C($sp) -/* 00494 80983794 8FB60060 */ lw $s6, 0x0060($sp) -/* 00498 80983798 03E00008 */ jr $ra -/* 0049C 8098379C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s deleted file mode 100644 index d15397110e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_809837A0 -/* 004A0 809837A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004A4 809837A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004A8 809837A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004AC 809837AC AFA5001C */ sw $a1, 0x001C($sp) -/* 004B0 809837B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004B4 809837B4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 004B8 809837B8 0C260CDD */ jal func_80983374 -/* 004BC 809837BC AFA70018 */ sw $a3, 0x0018($sp) -/* 004C0 809837C0 10400013 */ beq $v0, $zero, .L80983810 -/* 004C4 809837C4 8FA70018 */ lw $a3, 0x0018($sp) -/* 004C8 809837C8 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 004CC 809837CC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 004D0 809837D0 00000000 */ nop -/* 004D4 809837D4 468021A0 */ cvt.s.w $f6, $f4 -/* 004D8 809837D8 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 004DC 809837DC 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 004E0 809837E0 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 004E4 809837E4 00000000 */ nop -/* 004E8 809837E8 468042A0 */ cvt.s.w $f10, $f8 -/* 004EC 809837EC E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 004F0 809837F0 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 004F4 809837F4 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 004F8 809837F8 00000000 */ nop -/* 004FC 809837FC 468084A0 */ cvt.s.w $f18, $f16 -/* 00500 80983800 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 00504 80983804 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00508 80983808 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 0050C 8098380C A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80983810: -/* 00510 80983810 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00514 80983814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00518 80983818 03E00008 */ jr $ra -/* 0051C 8098381C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s deleted file mode 100644 index 1de5ea38d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80983820 -/* 00520 80983820 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00524 80983824 AFBF002C */ sw $ra, 0x002C($sp) -/* 00528 80983828 AFB10028 */ sw $s1, 0x0028($sp) -/* 0052C 8098382C AFB00024 */ sw $s0, 0x0024($sp) -/* 00530 80983830 AFA5005C */ sw $a1, 0x005C($sp) -/* 00534 80983834 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00538 80983838 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0053C 8098383C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00540 80983840 10400006 */ beq $v0, $zero, .L8098385C -/* 00544 80983844 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00548 80983848 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0054C 8098384C 1041000B */ beq $v0, $at, .L8098387C -/* 00550 80983850 3C0F0600 */ lui $t7, %hi(D_06000660) ## $t7 = 06000000 -/* 00554 80983854 10000010 */ beq $zero, $zero, .L80983898 -/* 00558 80983858 3C180600 */ lui $t8, %hi(D_06000380) ## $t8 = 06000000 -.L8098385C: -/* 0055C 8098385C 3C0E0600 */ lui $t6, %hi(D_06000C90) ## $t6 = 06000000 -/* 00560 80983860 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00564 80983864 25CE0C90 */ addiu $t6, $t6, %lo(D_06000C90) ## $t6 = 06000C90 -/* 00568 80983868 3C110600 */ lui $s1, %hi(D_06000C6C) ## $s1 = 06000000 -/* 0056C 8098386C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00570 80983870 AFAE0048 */ sw $t6, 0x0048($sp) -/* 00574 80983874 1000000E */ beq $zero, $zero, .L809838B0 -/* 00578 80983878 26310C6C */ addiu $s1, $s1, %lo(D_06000C6C) ## $s1 = 06000C6C -.L8098387C: -/* 0057C 8098387C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00580 80983880 25EF0660 */ addiu $t7, $t7, %lo(D_06000660) ## $t7 = 06000660 -/* 00584 80983884 3C110600 */ lui $s1, %hi(D_06000634) ## $s1 = 06000000 -/* 00588 80983888 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 0058C 8098388C AFAF0048 */ sw $t7, 0x0048($sp) -/* 00590 80983890 10000007 */ beq $zero, $zero, .L809838B0 -/* 00594 80983894 26310634 */ addiu $s1, $s1, %lo(D_06000634) ## $s1 = 06000634 -.L80983898: -/* 00598 80983898 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0059C 8098389C 27180380 */ addiu $t8, $t8, %lo(D_06000380) ## $t8 = 06000380 -/* 005A0 809838A0 3C110600 */ lui $s1, %hi(D_0600035C) ## $s1 = 06000000 -/* 005A4 809838A4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 005A8 809838A8 AFB80048 */ sw $t8, 0x0048($sp) -/* 005AC 809838AC 2631035C */ addiu $s1, $s1, %lo(D_0600035C) ## $s1 = 0600035C -.L809838B0: -/* 005B0 809838B0 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 005B4 809838B4 44070000 */ mfc1 $a3, $f0 -/* 005B8 809838B8 0C00AC78 */ jal ActorShape_Init - -/* 005BC 809838BC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 005C0 809838C0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 005C4 809838C4 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 -/* 005C8 809838C8 2608019C */ addiu $t0, $s0, 0x019C ## $t0 = 0000019C -/* 005CC 809838CC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005D0 809838D0 AFA90018 */ sw $t1, 0x0018($sp) -/* 005D4 809838D4 AFA80014 */ sw $t0, 0x0014($sp) -/* 005D8 809838D8 AFB90010 */ sw $t9, 0x0010($sp) -/* 005DC 809838DC AFA50034 */ sw $a1, 0x0034($sp) -/* 005E0 809838E0 8FA4005C */ lw $a0, 0x005C($sp) -/* 005E4 809838E4 8FA60048 */ lw $a2, 0x0048($sp) -/* 005E8 809838E8 0C02915F */ jal SkelAnime_Init - -/* 005EC 809838EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005F0 809838F0 0C028800 */ jal Animation_GetLastFrame - -/* 005F4 809838F4 02202025 */ or $a0, $s1, $zero ## $a0 = 0600035C -/* 005F8 809838F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005FC 809838FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00600 80983900 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00604 80983904 468021A0 */ cvt.s.w $f6, $f4 -/* 00608 80983908 44070000 */ mfc1 $a3, $f0 -/* 0060C 8098390C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00610 80983910 8FA40034 */ lw $a0, 0x0034($sp) -/* 00614 80983914 02202825 */ or $a1, $s1, $zero ## $a1 = 0600035C -/* 00618 80983918 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0061C 8098391C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00620 80983920 0C029468 */ jal Animation_Change - -/* 00624 80983924 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00628 80983928 8FBF002C */ lw $ra, 0x002C($sp) -/* 0062C 8098392C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00630 80983930 8FB10028 */ lw $s1, 0x0028($sp) -/* 00634 80983934 03E00008 */ jr $ra -/* 00638 80983938 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s deleted file mode 100644 index 64cdf19cb7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8098393C -/* 0063C 8098393C AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 00640 80983940 AC8001AC */ sw $zero, 0x01AC($a0) ## 000001AC -/* 00644 80983944 03E00008 */ jr $ra -/* 00648 80983948 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s deleted file mode 100644 index c52989f6a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098394C -/* 0064C 8098394C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00650 80983950 AFBF001C */ sw $ra, 0x001C($sp) -/* 00654 80983954 AFB00018 */ sw $s0, 0x0018($sp) -/* 00658 80983958 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0065C 8098395C 0C260D06 */ jal func_80983418 -/* 00660 80983960 AFA50024 */ sw $a1, 0x0024($sp) -/* 00664 80983964 0C260D36 */ jal func_809834D8 -/* 00668 80983968 8604001C */ lh $a0, 0x001C($s0) ## 0000001C -/* 0066C 8098396C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00670 80983970 8FA50024 */ lw $a1, 0x0024($sp) -/* 00674 80983974 0C260DE8 */ jal func_809837A0 -/* 00678 80983978 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0067C 8098397C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00680 80983980 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00684 80983984 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00688 80983988 AE0201A8 */ sw $v0, 0x01A8($s0) ## 000001A8 -/* 0068C 8098398C AE0201AC */ sw $v0, 0x01AC($s0) ## 000001AC -/* 00690 80983990 A20E00C8 */ sb $t6, 0x00C8($s0) ## 000000C8 -/* 00694 80983994 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 00698 80983998 8FBF001C */ lw $ra, 0x001C($sp) -/* 0069C 8098399C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006A0 809839A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 006A4 809839A4 03E00008 */ jr $ra -/* 006A8 809839A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s deleted file mode 100644 index c5bdf555ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_809839AC -/* 006AC 809839AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006B0 809839B0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 006B4 809839B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 006B8 809839B8 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 006BC 809839BC AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 -/* 006C0 809839C0 AC8F01AC */ sw $t7, 0x01AC($a0) ## 000001AC -/* 006C4 809839C4 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 006C8 809839C8 03E00008 */ jr $ra -/* 006CC 809839CC E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s deleted file mode 100644 index f0276e6a99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_809847B0 - .asciz "Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.balign 4 - -.late_rodata -glabel jtbl_809849E0 -.word L80983A3C -.word L80983A4C -.word L80983A60 -.word L80983A70 -.word L80983A88 -.word L80983A88 -.word 0x00000000, 0x00000000 - -.text -glabel func_809839D0 -/* 006D0 809839D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006D4 809839D4 AFB00018 */ sw $s0, 0x0018($sp) -/* 006D8 809839D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006DC 809839DC AFBF001C */ sw $ra, 0x001C($sp) -/* 006E0 809839E0 AFA5002C */ sw $a1, 0x002C($sp) -/* 006E4 809839E4 0C260D36 */ jal func_809834D8 -/* 006E8 809839E8 8484001C */ lh $a0, 0x001C($a0) ## 0000001C -/* 006EC 809839EC 8FA4002C */ lw $a0, 0x002C($sp) -/* 006F0 809839F0 0C260CDD */ jal func_80983374 -/* 006F4 809839F4 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 006F8 809839F8 50400026 */ beql $v0, $zero, .L80983A94 -/* 006FC 809839FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00700 80983A00 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 00704 80983A04 AFAE0020 */ sw $t6, 0x0020($sp) -/* 00708 80983A08 8E0301B0 */ lw $v1, 0x01B0($s0) ## 000001B0 -/* 0070C 80983A0C 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 00710 80983A10 2F010006 */ sltiu $at, $t8, 0x0006 -/* 00714 80983A14 51C3001F */ beql $t6, $v1, .L80983A94 -/* 00718 80983A18 8FBF001C */ lw $ra, 0x001C($sp) -/* 0071C 80983A1C 10200018 */ beq $at, $zero, .L80983A80 -/* 00720 80983A20 3C048098 */ lui $a0, %hi(D_809847B0) ## $a0 = 80980000 -/* 00724 80983A24 0018C080 */ sll $t8, $t8, 2 -/* 00728 80983A28 3C018098 */ lui $at, %hi(jtbl_809849E0) ## $at = 80980000 -/* 0072C 80983A2C 00380821 */ addu $at, $at, $t8 -/* 00730 80983A30 8C3849E0 */ lw $t8, %lo(jtbl_809849E0)($at) -/* 00734 80983A34 03000008 */ jr $t8 -/* 00738 80983A38 00000000 */ nop -glabel L80983A3C -/* 0073C 80983A3C 0C260E4F */ jal func_8098393C -/* 00740 80983A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00744 80983A44 10000011 */ beq $zero, $zero, .L80983A8C -/* 00748 80983A48 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80983A4C -/* 0074C 80983A4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00750 80983A50 0C260E53 */ jal func_8098394C -/* 00754 80983A54 8FA5002C */ lw $a1, 0x002C($sp) -/* 00758 80983A58 1000000C */ beq $zero, $zero, .L80983A8C -/* 0075C 80983A5C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80983A60 -/* 00760 80983A60 0C260E6B */ jal func_809839AC -/* 00764 80983A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00768 80983A68 10000008 */ beq $zero, $zero, .L80983A8C -/* 0076C 80983A6C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80983A70 -/* 00770 80983A70 0C00B55C */ jal Actor_Kill - -/* 00774 80983A74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00778 80983A78 10000004 */ beq $zero, $zero, .L80983A8C -/* 0077C 80983A7C 8FB90020 */ lw $t9, 0x0020($sp) -.L80983A80: -/* 00780 80983A80 0C00084C */ jal osSyncPrintf - -/* 00784 80983A84 248447B0 */ addiu $a0, $a0, %lo(D_809847B0) ## $a0 = 000047B0 -glabel L80983A88 -/* 00788 80983A88 8FB90020 */ lw $t9, 0x0020($sp) -.L80983A8C: -/* 0078C 80983A8C AE1901B0 */ sw $t9, 0x01B0($s0) ## 000001B0 -/* 00790 80983A90 8FBF001C */ lw $ra, 0x001C($sp) -.L80983A94: -/* 00794 80983A94 8FB00018 */ lw $s0, 0x0018($sp) -/* 00798 80983A98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0079C 80983A9C 03E00008 */ jr $ra -/* 007A0 80983AA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s deleted file mode 100644 index 096c23f662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80983AA4 -/* 007A4 80983AA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A8 80983AA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007AC 80983AAC 0C260E74 */ jal func_809839D0 -/* 007B0 80983AB0 00000000 */ nop -/* 007B4 80983AB4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007B8 80983AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007BC 80983ABC 03E00008 */ jr $ra -/* 007C0 80983AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s deleted file mode 100644 index a4ba4a01f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80983AC4 -/* 007C4 80983AC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007C8 80983AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007CC 80983ACC AFA40018 */ sw $a0, 0x0018($sp) -/* 007D0 80983AD0 0C260CC3 */ jal func_8098330C -/* 007D4 80983AD4 AFA5001C */ sw $a1, 0x001C($sp) -/* 007D8 80983AD8 8FA40018 */ lw $a0, 0x0018($sp) -/* 007DC 80983ADC 0C260E74 */ jal func_809839D0 -/* 007E0 80983AE0 8FA5001C */ lw $a1, 0x001C($sp) -/* 007E4 80983AE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007E8 80983AE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007EC 80983AEC 03E00008 */ jr $ra -/* 007F0 80983AF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s deleted file mode 100644 index 3dd2a679d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80983AF4 -/* 007F4 80983AF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007F8 80983AF8 AFBF001C */ sw $ra, 0x001C($sp) -/* 007FC 80983AFC AFB00018 */ sw $s0, 0x0018($sp) -/* 00800 80983B00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00804 80983B04 0C260CD5 */ jal func_80983354 -/* 00808 80983B08 AFA50024 */ sw $a1, 0x0024($sp) -/* 0080C 80983B0C 0C260D40 */ jal func_80983500 -/* 00810 80983B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00814 80983B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00818 80983B18 0C260CF6 */ jal func_809833D8 -/* 0081C 80983B1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00820 80983B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00824 80983B24 0C260CC3 */ jal func_8098330C -/* 00828 80983B28 8FA50024 */ lw $a1, 0x0024($sp) -/* 0082C 80983B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00830 80983B30 0C260D7F */ jal func_809835FC -/* 00834 80983B34 8FA50024 */ lw $a1, 0x0024($sp) -/* 00838 80983B38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0083C 80983B3C 0C260E74 */ jal func_809839D0 -/* 00840 80983B40 8FA50024 */ lw $a1, 0x0024($sp) -/* 00844 80983B44 8FBF001C */ lw $ra, 0x001C($sp) -/* 00848 80983B48 8FB00018 */ lw $s0, 0x0018($sp) -/* 0084C 80983B4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00850 80983B50 03E00008 */ jr $ra -/* 00854 80983B54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s deleted file mode 100644 index b4b8d4757a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_809847E4 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_809847FC - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_80984814 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_8098482C - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -.text -glabel func_80983B58 -/* 00858 80983B58 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0085C 80983B5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00860 80983B60 AFB00018 */ sw $s0, 0x0018($sp) -/* 00864 80983B64 AFA40058 */ sw $a0, 0x0058($sp) -/* 00868 80983B68 AFA5005C */ sw $a1, 0x005C($sp) -/* 0086C 80983B6C AFA60060 */ sw $a2, 0x0060($sp) -/* 00870 80983B70 AFA70064 */ sw $a3, 0x0064($sp) -/* 00874 80983B74 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00878 80983B78 3C068098 */ lui $a2, %hi(D_809847E4) ## $a2 = 80980000 -/* 0087C 80983B7C 24C647E4 */ addiu $a2, $a2, %lo(D_809847E4) ## $a2 = 809847E4 -/* 00880 80983B80 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 00884 80983B84 24070181 */ addiu $a3, $zero, 0x0181 ## $a3 = 00000181 -/* 00888 80983B88 0C031AB1 */ jal Graph_OpenDisps -/* 0088C 80983B8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00890 80983B90 8FAF005C */ lw $t7, 0x005C($sp) -/* 00894 80983B94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00898 80983B98 8FB80068 */ lw $t8, 0x0068($sp) -/* 0089C 80983B9C 15E10034 */ bne $t7, $at, .L80983C70 -/* 008A0 80983BA0 00000000 */ nop -/* 008A4 80983BA4 8702001C */ lh $v0, 0x001C($t8) ## 0000001C -/* 008A8 80983BA8 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 008AC 80983BAC 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 008B0 80983BB0 10400006 */ beq $v0, $zero, .L80983BCC -/* 008B4 80983BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008B8 80983BB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 008BC 80983BBC 10410017 */ beq $v0, $at, .L80983C1C -/* 008C0 80983BC0 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 008C4 80983BC4 1000002A */ beq $zero, $zero, .L80983C70 -/* 008C8 80983BC8 00000000 */ nop -.L80983BCC: -/* 008CC 80983BCC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008D0 80983BD0 3C058098 */ lui $a1, %hi(D_809847FC) ## $a1 = 80980000 -/* 008D4 80983BD4 24A547FC */ addiu $a1, $a1, %lo(D_809847FC) ## $a1 = 809847FC -/* 008D8 80983BD8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 008DC 80983BDC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 008E0 80983BE0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 008E4 80983BE4 24060186 */ addiu $a2, $zero, 0x0186 ## $a2 = 00000186 -/* 008E8 80983BE8 0C0346A2 */ jal Matrix_NewMtx -/* 008EC 80983BEC AFA20038 */ sw $v0, 0x0038($sp) -/* 008F0 80983BF0 8FA30038 */ lw $v1, 0x0038($sp) -/* 008F4 80983BF4 3C0B0601 */ lui $t3, %hi(D_06016BE0) ## $t3 = 06010000 -/* 008F8 80983BF8 256B6BE0 */ addiu $t3, $t3, %lo(D_06016BE0) ## $t3 = 06016BE0 -/* 008FC 80983BFC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00900 80983C00 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00904 80983C04 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00908 80983C08 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 0090C 80983C0C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00910 80983C10 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00914 80983C14 10000016 */ beq $zero, $zero, .L80983C70 -/* 00918 80983C18 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -.L80983C1C: -/* 0091C 80983C1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00920 80983C20 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = 00000003 -/* 00924 80983C24 3C058098 */ lui $a1, %hi(D_80984814) ## $a1 = 80980000 -/* 00928 80983C28 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0092C 80983C2C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00930 80983C30 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00934 80983C34 24A54814 */ addiu $a1, $a1, %lo(D_80984814) ## $a1 = 80984814 -/* 00938 80983C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0093C 80983C3C 2406018C */ addiu $a2, $zero, 0x018C ## $a2 = 0000018C -/* 00940 80983C40 0C0346A2 */ jal Matrix_NewMtx -/* 00944 80983C44 AFA20030 */ sw $v0, 0x0030($sp) -/* 00948 80983C48 8FA30030 */ lw $v1, 0x0030($sp) -/* 0094C 80983C4C 3C180601 */ lui $t8, %hi(D_06016F88) ## $t8 = 06010000 -/* 00950 80983C50 27186F88 */ addiu $t8, $t8, %lo(D_06016F88) ## $t8 = 06016F88 -/* 00954 80983C54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00958 80983C58 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0095C 80983C5C 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 00960 80983C60 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00964 80983C64 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00968 80983C68 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0096C 80983C6C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -.L80983C70: -/* 00970 80983C70 3C068098 */ lui $a2, %hi(D_8098482C) ## $a2 = 80980000 -/* 00974 80983C74 24C6482C */ addiu $a2, $a2, %lo(D_8098482C) ## $a2 = 8098482C -/* 00978 80983C78 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 0097C 80983C7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00980 80983C80 0C031AD5 */ jal Graph_CloseDisps -/* 00984 80983C84 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 -/* 00988 80983C88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0098C 80983C8C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00990 80983C90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00994 80983C94 03E00008 */ jr $ra -/* 00998 80983C98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s deleted file mode 100644 index 8738334548..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s +++ /dev/null @@ -1,111 +0,0 @@ -.rdata -glabel D_80984844 - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -glabel D_8098485C - .asciz "../z_demo_ik_inArmer.c" - .balign 4 - -.text -glabel func_80983C9C -/* 0099C 80983C9C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 009A0 80983CA0 AFBF002C */ sw $ra, 0x002C($sp) -/* 009A4 80983CA4 AFB00028 */ sw $s0, 0x0028($sp) -/* 009A8 80983CA8 AFA40068 */ sw $a0, 0x0068($sp) -/* 009AC 80983CAC AFA5006C */ sw $a1, 0x006C($sp) -/* 009B0 80983CB0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 009B4 80983CB4 3C068098 */ lui $a2, %hi(D_80984844) ## $a2 = 80980000 -/* 009B8 80983CB8 24C64844 */ addiu $a2, $a2, %lo(D_80984844) ## $a2 = 80984844 -/* 009BC 80983CBC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 009C0 80983CC0 240701A6 */ addiu $a3, $zero, 0x01A6 ## $a3 = 000001A6 -/* 009C4 80983CC4 0C031AB1 */ jal Graph_OpenDisps -/* 009C8 80983CC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 009CC 80983CCC 8FA40068 */ lw $a0, 0x0068($sp) -/* 009D0 80983CD0 8FA5006C */ lw $a1, 0x006C($sp) -/* 009D4 80983CD4 0C00BAF3 */ jal func_8002EBCC -/* 009D8 80983CD8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009DC 80983CDC 0C024F46 */ jal func_80093D18 -/* 009E0 80983CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009E4 80983CE4 0C024F61 */ jal func_80093D84 -/* 009E8 80983CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009EC 80983CEC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 009F0 80983CF0 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 009F4 80983CF4 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 009F8 80983CF8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 009FC 80983CFC AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00A00 80983D00 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00A04 80983D04 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 00A08 80983D08 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 00A0C 80983D0C AFA80014 */ sw $t0, 0x0014($sp) -/* 00A10 80983D10 AFB90010 */ sw $t9, 0x0010($sp) -/* 00A14 80983D14 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A18 80983D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A1C 80983D1C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 -/* 00A20 80983D20 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 00A24 80983D24 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 00A28 80983D28 0C260D0C */ jal func_80983430 -/* 00A2C 80983D2C AFA20040 */ sw $v0, 0x0040($sp) -/* 00A30 80983D30 8FA30040 */ lw $v1, 0x0040($sp) -/* 00A34 80983D34 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00A38 80983D38 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 00A3C 80983D3C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00A40 80983D40 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00A44 80983D44 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 00A48 80983D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A4C 80983D4C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00A50 80983D50 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 00A54 80983D54 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00A58 80983D58 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A5C 80983D5C AFA00014 */ sw $zero, 0x0014($sp) -/* 00A60 80983D60 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00A64 80983D64 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00A68 80983D68 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 00A6C 80983D6C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A70 80983D70 0C260D0C */ jal func_80983430 -/* 00A74 80983D74 AFA2003C */ sw $v0, 0x003C($sp) -/* 00A78 80983D78 8FA3003C */ lw $v1, 0x003C($sp) -/* 00A7C 80983D7C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00A80 80983D80 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 00A84 80983D84 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00A88 80983D88 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00A8C 80983D8C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 00A90 80983D90 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 00A94 80983D94 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00A98 80983D98 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 00A9C 80983D9C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00AA0 80983DA0 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00AA4 80983DA4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00AA8 80983DA8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00AAC 80983DAC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00AB0 80983DB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB4 80983DB4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00AB8 80983DB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00ABC 80983DBC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00AC0 80983DC0 0C260D0C */ jal func_80983430 -/* 00AC4 80983DC4 AFA20038 */ sw $v0, 0x0038($sp) -/* 00AC8 80983DC8 8FA30038 */ lw $v1, 0x0038($sp) -/* 00ACC 80983DCC 3C198098 */ lui $t9, %hi(func_80983B58) ## $t9 = 80980000 -/* 00AD0 80983DD0 27393B58 */ addiu $t9, $t9, %lo(func_80983B58) ## $t9 = 80983B58 -/* 00AD4 80983DD4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00AD8 80983DD8 8FA30068 */ lw $v1, 0x0068($sp) -/* 00ADC 80983DDC 8FA4006C */ lw $a0, 0x006C($sp) -/* 00AE0 80983DE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00AE4 80983DE4 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00AE8 80983DE8 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00AEC 80983DEC 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00AF0 80983DF0 AFB90010 */ sw $t9, 0x0010($sp) -/* 00AF4 80983DF4 0C028572 */ jal SkelAnime_DrawOpa - -/* 00AF8 80983DF8 AFA30014 */ sw $v1, 0x0014($sp) -/* 00AFC 80983DFC 3C068098 */ lui $a2, %hi(D_8098485C) ## $a2 = 80980000 -/* 00B00 80983E00 24C6485C */ addiu $a2, $a2, %lo(D_8098485C) ## $a2 = 8098485C -/* 00B04 80983E04 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 00B08 80983E08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B0C 80983E0C 0C031AD5 */ jal Graph_CloseDisps -/* 00B10 80983E10 240701BC */ addiu $a3, $zero, 0x01BC ## $a3 = 000001BC -/* 00B14 80983E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B18 80983E18 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B1C 80983E1C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00B20 80983E20 03E00008 */ jr $ra -/* 00B24 80983E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s deleted file mode 100644 index daee44aafa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80983E28 -/* 00B28 80983E28 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B2C 80983E2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00B30 80983E30 AFB10028 */ sw $s1, 0x0028($sp) -/* 00B34 80983E34 AFB00024 */ sw $s0, 0x0024($sp) -/* 00B38 80983E38 AFA50054 */ sw $a1, 0x0054($sp) -/* 00B3C 80983E3C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00B40 80983E40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00B44 80983E44 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00B48 80983E48 10410009 */ beq $v0, $at, .L80983E70 -/* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) -/* 00B50 80983E50 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 -/* 00B58 80983E58 3C060602 */ lui $a2, %hi(D_0601EE60) ## $a2 = 06020000 -/* 00B5C 80983E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 -/* 00B64 80983E64 3C060600 */ lui $a2, %hi(D_06000F30) ## $a2 = 06000000 -/* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 -/* 00B6C 80983E6C 3C060600 */ lui $a2, %hi(D_06000900) ## $a2 = 06000000 -.L80983E70: -/* 00B70 80983E70 3C060602 */ lui $a2, %hi(D_0601EB40) ## $a2 = 06020000 -/* 00B74 80983E74 3C100602 */ lui $s0, %hi(D_0601EB14) ## $s0 = 06020000 -/* 00B78 80983E78 24C6EB40 */ addiu $a2, $a2, %lo(D_0601EB40) ## $a2 = 0601EB40 -/* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 -/* 00B80 80983E80 2610EB14 */ addiu $s0, $s0, %lo(D_0601EB14) ## $s0 = 0601EB14 -.L80983E84: -/* 00B84 80983E84 3C100602 */ lui $s0, %hi(D_0601EE34) ## $s0 = 06020000 -/* 00B88 80983E88 24C6EE60 */ addiu $a2, $a2, %lo(D_0601EE60) ## $a2 = 0601D9A0 -/* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 -/* 00B90 80983E90 2610EE34 */ addiu $s0, $s0, %lo(D_0601EE34) ## $s0 = 0601EE34 -.L80983E94: -/* 00B94 80983E94 3C100600 */ lui $s0, %hi(D_06000F0C) ## $s0 = 06000000 -/* 00B98 80983E98 24C60F30 */ addiu $a2, $a2, %lo(D_06000F30) ## $a2 = 0601E8D0 -/* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 -/* 00BA0 80983EA0 26100F0C */ addiu $s0, $s0, %lo(D_06000F0C) ## $s0 = 06000F0C -.L80983EA4: -/* 00BA4 80983EA4 3C100600 */ lui $s0, %hi(D_060008DC) ## $s0 = 06000000 -/* 00BA8 80983EA8 24C60900 */ addiu $a2, $a2, %lo(D_06000900) ## $a2 = 0601F1D0 -/* 00BAC 80983EAC 261008DC */ addiu $s0, $s0, %lo(D_060008DC) ## $s0 = 060008DC -.L80983EB0: -/* 00BB0 80983EB0 2625014C */ addiu $a1, $s1, 0x014C ## $a1 = 0000014C -/* 00BB4 80983EB4 262E0190 */ addiu $t6, $s1, 0x0190 ## $t6 = 00000190 -/* 00BB8 80983EB8 262F019C */ addiu $t7, $s1, 0x019C ## $t7 = 0000019C -/* 00BBC 80983EBC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00BC0 80983EC0 AFB80018 */ sw $t8, 0x0018($sp) -/* 00BC4 80983EC4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00BC8 80983EC8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00BCC 80983ECC AFA50034 */ sw $a1, 0x0034($sp) -/* 00BD0 80983ED0 0C0291BE */ jal SkelAnime_InitFlex -/* 00BD4 80983ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00BD8 80983ED8 0C028800 */ jal Animation_GetLastFrame - -/* 00BDC 80983EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 060008DC -/* 00BE0 80983EE0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00BE4 80983EE4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00BE8 80983EE8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00BEC 80983EEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00BF0 80983EF0 44070000 */ mfc1 $a3, $f0 -/* 00BF4 80983EF4 AFB90014 */ sw $t9, 0x0014($sp) -/* 00BF8 80983EF8 8FA40034 */ lw $a0, 0x0034($sp) -/* 00BFC 80983EFC 02002825 */ or $a1, $s0, $zero ## $a1 = 060008DC -/* 00C00 80983F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C04 80983F04 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C08 80983F08 0C029468 */ jal Animation_Change - -/* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00C10 80983F10 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 00C14 80983F14 AE2801A8 */ sw $t0, 0x01A8($s1) ## 000001A8 -/* 00C18 80983F18 AE2001AC */ sw $zero, 0x01AC($s1) ## 000001AC -/* 00C1C 80983F1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C20 80983F20 8FB10028 */ lw $s1, 0x0028($sp) -/* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) -/* 00C28 80983F28 03E00008 */ jr $ra -/* 00C2C 80983F2C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s deleted file mode 100644 index 566412d86e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80983F30 -/* 00C30 80983F30 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 00C34 80983F34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C38 80983F38 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C3C 80983F3C AFA40020 */ sw $a0, 0x0020($sp) -/* 00C40 80983F40 44056000 */ mfc1 $a1, $f12 -/* 00C44 80983F44 0C0295B2 */ jal Animation_OnFrame -/* 00C48 80983F48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C4C 80983F4C 1040000B */ beq $v0, $zero, .L80983F7C -/* 00C50 80983F50 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00C54 80983F54 8FA50020 */ lw $a1, 0x0020($sp) -/* 00C58 80983F58 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 00C5C 80983F5C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00C60 80983F60 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00C64 80983F64 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00C68 80983F68 AFA70010 */ sw $a3, 0x0010($sp) -/* 00C6C 80983F6C 2404392C */ addiu $a0, $zero, 0x392C ## $a0 = 0000392C -/* 00C70 80983F70 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00C74 80983F74 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00C78 80983F78 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 -.L80983F7C: -/* 00C7C 80983F7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C80 80983F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C84 80983F84 03E00008 */ jr $ra -/* 00C88 80983F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s deleted file mode 100644 index 5e9b998355..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80983F8C -/* 00C8C 80983F8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C90 80983F90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C94 80983F94 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00C98 80983F98 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00C9C 80983F9C 10410005 */ beq $v0, $at, .L80983FB4 -/* 00CA0 80983FA0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00CA4 80983FA4 10410007 */ beq $v0, $at, .L80983FC4 -/* 00CA8 80983FA8 00000000 */ nop -/* 00CAC 80983FAC 10000008 */ beq $zero, $zero, .L80983FD0 -/* 00CB0 80983FB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80983FB4: -/* 00CB4 80983FB4 0C260FCC */ jal func_80983F30 -/* 00CB8 80983FB8 3C054204 */ lui $a1, 0x4204 ## $a1 = 42040000 -/* 00CBC 80983FBC 10000004 */ beq $zero, $zero, .L80983FD0 -/* 00CC0 80983FC0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80983FC4: -/* 00CC4 80983FC4 0C260FCC */ jal func_80983F30 -/* 00CC8 80983FC8 3C054230 */ lui $a1, 0x4230 ## $a1 = 42300000 -/* 00CCC 80983FCC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80983FD0: -/* 00CD0 80983FD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CD4 80983FD4 03E00008 */ jr $ra -/* 00CD8 80983FD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s deleted file mode 100644 index 35319c9d7c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80983FDC -/* 00CDC 80983FDC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00CE0 80983FE0 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 -/* 00CE4 80983FE4 03E00008 */ jr $ra -/* 00CE8 80983FE8 AC8001AC */ sw $zero, 0x01AC($a0) ## 000001AC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s deleted file mode 100644 index 3df8a2d491..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80983FEC -/* 00CEC 80983FEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CF0 80983FF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CF4 80983FF4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CF8 80983FF8 0C260DE8 */ jal func_809837A0 -/* 00CFC 80983FFC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00D00 80984000 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D04 80984004 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00D08 80984008 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00D0C 8098400C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00D10 80984010 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 -/* 00D14 80984014 AC8F01AC */ sw $t7, 0x01AC($a0) ## 000001AC -/* 00D18 80984018 E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 -/* 00D1C 8098401C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D20 80984020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D24 80984024 03E00008 */ jr $ra -/* 00D28 80984028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s deleted file mode 100644 index 412ee5dd17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8098402C -/* 00D2C 8098402C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00D30 80984030 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00D34 80984034 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00D38 80984038 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 -/* 00D3C 8098403C AC8F01AC */ sw $t7, 0x01AC($a0) ## 000001AC -/* 00D40 80984040 03E00008 */ jr $ra -/* 00D44 80984044 E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s deleted file mode 100644 index 04b427b19a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80984874 - .asciz "Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_80984048 -/* 00D48 80984048 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D4C 8098404C AFB00018 */ sw $s0, 0x0018($sp) -/* 00D50 80984050 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D54 80984054 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D58 80984058 AFA5002C */ sw $a1, 0x002C($sp) -/* 00D5C 8098405C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D60 80984060 0C260CDD */ jal func_80983374 -/* 00D64 80984064 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00D68 80984068 5040002A */ beql $v0, $zero, .L80984114 -/* 00D6C 8098406C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D70 80984070 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 00D74 80984074 8E0301B0 */ lw $v1, 0x01B0($s0) ## 000001B0 -/* 00D78 80984078 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D7C 8098407C 50C30025 */ beql $a2, $v1, .L80984114 -/* 00D80 80984080 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D84 80984084 10C1000C */ beq $a2, $at, .L809840B8 -/* 00D88 80984088 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D8C 8098408C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00D90 80984090 10C1000D */ beq $a2, $at, .L809840C8 -/* 00D94 80984094 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D98 80984098 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00D9C 8098409C 10C1000F */ beq $a2, $at, .L809840DC -/* 00DA0 809840A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DA4 809840A4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00DA8 809840A8 10C10010 */ beq $a2, $at, .L809840EC -/* 00DAC 809840AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DB0 809840B0 10000012 */ beq $zero, $zero, .L809840FC -/* 00DB4 809840B4 3C048098 */ lui $a0, %hi(D_80984874) ## $a0 = 80980000 -.L809840B8: -/* 00DB8 809840B8 0C260FF7 */ jal func_80983FDC -/* 00DBC 809840BC AFA60020 */ sw $a2, 0x0020($sp) -/* 00DC0 809840C0 10000012 */ beq $zero, $zero, .L8098410C -/* 00DC4 809840C4 8FA60020 */ lw $a2, 0x0020($sp) -.L809840C8: -/* 00DC8 809840C8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DCC 809840CC 0C260FFB */ jal func_80983FEC -/* 00DD0 809840D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00DD4 809840D4 1000000D */ beq $zero, $zero, .L8098410C -/* 00DD8 809840D8 8FA60020 */ lw $a2, 0x0020($sp) -.L809840DC: -/* 00DDC 809840DC 0C26100B */ jal func_8098402C -/* 00DE0 809840E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00DE4 809840E4 10000009 */ beq $zero, $zero, .L8098410C -/* 00DE8 809840E8 8FA60020 */ lw $a2, 0x0020($sp) -.L809840EC: -/* 00DEC 809840EC 0C00B55C */ jal Actor_Kill - -/* 00DF0 809840F0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00DF4 809840F4 10000005 */ beq $zero, $zero, .L8098410C -/* 00DF8 809840F8 8FA60020 */ lw $a2, 0x0020($sp) -.L809840FC: -/* 00DFC 809840FC 24844874 */ addiu $a0, $a0, %lo(D_80984874) ## $a0 = 00004874 -/* 00E00 80984100 0C00084C */ jal osSyncPrintf - -/* 00E04 80984104 AFA60020 */ sw $a2, 0x0020($sp) -/* 00E08 80984108 8FA60020 */ lw $a2, 0x0020($sp) -.L8098410C: -/* 00E0C 8098410C AE0601B0 */ sw $a2, 0x01B0($s0) ## 000001B0 -/* 00E10 80984110 8FBF001C */ lw $ra, 0x001C($sp) -.L80984114: -/* 00E14 80984114 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E18 80984118 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E1C 8098411C 03E00008 */ jr $ra -/* 00E20 80984120 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s deleted file mode 100644 index 69b99b51f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80984124 -/* 00E24 80984124 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E28 80984128 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E2C 8098412C 0C261012 */ jal func_80984048 -/* 00E30 80984130 00000000 */ nop -/* 00E34 80984134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E38 80984138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E3C 8098413C 03E00008 */ jr $ra -/* 00E40 80984140 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s deleted file mode 100644 index 6cd402a5e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80984144 -/* 00E44 80984144 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E48 80984148 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E4C 8098414C 0C261012 */ jal func_80984048 -/* 00E50 80984150 00000000 */ nop -/* 00E54 80984154 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E58 80984158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E5C 8098415C 03E00008 */ jr $ra -/* 00E60 80984160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s deleted file mode 100644 index 54cca8c817..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80984164 -/* 00E64 80984164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E68 80984168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E6C 8098416C AFA40018 */ sw $a0, 0x0018($sp) -/* 00E70 80984170 0C260CD5 */ jal func_80983354 -/* 00E74 80984174 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E78 80984178 0C260FE3 */ jal func_80983F8C -/* 00E7C 8098417C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E80 80984180 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E84 80984184 0C261012 */ jal func_80984048 -/* 00E88 80984188 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E8C 8098418C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E90 80984190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E94 80984194 03E00008 */ jr $ra -/* 00E98 80984198 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s deleted file mode 100644 index 47fec97599..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098419C -/* 00E9C 8098419C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EA0 809841A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EA4 809841A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EA8 809841A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00EAC 809841AC AFA60020 */ sw $a2, 0x0020($sp) -/* 00EB0 809841B0 14A1000B */ bne $a1, $at, .L809841E0 -/* 00EB4 809841B4 AFA70024 */ sw $a3, 0x0024($sp) -/* 00EB8 809841B8 0C260D0A */ jal func_80983428 -/* 00EBC 809841BC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00EC0 809841C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00EC4 809841C4 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00EC8 809841C8 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00ECC 809841CC 4604003C */ c.lt.s $f0, $f4 -/* 00ED0 809841D0 00000000 */ nop -/* 00ED4 809841D4 45020003 */ bc1fl .L809841E4 -/* 00ED8 809841D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EDC 809841DC ADC00000 */ sw $zero, 0x0000($t6) ## 00000000 -.L809841E0: -/* 00EE0 809841E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809841E4: -/* 00EE4 809841E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EE8 809841E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00EEC 809841EC 03E00008 */ jr $ra -/* 00EF0 809841F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s deleted file mode 100644 index 3df31b17f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s +++ /dev/null @@ -1,170 +0,0 @@ -.rdata -glabel D_809848AC - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848C4 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848DC - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_809848F4 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_8098490C - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_80984924 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -.text -glabel func_809841F4 -/* 00EF4 809841F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00EF8 809841F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EFC 809841FC AFB00018 */ sw $s0, 0x0018($sp) -/* 00F00 80984200 AFA40068 */ sw $a0, 0x0068($sp) -/* 00F04 80984204 AFA5006C */ sw $a1, 0x006C($sp) -/* 00F08 80984208 AFA60070 */ sw $a2, 0x0070($sp) -/* 00F0C 8098420C AFA70074 */ sw $a3, 0x0074($sp) -/* 00F10 80984210 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00F14 80984214 0C260D0A */ jal func_80983428 -/* 00F18 80984218 8FA40078 */ lw $a0, 0x0078($sp) -/* 00F1C 8098421C 3C068098 */ lui $a2, %hi(D_809848AC) ## $a2 = 80980000 -/* 00F20 80984220 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 00F24 80984224 24C648AC */ addiu $a2, $a2, %lo(D_809848AC) ## $a2 = 809848AC -/* 00F28 80984228 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 00F2C 8098422C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F30 80984230 0C031AB1 */ jal Graph_OpenDisps -/* 00F34 80984234 2407010C */ addiu $a3, $zero, 0x010C ## $a3 = 0000010C -/* 00F38 80984238 8FAE006C */ lw $t6, 0x006C($sp) -/* 00F3C 8098423C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F40 80984240 C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 00F44 80984244 15C1006A */ bne $t6, $at, .L809843F0 -/* 00F48 80984248 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00F4C 8098424C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00F50 80984250 8FAF0078 */ lw $t7, 0x0078($sp) -/* 00F54 80984254 4604303E */ c.le.s $f6, $f4 -/* 00F58 80984258 00000000 */ nop -/* 00F5C 8098425C 45000064 */ bc1f .L809843F0 -/* 00F60 80984260 00000000 */ nop -/* 00F64 80984264 85E2001C */ lh $v0, 0x001C($t7) ## 0000001C -/* 00F68 80984268 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00F6C 8098426C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00F70 80984270 10410009 */ beq $v0, $at, .L80984298 -/* 00F74 80984274 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00F78 80984278 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00F7C 8098427C 1041001B */ beq $v0, $at, .L809842EC -/* 00F80 80984280 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00F84 80984284 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00F88 80984288 1041002E */ beq $v0, $at, .L80984344 -/* 00F8C 8098428C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00F90 80984290 10000042 */ beq $zero, $zero, .L8098439C -/* 00F94 80984294 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -.L80984298: -/* 00F98 80984298 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00F9C 8098429C 3C058098 */ lui $a1, %hi(D_809848C4) ## $a1 = 80980000 -/* 00FA0 809842A0 24A548C4 */ addiu $a1, $a1, %lo(D_809848C4) ## $a1 = 809848C4 -/* 00FA4 809842A4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00FA8 809842A8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00FAC 809842AC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00FB0 809842B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FB4 809842B4 24060112 */ addiu $a2, $zero, 0x0112 ## $a2 = 00000112 -/* 00FB8 809842B8 0C0346A2 */ jal Matrix_NewMtx -/* 00FBC 809842BC AFA20044 */ sw $v0, 0x0044($sp) -/* 00FC0 809842C0 8FA30044 */ lw $v1, 0x0044($sp) -/* 00FC4 809842C4 3C0A0601 */ lui $t2, %hi(D_06017028) ## $t2 = 06010000 -/* 00FC8 809842C8 254A7028 */ addiu $t2, $t2, %lo(D_06017028) ## $t2 = 06017028 -/* 00FCC 809842CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00FD0 809842D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00FD4 809842D4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00FD8 809842D8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00FDC 809842DC AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 00FE0 809842E0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00FE4 809842E4 10000042 */ beq $zero, $zero, .L809843F0 -/* 00FE8 809842E8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L809842EC: -/* 00FEC 809842EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00FF0 809842F0 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = 00000003 -/* 00FF4 809842F4 3C058098 */ lui $a1, %hi(D_809848DC) ## $a1 = 80980000 -/* 00FF8 809842F8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00FFC 809842FC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01000 80984300 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01004 80984304 24A548DC */ addiu $a1, $a1, %lo(D_809848DC) ## $a1 = 809848DC -/* 01008 80984308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0100C 8098430C 24060118 */ addiu $a2, $zero, 0x0118 ## $a2 = 00000118 -/* 01010 80984310 0C0346A2 */ jal Matrix_NewMtx -/* 01014 80984314 AFA2003C */ sw $v0, 0x003C($sp) -/* 01018 80984318 8FA3003C */ lw $v1, 0x003C($sp) -/* 0101C 8098431C 3C0F0601 */ lui $t7, %hi(D_06017170) ## $t7 = 06010000 -/* 01020 80984320 25EF7170 */ addiu $t7, $t7, %lo(D_06017170) ## $t7 = 06017170 -/* 01024 80984324 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01028 80984328 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0102C 8098432C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 01030 80984330 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01034 80984334 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01038 80984338 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0103C 8098433C 1000002C */ beq $zero, $zero, .L809843F0 -/* 01040 80984340 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -.L80984344: -/* 01044 80984344 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01048 80984348 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = 00000003 -/* 0104C 8098434C 3C058098 */ lui $a1, %hi(D_809848F4) ## $a1 = 80980000 -/* 01050 80984350 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01054 80984354 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01058 80984358 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0105C 8098435C 24A548F4 */ addiu $a1, $a1, %lo(D_809848F4) ## $a1 = 809848F4 -/* 01060 80984360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 80984364 2406011E */ addiu $a2, $zero, 0x011E ## $a2 = 0000011E -/* 01068 80984368 0C0346A2 */ jal Matrix_NewMtx -/* 0106C 8098436C AFA20034 */ sw $v0, 0x0034($sp) -/* 01070 80984370 8FA30034 */ lw $v1, 0x0034($sp) -/* 01074 80984374 3C0A0601 */ lui $t2, %hi(D_06016BE0) ## $t2 = 06010000 -/* 01078 80984378 254A6BE0 */ addiu $t2, $t2, %lo(D_06016BE0) ## $t2 = 06016BE0 -/* 0107C 8098437C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01080 80984380 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01084 80984384 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01088 80984388 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 0108C 8098438C AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 01090 80984390 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01094 80984394 10000016 */ beq $zero, $zero, .L809843F0 -/* 01098 80984398 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L8098439C: -/* 0109C 8098439C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 010A0 809843A0 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = 00000003 -/* 010A4 809843A4 3C058098 */ lui $a1, %hi(D_8098490C) ## $a1 = 80980000 -/* 010A8 809843A8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 010AC 809843AC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 010B0 809843B0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 010B4 809843B4 24A5490C */ addiu $a1, $a1, %lo(D_8098490C) ## $a1 = 8098490C -/* 010B8 809843B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010BC 809843BC 24060124 */ addiu $a2, $zero, 0x0124 ## $a2 = 00000124 -/* 010C0 809843C0 0C0346A2 */ jal Matrix_NewMtx -/* 010C4 809843C4 AFA2002C */ sw $v0, 0x002C($sp) -/* 010C8 809843C8 8FA3002C */ lw $v1, 0x002C($sp) -/* 010CC 809843CC 3C0F0601 */ lui $t7, %hi(D_06016CD8) ## $t7 = 06010000 -/* 010D0 809843D0 25EF6CD8 */ addiu $t7, $t7, %lo(D_06016CD8) ## $t7 = 06016CD8 -/* 010D4 809843D4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 010D8 809843D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 010DC 809843DC 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 010E0 809843E0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 010E4 809843E4 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 010E8 809843E8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 010EC 809843EC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -.L809843F0: -/* 010F0 809843F0 3C068098 */ lui $a2, %hi(D_80984924) ## $a2 = 80980000 -/* 010F4 809843F4 24C64924 */ addiu $a2, $a2, %lo(D_80984924) ## $a2 = 80984924 -/* 010F8 809843F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 010FC 809843FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01100 80984400 0C031AD5 */ jal Graph_CloseDisps -/* 01104 80984404 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 01108 80984408 8FBF001C */ lw $ra, 0x001C($sp) -/* 0110C 8098440C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01110 80984410 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 01114 80984414 03E00008 */ jr $ra -/* 01118 80984418 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s deleted file mode 100644 index b1b9bc7af5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s +++ /dev/null @@ -1,113 +0,0 @@ -.rdata -glabel D_8098493C - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -glabel D_80984954 - .asciz "../z_demo_ik_inFace.c" - .balign 4 - -.text -glabel func_8098441C -/* 0111C 8098441C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) -/* 01124 80984424 AFB00028 */ sw $s0, 0x0028($sp) -/* 01128 80984428 AFA40068 */ sw $a0, 0x0068($sp) -/* 0112C 8098442C AFA5006C */ sw $a1, 0x006C($sp) -/* 01130 80984430 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 01134 80984434 3C068098 */ lui $a2, %hi(D_8098493C) ## $a2 = 80980000 -/* 01138 80984438 24C6493C */ addiu $a2, $a2, %lo(D_8098493C) ## $a2 = 8098493C -/* 0113C 8098443C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 01140 80984440 2407013E */ addiu $a3, $zero, 0x013E ## $a3 = 0000013E -/* 01144 80984444 0C031AB1 */ jal Graph_OpenDisps -/* 01148 80984448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) -/* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) -/* 01154 80984454 0C00BAF3 */ jal func_8002EBCC -/* 01158 80984458 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0115C 8098445C 0C024F46 */ jal func_80093D18 -/* 01160 80984460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 80984464 0C024F61 */ jal func_80093D84 -/* 01168 80984468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0116C 8098446C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01170 80984470 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01174 80984474 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01178 80984478 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0117C 8098447C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 01180 80984480 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01184 80984484 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 01188 80984488 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0118C 8098448C AFA80014 */ sw $t0, 0x0014($sp) -/* 01190 80984490 AFB90010 */ sw $t9, 0x0010($sp) -/* 01194 80984494 AFA00018 */ sw $zero, 0x0018($sp) -/* 01198 80984498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0119C 8098449C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 -/* 011A0 809844A0 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 011A4 809844A4 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 011A8 809844A8 0C260D0C */ jal func_80983430 -/* 011AC 809844AC AFA20040 */ sw $v0, 0x0040($sp) -/* 011B0 809844B0 8FA30040 */ lw $v1, 0x0040($sp) -/* 011B4 809844B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 011B8 809844B8 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 011BC 809844BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 011C0 809844C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 011C4 809844C4 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 011C8 809844C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011CC 809844CC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 011D0 809844D0 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 011D4 809844D4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 011D8 809844D8 AFA00018 */ sw $zero, 0x0018($sp) -/* 011DC 809844DC AFA00014 */ sw $zero, 0x0014($sp) -/* 011E0 809844E0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 011E4 809844E4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 011E8 809844E8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 011EC 809844EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011F0 809844F0 0C260D0C */ jal func_80983430 -/* 011F4 809844F4 AFA2003C */ sw $v0, 0x003C($sp) -/* 011F8 809844F8 8FA3003C */ lw $v1, 0x003C($sp) -/* 011FC 809844FC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01200 80984500 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01204 80984504 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01208 80984508 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0120C 8098450C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 01210 80984510 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 01214 80984514 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01218 80984518 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0121C 8098451C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01220 80984520 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 01224 80984524 AFB80018 */ sw $t8, 0x0018($sp) -/* 01228 80984528 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0122C 8098452C AFAE0010 */ sw $t6, 0x0010($sp) -/* 01230 80984530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01234 80984534 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 01238 80984538 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0123C 8098453C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 01240 80984540 0C260D0C */ jal func_80983430 -/* 01244 80984544 AFA20038 */ sw $v0, 0x0038($sp) -/* 01248 80984548 8FA30038 */ lw $v1, 0x0038($sp) -/* 0124C 8098454C 3C198098 */ lui $t9, %hi(func_8098419C) ## $t9 = 80980000 -/* 01250 80984550 3C088098 */ lui $t0, %hi(func_809841F4) ## $t0 = 80980000 -/* 01254 80984554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01258 80984558 8FA30068 */ lw $v1, 0x0068($sp) -/* 0125C 8098455C 250841F4 */ addiu $t0, $t0, %lo(func_809841F4) ## $t0 = 809841F4 -/* 01260 80984560 2739419C */ addiu $t9, $t9, %lo(func_8098419C) ## $t9 = 8098419C -/* 01264 80984564 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 01268 80984568 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 0126C 8098456C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01270 80984570 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01274 80984574 AFA80014 */ sw $t0, 0x0014($sp) -/* 01278 80984578 AFB90010 */ sw $t9, 0x0010($sp) -/* 0127C 8098457C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01280 80984580 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 01284 80984584 AFA30018 */ sw $v1, 0x0018($sp) -/* 01288 80984588 3C068098 */ lui $a2, %hi(D_80984954) ## $a2 = 80980000 -/* 0128C 8098458C 24C64954 */ addiu $a2, $a2, %lo(D_80984954) ## $a2 = 80984954 -/* 01290 80984590 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 01294 80984594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01298 80984598 0C031AD5 */ jal Graph_CloseDisps -/* 0129C 8098459C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 -/* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) -/* 012A8 809845A8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 012AC 809845AC 03E00008 */ jr $ra -/* 012B0 809845B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s deleted file mode 100644 index 17ccfeef6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80984610 -/* 01310 80984610 AFA40000 */ sw $a0, 0x0000($sp) -/* 01314 80984614 03E00008 */ jr $ra -/* 01318 80984618 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s deleted file mode 100644 index ff781f5503..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel DemoKankyo_Destroy -/* 0041C 8098929C 03E00008 */ jr $ra -/* 00420 809892A0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s deleted file mode 100644 index 8e30619e48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel jtbl_8098CAE4 -.word L809899F8 -.word L809899F8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989AA8 -.word L80989ABC -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989B1C -.word L80989AD0 -.word L80989AE4 -.word L80989AF8 -.word L80989AF8 -.word L80989B0C - -.text -glabel DemoKankyo_Draw -/* 00B2C 809899AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B30 809899B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B34 809899B4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B38 809899B8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B3C 809899BC 808E001E */ lb $t6, 0x001E($a0) ## 0000001E -/* 00B40 809899C0 9086014C */ lbu $a2, 0x014C($a0) ## 0000014C -/* 00B44 809899C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B48 809899C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B4C 809899CC 54CE0054 */ bnel $a2, $t6, .L80989B20 -/* 00B50 809899D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B54 809899D4 948F001C */ lhu $t7, 0x001C($a0) ## 0000001C -/* 00B58 809899D8 2DE10012 */ sltiu $at, $t7, 0x0012 -/* 00B5C 809899DC 1020004F */ beq $at, $zero, .L80989B1C -/* 00B60 809899E0 000F7880 */ sll $t7, $t7, 2 -/* 00B64 809899E4 3C018099 */ lui $at, %hi(jtbl_8098CAE4) ## $at = 80990000 -/* 00B68 809899E8 002F0821 */ addu $at, $at, $t7 -/* 00B6C 809899EC 8C2FCAE4 */ lw $t7, %lo(jtbl_8098CAE4)($at) -/* 00B70 809899F0 01E00008 */ jr $t7 -/* 00B74 809899F4 00000000 */ nop -glabel L809899F8 -/* 00B78 809899F8 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 00B7C 809899FC 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 00B80 80989A00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B84 80989A04 57010024 */ bnel $t8, $at, .L80989A98 -/* 00B88 80989A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B8C 80989A0C 0C01B129 */ jal Flags_GetEnv -/* 00B90 80989A10 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00B94 80989A14 14400003 */ bne $v0, $zero, .L80989A24 -/* 00B98 80989A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B9C 80989A1C 1000003F */ beq $zero, $zero, .L80989B1C -/* 00BA0 80989A20 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -.L80989A24: -/* 00BA4 80989A24 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 00BA8 80989A28 0C00B84B */ jal func_8002E12C -/* 00BAC 80989A2C 24067530 */ addiu $a2, $zero, 0x7530 ## $a2 = 00007530 -/* 00BB0 80989A30 14400003 */ bne $v0, $zero, .L80989A40 -/* 00BB4 80989A34 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 00BB8 80989A38 10000038 */ beq $zero, $zero, .L80989B1C -/* 00BBC 80989A3C 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -.L80989A40: -/* 00BC0 80989A40 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 00BC4 80989A44 5320000B */ beql $t9, $zero, .L80989A74 -/* 00BC8 80989A48 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -/* 00BCC 80989A4C 96281D74 */ lhu $t0, 0x1D74($s1) ## 00001D74 -/* 00BD0 80989A50 290100AA */ slti $at, $t0, 0x00AA -/* 00BD4 80989A54 14200004 */ bne $at, $zero, .L80989A68 -/* 00BD8 80989A58 00000000 */ nop -/* 00BDC 80989A5C 92291D6C */ lbu $t1, 0x1D6C($s1) ## 00001D6C -/* 00BE0 80989A60 5520000D */ bnel $t1, $zero, .L80989A98 -/* 00BE4 80989A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A68: -/* 00BE8 80989A68 1000002C */ beq $zero, $zero, .L80989B1C -/* 00BEC 80989A6C 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -/* 00BF0 80989A70 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -.L80989A74: -/* 00BF4 80989A74 29410078 */ slti $at, $t2, 0x0078 -/* 00BF8 80989A78 14200004 */ bne $at, $zero, .L80989A8C -/* 00BFC 80989A7C 00000000 */ nop -/* 00C00 80989A80 922B1D6C */ lbu $t3, 0x1D6C($s1) ## 00001D6C -/* 00C04 80989A84 55600004 */ bnel $t3, $zero, .L80989A98 -/* 00C08 80989A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A8C: -/* 00C0C 80989A8C 10000023 */ beq $zero, $zero, .L80989B1C -/* 00C10 80989A90 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -/* 00C14 80989A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80989A98: -/* 00C18 80989A98 0C262749 */ jal func_80989D24 -/* 00C1C 80989A9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C20 80989AA0 1000001E */ beq $zero, $zero, .L80989B1C -/* 00C24 80989AA4 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AA8 -/* 00C28 80989AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C2C 80989AAC 0C2628DB */ jal func_8098A36C -/* 00C30 80989AB0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C34 80989AB4 10000019 */ beq $zero, $zero, .L80989B1C -/* 00C38 80989AB8 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989ABC -/* 00C3C 80989ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C40 80989AC0 0C26293C */ jal func_8098A4F0 -/* 00C44 80989AC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C48 80989AC8 10000014 */ beq $zero, $zero, .L80989B1C -/* 00C4C 80989ACC 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AD0 -/* 00C50 80989AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C54 80989AD4 0C262A15 */ jal func_8098A854 -/* 00C58 80989AD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C5C 80989ADC 1000000F */ beq $zero, $zero, .L80989B1C -/* 00C60 80989AE0 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AE4 -/* 00C64 80989AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C68 80989AE8 0C262A69 */ jal func_8098A9A4 -/* 00C6C 80989AEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C70 80989AF0 1000000A */ beq $zero, $zero, .L80989B1C -/* 00C74 80989AF4 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989AF8 -/* 00C78 80989AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C7C 80989AFC 0C262AF0 */ jal func_8098ABC0 -/* 00C80 80989B00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C84 80989B04 10000005 */ beq $zero, $zero, .L80989B1C -/* 00C88 80989B08 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989B0C -/* 00C8C 80989B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C90 80989B10 0C262CD5 */ jal func_8098B354 -/* 00C94 80989B14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C98 80989B18 9206014C */ lbu $a2, 0x014C($s0) ## 0000014C -glabel L80989B1C -.L80989B1C: -/* 00C9C 80989B1C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80989B20: -/* 00CA0 80989B20 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00CA4 80989B24 02212021 */ addu $a0, $s1, $at -/* 00CA8 80989B28 0C026062 */ jal Object_IsLoaded - -/* 00CAC 80989B2C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00CB0 80989B30 50400004 */ beql $v0, $zero, .L80989B44 -/* 00CB4 80989B34 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CB8 80989B38 920C014C */ lbu $t4, 0x014C($s0) ## 0000014C -/* 00CBC 80989B3C A20C001E */ sb $t4, 0x001E($s0) ## 0000001E -/* 00CC0 80989B40 8FBF001C */ lw $ra, 0x001C($sp) -.L80989B44: -/* 00CC4 80989B44 8FB00014 */ lw $s0, 0x0014($sp) -/* 00CC8 80989B48 8FB10018 */ lw $s1, 0x0018($sp) -/* 00CCC 80989B4C 03E00008 */ jr $ra -/* 00CD0 80989B50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s deleted file mode 100644 index 63904794a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s +++ /dev/null @@ -1,333 +0,0 @@ -.rdata -glabel D_8098C870 - .asciz "bank_ID = %d\n" - .balign 4 - -glabel D_8098C880 - .asciz "0" - .balign 4 - -glabel D_8098C884 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel jtbl_8098CA50 -.word L80988F2C -.word L80988F2C -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L80988FCC -.word L8098906C -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L80989244 -.word L809890DC -.word L8098916C -.word L80989190 -.word L80989190 -.word L8098921C -glabel D_8098CA98 - .word 0x477FFF00 - -.text -glabel DemoKankyo_Init -/* 00008 80988E88 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0000C 80988E8C AFB30040 */ sw $s3, 0x0040($sp) -/* 00010 80988E90 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00014 80988E94 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00018 80988E98 AFB2003C */ sw $s2, 0x003C($sp) -/* 0001C 80988E9C AFB10038 */ sw $s1, 0x0038($sp) -/* 00020 80988EA0 AFB00034 */ sw $s0, 0x0034($sp) -/* 00024 80988EA4 866E001C */ lh $t6, 0x001C($s3) ## 0000001C -/* 00028 80988EA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0002C 80988EAC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00030 80988EB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00034 80988EB4 00A12021 */ addu $a0, $a1, $at -/* 00038 80988EB8 3C058099 */ lui $a1, %hi(D_8098C2F0) ## $a1 = 80990000 -/* 0003C 80988EBC 000E7840 */ sll $t7, $t6, 1 -/* 00040 80988EC0 00AF2821 */ addu $a1, $a1, $t7 -/* 00044 80988EC4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00048 80988EC8 84A5C2F0 */ lh $a1, %lo(D_8098C2F0)($a1) -/* 0004C 80988ECC 3C048099 */ lui $a0, %hi(D_8098C870) ## $a0 = 80990000 -/* 00050 80988ED0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 00054 80988ED4 2484C870 */ addiu $a0, $a0, %lo(D_8098C870) ## $a0 = 8098C870 -/* 00058 80988ED8 0C00084C */ jal osSyncPrintf - -/* 0005C 80988EDC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00060 80988EE0 06210008 */ bgez $s1, .L80988F04 -/* 00064 80988EE4 24060209 */ addiu $a2, $zero, 0x0209 ## $a2 = 00000209 -/* 00068 80988EE8 3C048099 */ lui $a0, %hi(D_8098C880) ## $a0 = 80990000 -/* 0006C 80988EEC 3C058099 */ lui $a1, %hi(D_8098C884) ## $a1 = 80990000 -/* 00070 80988EF0 24A5C884 */ addiu $a1, $a1, %lo(D_8098C884) ## $a1 = 8098C884 -/* 00074 80988EF4 0C0007FC */ jal __assert - -/* 00078 80988EF8 2484C880 */ addiu $a0, $a0, %lo(D_8098C880) ## $a0 = 8098C880 -/* 0007C 80988EFC 10000003 */ beq $zero, $zero, .L80988F0C -/* 00080 80988F00 9678001C */ lhu $t8, 0x001C($s3) ## 0000001C -.L80988F04: -/* 00084 80988F04 A271014C */ sb $s1, 0x014C($s3) ## 0000014C -/* 00088 80988F08 9678001C */ lhu $t8, 0x001C($s3) ## 0000001C -.L80988F0C: -/* 0008C 80988F0C 2F010012 */ sltiu $at, $t8, 0x0012 -/* 00090 80988F10 102000CC */ beq $at, $zero, .L80989244 -/* 00094 80988F14 0018C080 */ sll $t8, $t8, 2 -/* 00098 80988F18 3C018099 */ lui $at, %hi(jtbl_8098CA50) ## $at = 80990000 -/* 0009C 80988F1C 00380821 */ addu $at, $at, $t8 -/* 000A0 80988F20 8C38CA50 */ lw $t8, %lo(jtbl_8098CA50)($at) -/* 000A4 80988F24 03000008 */ jr $t8 -/* 000A8 80988F28 00000000 */ nop -glabel L80988F2C -/* 000AC 80988F2C 860200A4 */ lh $v0, 0x00A4($s0) ## 000000A4 -/* 000B0 80988F30 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 000B4 80988F34 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 000B8 80988F38 10410013 */ beq $v0, $at, .L80988F88 -/* 000BC 80988F3C 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 -/* 000C0 80988F40 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 000C4 80988F44 10410006 */ beq $v0, $at, .L80988F60 -/* 000C8 80988F48 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 000CC 80988F4C 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 000D0 80988F50 10410013 */ beq $v0, $at, .L80988FA0 -/* 000D4 80988F54 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 000D8 80988F58 10000018 */ beq $zero, $zero, .L80988FBC -/* 000DC 80988F5C 00000000 */ nop -.L80988F60: -/* 000E0 80988F60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E4 80988F64 00300821 */ addu $at, $at, $s0 -/* 000E8 80988F68 AC201CC8 */ sw $zero, 0x1CC8($at) ## 00011CC8 -/* 000EC 80988F6C 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 000F0 80988F70 A439CF80 */ sh $t9, %lo(D_8098CF80)($at) -/* 000F4 80988F74 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 000F8 80988F78 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 000FC 80988F7C A428CF82 */ sh $t0, %lo(D_8098CF82)($at) -/* 00100 80988F80 100000B1 */ beq $zero, $zero, .L80989248 -/* 00104 80988F84 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988F88: -/* 00108 80988F88 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 0010C 80988F8C A429CF80 */ sh $t1, %lo(D_8098CF80)($at) -/* 00110 80988F90 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 00114 80988F94 A42ACF82 */ sh $t2, %lo(D_8098CF82)($at) -/* 00118 80988F98 100000AB */ beq $zero, $zero, .L80989248 -/* 0011C 80988F9C 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988FA0: -/* 00120 80988FA0 3C018099 */ lui $at, %hi(D_8098CF80) ## $at = 80990000 -/* 00124 80988FA4 A42BCF80 */ sh $t3, %lo(D_8098CF80)($at) -/* 00128 80988FA8 3C018099 */ lui $at, %hi(D_8098CF82) ## $at = 80990000 -/* 0012C 80988FAC 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 00130 80988FB0 A42CCF82 */ sh $t4, %lo(D_8098CF82)($at) -/* 00134 80988FB4 100000A4 */ beq $zero, $zero, .L80989248 -/* 00138 80988FB8 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80988FBC: -/* 0013C 80988FBC 0C00B55C */ jal Actor_Kill - -/* 00140 80988FC0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00144 80988FC4 100000A0 */ beq $zero, $zero, .L80989248 -/* 00148 80988FC8 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L80988FCC -/* 0014C 80988FCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00150 80988FD0 00300821 */ addu $at, $at, $s0 -/* 00154 80988FD4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00158 80988FD8 AC201CC8 */ sw $zero, 0x1CC8($at) ## 00011CC8 -/* 0015C 80988FDC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00160 80988FE0 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 00164 80988FE4 00000000 */ nop -/* 00168 80988FE8 460C0102 */ mul.s $f4, $f0, $f12 -/* 0016C 80988FEC 460C2080 */ add.s $f2, $f4, $f12 -/* 00170 80988FF0 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00174 80988FF4 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00178 80988FF8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0017C 80988FFC E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00180 80989000 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00184 80989004 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00188 80989008 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0018C 8098900C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 00190 80989010 00000000 */ nop -/* 00194 80989014 46060202 */ mul.s $f8, $f0, $f6 -/* 00198 80989018 46024280 */ add.s $f10, $f8, $f2 -/* 0019C 8098901C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001A0 80989020 E66A0150 */ swc1 $f10, 0x0150($s3) ## 00000150 -/* 001A4 80989024 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001A8 80989028 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 001AC 8098902C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 001B0 80989030 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 001B4 80989034 00000000 */ nop -/* 001B8 80989038 46100482 */ mul.s $f18, $f0, $f16 -/* 001BC 8098903C 46029100 */ add.s $f4, $f18, $f2 -/* 001C0 80989040 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001C4 80989044 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 -/* 001C8 80989048 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001CC 8098904C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 001D0 80989050 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 001D4 80989054 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 001D8 80989058 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 001DC 8098905C 46060202 */ mul.s $f8, $f0, $f6 -/* 001E0 80989060 46024280 */ add.s $f10, $f8, $f2 -/* 001E4 80989064 10000078 */ beq $zero, $zero, .L80989248 -/* 001E8 80989068 E66A0158 */ swc1 $f10, 0x0158($s3) ## 00000158 -glabel L8098906C -/* 001EC 8098906C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 001F0 80989070 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989074: -/* 001F4 80989074 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001F8 80989078 00000000 */ nop -/* 001FC 8098907C 3C018099 */ lui $at, %hi(D_8098CA98) ## $at = 80990000 -/* 00200 80989080 C430CA98 */ lwc1 $f16, %lo(D_8098CA98)($at) -/* 00204 80989084 02120019 */ multu $s0, $s2 -/* 00208 80989088 46100482 */ mul.s $f18, $f0, $f16 -/* 0020C 8098908C 4600910D */ trunc.w.s $f4, $f18 -/* 00210 80989090 00006812 */ mflo $t5 -/* 00214 80989094 026D8821 */ addu $s1, $s3, $t5 -/* 00218 80989098 440F2000 */ mfc1 $t7, $f4 -/* 0021C 8098909C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00220 809890A0 A62F0170 */ sh $t7, 0x0170($s1) ## 00000170 -/* 00224 809890A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00228 809890A8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0022C 809890AC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00230 809890B0 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 00234 809890B4 46060202 */ mul.s $f8, $f0, $f6 -/* 00238 809890B8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0023C 809890BC 00108400 */ sll $s0, $s0, 16 -/* 00240 809890C0 00108403 */ sra $s0, $s0, 16 -/* 00244 809890C4 2A01001E */ slti $at, $s0, 0x001E -/* 00248 809890C8 460A4400 */ add.s $f16, $f8, $f10 -/* 0024C 809890CC 1420FFE9 */ bne $at, $zero, .L80989074 -/* 00250 809890D0 E6300168 */ swc1 $f16, 0x0168($s1) ## 00000168 -/* 00254 809890D4 1000005D */ beq $zero, $zero, .L8098924C -/* 00258 809890D8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -glabel L809890DC -/* 0025C 809890DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00260 809890E0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00264 809890E4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00268 809890E8 3C188016 */ lui $t8, %hi(gSaveContext+0xedc) -/* 0026C 809890EC E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00270 809890F0 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00274 809890F4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00278 809890F8 E6720168 */ swc1 $f18, 0x0168($s3) ## 00000168 -/* 0027C 809890FC 9718F53C */ lhu $t8, %lo(gSaveContext+0xedc)($t8) -/* 00280 80989100 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00284 80989104 00300821 */ addu $at, $at, $s0 -/* 00288 80989108 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 0028C 8098910C 17200012 */ bne $t9, $zero, .L80989158 -/* 00290 80989110 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00294 80989114 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 -/* 00298 80989118 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 0029C 8098911C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 002A0 80989120 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 002A4 80989124 C6660028 */ lwc1 $f6, 0x0028($s3) ## 00000028 -/* 002A8 80989128 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 002AC 8098912C 24070070 */ addiu $a3, $zero, 0x0070 ## $a3 = 00000070 -/* 002B0 80989130 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 002B4 80989134 C668002C */ lwc1 $f8, 0x002C($s3) ## 0000002C -/* 002B8 80989138 AFA00028 */ sw $zero, 0x0028($sp) -/* 002BC 8098913C AFA00024 */ sw $zero, 0x0024($sp) -/* 002C0 80989140 AFA00020 */ sw $zero, 0x0020($sp) -/* 002C4 80989144 AFA0001C */ sw $zero, 0x001C($sp) -/* 002C8 80989148 0C00C916 */ jal Actor_SpawnAsChild - -/* 002CC 8098914C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 002D0 80989150 1000003D */ beq $zero, $zero, .L80989248 -/* 002D4 80989154 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989158: -/* 002D8 80989158 A4281D32 */ sh $t0, 0x1D32($at) ## 00001D32 -/* 002DC 8098915C 0C00B55C */ jal Actor_Kill - -/* 002E0 80989160 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 002E4 80989164 10000038 */ beq $zero, $zero, .L80989248 -/* 002E8 80989168 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L8098916C -/* 002EC 8098916C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002F0 80989170 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 002F4 80989174 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 002F8 80989178 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 002FC 8098917C E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 00300 80989180 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00304 80989184 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00308 80989188 1000002F */ beq $zero, $zero, .L80989248 -/* 0030C 8098918C E66A0168 */ swc1 $f10, 0x0168($s3) ## 00000168 -glabel L80989190 -/* 00310 80989190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80989194 26051C24 */ addiu $a1, $s0, 0x1C24 ## $a1 = 00001C24 -/* 00318 80989198 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 0031C 8098919C 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00320 809891A0 24070007 */ addiu $a3, $zero, 0x0007 ## $a3 = 00000007 -/* 00324 809891A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00328 809891A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 0032C 809891AC 8E690004 */ lw $t1, 0x0004($s3) ## 00000004 -/* 00330 809891B0 866D001C */ lh $t5, 0x001C($s3) ## 0000001C -/* 00334 809891B4 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 00338 809891B8 01215025 */ or $t2, $t1, $at ## $t2 = 02000000 -/* 0033C 809891BC 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00340 809891C0 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 00344 809891C4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00348 809891C8 AE6A0004 */ sw $t2, 0x0004($s3) ## 00000004 -/* 0034C 809891CC A26B0003 */ sb $t3, 0x0003($s3) ## 00000003 -/* 00350 809891D0 A26C014E */ sb $t4, 0x014E($s3) ## 0000014E -/* 00354 809891D4 A260014D */ sb $zero, 0x014D($s3) ## 0000014D -/* 00358 809891D8 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 0035C 809891DC E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 00360 809891E0 15A1000C */ bne $t5, $at, .L80989214 -/* 00364 809891E4 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -/* 00368 809891E8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0036C 809891EC 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 00370 809891F0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00374 809891F4 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00378 809891F8 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0037C 809891FC 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00380 80989200 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00384 80989204 AFA70010 */ sw $a3, 0x0010($sp) -/* 00388 80989208 240428A6 */ addiu $a0, $zero, 0x28A6 ## $a0 = 000028A6 -/* 0038C 8098920C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00390 80989210 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80989214: -/* 00394 80989214 1000000C */ beq $zero, $zero, .L80989248 -/* 00398 80989218 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -glabel L8098921C -/* 0039C 8098921C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003A0 80989220 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 003A4 80989224 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 -/* 003A8 80989228 A26F014E */ sb $t7, 0x014E($s3) ## 0000014E -/* 003AC 8098922C A260014D */ sb $zero, 0x014D($s3) ## 0000014D -/* 003B0 80989230 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -/* 003B4 80989234 E6620058 */ swc1 $f2, 0x0058($s3) ## 00000058 -/* 003B8 80989238 E6620054 */ swc1 $f2, 0x0054($s3) ## 00000054 -/* 003BC 8098923C 10000002 */ beq $zero, $zero, .L80989248 -/* 003C0 80989240 E6620050 */ swc1 $f2, 0x0050($s3) ## 00000050 -glabel L80989244 -.L80989244: -/* 003C4 80989244 24120028 */ addiu $s2, $zero, 0x0028 ## $s2 = 00000028 -.L80989248: -/* 003C8 80989248 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -.L8098924C: -/* 003CC 8098924C 02120019 */ multu $s0, $s2 -/* 003D0 80989250 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 003D4 80989254 00108400 */ sll $s0, $s0, 16 -/* 003D8 80989258 00108403 */ sra $s0, $s0, 16 -/* 003DC 8098925C 2A01001E */ slti $at, $s0, 0x001E -/* 003E0 80989260 0000C012 */ mflo $t8 -/* 003E4 80989264 0278C821 */ addu $t9, $s3, $t8 -/* 003E8 80989268 1420FFF8 */ bne $at, $zero, .L8098924C -/* 003EC 8098926C A3200172 */ sb $zero, 0x0172($t9) ## 00000172 -/* 003F0 80989270 3C058099 */ lui $a1, %hi(func_809892A4) ## $a1 = 80990000 -/* 003F4 80989274 24A592A4 */ addiu $a1, $a1, %lo(func_809892A4) ## $a1 = 809892A4 -/* 003F8 80989278 0C2623A0 */ jal func_80988E80 -/* 003FC 8098927C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00400 80989280 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00404 80989284 8FB00034 */ lw $s0, 0x0034($sp) -/* 00408 80989288 8FB10038 */ lw $s1, 0x0038($sp) -/* 0040C 8098928C 8FB2003C */ lw $s2, 0x003C($sp) -/* 00410 80989290 8FB30040 */ lw $s3, 0x0040($sp) -/* 00414 80989294 03E00008 */ jr $ra -/* 00418 80989298 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s deleted file mode 100644 index ac916d6235..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel DemoKankyo_Update -/* 00B08 80989988 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B0C 8098998C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B10 80989990 8C990600 */ lw $t9, 0x0600($a0) ## 00000600 -/* 00B14 80989994 0320F809 */ jalr $ra, $t9 -/* 00B18 80989998 00000000 */ nop -/* 00B1C 8098999C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B20 809899A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B24 809899A4 03E00008 */ jr $ra -/* 00B28 809899A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s deleted file mode 100644 index 68d7677fba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80988E80 -/* 00000 80988E80 03E00008 */ jr $ra -/* 00004 80988E84 AC850600 */ sw $a1, 0x0600($a0) ## 00000600 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s deleted file mode 100644 index 2e08f0ac6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s +++ /dev/null @@ -1,324 +0,0 @@ -.late_rodata -glabel jtbl_8098CA9C -.word L809896CC -.word L809896CC -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L809892E8 -.word L80989300 -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L809896CC -.word L80989318 -.word L809896CC -.word L80989348 -.word L8098964C -.word L809896CC - -.text -glabel func_809892A4 -/* 00424 809892A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00428 809892A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0042C 809892AC 808F001E */ lb $t7, 0x001E($a0) ## 0000001E -/* 00430 809892B0 908E014C */ lbu $t6, 0x014C($a0) ## 0000014C -/* 00434 809892B4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00438 809892B8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0043C 809892BC 15CF0103 */ bne $t6, $t7, .L809896CC -/* 00440 809892C0 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 00444 809892C4 9498001C */ lhu $t8, 0x001C($a0) ## 0000001C -/* 00448 809892C8 2F010012 */ sltiu $at, $t8, 0x0012 -/* 0044C 809892CC 102000FF */ beq $at, $zero, .L809896CC -/* 00450 809892D0 0018C080 */ sll $t8, $t8, 2 -/* 00454 809892D4 3C018099 */ lui $at, %hi(jtbl_8098CA9C) ## $at = 80990000 -/* 00458 809892D8 00380821 */ addu $at, $at, $t8 -/* 0045C 809892DC 8C38CA9C */ lw $t8, %lo(jtbl_8098CA9C)($at) -/* 00460 809892E0 03000008 */ jr $t8 -/* 00464 809892E4 00000000 */ nop -glabel L809892E8 -/* 00468 809892E8 3C058099 */ lui $a1, %hi(func_80989800) ## $a1 = 80990000 -/* 0046C 809892EC 24A59800 */ addiu $a1, $a1, %lo(func_80989800) ## $a1 = 80989800 -/* 00470 809892F0 0C2623A0 */ jal func_80988E80 -/* 00474 809892F4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00478 809892F8 100000F5 */ beq $zero, $zero, .L809896D0 -/* 0047C 809892FC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989300 -/* 00480 80989300 3C058099 */ lui $a1, %hi(func_8098987C) ## $a1 = 80990000 -/* 00484 80989304 24A5987C */ addiu $a1, $a1, %lo(func_8098987C) ## $a1 = 8098987C -/* 00488 80989308 0C2623A0 */ jal func_80988E80 -/* 0048C 8098930C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00490 80989310 100000EF */ beq $zero, $zero, .L809896D0 -/* 00494 80989314 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989318 -/* 00498 80989318 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0049C 8098931C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 004A0 80989320 0C01B129 */ jal Flags_GetEnv -/* 004A4 80989324 AFA70018 */ sw $a3, 0x0018($sp) -/* 004A8 80989328 104000E8 */ beq $v0, $zero, .L809896CC -/* 004AC 8098932C 8FA70018 */ lw $a3, 0x0018($sp) -/* 004B0 80989330 3C058099 */ lui $a1, %hi(func_809898C8) ## $a1 = 80990000 -/* 004B4 80989334 24A598C8 */ addiu $a1, $a1, %lo(func_809898C8) ## $a1 = 809898C8 -/* 004B8 80989338 0C2623A0 */ jal func_80988E80 -/* 004BC 8098933C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004C0 80989340 100000E3 */ beq $zero, $zero, .L809896D0 -/* 004C4 80989344 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80989348 -/* 004C8 80989348 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004CC 8098934C 00C12021 */ addu $a0, $a2, $at -/* 004D0 80989350 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 004D4 80989354 A0850B06 */ sb $a1, 0x0B06($a0) ## 00000B06 -/* 004D8 80989358 A0850B07 */ sb $a1, 0x0B07($a0) ## 00000B07 -/* 004DC 8098935C A0850B08 */ sb $a1, 0x0B08($a0) ## 00000B08 -/* 004E0 80989360 00260821 */ addu $at, $at, $a2 -/* 004E4 80989364 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 -/* 004E8 80989368 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 004EC 8098936C 28410015 */ slti $at, $v0, 0x0015 -/* 004F0 80989370 1020003E */ beq $at, $zero, .L8098946C -/* 004F4 80989374 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 004F8 80989378 2861000F */ slti $at, $v1, 0x000F -/* 004FC 8098937C 5420003C */ bnel $at, $zero, .L80989470 -/* 00500 80989380 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00504 80989384 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00508 80989388 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0050C 8098938C 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 00510 80989390 04410005 */ bgez $v0, .L809893A8 -/* 00514 80989394 468021A0 */ cvt.s.w $f6, $f4 -/* 00518 80989398 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0051C 8098939C 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 00520 809893A0 00000000 */ nop -/* 00524 809893A4 46083180 */ add.s $f6, $f6, $f8 -.L809893A8: -/* 00528 809893A8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0052C 809893AC 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 00530 809893B0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00534 809893B4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 00538 809893B8 460A3401 */ sub.s $f16, $f6, $f10 -/* 0053C 809893BC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00540 809893C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00544 809893C4 00260821 */ addu $at, $at, $a2 -/* 00548 809893C8 46128003 */ div.s $f0, $f16, $f18 -/* 0054C 809893CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00550 809893D0 A0390B05 */ sb $t9, 0x0B05($at) ## 00010B05 -/* 00554 809893D4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00558 809893D8 46001102 */ mul.s $f4, $f2, $f0 -/* 0055C 809893DC 46041201 */ sub.s $f8, $f2, $f4 -/* 00560 809893E0 4449F800 */ cfc1 $t1, $31 -/* 00564 809893E4 44CAF800 */ ctc1 $t2, $31 -/* 00568 809893E8 00000000 */ nop -/* 0056C 809893EC 460041A4 */ cvt.w.s $f6, $f8 -/* 00570 809893F0 444AF800 */ cfc1 $t2, $31 -/* 00574 809893F4 00000000 */ nop -/* 00578 809893F8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0057C 809893FC 51400013 */ beql $t2, $zero, .L8098944C -/* 00580 80989400 440A3000 */ mfc1 $t2, $f6 -/* 00584 80989404 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 00588 80989408 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0058C 8098940C 46064181 */ sub.s $f6, $f8, $f6 -/* 00590 80989410 44CAF800 */ ctc1 $t2, $31 -/* 00594 80989414 00000000 */ nop -/* 00598 80989418 460031A4 */ cvt.w.s $f6, $f6 -/* 0059C 8098941C 444AF800 */ cfc1 $t2, $31 -/* 005A0 80989420 00000000 */ nop -/* 005A4 80989424 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005A8 80989428 15400005 */ bne $t2, $zero, .L80989440 -/* 005AC 8098942C 00000000 */ nop -/* 005B0 80989430 440A3000 */ mfc1 $t2, $f6 -/* 005B4 80989434 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005B8 80989438 10000007 */ beq $zero, $zero, .L80989458 -/* 005BC 8098943C 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80989440: -/* 005C0 80989440 10000005 */ beq $zero, $zero, .L80989458 -/* 005C4 80989444 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 005C8 80989448 440A3000 */ mfc1 $t2, $f6 -.L8098944C: -/* 005CC 8098944C 00000000 */ nop -/* 005D0 80989450 0540FFFB */ bltz $t2, .L80989440 -/* 005D4 80989454 00000000 */ nop -.L80989458: -/* 005D8 80989458 A08A0B09 */ sb $t2, 0x0B09($a0) ## 00000B09 -/* 005DC 8098945C 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 005E0 80989460 44C9F800 */ ctc1 $t1, $31 -/* 005E4 80989464 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 005E8 80989468 00000000 */ nop -.L8098946C: -/* 005EC 8098946C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80989470: -/* 005F0 80989470 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 005F4 80989474 2861000F */ slti $at, $v1, 0x000F -/* 005F8 80989478 1020003A */ beq $at, $zero, .L80989564 -/* 005FC 8098947C 28610004 */ slti $at, $v1, 0x0004 -/* 00600 80989480 54200039 */ bnel $at, $zero, .L80989568 -/* 00604 80989484 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00608 80989488 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 0060C 8098948C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00610 80989490 04410004 */ bgez $v0, .L809894A4 -/* 00614 80989494 46805420 */ cvt.s.w $f16, $f10 -/* 00618 80989498 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 0061C 8098949C 00000000 */ nop -/* 00620 809894A0 46128400 */ add.s $f16, $f16, $f18 -.L809894A4: -/* 00624 809894A4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00628 809894A8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 0062C 809894AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00630 809894B0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00634 809894B4 46048201 */ sub.s $f8, $f16, $f4 -/* 00638 809894B8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0063C 809894BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00640 809894C0 00260821 */ addu $at, $at, $a2 -/* 00644 809894C4 46064003 */ div.s $f0, $f8, $f6 -/* 00648 809894C8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0064C 809894CC A02B0B05 */ sb $t3, 0x0B05($at) ## 00010B05 -/* 00650 809894D0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00654 809894D4 46001282 */ mul.s $f10, $f2, $f0 -/* 00658 809894D8 444CF800 */ cfc1 $t4, $31 -/* 0065C 809894DC 44CDF800 */ ctc1 $t5, $31 -/* 00660 809894E0 00000000 */ nop -/* 00664 809894E4 460054A4 */ cvt.w.s $f18, $f10 -/* 00668 809894E8 444DF800 */ cfc1 $t5, $31 -/* 0066C 809894EC 00000000 */ nop -/* 00670 809894F0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 00674 809894F4 51A00013 */ beql $t5, $zero, .L80989544 -/* 00678 809894F8 440D9000 */ mfc1 $t5, $f18 -/* 0067C 809894FC 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00680 80989500 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00684 80989504 46125481 */ sub.s $f18, $f10, $f18 -/* 00688 80989508 44CDF800 */ ctc1 $t5, $31 -/* 0068C 8098950C 00000000 */ nop -/* 00690 80989510 460094A4 */ cvt.w.s $f18, $f18 -/* 00694 80989514 444DF800 */ cfc1 $t5, $31 -/* 00698 80989518 00000000 */ nop -/* 0069C 8098951C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 006A0 80989520 15A00005 */ bne $t5, $zero, .L80989538 -/* 006A4 80989524 00000000 */ nop -/* 006A8 80989528 440D9000 */ mfc1 $t5, $f18 -/* 006AC 8098952C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006B0 80989530 10000007 */ beq $zero, $zero, .L80989550 -/* 006B4 80989534 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80989538: -/* 006B8 80989538 10000005 */ beq $zero, $zero, .L80989550 -/* 006BC 8098953C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 006C0 80989540 440D9000 */ mfc1 $t5, $f18 -.L80989544: -/* 006C4 80989544 00000000 */ nop -/* 006C8 80989548 05A0FFFB */ bltz $t5, .L80989538 -/* 006CC 8098954C 00000000 */ nop -.L80989550: -/* 006D0 80989550 A08D0B09 */ sb $t5, 0x0B09($a0) ## 00000B09 -/* 006D4 80989554 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -/* 006D8 80989558 44CCF800 */ ctc1 $t4, $31 -/* 006DC 8098955C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 006E0 80989560 00000000 */ nop -.L80989564: -/* 006E4 80989564 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -.L80989568: -/* 006E8 80989568 14610003 */ bne $v1, $at, .L80989578 -/* 006EC 8098956C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 006F0 80989570 AD000134 */ sw $zero, 0x0134($t0) ## 00000134 -/* 006F4 80989574 90E2014E */ lbu $v0, 0x014E($a3) ## 0000014E -.L80989578: -/* 006F8 80989578 10400004 */ beq $v0, $zero, .L8098958C -/* 006FC 8098957C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00700 80989580 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00704 80989584 A0EE014E */ sb $t6, 0x014E($a3) ## 0000014E -/* 00708 80989588 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF -.L8098958C: -/* 0070C 8098958C 54410050 */ bnel $v0, $at, .L809896D0 -/* 00710 80989590 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00714 80989594 84CF00A4 */ lh $t7, 0x00A4($a2) ## 000000A4 -/* 00718 80989598 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 0071C 8098959C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00720 809895A0 15E10010 */ bne $t7, $at, .L809895E4 -/* 00724 809895A4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00728 809895A8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0072C 809895AC 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 00730 809895B0 3C018099 */ lui $at, %hi(D_8098CF84) ## $at = 80990000 -/* 00734 809895B4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00738 809895B8 A438CF84 */ sh $t8, %lo(D_8098CF84)($at) -/* 0073C 809895BC 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 00740 809895C0 3C0A8099 */ lui $t2, %hi(D_8098BBA0) ## $t2 = 80990000 -/* 00744 809895C4 3C098099 */ lui $t1, %hi(D_8098C080) ## $t1 = 80990000 -/* 00748 809895C8 13200004 */ beq $t9, $zero, .L809895DC -/* 0074C 809895CC 254ABBA0 */ addiu $t2, $t2, %lo(D_8098BBA0) ## $t2 = 8098BBA0 -/* 00750 809895D0 2529C080 */ addiu $t1, $t1, %lo(D_8098C080) ## $t1 = 8098C080 -/* 00754 809895D4 1000000F */ beq $zero, $zero, .L80989614 -/* 00758 809895D8 ACC91D68 */ sw $t1, 0x1D68($a2) ## 00001D68 -.L809895DC: -/* 0075C 809895DC 1000000D */ beq $zero, $zero, .L80989614 -/* 00760 809895E0 ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 -.L809895E4: -/* 00764 809895E4 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00768 809895E8 3C018099 */ lui $at, %hi(D_8098CF84) ## $at = 80990000 -/* 0076C 809895EC A42BCF84 */ sh $t3, %lo(D_8098CF84)($at) -/* 00770 809895F0 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015E664 -/* 00774 809895F4 3C0E8099 */ lui $t6, %hi(D_8098B910) ## $t6 = 80990000 -/* 00778 809895F8 3C0D8099 */ lui $t5, %hi(D_8098BDD0) ## $t5 = 80990000 -/* 0077C 809895FC 11800004 */ beq $t4, $zero, .L80989610 -/* 00780 80989600 25CEB910 */ addiu $t6, $t6, %lo(D_8098B910) ## $t6 = 8098B910 -/* 00784 80989604 25ADBDD0 */ addiu $t5, $t5, %lo(D_8098BDD0) ## $t5 = 8098BDD0 -/* 00788 80989608 10000002 */ beq $zero, $zero, .L80989614 -/* 0078C 8098960C ACCD1D68 */ sw $t5, 0x1D68($a2) ## 00001D68 -.L80989610: -/* 00790 80989610 ACCE1D68 */ sw $t6, 0x1D68($a2) ## 00001D68 -.L80989614: -/* 00794 80989614 0C03032E */ jal func_800C0CB8 -/* 00798 80989618 AFA70018 */ sw $a3, 0x0018($sp) -/* 0079C 8098961C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 007A0 80989620 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 007A4 80989624 10400003 */ beq $v0, $zero, .L80989634 -/* 007A8 80989628 8FA70018 */ lw $a3, 0x0018($sp) -/* 007AC 8098962C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 007B0 80989630 A06F1414 */ sb $t7, 0x1414($v1) ## 8015FA74 -.L80989634: -/* 007B4 80989634 3C058099 */ lui $a1, %hi(func_809896DC) ## $a1 = 80990000 -/* 007B8 80989638 24A596DC */ addiu $a1, $a1, %lo(func_809896DC) ## $a1 = 809896DC -/* 007BC 8098963C 0C2623A0 */ jal func_80988E80 -/* 007C0 80989640 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007C4 80989644 10000022 */ beq $zero, $zero, .L809896D0 -/* 007C8 80989648 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8098964C -/* 007CC 8098964C 84D800A4 */ lh $t8, 0x00A4($a2) ## 000000A4 -/* 007D0 80989650 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 007D4 80989654 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007D8 80989658 1701000D */ bne $t8, $at, .L80989690 -/* 007DC 8098965C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007E0 80989660 3C038016 */ lui $v1, %hi(gSaveContext) -/* 007E4 80989664 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 007E8 80989668 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 007EC 8098966C 3C0A8099 */ lui $t2, %hi(D_8098BCB0) ## $t2 = 80990000 -/* 007F0 80989670 3C098099 */ lui $t1, %hi(D_8098C1B0) ## $t1 = 80990000 -/* 007F4 80989674 13200004 */ beq $t9, $zero, .L80989688 -/* 007F8 80989678 254ABCB0 */ addiu $t2, $t2, %lo(D_8098BCB0) ## $t2 = 8098BCB0 -/* 007FC 8098967C 2529C1B0 */ addiu $t1, $t1, %lo(D_8098C1B0) ## $t1 = 8098C1B0 -/* 00800 80989680 1000000E */ beq $zero, $zero, .L809896BC -/* 00804 80989684 ACC91D68 */ sw $t1, 0x1D68($a2) ## 00001D68 -.L80989688: -/* 00808 80989688 1000000C */ beq $zero, $zero, .L809896BC -/* 0080C 8098968C ACCA1D68 */ sw $t2, 0x1D68($a2) ## 00001D68 -.L80989690: -/* 00810 80989690 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00814 80989694 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00818 80989698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0081C 8098969C 3C0D8099 */ lui $t5, %hi(D_8098BA20) ## $t5 = 80990000 -/* 00820 809896A0 3C0C8099 */ lui $t4, %hi(D_8098BF00) ## $t4 = 80990000 -/* 00824 809896A4 11600004 */ beq $t3, $zero, .L809896B8 -/* 00828 809896A8 25ADBA20 */ addiu $t5, $t5, %lo(D_8098BA20) ## $t5 = 8098BA20 -/* 0082C 809896AC 258CBF00 */ addiu $t4, $t4, %lo(D_8098BF00) ## $t4 = 8098BF00 -/* 00830 809896B0 10000002 */ beq $zero, $zero, .L809896BC -/* 00834 809896B4 ACCC1D68 */ sw $t4, 0x1D68($a2) ## 00001D68 -.L809896B8: -/* 00838 809896B8 ACCD1D68 */ sw $t5, 0x1D68($a2) ## 00001D68 -.L809896BC: -/* 0083C 809896BC 3C058099 */ lui $a1, %hi(func_809896E8) ## $a1 = 80990000 -/* 00840 809896C0 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 -/* 00844 809896C4 0C2623A0 */ jal func_80988E80 -/* 00848 809896C8 24A596E8 */ addiu $a1, $a1, %lo(func_809896E8) ## $a1 = 809896E8 -glabel L809896CC -.L809896CC: -/* 0084C 809896CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809896D0: -/* 00850 809896D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00854 809896D4 03E00008 */ jr $ra -/* 00858 809896D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s deleted file mode 100644 index 63c6aa76a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809896DC -/* 0085C 809896DC AFA40000 */ sw $a0, 0x0000($sp) -/* 00860 809896E0 03E00008 */ jr $ra -/* 00864 809896E4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s deleted file mode 100644 index d7a4d3e869..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_809896E8 -/* 00868 809896E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0086C 809896EC AFA5001C */ sw $a1, 0x001C($sp) -/* 00870 809896F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00874 809896F4 3C058099 */ lui $a1, %hi(func_809896DC) ## $a1 = 80990000 -/* 00878 809896F8 0C2623A0 */ jal func_80988E80 -/* 0087C 809896FC 24A596DC */ addiu $a1, $a1, %lo(func_809896DC) ## $a1 = 809896DC -/* 00880 80989700 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00884 80989704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00888 80989708 03E00008 */ jr $ra -/* 0088C 8098970C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s deleted file mode 100644 index c4ae5c043c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80989710 -/* 00890 80989710 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00894 80989714 00067880 */ sll $t7, $a2, 2 -/* 00898 80989718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0089C 8098971C AFA40030 */ sw $a0, 0x0030($sp) -/* 008A0 80989720 AFA60038 */ sw $a2, 0x0038($sp) -/* 008A4 80989724 00AFC021 */ addu $t8, $a1, $t7 -/* 008A8 80989728 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 008AC 8098972C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 008B0 80989730 8C4A0018 */ lw $t2, 0x0018($v0) ## 00000018 -/* 008B4 80989734 8C59000C */ lw $t9, 0x000C($v0) ## 0000000C -/* 008B8 80989738 8C480010 */ lw $t0, 0x0010($v0) ## 00000010 -/* 008BC 8098973C 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 008C0 80989740 8C490014 */ lw $t1, 0x0014($v0) ## 00000014 -/* 008C4 80989744 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 008C8 80989748 46805420 */ cvt.s.w $f16, $f10 -/* 008CC 8098974C 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 008D0 80989750 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 008D4 80989754 468020A0 */ cvt.s.w $f2, $f4 -/* 008D8 80989758 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 008DC 8098975C 8C4B001C */ lw $t3, 0x001C($v0) ## 0000001C -/* 008E0 80989760 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 008E4 80989764 46803320 */ cvt.s.w $f12, $f6 -/* 008E8 80989768 46809120 */ cvt.s.w $f4, $f18 -/* 008EC 8098976C 468043A0 */ cvt.s.w $f14, $f8 -/* 008F0 80989770 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 008F4 80989774 8C4C0020 */ lw $t4, 0x0020($v0) ## 00000020 -/* 008F8 80989778 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 008FC 8098977C 00000000 */ nop -/* 00900 80989780 46803220 */ cvt.s.w $f8, $f6 -/* 00904 80989784 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 00908 80989788 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 0090C 8098978C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 00910 80989790 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 00914 80989794 E7AE002C */ swc1 $f14, 0x002C($sp) -/* 00918 80989798 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 0091C 8098979C 0C01BE4F */ jal func_8006F93C -/* 00920 809897A0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 00924 809897A4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00928 809897A8 C7AA0018 */ lwc1 $f10, 0x0018($sp) -/* 0092C 809897AC 8FA20030 */ lw $v0, 0x0030($sp) -/* 00930 809897B0 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 00934 809897B4 46025401 */ sub.s $f16, $f10, $f2 -/* 00938 809897B8 C7AE002C */ lwc1 $f14, 0x002C($sp) -/* 0093C 809897BC 46008482 */ mul.s $f18, $f16, $f0 -/* 00940 809897C0 46029100 */ add.s $f4, $f18, $f2 -/* 00944 809897C4 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 00948 809897C8 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 0094C 809897CC 460C3201 */ sub.s $f8, $f6, $f12 -/* 00950 809897D0 46004282 */ mul.s $f10, $f8, $f0 -/* 00954 809897D4 460C5400 */ add.s $f16, $f10, $f12 -/* 00958 809897D8 E4500028 */ swc1 $f16, 0x0028($v0) ## 00000028 -/* 0095C 809897DC C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 00960 809897E0 460E9101 */ sub.s $f4, $f18, $f14 -/* 00964 809897E4 46002182 */ mul.s $f6, $f4, $f0 -/* 00968 809897E8 460E3200 */ add.s $f8, $f6, $f14 -/* 0096C 809897EC E448002C */ swc1 $f8, 0x002C($v0) ## 0000002C -/* 00970 809897F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00974 809897F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00978 809897F8 03E00008 */ jr $ra -/* 0097C 809897FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s deleted file mode 100644 index f4b1c75e86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80989800 -/* 00980 80989800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00984 80989804 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00988 80989808 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0098C 8098980C 51C0000C */ beql $t6, $zero, .L80989840 -/* 00990 80989810 C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 00994 80989814 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00998 80989818 00027880 */ sll $t7, $v0, 2 -/* 0099C 8098981C 00AFC021 */ addu $t8, $a1, $t7 -/* 009A0 80989820 8F191D84 */ lw $t9, 0x1D84($t8) ## 00001D84 -/* 009A4 80989824 2446FFFE */ addiu $a2, $v0, 0xFFFE ## $a2 = FFFFFFFE -/* 009A8 80989828 53200005 */ beql $t9, $zero, .L80989840 -/* 009AC 8098982C C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 009B0 80989830 0C2625C4 */ jal func_80989710 -/* 009B4 80989834 AFA40018 */ sw $a0, 0x0018($sp) -/* 009B8 80989838 8FA40018 */ lw $a0, 0x0018($sp) -/* 009BC 8098983C C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -.L80989840: -/* 009C0 80989840 C4860150 */ lwc1 $f6, 0x0150($a0) ## 00000150 -/* 009C4 80989844 C48A0160 */ lwc1 $f10, 0x0160($a0) ## 00000160 -/* 009C8 80989848 C4900154 */ lwc1 $f16, 0x0154($a0) ## 00000154 -/* 009CC 8098984C 46062200 */ add.s $f8, $f4, $f6 -/* 009D0 80989850 C4860158 */ lwc1 $f6, 0x0158($a0) ## 00000158 -/* 009D4 80989854 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 009D8 80989858 46105480 */ add.s $f18, $f10, $f16 -/* 009DC 8098985C E488015C */ swc1 $f8, 0x015C($a0) ## 0000015C -/* 009E0 80989860 46062200 */ add.s $f8, $f4, $f6 -/* 009E4 80989864 E4920160 */ swc1 $f18, 0x0160($a0) ## 00000160 -/* 009E8 80989868 E4880164 */ swc1 $f8, 0x0164($a0) ## 00000164 -/* 009EC 8098986C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009F0 80989870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009F4 80989874 03E00008 */ jr $ra -/* 009F8 80989878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s deleted file mode 100644 index 656684e6f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098987C -/* 009FC 8098987C AFA50004 */ sw $a1, 0x0004($sp) -/* 00A00 80989880 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00A04 80989884 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80989888: -/* 00A08 80989888 00450019 */ multu $v0, $a1 -/* 00A0C 8098988C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00A10 80989890 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000001 -/* 00A14 80989894 2841001E */ slti $at, $v0, 0x001E -/* 00A18 80989898 00007012 */ mflo $t6 -/* 00A1C 8098989C 008E1821 */ addu $v1, $a0, $t6 -/* 00A20 809898A0 C4640168 */ lwc1 $f4, 0x0168($v1) ## 00000168 -/* 00A24 809898A4 846F0170 */ lh $t7, 0x0170($v1) ## 00000170 -/* 00A28 809898A8 4600218D */ trunc.w.s $f6, $f4 -/* 00A2C 809898AC 44093000 */ mfc1 $t1, $f6 -/* 00A30 809898B0 00000000 */ nop -/* 00A34 809898B4 01E95021 */ addu $t2, $t7, $t1 -/* 00A38 809898B8 1420FFF3 */ bne $at, $zero, .L80989888 -/* 00A3C 809898BC A46A0170 */ sh $t2, 0x0170($v1) ## 00000170 -/* 00A40 809898C0 03E00008 */ jr $ra -/* 00A44 809898C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s deleted file mode 100644 index 656dfcc5fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_809898C8 -/* 00A48 809898C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A4C 809898CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A50 809898D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A54 809898D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A58 809898D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A5C 809898DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A60 809898E0 2405201E */ addiu $a1, $zero, 0x201E ## $a1 = 0000201E -/* 00A64 809898E4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A68 809898E8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A6C 809898EC C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 00A70 809898F0 3C0142CC */ lui $at, 0x42CC ## $at = 42CC0000 -/* 00A74 809898F4 44818000 */ mtc1 $at, $f16 ## $f16 = 102.00 -/* 00A78 809898F8 46062200 */ add.s $f8, $f4, $f6 -/* 00A7C 809898FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A80 80989900 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -/* 00A84 80989904 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 00A88 80989908 460A803E */ c.le.s $f16, $f10 -/* 00A8C 8098990C 00000000 */ nop -/* 00A90 80989910 4502000F */ bc1fl .L80989950 -/* 00A94 80989914 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A98 80989918 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A9C 8098991C 24052893 */ addiu $a1, $zero, 0x2893 ## $a1 = 00002893 -/* 00AA0 80989920 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00AA4 80989924 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00AA8 80989928 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 00AAC 8098992C 35CF0800 */ ori $t7, $t6, 0x0800 ## $t7 = 00000800 -/* 00AB0 80989930 A44F0EDC */ sh $t7, 0x0EDC($v0) ## 8015F53C -/* 00AB4 80989934 0C00B55C */ jal Actor_Kill - -/* 00AB8 80989938 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 00ABC 8098993C 3C058099 */ lui $a1, %hi(func_80989960) ## $a1 = 80990000 -/* 00AC0 80989940 24A59960 */ addiu $a1, $a1, %lo(func_80989960) ## $a1 = 80989960 -/* 00AC4 80989944 0C2623A0 */ jal func_80988E80 -/* 00AC8 80989948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 8098994C 8FBF001C */ lw $ra, 0x001C($sp) -.L80989950: -/* 00AD0 80989950 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AD4 80989954 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AD8 80989958 03E00008 */ jr $ra -/* 00ADC 8098995C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s deleted file mode 100644 index dc48c40de6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80989960 -/* 00AE0 80989960 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AE4 80989964 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AE8 80989968 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AEC 8098996C AFA5001C */ sw $a1, 0x001C($sp) -/* 00AF0 80989970 0C00B55C */ jal Actor_Kill - -/* 00AF4 80989974 8C84011C */ lw $a0, 0x011C($a0) ## 0000011C -/* 00AF8 80989978 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AFC 8098997C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B00 80989980 03E00008 */ jr $ra -/* 00B04 80989984 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s deleted file mode 100644 index 21b72868ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80989B54 -/* 00CD4 80989B54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CD8 80989B58 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CDC 80989B5C AFB10018 */ sw $s1, 0x0018($sp) -/* 00CE0 80989B60 AFB00014 */ sw $s0, 0x0014($sp) -/* 00CE4 80989B64 AFA60028 */ sw $a2, 0x0028($sp) -/* 00CE8 80989B68 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00CEC 80989B6C 00063400 */ sll $a2, $a2, 16 -/* 00CF0 80989B70 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 00CF4 80989B74 00063403 */ sra $a2, $a2, 16 -/* 00CF8 80989B78 10410022 */ beq $v0, $at, .L80989C04 -/* 00CFC 80989B7C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00D00 80989B80 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 00D04 80989B84 10410007 */ beq $v0, $at, .L80989BA4 -/* 00D08 80989B88 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 00D0C 80989B8C 10410039 */ beq $v0, $at, .L80989C74 -/* 00D10 80989B90 00067080 */ sll $t6, $a2, 2 -/* 00D14 80989B94 01C67021 */ addu $t6, $t6, $a2 -/* 00D18 80989B98 000E70C0 */ sll $t6, $t6, 3 -/* 00D1C 80989B9C 1000004E */ beq $zero, $zero, .L80989CD8 -/* 00D20 80989BA0 008E8021 */ addu $s0, $a0, $t6 -.L80989BA4: -/* 00D24 80989BA4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00D28 80989BA8 A7A6002A */ sh $a2, 0x002A($sp) -/* 00D2C 80989BAC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00D30 80989BB0 44811000 */ mtc1 $at, $f2 ## $f2 = 500.00 -/* 00D34 80989BB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00D38 80989BB8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00D3C 80989BBC 87A6002A */ lh $a2, 0x002A($sp) -/* 00D40 80989BC0 46040181 */ sub.s $f6, $f0, $f4 -/* 00D44 80989BC4 00067880 */ sll $t7, $a2, 2 -/* 00D48 80989BC8 01E67821 */ addu $t7, $t7, $a2 -/* 00D4C 80989BCC 000F78C0 */ sll $t7, $t7, 3 -/* 00D50 80989BD0 46023202 */ mul.s $f8, $f6, $f2 -/* 00D54 80989BD4 022F8021 */ addu $s0, $s1, $t7 -/* 00D58 80989BD8 E6020154 */ swc1 $f2, 0x0154($s0) ## 00000154 -/* 00D5C 80989BDC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00D60 80989BE0 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 00D64 80989BE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00D68 80989BE8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00D6C 80989BEC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00D70 80989BF0 44819000 */ mtc1 $at, $f18 ## $f18 = 500.00 -/* 00D74 80989BF4 460A0401 */ sub.s $f16, $f0, $f10 -/* 00D78 80989BF8 46128102 */ mul.s $f4, $f16, $f18 -/* 00D7C 80989BFC 10000036 */ beq $zero, $zero, .L80989CD8 -/* 00D80 80989C00 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L80989C04: -/* 00D84 80989C04 0006C080 */ sll $t8, $a2, 2 -/* 00D88 80989C08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D8C 80989C0C 0306C021 */ addu $t8, $t8, $a2 -/* 00D90 80989C10 0018C0C0 */ sll $t8, $t8, 3 -/* 00D94 80989C14 02388021 */ addu $s0, $s1, $t8 -/* 00D98 80989C18 E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C -/* 00D9C 80989C1C E6000160 */ swc1 $f0, 0x0160($s0) ## 00000160 -/* 00DA0 80989C20 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DA4 80989C24 E6000164 */ swc1 $f0, 0x0164($s0) ## 00000164 -/* 00DA8 80989C28 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00DAC 80989C2C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00DB0 80989C30 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00DB4 80989C34 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 00DB8 80989C38 46060201 */ sub.s $f8, $f0, $f6 -/* 00DBC 80989C3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00DC0 80989C40 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00DC4 80989C44 460A4402 */ mul.s $f16, $f8, $f10 -/* 00DC8 80989C48 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -/* 00DCC 80989C4C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DD0 80989C50 E6100150 */ swc1 $f16, 0x0150($s0) ## 00000150 -/* 00DD4 80989C54 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00DD8 80989C58 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00DDC 80989C5C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00DE0 80989C60 44814000 */ mtc1 $at, $f8 ## $f8 = 180.00 -/* 00DE4 80989C64 46040181 */ sub.s $f6, $f0, $f4 -/* 00DE8 80989C68 46083282 */ mul.s $f10, $f6, $f8 -/* 00DEC 80989C6C 1000001A */ beq $zero, $zero, .L80989CD8 -/* 00DF0 80989C70 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 -.L80989C74: -/* 00DF4 80989C74 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DF8 80989C78 A7A6002A */ sh $a2, 0x002A($sp) -/* 00DFC 80989C7C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E00 80989C80 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00E04 80989C84 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00E08 80989C88 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 -/* 00E0C 80989C8C 46100481 */ sub.s $f18, $f0, $f16 -/* 00E10 80989C90 87A6002A */ lh $a2, 0x002A($sp) -/* 00E14 80989C94 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 00E18 80989C98 44814000 */ mtc1 $at, $f8 ## $f8 = -500.00 -/* 00E1C 80989C9C 46049182 */ mul.s $f6, $f18, $f4 -/* 00E20 80989CA0 0006C880 */ sll $t9, $a2, 2 -/* 00E24 80989CA4 0326C821 */ addu $t9, $t9, $a2 -/* 00E28 80989CA8 0019C8C0 */ sll $t9, $t9, 3 -/* 00E2C 80989CAC 02398021 */ addu $s0, $s1, $t9 -/* 00E30 80989CB0 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -/* 00E34 80989CB4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E38 80989CB8 E6060150 */ swc1 $f6, 0x0150($s0) ## 00000150 -/* 00E3C 80989CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E40 80989CC0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00E44 80989CC4 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00E48 80989CC8 44819000 */ mtc1 $at, $f18 ## $f18 = 600.00 -/* 00E4C 80989CCC 460A0401 */ sub.s $f16, $f0, $f10 -/* 00E50 80989CD0 46128102 */ mul.s $f4, $f16, $f18 -/* 00E54 80989CD4 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L80989CD8: -/* 00E58 80989CD8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E5C 80989CDC 00000000 */ nop -/* 00E60 80989CE0 3C088099 */ lui $t0, %hi(D_8098CF80) ## $t0 = 80990000 -/* 00E64 80989CE4 8508CF80 */ lh $t0, %lo(D_8098CF80)($t0) -/* 00E68 80989CE8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00E6C 80989CEC 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00E70 80989CF0 44883000 */ mtc1 $t0, $f6 ## $f6 = -0.00 -/* 00E74 80989CF4 00000000 */ nop -/* 00E78 80989CF8 468030A0 */ cvt.s.w $f2, $f6 -/* 00E7C 80989CFC 46081282 */ mul.s $f10, $f2, $f8 -/* 00E80 80989D00 00000000 */ nop -/* 00E84 80989D04 460A0402 */ mul.s $f16, $f0, $f10 -/* 00E88 80989D08 46028480 */ add.s $f18, $f16, $f2 -/* 00E8C 80989D0C E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 00E90 80989D10 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E94 80989D14 8FB10018 */ lw $s1, 0x0018($sp) -/* 00E98 80989D18 8FB00014 */ lw $s0, 0x0014($sp) -/* 00E9C 80989D1C 03E00008 */ jr $ra -/* 00EA0 80989D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s deleted file mode 100644 index d26d92eaee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ /dev/null @@ -1,453 +0,0 @@ -.rdata -glabel D_8098C898 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8AC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8C0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB2C - .float 1500.0 - -glabel D_8098CB30 - .float 3.14159274101 - -glabel D_8098CB34 - .float 0.001 - -.text -glabel func_80989D24 -/* 00EA4 80989D24 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 -/* 00EA8 80989D28 AFB5005C */ sw $s5, 0x005C($sp) -/* 00EAC 80989D2C 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 00EB0 80989D30 AFBF006C */ sw $ra, 0x006C($sp) -/* 00EB4 80989D34 AFBE0068 */ sw $s8, 0x0068($sp) -/* 00EB8 80989D38 AFB70064 */ sw $s7, 0x0064($sp) -/* 00EBC 80989D3C AFB60060 */ sw $s6, 0x0060($sp) -/* 00EC0 80989D40 AFB40058 */ sw $s4, 0x0058($sp) -/* 00EC4 80989D44 AFB30054 */ sw $s3, 0x0054($sp) -/* 00EC8 80989D48 AFB20050 */ sw $s2, 0x0050($sp) -/* 00ECC 80989D4C AFB1004C */ sw $s1, 0x004C($sp) -/* 00ED0 80989D50 AFB00048 */ sw $s0, 0x0048($sp) -/* 00ED4 80989D54 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 00ED8 80989D58 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 00EDC 80989D5C F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 00EE0 80989D60 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00EE4 80989D64 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00EE8 80989D68 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00EEC 80989D6C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00EF0 80989D70 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 00EF4 80989D74 3C068099 */ lui $a2, %hi(D_8098C898) ## $a2 = 80990000 -/* 00EF8 80989D78 24C6C898 */ addiu $a2, $a2, %lo(D_8098C898) ## $a2 = 8098C898 -/* 00EFC 80989D7C 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 -/* 00F00 80989D80 240704A2 */ addiu $a3, $zero, 0x04A2 ## $a3 = 000004A2 -/* 00F04 80989D84 0C031AB1 */ jal Graph_OpenDisps -/* 00F08 80989D88 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00F0C 80989D8C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00F10 80989D90 4481F000 */ mtc1 $at, $f30 ## $f30 = 300.00 -/* 00F14 80989D94 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 00F18 80989D98 4481E000 */ mtc1 $at, $f28 ## $f28 = 350.00 -/* 00F1C 80989D9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F20 80989DA0 4481D000 */ mtc1 $at, $f26 ## $f26 = 10.00 -/* 00F24 80989DA4 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 00F28 80989DA8 4481C000 */ mtc1 $at, $f24 ## $f24 = 4000.00 -/* 00F2C 80989DAC 3C0E0600 */ lui $t6, %hi(D_06000080) ## $t6 = 06000000 -/* 00F30 80989DB0 25CE0080 */ addiu $t6, $t6, %lo(D_06000080) ## $t6 = 06000080 -/* 00F34 80989DB4 3C018099 */ lui $at, %hi(D_8098CB2C) ## $at = 80990000 -/* 00F38 80989DB8 3C1E8099 */ lui $s8, %hi(D_8098C8AC) ## $s8 = 80990000 -/* 00F3C 80989DBC 3C17DA38 */ lui $s7, 0xDA38 ## $s7 = DA380000 -/* 00F40 80989DC0 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00F44 80989DC4 36F70003 */ ori $s7, $s7, 0x0003 ## $s7 = DA380003 -/* 00F48 80989DC8 27DEC8AC */ addiu $s8, $s8, %lo(D_8098C8AC) ## $s8 = 8098C8AC -/* 00F4C 80989DCC C436CB2C */ lwc1 $f22, %lo(D_8098CB2C)($at) -/* 00F50 80989DD0 AFAE0074 */ sw $t6, 0x0074($sp) -/* 00F54 80989DD4 A7A000DE */ sh $zero, 0x00DE($sp) -/* 00F58 80989DD8 24160043 */ addiu $s6, $zero, 0x0043 ## $s6 = 00000043 -.L80989DDC: -/* 00F5C 80989DDC C6B000E0 */ lwc1 $f16, 0x00E0($s5) ## 000000E0 -/* 00F60 80989DE0 C6A400EC */ lwc1 $f4, 0x00EC($s5) ## 000000EC -/* 00F64 80989DE4 C6A600F0 */ lwc1 $f6, 0x00F0($s5) ## 000000F0 -/* 00F68 80989DE8 C6A800E4 */ lwc1 $f8, 0x00E4($s5) ## 000000E4 -/* 00F6C 80989DEC 46102301 */ sub.s $f12, $f4, $f16 -/* 00F70 80989DF0 C6AA00F4 */ lwc1 $f10, 0x00F4($s5) ## 000000F4 -/* 00F74 80989DF4 C6B200E8 */ lwc1 $f18, 0x00E8($s5) ## 000000E8 -/* 00F78 80989DF8 46083081 */ sub.s $f2, $f6, $f8 -/* 00F7C 80989DFC 460C6102 */ mul.s $f4, $f12, $f12 -/* 00F80 80989E00 86AF00A4 */ lh $t7, 0x00A4($s5) ## 000000A4 -/* 00F84 80989E04 46125381 */ sub.s $f14, $f10, $f18 -/* 00F88 80989E08 46021182 */ mul.s $f6, $f2, $f2 -/* 00F8C 80989E0C 87B800DE */ lh $t8, 0x00DE($sp) -/* 00F90 80989E10 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00F94 80989E14 460E7282 */ mul.s $f10, $f14, $f14 -/* 00F98 80989E18 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 -/* 00F9C 80989E1C 46062200 */ add.s $f8, $f4, $f6 -/* 00FA0 80989E20 460A4000 */ add.s $f0, $f8, $f10 -/* 00FA4 80989E24 12CF0015 */ beq $s6, $t7, .L80989E7C -/* 00FA8 80989E28 46000004 */ sqrt.s $f0, $f0 -/* 00FAC 80989E2C 46006483 */ div.s $f18, $f12, $f0 -/* 00FB0 80989E30 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00FB4 80989E34 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 00FB8 80989E38 0018C880 */ sll $t9, $t8, 2 -/* 00FBC 80989E3C 0338C821 */ addu $t9, $t9, $t8 -/* 00FC0 80989E40 0019C8C0 */ sll $t9, $t9, 3 -/* 00FC4 80989E44 02999821 */ addu $s3, $s4, $t9 -/* 00FC8 80989E48 46001203 */ div.s $f8, $f2, $f0 -/* 00FCC 80989E4C 461C9102 */ mul.s $f4, $f18, $f28 -/* 00FD0 80989E50 46048180 */ add.s $f6, $f16, $f4 -/* 00FD4 80989E54 460A4482 */ mul.s $f18, $f8, $f10 -/* 00FD8 80989E58 E666015C */ swc1 $f6, 0x015C($s3) ## 0000015C -/* 00FDC 80989E5C C6A400E4 */ lwc1 $f4, 0x00E4($s5) ## 000000E4 -/* 00FE0 80989E60 46007283 */ div.s $f10, $f14, $f0 -/* 00FE4 80989E64 46122180 */ add.s $f6, $f4, $f18 -/* 00FE8 80989E68 E6660160 */ swc1 $f6, 0x0160($s3) ## 00000160 -/* 00FEC 80989E6C C6A800E8 */ lwc1 $f8, 0x00E8($s5) ## 000000E8 -/* 00FF0 80989E70 461C5102 */ mul.s $f4, $f10, $f28 -/* 00FF4 80989E74 46044480 */ add.s $f18, $f8, $f4 -/* 00FF8 80989E78 E6720164 */ swc1 $f18, 0x0164($s3) ## 00000164 -.L80989E7C: -/* 00FFC 80989E7C 87A800DE */ lh $t0, 0x00DE($sp) -/* 01000 80989E80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01004 80989E84 00084880 */ sll $t1, $t0, 2 -/* 01008 80989E88 01284821 */ addu $t1, $t1, $t0 -/* 0100C 80989E8C 000948C0 */ sll $t1, $t1, 3 -/* 01010 80989E90 02899821 */ addu $s3, $s4, $t1 -/* 01014 80989E94 92620172 */ lbu $v0, 0x0172($s3) ## 00000172 -/* 01018 80989E98 10400009 */ beq $v0, $zero, .L80989EC0 -/* 0101C 80989E9C 00000000 */ nop -/* 01020 80989EA0 10410024 */ beq $v0, $at, .L80989F34 -/* 01024 80989EA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01028 80989EA8 1041006B */ beq $v0, $at, .L8098A058 -/* 0102C 80989EAC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01030 80989EB0 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 01034 80989EB4 C66A0160 */ lwc1 $f10, 0x0160($s3) ## 00000160 -/* 01038 80989EB8 10000070 */ beq $zero, $zero, .L8098A07C -/* 0103C 80989EBC 460A3380 */ add.s $f14, $f6, $f10 -.L80989EC0: -/* 01040 80989EC0 0C2626D5 */ jal func_80989B54 -/* 01044 80989EC4 87A600DE */ lh $a2, 0x00DE($sp) -/* 01048 80989EC8 3C0A8016 */ lui $t2, %hi(gSaveContext) -/* 0104C 80989ECC 8D4AE660 */ lw $t2, %lo(gSaveContext)($t2) -/* 01050 80989ED0 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 01054 80989ED4 15410009 */ bne $t2, $at, .L80989EFC -/* 01058 80989ED8 00000000 */ nop -/* 0105C 80989EDC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01060 80989EE0 00000000 */ nop -/* 01064 80989EE4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 01068 80989EE8 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 -/* 0106C 80989EEC 00000000 */ nop -/* 01070 80989EF0 46080102 */ mul.s $f4, $f0, $f8 -/* 01074 80989EF4 10000008 */ beq $zero, $zero, .L80989F18 -/* 01078 80989EF8 E6640154 */ swc1 $f4, 0x0154($s3) ## 00000154 -.L80989EFC: -/* 0107C 80989EFC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01080 80989F00 00000000 */ nop -/* 01084 80989F04 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 01088 80989F08 44819000 */ mtc1 $at, $f18 ## $f18 = -500.00 -/* 0108C 80989F0C 00000000 */ nop -/* 01090 80989F10 46120182 */ mul.s $f6, $f0, $f18 -/* 01094 80989F14 E6660154 */ swc1 $f6, 0x0154($s3) ## 00000154 -.L80989F18: -/* 01098 80989F18 926B0172 */ lbu $t3, 0x0172($s3) ## 00000172 -/* 0109C 80989F1C C66A0154 */ lwc1 $f10, 0x0154($s3) ## 00000154 -/* 010A0 80989F20 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 010A4 80989F24 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 010A8 80989F28 A26C0172 */ sb $t4, 0x0172($s3) ## 00000172 -/* 010AC 80989F2C 10000053 */ beq $zero, $zero, .L8098A07C -/* 010B0 80989F30 46085380 */ add.s $f14, $f10, $f8 -.L80989F34: -/* 010B4 80989F34 46001103 */ div.s $f4, $f2, $f0 -/* 010B8 80989F38 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 010BC 80989F3C 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 010C0 80989F40 3C0D8016 */ lui $t5, %hi(gSaveContext) -/* 010C4 80989F44 8DADE660 */ lw $t5, %lo(gSaveContext)($t5) -/* 010C8 80989F48 C6AA00E4 */ lwc1 $f10, 0x00E4($s5) ## 000000E4 -/* 010CC 80989F4C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 010D0 80989F50 3C028016 */ lui $v0, %hi(gSaveContext) -/* 010D4 80989F54 46122182 */ mul.s $f6, $f4, $f18 -/* 010D8 80989F58 15A10006 */ bne $t5, $at, .L80989F74 -/* 010DC 80989F5C 46065300 */ add.s $f12, $f10, $f6 -/* 010E0 80989F60 C6680154 */ lwc1 $f8, 0x0154($s3) ## 00000154 -/* 010E4 80989F64 C6640168 */ lwc1 $f4, 0x0168($s3) ## 00000168 -/* 010E8 80989F68 46044481 */ sub.s $f18, $f8, $f4 -/* 010EC 80989F6C 10000005 */ beq $zero, $zero, .L80989F84 -/* 010F0 80989F70 E6720154 */ swc1 $f18, 0x0154($s3) ## 00000154 -.L80989F74: -/* 010F4 80989F74 C66A0154 */ lwc1 $f10, 0x0154($s3) ## 00000154 -/* 010F8 80989F78 C6660168 */ lwc1 $f6, 0x0168($s3) ## 00000168 -/* 010FC 80989F7C 46065200 */ add.s $f8, $f10, $f6 -/* 01100 80989F80 E6680154 */ swc1 $f8, 0x0154($s3) ## 00000154 -.L80989F84: -/* 01104 80989F84 8C42E660 */ lw $v0, %lo(gSaveContext)($v0) -/* 01108 80989F88 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 0110C 80989F8C 54410011 */ bnel $v0, $at, .L80989FD4 -/* 01110 80989F90 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01114 80989F94 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 01118 80989F98 C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 0111C 80989F9C 461E6281 */ sub.s $f10, $f12, $f30 -/* 01120 80989FA0 46122380 */ add.s $f14, $f4, $f18 -/* 01124 80989FA4 460A703C */ c.lt.s $f14, $f10 -/* 01128 80989FA8 00000000 */ nop -/* 0112C 80989FAC 45020034 */ bc1fl .L8098A080 -/* 01130 80989FB0 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 01134 80989FB4 926E0172 */ lbu $t6, 0x0172($s3) ## 00000172 -/* 01138 80989FB8 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 0113C 80989FBC C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 01140 80989FC0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01144 80989FC4 A26F0172 */ sb $t7, 0x0172($s3) ## 00000172 -/* 01148 80989FC8 1000002C */ beq $zero, $zero, .L8098A07C -/* 0114C 80989FCC 46083380 */ add.s $f14, $f6, $f8 -/* 01150 80989FD0 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -.L80989FD4: -/* 01154 80989FD4 54410011 */ bnel $v0, $at, .L8098A01C -/* 01158 80989FD8 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 0115C 80989FDC C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 01160 80989FE0 C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 01164 80989FE4 461E6280 */ add.s $f10, $f12, $f30 -/* 01168 80989FE8 46122380 */ add.s $f14, $f4, $f18 -/* 0116C 80989FEC 460E503C */ c.lt.s $f10, $f14 -/* 01170 80989FF0 00000000 */ nop -/* 01174 80989FF4 45020022 */ bc1fl .L8098A080 -/* 01178 80989FF8 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 0117C 80989FFC 92780172 */ lbu $t8, 0x0172($s3) ## 00000172 -/* 01180 8098A000 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 01184 8098A004 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 01188 8098A008 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0118C 8098A00C A2790172 */ sb $t9, 0x0172($s3) ## 00000172 -/* 01190 8098A010 1000001A */ beq $zero, $zero, .L8098A07C -/* 01194 8098A014 46083380 */ add.s $f14, $f6, $f8 -/* 01198 8098A018 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -.L8098A01C: -/* 0119C 8098A01C C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 011A0 8098A020 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 011A4 8098A024 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 -/* 011A8 8098A028 46122380 */ add.s $f14, $f4, $f18 -/* 011AC 8098A02C 460E503C */ c.lt.s $f10, $f14 -/* 011B0 8098A030 00000000 */ nop -/* 011B4 8098A034 45020012 */ bc1fl .L8098A080 -/* 011B8 8098A038 C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -/* 011BC 8098A03C 92680172 */ lbu $t0, 0x0172($s3) ## 00000172 -/* 011C0 8098A040 C6660154 */ lwc1 $f6, 0x0154($s3) ## 00000154 -/* 011C4 8098A044 C6680160 */ lwc1 $f8, 0x0160($s3) ## 00000160 -/* 011C8 8098A048 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 011CC 8098A04C A2690172 */ sb $t1, 0x0172($s3) ## 00000172 -/* 011D0 8098A050 1000000A */ beq $zero, $zero, .L8098A07C -/* 011D4 8098A054 46083380 */ add.s $f14, $f6, $f8 -.L8098A058: -/* 011D8 8098A058 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 -/* 011DC 8098A05C 0C2626D5 */ jal func_80989B54 -/* 011E0 8098A060 87A600DE */ lh $a2, 0x00DE($sp) -/* 011E4 8098A064 926A0172 */ lbu $t2, 0x0172($s3) ## 00000172 -/* 011E8 8098A068 C6640154 */ lwc1 $f4, 0x0154($s3) ## 00000154 -/* 011EC 8098A06C C6720160 */ lwc1 $f18, 0x0160($s3) ## 00000160 -/* 011F0 8098A070 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 011F4 8098A074 A26B0172 */ sb $t3, 0x0172($s3) ## 00000172 -/* 011F8 8098A078 46122380 */ add.s $f14, $f4, $f18 -.L8098A07C: -/* 011FC 8098A07C C6680158 */ lwc1 $f8, 0x0158($s3) ## 00000158 -.L8098A080: -/* 01200 8098A080 C6640164 */ lwc1 $f4, 0x0164($s3) ## 00000164 -/* 01204 8098A084 C66A0150 */ lwc1 $f10, 0x0150($s3) ## 00000150 -/* 01208 8098A088 C666015C */ lwc1 $f6, 0x015C($s3) ## 0000015C -/* 0120C 8098A08C 46044480 */ add.s $f18, $f8, $f4 -/* 01210 8098A090 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01214 8098A094 46065300 */ add.s $f12, $f10, $f6 -/* 01218 8098A098 44069000 */ mfc1 $a2, $f18 -/* 0121C 8098A09C 0C034261 */ jal Matrix_Translate -/* 01220 8098A0A0 00000000 */ nop -/* 01224 8098A0A4 3C0C8016 */ lui $t4, %hi(gSaveContext) -/* 01228 8098A0A8 8D8CE660 */ lw $t4, %lo(gSaveContext)($t4) -/* 0122C 8098A0AC 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 01230 8098A0B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01234 8098A0B4 11810003 */ beq $t4, $at, .L8098A0C4 -/* 01238 8098A0B8 3C018099 */ lui $at, %hi(D_8098CB30) ## $at = 80990000 -/* 0123C 8098A0BC 0C0342DC */ jal Matrix_RotateX -/* 01240 8098A0C0 C42CCB30 */ lwc1 $f12, %lo(D_8098CB30)($at) -.L8098A0C4: -/* 01244 8098A0C4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01248 8098A0C8 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 0124C 8098A0CC 3C0F8016 */ lui $t7, %hi(gSaveContext) -/* 01250 8098A0D0 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 01254 8098A0D4 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 -/* 01258 8098A0D8 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 0125C 8098A0DC AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 01260 8098A0E0 8DEFE660 */ lw $t7, %lo(gSaveContext)($t7) -/* 01264 8098A0E4 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01268 8098A0E8 3C0EC8FF */ lui $t6, 0xC8FF ## $t6 = C8FF0000 -/* 0126C 8098A0EC 15E10011 */ bne $t7, $at, .L8098A134 -/* 01270 8098A0F0 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 01274 8098A0F4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01278 8098A0F8 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 0127C 8098A0FC 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 01280 8098A100 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 01284 8098A104 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 01288 8098A108 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 0128C 8098A10C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 01290 8098A110 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01294 8098A114 3C0BFFFF */ lui $t3, 0xFFFF ## $t3 = FFFF0000 -/* 01298 8098A118 356B00FF */ ori $t3, $t3, 0x00FF ## $t3 = FFFF00FF -/* 0129C 8098A11C 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 012A0 8098A120 AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 -/* 012A4 8098A124 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 012A8 8098A128 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 012AC 8098A12C 1000000F */ beq $zero, $zero, .L8098A16C -/* 012B0 8098A130 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -.L8098A134: -/* 012B4 8098A134 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 012B8 8098A138 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = C8FFFFFF -/* 012BC 8098A13C 3C190096 */ lui $t9, 0x0096 ## $t9 = 00960000 -/* 012C0 8098A140 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 012C4 8098A144 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 012C8 8098A148 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 012CC 8098A14C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 012D0 8098A150 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 012D4 8098A154 3739FFFF */ ori $t9, $t9, 0xFFFF ## $t9 = 0096FFFF -/* 012D8 8098A158 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 012DC 8098A15C 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 012E0 8098A160 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 012E4 8098A164 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 012E8 8098A168 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -.L8098A16C: -/* 012EC 8098A16C 3C088099 */ lui $t0, %hi(D_8098CF82) ## $t0 = 80990000 -/* 012F0 8098A170 8508CF82 */ lh $t0, %lo(D_8098CF82)($t0) -/* 012F4 8098A174 3C018099 */ lui $at, %hi(D_8098CB34) ## $at = 80990000 -/* 012F8 8098A178 C428CB34 */ lwc1 $f8, %lo(D_8098CB34)($at) -/* 012FC 8098A17C 44885000 */ mtc1 $t0, $f10 ## $f10 = -0.00 -/* 01300 8098A180 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01304 8098A184 468051A0 */ cvt.s.w $f6, $f10 -/* 01308 8098A188 46083302 */ mul.s $f12, $f6, $f8 -/* 0130C 8098A18C 44066000 */ mfc1 $a2, $f12 -/* 01310 8098A190 0C0342A3 */ jal Matrix_Scale -/* 01314 8098A194 46006386 */ mov.s $f14, $f12 -/* 01318 8098A198 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -.L8098A19C: -/* 0131C 8098A19C 86A900A4 */ lh $t1, 0x00A4($s5) ## 000000A4 -/* 01320 8098A1A0 320C0001 */ andi $t4, $s0, 0x0001 ## $t4 = 00000000 -/* 01324 8098A1A4 52C90032 */ beql $s6, $t1, .L8098A270 -/* 01328 8098A1A8 44904000 */ mtc1 $s0, $f8 ## $f8 = 0.00 -/* 0132C 8098A1AC C6640150 */ lwc1 $f4, 0x0150($s3) ## 00000150 -/* 01330 8098A1B0 00105023 */ subu $t2, $zero, $s0 -/* 01334 8098A1B4 00105823 */ subu $t3, $zero, $s0 -/* 01338 8098A1B8 4604A03E */ c.le.s $f20, $f4 -/* 0133C 8098A1BC 00106823 */ subu $t5, $zero, $s0 -/* 01340 8098A1C0 45020008 */ bc1fl .L8098A1E4 -/* 01344 8098A1C4 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -/* 01348 8098A1C8 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 0134C 8098A1CC 00000000 */ nop -/* 01350 8098A1D0 468092A0 */ cvt.s.w $f10, $f18 -/* 01354 8098A1D4 46165302 */ mul.s $f12, $f10, $f22 -/* 01358 8098A1D8 10000007 */ beq $zero, $zero, .L8098A1F8 -/* 0135C 8098A1DC C6640158 */ lwc1 $f4, 0x0158($s3) ## 00000158 -/* 01360 8098A1E0 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -.L8098A1E4: -/* 01364 8098A1E4 00000000 */ nop -/* 01368 8098A1E8 46803220 */ cvt.s.w $f8, $f6 -/* 0136C 8098A1EC 46164302 */ mul.s $f12, $f8, $f22 -/* 01370 8098A1F0 00000000 */ nop -/* 01374 8098A1F4 C6640158 */ lwc1 $f4, 0x0158($s3) ## 00000158 -.L8098A1F8: -/* 01378 8098A1F8 4604A03E */ c.le.s $f20, $f4 -/* 0137C 8098A1FC 00000000 */ nop -/* 01380 8098A200 45020008 */ bc1fl .L8098A224 -/* 01384 8098A204 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -/* 01388 8098A208 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 0138C 8098A20C 00000000 */ nop -/* 01390 8098A210 468092A0 */ cvt.s.w $f10, $f18 -/* 01394 8098A214 46165002 */ mul.s $f0, $f10, $f22 -/* 01398 8098A218 10000006 */ beq $zero, $zero, .L8098A234 -/* 0139C 8098A21C 00000000 */ nop -/* 013A0 8098A220 44903000 */ mtc1 $s0, $f6 ## $f6 = 0.00 -.L8098A224: -/* 013A4 8098A224 00000000 */ nop -/* 013A8 8098A228 46803220 */ cvt.s.w $f8, $f6 -/* 013AC 8098A22C 46164002 */ mul.s $f0, $f8, $f22 -/* 013B0 8098A230 00000000 */ nop -.L8098A234: -/* 013B4 8098A234 51800008 */ beql $t4, $zero, .L8098A258 -/* 013B8 8098A238 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 013BC 8098A23C 44902000 */ mtc1 $s0, $f4 ## $f4 = 0.00 -/* 013C0 8098A240 00000000 */ nop -/* 013C4 8098A244 468024A0 */ cvt.s.w $f18, $f4 -/* 013C8 8098A248 46189382 */ mul.s $f14, $f18, $f24 -/* 013CC 8098A24C 1000000E */ beq $zero, $zero, .L8098A288 -/* 013D0 8098A250 44060000 */ mfc1 $a2, $f0 -/* 013D4 8098A254 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -.L8098A258: -/* 013D8 8098A258 00000000 */ nop -/* 013DC 8098A25C 468051A0 */ cvt.s.w $f6, $f10 -/* 013E0 8098A260 46183382 */ mul.s $f14, $f6, $f24 -/* 013E4 8098A264 10000008 */ beq $zero, $zero, .L8098A288 -/* 013E8 8098A268 44060000 */ mfc1 $a2, $f0 -/* 013EC 8098A26C 44904000 */ mtc1 $s0, $f8 ## $f8 = 0.00 -.L8098A270: -/* 013F0 8098A270 4600A306 */ mov.s $f12, $f20 -/* 013F4 8098A274 4600A006 */ mov.s $f0, $f20 -/* 013F8 8098A278 46804120 */ cvt.s.w $f4, $f8 -/* 013FC 8098A27C 461A2382 */ mul.s $f14, $f4, $f26 -/* 01400 8098A280 00000000 */ nop -/* 01404 8098A284 44060000 */ mfc1 $a2, $f0 -.L8098A288: -/* 01408 8098A288 0C034261 */ jal Matrix_Translate -/* 0140C 8098A28C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01410 8098A290 8E5102D0 */ lw $s1, 0x02D0($s2) ## 000002D0 -/* 01414 8098A294 03C02825 */ or $a1, $s8, $zero ## $a1 = 8098C8AC -/* 01418 8098A298 24060540 */ addiu $a2, $zero, 0x0540 ## $a2 = 00000540 -/* 0141C 8098A29C 262E0008 */ addiu $t6, $s1, 0x0008 ## $t6 = 00000008 -/* 01420 8098A2A0 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 01424 8098A2A4 AE370000 */ sw $s7, 0x0000($s1) ## 00000000 -/* 01428 8098A2A8 0C0346A2 */ jal Matrix_NewMtx -/* 0142C 8098A2AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 -/* 01430 8098A2B0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 01434 8098A2B4 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 01438 8098A2B8 0C024DDD */ jal Gfx_CallSetupDL -/* 0143C 8098A2BC 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 01440 8098A2C0 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0 -/* 01444 8098A2C4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01448 8098A2C8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0144C 8098A2CC AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 01450 8098A2D0 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 01454 8098A2D4 00108400 */ sll $s0, $s0, 16 -/* 01458 8098A2D8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0145C 8098A2DC 8FB90074 */ lw $t9, 0x0074($sp) -/* 01460 8098A2E0 00108403 */ sra $s0, $s0, 16 -/* 01464 8098A2E4 2A010005 */ slti $at, $s0, 0x0005 -/* 01468 8098A2E8 1420FFAC */ bne $at, $zero, .L8098A19C -/* 0146C 8098A2EC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01470 8098A2F0 87A800DE */ lh $t0, 0x00DE($sp) -/* 01474 8098A2F4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01478 8098A2F8 00095400 */ sll $t2, $t1, 16 -/* 0147C 8098A2FC 000A5C03 */ sra $t3, $t2, 16 -/* 01480 8098A300 2961001E */ slti $at, $t3, 0x001E -/* 01484 8098A304 1420FEB5 */ bne $at, $zero, .L80989DDC -/* 01488 8098A308 A7A900DE */ sh $t1, 0x00DE($sp) -/* 0148C 8098A30C 3C068099 */ lui $a2, %hi(D_8098C8C0) ## $a2 = 80990000 -/* 01490 8098A310 24C6C8C0 */ addiu $a2, $a2, %lo(D_8098C8C0) ## $a2 = 8098C8C0 -/* 01494 8098A314 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 -/* 01498 8098A318 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0149C 8098A31C 0C031AD5 */ jal Graph_CloseDisps -/* 014A0 8098A320 2407054E */ addiu $a3, $zero, 0x054E ## $a3 = 0000054E -/* 014A4 8098A324 8FBF006C */ lw $ra, 0x006C($sp) -/* 014A8 8098A328 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 014AC 8098A32C D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 014B0 8098A330 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 014B4 8098A334 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 014B8 8098A338 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 014BC 8098A33C D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 014C0 8098A340 8FB00048 */ lw $s0, 0x0048($sp) -/* 014C4 8098A344 8FB1004C */ lw $s1, 0x004C($sp) -/* 014C8 8098A348 8FB20050 */ lw $s2, 0x0050($sp) -/* 014CC 8098A34C 8FB30054 */ lw $s3, 0x0054($sp) -/* 014D0 8098A350 8FB40058 */ lw $s4, 0x0058($sp) -/* 014D4 8098A354 8FB5005C */ lw $s5, 0x005C($sp) -/* 014D8 8098A358 8FB60060 */ lw $s6, 0x0060($sp) -/* 014DC 8098A35C 8FB70064 */ lw $s7, 0x0064($sp) -/* 014E0 8098A360 8FBE0068 */ lw $s8, 0x0068($sp) -/* 014E4 8098A364 03E00008 */ jr $ra -/* 014E8 8098A368 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s deleted file mode 100644 index 34a48e02ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ /dev/null @@ -1,120 +0,0 @@ -.rdata -glabel D_8098C8D4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8E8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C8FC - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB38 - .word 0x3C8EFA35 -glabel D_8098CB3C - .word 0x3C8EFA35 -glabel D_8098CB40 - .word 0x3C8EFA35 - -.text -glabel func_8098A36C -/* 014EC 8098A36C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 014F0 8098A370 AFBF001C */ sw $ra, 0x001C($sp) -/* 014F4 8098A374 AFB10018 */ sw $s1, 0x0018($sp) -/* 014F8 8098A378 AFB00014 */ sw $s0, 0x0014($sp) -/* 014FC 8098A37C AFA50054 */ sw $a1, 0x0054($sp) -/* 01500 8098A380 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01504 8098A384 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01508 8098A388 3C068099 */ lui $a2, %hi(D_8098C8D4) ## $a2 = 80990000 -/* 0150C 8098A38C 24C6C8D4 */ addiu $a2, $a2, %lo(D_8098C8D4) ## $a2 = 8098C8D4 -/* 01510 8098A390 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01514 8098A394 24070560 */ addiu $a3, $zero, 0x0560 ## $a3 = 00000560 -/* 01518 8098A398 0C031AB1 */ jal Graph_OpenDisps -/* 0151C 8098A39C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01520 8098A3A0 8FAF0054 */ lw $t7, 0x0054($sp) -/* 01524 8098A3A4 0C024F46 */ jal func_80093D18 -/* 01528 8098A3A8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0152C 8098A3AC C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 01530 8098A3B0 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 01534 8098A3B4 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 01538 8098A3B8 0C034261 */ jal Matrix_Translate -/* 0153C 8098A3BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01540 8098A3C0 3C018099 */ lui $at, %hi(D_8098CB38) ## $at = 80990000 -/* 01544 8098A3C4 C426CB38 */ lwc1 $f6, %lo(D_8098CB38)($at) -/* 01548 8098A3C8 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 0154C 8098A3CC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01550 8098A3D0 46062302 */ mul.s $f12, $f4, $f6 -/* 01554 8098A3D4 0C0342DC */ jal Matrix_RotateX -/* 01558 8098A3D8 00000000 */ nop -/* 0155C 8098A3DC 3C018099 */ lui $at, %hi(D_8098CB3C) ## $at = 80990000 -/* 01560 8098A3E0 C42ACB3C */ lwc1 $f10, %lo(D_8098CB3C)($at) -/* 01564 8098A3E4 C6080160 */ lwc1 $f8, 0x0160($s0) ## 00000160 -/* 01568 8098A3E8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0156C 8098A3EC 460A4302 */ mul.s $f12, $f8, $f10 -/* 01570 8098A3F0 0C034348 */ jal Matrix_RotateY -/* 01574 8098A3F4 00000000 */ nop -/* 01578 8098A3F8 3C018099 */ lui $at, %hi(D_8098CB40) ## $at = 80990000 -/* 0157C 8098A3FC C432CB40 */ lwc1 $f18, %lo(D_8098CB40)($at) -/* 01580 8098A400 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 01584 8098A404 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01588 8098A408 46128302 */ mul.s $f12, $f16, $f18 -/* 0158C 8098A40C 0C0343B5 */ jal Matrix_RotateZ -/* 01590 8098A410 00000000 */ nop -/* 01594 8098A414 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 01598 8098A418 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 0159C 8098A41C 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 015A0 8098A420 0C0342A3 */ jal Matrix_Scale -/* 015A4 8098A424 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015A8 8098A428 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015AC 8098A42C 3C08FF9B */ lui $t0, 0xFF9B ## $t0 = FF9B0000 -/* 015B0 8098A430 350837FF */ ori $t0, $t0, 0x37FF ## $t0 = FF9B37FF -/* 015B4 8098A434 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 015B8 8098A438 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 -/* 015BC 8098A43C 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 015C0 8098A440 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 015C4 8098A444 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 015C8 8098A448 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015CC 8098A44C 3C0B9BFF */ lui $t3, 0x9BFF ## $t3 = 9BFF0000 -/* 015D0 8098A450 356B37FF */ ori $t3, $t3, 0x37FF ## $t3 = 9BFF37FF -/* 015D4 8098A454 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 015D8 8098A458 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 015DC 8098A45C 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 015E0 8098A460 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 015E4 8098A464 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 015E8 8098A468 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 015EC 8098A46C 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 015F0 8098A470 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 015F4 8098A474 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 015F8 8098A478 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 015FC 8098A47C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01600 8098A480 8FAE0054 */ lw $t6, 0x0054($sp) -/* 01604 8098A484 3C058099 */ lui $a1, %hi(D_8098C8E8) ## $a1 = 80990000 -/* 01608 8098A488 24A5C8E8 */ addiu $a1, $a1, %lo(D_8098C8E8) ## $a1 = 8098C8E8 -/* 0160C 8098A48C 2406057C */ addiu $a2, $zero, 0x057C ## $a2 = 0000057C -/* 01610 8098A490 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01614 8098A494 0C0346A2 */ jal Matrix_NewMtx -/* 01618 8098A498 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0161C 8098A49C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 01620 8098A4A0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01624 8098A4A4 3C190600 */ lui $t9, %hi(D_06000DE0) ## $t9 = 06000000 -/* 01628 8098A4A8 27390DE0 */ addiu $t9, $t9, %lo(D_06000DE0) ## $t9 = 06000DE0 -/* 0162C 8098A4AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01630 8098A4B0 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 01634 8098A4B4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 01638 8098A4B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0163C 8098A4BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01640 8098A4C0 8FA80054 */ lw $t0, 0x0054($sp) -/* 01644 8098A4C4 3C068099 */ lui $a2, %hi(D_8098C8FC) ## $a2 = 80990000 -/* 01648 8098A4C8 24C6C8FC */ addiu $a2, $a2, %lo(D_8098C8FC) ## $a2 = 8098C8FC -/* 0164C 8098A4CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01650 8098A4D0 24070581 */ addiu $a3, $zero, 0x0581 ## $a3 = 00000581 -/* 01654 8098A4D4 0C031AD5 */ jal Graph_CloseDisps -/* 01658 8098A4D8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 0165C 8098A4DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01660 8098A4E0 8FB00014 */ lw $s0, 0x0014($sp) -/* 01664 8098A4E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 01668 8098A4E8 03E00008 */ jr $ra -/* 0166C 8098A4EC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s deleted file mode 100644 index 21d515c1d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ /dev/null @@ -1,236 +0,0 @@ -.rdata -glabel D_8098C910 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C924 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C938 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A4F0 -/* 01670 8098A4F0 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 01674 8098A4F4 AFB30054 */ sw $s3, 0x0054($sp) -/* 01678 8098A4F8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0167C 8098A4FC AFBF006C */ sw $ra, 0x006C($sp) -/* 01680 8098A500 AFBE0068 */ sw $s8, 0x0068($sp) -/* 01684 8098A504 AFB70064 */ sw $s7, 0x0064($sp) -/* 01688 8098A508 AFB60060 */ sw $s6, 0x0060($sp) -/* 0168C 8098A50C AFB5005C */ sw $s5, 0x005C($sp) -/* 01690 8098A510 AFB40058 */ sw $s4, 0x0058($sp) -/* 01694 8098A514 AFB20050 */ sw $s2, 0x0050($sp) -/* 01698 8098A518 AFB1004C */ sw $s1, 0x004C($sp) -/* 0169C 8098A51C AFB00048 */ sw $s0, 0x0048($sp) -/* 016A0 8098A520 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 016A4 8098A524 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 016A8 8098A528 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 016AC 8098A52C F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 016B0 8098A530 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 016B4 8098A534 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 016B8 8098A538 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 016BC 8098A53C 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 016C0 8098A540 3C068099 */ lui $a2, %hi(D_8098C910) ## $a2 = 80990000 -/* 016C4 8098A544 24C6C910 */ addiu $a2, $a2, %lo(D_8098C910) ## $a2 = 8098C910 -/* 016C8 8098A548 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 -/* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591 -/* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisps -/* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 016D8 8098A558 3C020405 */ lui $v0, %hi(gDust5Tex) ## $v0 = 04050000 -/* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 016E0 8098A560 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 016E4 8098A564 24422DB0 */ addiu $v0, $v0, %lo(gDust5Tex) ## $v0 = 04052DB0 -/* 016E8 8098A568 0041B824 */ and $s7, $v0, $at -/* 016EC 8098A56C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 016F0 8098A570 4481F000 */ mtc1 $at, $f30 ## $f30 = 30.00 -/* 016F4 8098A574 00027100 */ sll $t6, $v0, 4 -/* 016F8 8098A578 000E7F02 */ srl $t7, $t6, 28 -/* 016FC 8098A57C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01700 8098A580 3C198016 */ lui $t9, %hi(gSegments) -/* 01704 8098A584 3C080401 */ lui $t0, %hi(gEffDustDL) ## $t0 = 04010000 -/* 01708 8098A588 25080050 */ addiu $t0, $t0, %lo(gEffDustDL) ## $t0 = 04010050 -/* 0170C 8098A58C 27396FA8 */ addiu $t9, %lo(gSegments) -/* 01710 8098A590 000FC080 */ sll $t8, $t7, 2 -/* 01714 8098A594 3C1E0100 */ lui $s8, %hi(D_01000000) ## $s8 = 01000000 -/* 01718 8098A598 3C15E300 */ lui $s5, 0xE300 ## $s5 = E3000000 -/* 0171C 8098A59C 4481E000 */ mtc1 $at, $f28 ## $f28 = 120.00 -/* 01720 8098A5A0 36B51801 */ ori $s5, $s5, 0x1801 ## $s5 = E3001801 -/* 01724 8098A5A4 27DE0000 */ addiu $s8, $s8, %lo(D_01000000) ## $s8 = 01000000 -/* 01728 8098A5A8 0319B021 */ addu $s6, $t8, $t9 -/* 0172C 8098A5AC AFA80078 */ sw $t0, 0x0078($sp) -/* 01730 8098A5B0 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -.L8098A5B4: -/* 01734 8098A5B4 00124880 */ sll $t1, $s2, 2 -/* 01738 8098A5B8 01324821 */ addu $t1, $t1, $s2 -/* 0173C 8098A5BC 000948C0 */ sll $t1, $t1, 3 -/* 01740 8098A5C0 02898821 */ addu $s1, $s4, $t1 -/* 01744 8098A5C4 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 01748 8098A5C8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 0174C 8098A5CC 00812021 */ addu $a0, $a0, $at -/* 01750 8098A5D0 00042400 */ sll $a0, $a0, 16 -/* 01754 8098A5D4 0C01DE1C */ jal Math_SinS - ## sins? -/* 01758 8098A5D8 00042403 */ sra $a0, $a0, 16 -/* 0175C 8098A5DC 44922000 */ mtc1 $s2, $f4 ## $f4 = 0.00 -/* 01760 8098A5E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01764 8098A5E4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01768 8098A5E8 46802520 */ cvt.s.w $f20, $f4 -/* 0176C 8098A5EC 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 01770 8098A5F0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 01774 8098A5F4 00812021 */ addu $a0, $a0, $at -/* 01778 8098A5F8 00042400 */ sll $a0, $a0, 16 -/* 0177C 8098A5FC 461EA183 */ div.s $f6, $f20, $f30 -/* 01780 8098A600 00042403 */ sra $a0, $a0, 16 -/* 01784 8098A604 46083282 */ mul.s $f10, $f6, $f8 -/* 01788 8098A608 00000000 */ nop -/* 0178C 8098A60C 461C0402 */ mul.s $f16, $f0, $f28 -/* 01790 8098A610 460AF580 */ add.s $f22, $f30, $f10 -/* 01794 8098A614 46008487 */ neg.s $f18, $f16 -/* 01798 8098A618 46169602 */ mul.s $f24, $f18, $f22 -/* 0179C 8098A61C 0C01DE0D */ jal Math_CosS - ## coss? -/* 017A0 8098A620 00000000 */ nop -/* 017A4 8098A624 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017A8 8098A628 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 017AC 8098A62C 86240170 */ lh $a0, 0x0170($s1) ## 00000170 -/* 017B0 8098A630 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 017B4 8098A634 46040182 */ mul.s $f6, $f0, $f4 -/* 017B8 8098A638 44814000 */ mtc1 $at, $f8 ## $f8 = 1200.00 -/* 017BC 8098A63C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 017C0 8098A640 00812021 */ addu $a0, $a0, $at -/* 017C4 8098A644 00042400 */ sll $a0, $a0, 16 -/* 017C8 8098A648 00042403 */ sra $a0, $a0, 16 -/* 017CC 8098A64C 0C01DE0D */ jal Math_CosS - ## coss? -/* 017D0 8098A650 46083680 */ add.s $f26, $f6, $f8 -/* 017D4 8098A654 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 017D8 8098A658 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 017DC 8098A65C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 017E0 8098A660 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 017E4 8098A664 4610A481 */ sub.s $f18, $f20, $f16 -/* 017E8 8098A668 C66A00E0 */ lwc1 $f10, 0x00E0($s3) ## 000000E0 -/* 017EC 8098A66C C66800E4 */ lwc1 $f8, 0x00E4($s3) ## 000000E4 -/* 017F0 8098A670 C67000E8 */ lwc1 $f16, 0x00E8($s3) ## 000000E8 -/* 017F4 8098A674 46049182 */ mul.s $f6, $f18, $f4 -/* 017F8 8098A678 46185300 */ add.s $f12, $f10, $f24 -/* 017FC 8098A67C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01800 8098A680 461C0482 */ mul.s $f18, $f0, $f28 -/* 01804 8098A684 461A4280 */ add.s $f10, $f8, $f26 -/* 01808 8098A688 46065380 */ add.s $f14, $f10, $f6 -/* 0180C 8098A68C 46169102 */ mul.s $f4, $f18, $f22 -/* 01810 8098A690 46048200 */ add.s $f8, $f16, $f4 -/* 01814 8098A694 44064000 */ mfc1 $a2, $f8 -/* 01818 8098A698 0C034261 */ jal Matrix_Translate -/* 0181C 8098A69C 00000000 */ nop -/* 01820 8098A6A0 3C0142FA */ lui $at, 0x42FA ## $at = 42FA0000 -/* 01824 8098A6A4 44816000 */ mtc1 $at, $f12 ## $f12 = 125.00 -/* 01828 8098A6A8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0182C 8098A6AC 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 01830 8098A6B0 44066000 */ mfc1 $a2, $f12 -/* 01834 8098A6B4 0C0342A3 */ jal Matrix_Scale -/* 01838 8098A6B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0183C 8098A6BC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01840 8098A6C0 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 -/* 01844 8098A6C4 3C0ED2D2 */ lui $t6, 0xD2D2 ## $t6 = D2D20000 -/* 01848 8098A6C8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0184C 8098A6CC AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01850 8098A6D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01854 8098A6D4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01858 8098A6D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0185C 8098A6DC 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = D2D2FFFF -/* 01860 8098A6E0 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 01864 8098A6E4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01868 8098A6E8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 0186C 8098A6EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01870 8098A6F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01874 8098A6F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01878 8098A6F8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 0187C 8098A6FC 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01880 8098A700 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01884 8098A704 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 01888 8098A708 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0188C 8098A70C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01890 8098A710 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01894 8098A714 240900C0 */ addiu $t1, $zero, 0x00C0 ## $t1 = 000000C0 -/* 01898 8098A718 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 0189C 8098A71C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 018A0 8098A720 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 018A4 8098A724 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 018A8 8098A728 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 018AC 8098A72C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018B0 8098A730 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 018B4 8098A734 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 018B8 8098A738 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 018BC 8098A73C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 018C0 8098A740 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 018C4 8098A744 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 018C8 8098A748 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018CC 8098A74C 3C058099 */ lui $a1, %hi(D_8098C924) ## $a1 = 80990000 -/* 018D0 8098A750 24A5C924 */ addiu $a1, $a1, %lo(D_8098C924) ## $a1 = 8098C924 -/* 018D4 8098A754 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 018D8 8098A758 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 018DC 8098A75C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 018E0 8098A760 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 018E4 8098A764 240605B5 */ addiu $a2, $zero, 0x05B5 ## $a2 = 000005B5 -/* 018E8 8098A768 0C0346A2 */ jal Matrix_NewMtx -/* 018EC 8098A76C 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 018F0 8098A770 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 018F4 8098A774 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 018F8 8098A778 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 018FC 8098A77C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01900 8098A780 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01904 8098A784 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 01908 8098A788 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0190C 8098A78C 8ED80000 */ lw $t8, 0x0000($s6) ## 00000000 -/* 01910 8098A790 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01914 8098A794 0317C821 */ addu $t9, $t8, $s7 -/* 01918 8098A798 03214021 */ addu $t0, $t9, $at -/* 0191C 8098A79C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 01920 8098A7A0 0C025314 */ jal func_80094C50 -/* 01924 8098A7A4 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 -/* 01928 8098A7A8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0192C 8098A7AC 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01930 8098A7B0 354A0001 */ ori $t2, $t2, 0x0001 ## $t2 = DA380001 -/* 01934 8098A7B4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01938 8098A7B8 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0193C 8098A7BC AC5E0004 */ sw $s8, 0x0004($v0) ## 00000004 -/* 01940 8098A7C0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01944 8098A7C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01948 8098A7C8 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 0194C 8098A7CC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 01950 8098A7D0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01954 8098A7D4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01958 8098A7D8 00129400 */ sll $s2, $s2, 16 -/* 0195C 8098A7DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01960 8098A7E0 8FAD0078 */ lw $t5, 0x0078($sp) -/* 01964 8098A7E4 00129403 */ sra $s2, $s2, 16 -/* 01968 8098A7E8 2A41001E */ slti $at, $s2, 0x001E -/* 0196C 8098A7EC 1420FF71 */ bne $at, $zero, .L8098A5B4 -/* 01970 8098A7F0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01974 8098A7F4 3C068099 */ lui $a2, %hi(D_8098C938) ## $a2 = 80990000 -/* 01978 8098A7F8 24C6C938 */ addiu $a2, $a2, %lo(D_8098C938) ## $a2 = 8098C938 -/* 0197C 8098A7FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 -/* 01980 8098A800 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01984 8098A804 0C031AD5 */ jal Graph_CloseDisps -/* 01988 8098A808 240705C2 */ addiu $a3, $zero, 0x05C2 ## $a3 = 000005C2 -/* 0198C 8098A80C 8FBF006C */ lw $ra, 0x006C($sp) -/* 01990 8098A810 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 01994 8098A814 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 01998 8098A818 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 0199C 8098A81C D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 019A0 8098A820 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 019A4 8098A824 D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 019A8 8098A828 8FB00048 */ lw $s0, 0x0048($sp) -/* 019AC 8098A82C 8FB1004C */ lw $s1, 0x004C($sp) -/* 019B0 8098A830 8FB20050 */ lw $s2, 0x0050($sp) -/* 019B4 8098A834 8FB30054 */ lw $s3, 0x0054($sp) -/* 019B8 8098A838 8FB40058 */ lw $s4, 0x0058($sp) -/* 019BC 8098A83C 8FB5005C */ lw $s5, 0x005C($sp) -/* 019C0 8098A840 8FB60060 */ lw $s6, 0x0060($sp) -/* 019C4 8098A844 8FB70064 */ lw $s7, 0x0064($sp) -/* 019C8 8098A848 8FBE0068 */ lw $s8, 0x0068($sp) -/* 019CC 8098A84C 03E00008 */ jr $ra -/* 019D0 8098A850 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s deleted file mode 100644 index e472c9b0c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_8098C94C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C960 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C974 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C988 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A854 -/* 019D4 8098A854 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 019D8 8098A858 AFB10018 */ sw $s1, 0x0018($sp) -/* 019DC 8098A85C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 019E0 8098A860 AFBF001C */ sw $ra, 0x001C($sp) -/* 019E4 8098A864 AFB00014 */ sw $s0, 0x0014($sp) -/* 019E8 8098A868 AFA40050 */ sw $a0, 0x0050($sp) -/* 019EC 8098A86C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 019F0 8098A870 3C068099 */ lui $a2, %hi(D_8098C94C) ## $a2 = 80990000 -/* 019F4 8098A874 24C6C94C */ addiu $a2, $a2, %lo(D_8098C94C) ## $a2 = 8098C94C -/* 019F8 8098A878 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 019FC 8098A87C 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 01A00 8098A880 0C031AB1 */ jal Graph_OpenDisps -/* 01A04 8098A884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01A08 8098A888 0C024F46 */ jal func_80093D18 -/* 01A0C 8098A88C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01A10 8098A890 8FAE0050 */ lw $t6, 0x0050($sp) -/* 01A14 8098A894 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01A18 8098A898 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01A1C 8098A89C C5CC0168 */ lwc1 $f12, 0x0168($t6) ## 00000168 -/* 01A20 8098A8A0 44067000 */ mfc1 $a2, $f14 -/* 01A24 8098A8A4 0C034261 */ jal Matrix_Translate -/* 01A28 8098A8A8 46006307 */ neg.s $f12, $f12 -/* 01A2C 8098A8AC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01A30 8098A8B0 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01A34 8098A8B4 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01A38 8098A8B8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01A3C 8098A8BC AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 01A40 8098A8C0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01A44 8098A8C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01A48 8098A8C8 3C058099 */ lui $a1, %hi(D_8098C960) ## $a1 = 80990000 -/* 01A4C 8098A8CC 24A5C960 */ addiu $a1, $a1, %lo(D_8098C960) ## $a1 = 8098C960 -/* 01A50 8098A8D0 240605D4 */ addiu $a2, $zero, 0x05D4 ## $a2 = 000005D4 -/* 01A54 8098A8D4 0C0346A2 */ jal Matrix_NewMtx -/* 01A58 8098A8D8 AFA20030 */ sw $v0, 0x0030($sp) -/* 01A5C 8098A8DC 8FA30030 */ lw $v1, 0x0030($sp) -/* 01A60 8098A8E0 3C090600 */ lui $t1, %hi(D_06007440) ## $t1 = 06000000 -/* 01A64 8098A8E4 25297440 */ addiu $t1, $t1, %lo(D_06007440) ## $t1 = 06007440 -/* 01A68 8098A8E8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01A6C 8098A8EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01A70 8098A8F0 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 01A74 8098A8F4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01A78 8098A8F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01A7C 8098A8FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01A80 8098A900 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 01A84 8098A904 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01A88 8098A908 8FAA0050 */ lw $t2, 0x0050($sp) -/* 01A8C 8098A90C 44067000 */ mfc1 $a2, $f14 -/* 01A90 8098A910 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01A94 8098A914 C5400168 */ lwc1 $f0, 0x0168($t2) ## 00000168 -/* 01A98 8098A918 0C034261 */ jal Matrix_Translate -/* 01A9C 8098A91C 46000300 */ add.s $f12, $f0, $f0 -/* 01AA0 8098A920 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01AA4 8098A924 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 01AA8 8098A928 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 01AAC 8098A92C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01AB0 8098A930 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 01AB4 8098A934 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01AB8 8098A938 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01ABC 8098A93C 3C058099 */ lui $a1, %hi(D_8098C974) ## $a1 = 80990000 -/* 01AC0 8098A940 24A5C974 */ addiu $a1, $a1, %lo(D_8098C974) ## $a1 = 8098C974 -/* 01AC4 8098A944 240605D9 */ addiu $a2, $zero, 0x05D9 ## $a2 = 000005D9 -/* 01AC8 8098A948 0C0346A2 */ jal Matrix_NewMtx -/* 01ACC 8098A94C AFA20028 */ sw $v0, 0x0028($sp) -/* 01AD0 8098A950 8FA30028 */ lw $v1, 0x0028($sp) -/* 01AD4 8098A954 3C0F0600 */ lui $t7, %hi(D_06007578) ## $t7 = 06000000 -/* 01AD8 8098A958 25EF7578 */ addiu $t7, $t7, %lo(D_06007578) ## $t7 = 06007578 -/* 01ADC 8098A95C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01AE0 8098A960 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01AE4 8098A964 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 01AE8 8098A968 3C068099 */ lui $a2, %hi(D_8098C988) ## $a2 = 80990000 -/* 01AEC 8098A96C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01AF0 8098A970 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 01AF4 8098A974 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01AF8 8098A978 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01AFC 8098A97C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01B00 8098A980 24C6C988 */ addiu $a2, $a2, %lo(D_8098C988) ## $a2 = 8098C988 -/* 01B04 8098A984 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01B08 8098A988 0C031AD5 */ jal Graph_CloseDisps -/* 01B0C 8098A98C 240705DD */ addiu $a3, $zero, 0x05DD ## $a3 = 000005DD -/* 01B10 8098A990 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B14 8098A994 8FB00014 */ lw $s0, 0x0014($sp) -/* 01B18 8098A998 8FB10018 */ lw $s1, 0x0018($sp) -/* 01B1C 8098A99C 03E00008 */ jr $ra -/* 01B20 8098A9A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s deleted file mode 100644 index b43dd87e4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ /dev/null @@ -1,90 +0,0 @@ -.rdata -glabel D_8098C99C - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9B0 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9C4 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.text -glabel func_8098A9A4 -/* 01B24 8098A9A4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01B28 8098A9A8 AFB10020 */ sw $s1, 0x0020($sp) -/* 01B2C 8098A9AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01B30 8098A9B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B34 8098A9B4 AFB0001C */ sw $s0, 0x001C($sp) -/* 01B38 8098A9B8 AFA40058 */ sw $a0, 0x0058($sp) -/* 01B3C 8098A9BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01B40 8098A9C0 3C068099 */ lui $a2, %hi(D_8098C99C) ## $a2 = 80990000 -/* 01B44 8098A9C4 24C6C99C */ addiu $a2, $a2, %lo(D_8098C99C) ## $a2 = 8098C99C -/* 01B48 8098A9C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 01B4C 8098A9CC 240705EA */ addiu $a3, $zero, 0x05EA ## $a3 = 000005EA -/* 01B50 8098A9D0 0C031AB1 */ jal Graph_OpenDisps -/* 01B54 8098A9D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01B58 8098A9D8 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C -/* 01B5C 8098A9DC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) -/* 01B60 8098A9E0 11C00005 */ beq $t6, $zero, .L8098A9F8 -/* 01B64 8098A9E4 00000000 */ nop -/* 01B68 8098A9E8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) -/* 01B6C 8098A9EC 29E10004 */ slti $at, $t7, 0x0004 -/* 01B70 8098A9F0 1420002A */ bne $at, $zero, .L8098AA9C -/* 01B74 8098A9F4 00000000 */ nop -.L8098A9F8: -/* 01B78 8098A9F8 0C024F61 */ jal func_80093D84 -/* 01B7C 8098A9FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01B80 8098AA00 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01B84 8098AA04 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 01B88 8098AA08 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01B8C 8098AA0C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01B90 8098AA10 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01B94 8098AA14 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01B98 8098AA18 8E26009C */ lw $a2, 0x009C($s1) ## 0000009C -/* 01B9C 8098AA1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01BA0 8098AA20 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 01BA4 8098AA24 AFA80010 */ sw $t0, 0x0010($sp) -/* 01BA8 8098AA28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01BAC 8098AA2C 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 01BB0 8098AA30 AFA20038 */ sw $v0, 0x0038($sp) -/* 01BB4 8098AA34 0C0253A7 */ jal Gfx_TexScroll -/* 01BB8 8098AA38 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 01BBC 8098AA3C 8FA30038 */ lw $v1, 0x0038($sp) -/* 01BC0 8098AA40 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01BC4 8098AA44 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 01BC8 8098AA48 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01BCC 8098AA4C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01BD0 8098AA50 3C058099 */ lui $a1, %hi(D_8098C9B0) ## $a1 = 80990000 -/* 01BD4 8098AA54 24A5C9B0 */ addiu $a1, $a1, %lo(D_8098C9B0) ## $a1 = 8098C9B0 -/* 01BD8 8098AA58 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01BDC 8098AA5C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 01BE0 8098AA60 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01BE4 8098AA64 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01BE8 8098AA68 240605F9 */ addiu $a2, $zero, 0x05F9 ## $a2 = 000005F9 -/* 01BEC 8098AA6C 0C0346A2 */ jal Matrix_NewMtx -/* 01BF0 8098AA70 AFA20034 */ sw $v0, 0x0034($sp) -/* 01BF4 8098AA74 8FA30034 */ lw $v1, 0x0034($sp) -/* 01BF8 8098AA78 3C0D0601 */ lui $t5, %hi(D_06008390) ## $t5 = 06010000 -/* 01BFC 8098AA7C 25AD8390 */ addiu $t5, $t5, %lo(D_06008390) ## $t5 = 06008390 -/* 01C00 8098AA80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01C04 8098AA84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01C08 8098AA88 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 01C0C 8098AA8C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01C10 8098AA90 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01C14 8098AA94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01C18 8098AA98 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L8098AA9C: -/* 01C1C 8098AA9C 3C068099 */ lui $a2, %hi(D_8098C9C4) ## $a2 = 80990000 -/* 01C20 8098AAA0 24C6C9C4 */ addiu $a2, $a2, %lo(D_8098C9C4) ## $a2 = 8098C9C4 -/* 01C24 8098AAA4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 01C28 8098AAA8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01C2C 8098AAAC 0C031AD5 */ jal Graph_CloseDisps -/* 01C30 8098AAB0 240705FE */ addiu $a3, $zero, 0x05FE ## $a3 = 000005FE -/* 01C34 8098AAB4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C38 8098AAB8 8FB0001C */ lw $s0, 0x001C($sp) -/* 01C3C 8098AABC 8FB10020 */ lw $s1, 0x0020($sp) -/* 01C40 8098AAC0 03E00008 */ jr $ra -/* 01C44 8098AAC4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s deleted file mode 100644 index 9fb1fd618c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8098AAC8 -/* 01C48 8098AAC8 C4840000 */ lwc1 $f4, 0x0000($a0) ## 00000000 -/* 01C4C 8098AACC E4A40000 */ swc1 $f4, 0x0000($a1) ## 00000000 -/* 01C50 8098AAD0 C4860004 */ lwc1 $f6, 0x0004($a0) ## 00000004 -/* 01C54 8098AAD4 E4A60004 */ swc1 $f6, 0x0004($a1) ## 00000004 -/* 01C58 8098AAD8 C4880008 */ lwc1 $f8, 0x0008($a0) ## 00000008 -/* 01C5C 8098AADC 03E00008 */ jr $ra -/* 01C60 8098AAE0 E4A80008 */ swc1 $f8, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s deleted file mode 100644 index c47be599f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098AAE4 -/* 01C64 8098AAE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C68 8098AAE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C6C 8098AAEC AFA40030 */ sw $a0, 0x0030($sp) -/* 01C70 8098AAF0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01C74 8098AAF4 AFA70034 */ sw $a3, 0x0034($sp) -/* 01C78 8098AAF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01C7C 8098AAFC 0C01F097 */ jal OLib_VecSphGeoToVec3f -/* 01C80 8098AB00 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFE8 -/* 01C84 8098AB04 8FA70034 */ lw $a3, 0x0034($sp) -/* 01C88 8098AB08 C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 01C8C 8098AB0C C7B0001C */ lwc1 $f16, 0x001C($sp) -/* 01C90 8098AB10 C4E40000 */ lwc1 $f4, 0x0000($a3) ## 00000000 -/* 01C94 8098AB14 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 -/* 01C98 8098AB18 8FA20030 */ lw $v0, 0x0030($sp) -/* 01C9C 8098AB1C 46062200 */ add.s $f8, $f4, $f6 -/* 01CA0 8098AB20 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01CA4 8098AB24 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 01CA8 8098AB28 C4EA0004 */ lwc1 $f10, 0x0004($a3) ## 00000004 -/* 01CAC 8098AB2C 46105480 */ add.s $f18, $f10, $f16 -/* 01CB0 8098AB30 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 01CB4 8098AB34 C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 01CB8 8098AB38 46062200 */ add.s $f8, $f4, $f6 -/* 01CBC 8098AB3C E7A8002C */ swc1 $f8, 0x002C($sp) -/* 01CC0 8098AB40 8DD80000 */ lw $t8, 0x0000($t6) ## FFFFFFF4 -/* 01CC4 8098AB44 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01CC8 8098AB48 8DCF0004 */ lw $t7, 0x0004($t6) ## FFFFFFF8 -/* 01CCC 8098AB4C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01CD0 8098AB50 8DD80008 */ lw $t8, 0x0008($t6) ## FFFFFFFC -/* 01CD4 8098AB54 AC580008 */ sw $t8, 0x0008($v0) ## 00000008 -/* 01CD8 8098AB58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CDC 8098AB5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01CE0 8098AB60 03E00008 */ jr $ra -/* 01CE4 8098AB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s deleted file mode 100644 index faee821161..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8098AB68 -/* 01CE8 8098AB68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01CEC 8098AB6C AFA40030 */ sw $a0, 0x0030($sp) -/* 01CF0 8098AB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CF4 8098AB74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01CF8 8098AB78 AFA60038 */ sw $a2, 0x0038($sp) -/* 01CFC 8098AB7C 0C262AB2 */ jal func_8098AAC8 -/* 01D00 8098AB80 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 01D04 8098AB84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF8 -/* 01D08 8098AB88 0C01F0FD */ jal OLib_Vec3fToVecSphGeo -/* 01D0C 8098AB8C 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 01D10 8098AB90 8FA50030 */ lw $a1, 0x0030($sp) -/* 01D14 8098AB94 87AE002E */ lh $t6, 0x002E($sp) -/* 01D18 8098AB98 8FA40038 */ lw $a0, 0x0038($sp) -/* 01D1C 8098AB9C 84AF000E */ lh $t7, 0x000E($a1) ## 0000000E -/* 01D20 8098ABA0 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFF8 -/* 01D24 8098ABA4 01CFC021 */ addu $t8, $t6, $t7 -/* 01D28 8098ABA8 0C262AB9 */ jal func_8098AAE4 -/* 01D2C 8098ABAC A7B8002E */ sh $t8, 0x002E($sp) -/* 01D30 8098ABB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D34 8098ABB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D38 8098ABB8 03E00008 */ jr $ra -/* 01D3C 8098ABBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s deleted file mode 100644 index 3183378e51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ /dev/null @@ -1,547 +0,0 @@ -.rdata -glabel D_8098C9D8 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098C9EC - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA00 - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB44 - .float 0.2 - -glabel D_8098CB48 - .float 0.2 - -glabel D_8098CB4C - .word 0x3C9374BC -glabel D_8098CB50 - .word 0x3C8EFA35 - -.text -glabel func_8098ABC0 -/* 01D40 8098ABC0 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 -/* 01D44 8098ABC4 AFBF006C */ sw $ra, 0x006C($sp) -/* 01D48 8098ABC8 AFB60068 */ sw $s6, 0x0068($sp) -/* 01D4C 8098ABCC AFB50064 */ sw $s5, 0x0064($sp) -/* 01D50 8098ABD0 AFB40060 */ sw $s4, 0x0060($sp) -/* 01D54 8098ABD4 AFB3005C */ sw $s3, 0x005C($sp) -/* 01D58 8098ABD8 AFB20058 */ sw $s2, 0x0058($sp) -/* 01D5C 8098ABDC AFB10054 */ sw $s1, 0x0054($sp) -/* 01D60 8098ABE0 AFB00050 */ sw $s0, 0x0050($sp) -/* 01D64 8098ABE4 F7BE0048 */ sdc1 $f30, 0x0048($sp) -/* 01D68 8098ABE8 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 01D6C 8098ABEC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 01D70 8098ABF0 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 01D74 8098ABF4 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 01D78 8098ABF8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 01D7C 8098ABFC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 01D80 8098AC00 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01D84 8098AC04 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 01D88 8098AC08 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01D8C 8098AC0C AFAE00E4 */ sw $t6, 0x00E4($sp) -/* 01D90 8098AC10 A3AF00B7 */ sb $t7, 0x00B7($sp) -/* 01D94 8098AC14 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01D98 8098AC18 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01D9C 8098AC1C 3C068099 */ lui $a2, %hi(D_8098C9D8) ## $a2 = 80990000 -/* 01DA0 8098AC20 24C6C9D8 */ addiu $a2, $a2, %lo(D_8098C9D8) ## $a2 = 8098C9D8 -/* 01DA4 8098AC24 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 -/* 01DA8 8098AC28 24070720 */ addiu $a3, $zero, 0x0720 ## $a3 = 00000720 -/* 01DAC 8098AC2C 0C031AB1 */ jal Graph_OpenDisps -/* 01DB0 8098AC30 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 01DB4 8098AC34 9222014D */ lbu $v0, 0x014D($s1) ## 0000014D -/* 01DB8 8098AC38 27B600D8 */ addiu $s6, $sp, 0x00D8 ## $s6 = FFFFFFE0 -/* 01DBC 8098AC3C 2841001E */ slti $at, $v0, 0x001E -/* 01DC0 8098AC40 10200003 */ beq $at, $zero, .L8098AC50 -/* 01DC4 8098AC44 24580002 */ addiu $t8, $v0, 0x0002 ## $t8 = 00000002 -/* 01DC8 8098AC48 A238014D */ sb $t8, 0x014D($s1) ## 0000014D -/* 01DCC 8098AC4C 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000002 -.L8098AC50: -/* 01DD0 8098AC50 2454FFFF */ addiu $s4, $v0, 0xFFFF ## $s4 = 00000001 -/* 01DD4 8098AC54 0014A400 */ sll $s4, $s4, 16 -/* 01DD8 8098AC58 0014A403 */ sra $s4, $s4, 16 -/* 01DDC 8098AC5C 068001A7 */ bltz $s4, .L8098B2FC -/* 01DE0 8098AC60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DE4 8098AC64 4481E000 */ mtc1 $at, $f28 ## $f28 = 1.00 -/* 01DE8 8098AC68 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 01DEC 8098AC6C 4481D000 */ mtc1 $at, $f26 ## $f26 = 16.00 -/* 01DF0 8098AC70 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01DF4 8098AC74 4481C000 */ mtc1 $at, $f24 ## $f24 = 0.50 -/* 01DF8 8098AC78 4480F000 */ mtc1 $zero, $f30 ## $f30 = 0.00 -/* 01DFC 8098AC7C 2415000F */ addiu $s5, $zero, 0x000F ## $s5 = 0000000F -/* 01E00 8098AC80 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098AC84: -/* 01E04 8098AC84 44942000 */ mtc1 $s4, $f4 ## $f4 = 0.00 -/* 01E08 8098AC88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01E0C 8098AC8C 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 01E10 8098AC90 468021A0 */ cvt.s.w $f6, $f4 -/* 01E14 8098AC94 04610004 */ bgez $v1, .L8098ACA8 -/* 01E18 8098AC98 468042A0 */ cvt.s.w $f10, $f8 -/* 01E1C 8098AC9C 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 01E20 8098ACA0 00000000 */ nop -/* 01E24 8098ACA4 46105280 */ add.s $f10, $f10, $f16 -.L8098ACA8: -/* 01E28 8098ACA8 460A3483 */ div.s $f18, $f6, $f10 -/* 01E2C 8098ACAC 0014C880 */ sll $t9, $s4, 2 -/* 01E30 8098ACB0 0334C821 */ addu $t9, $t9, $s4 -/* 01E34 8098ACB4 0019C8C0 */ sll $t9, $t9, 3 -/* 01E38 8098ACB8 02398021 */ addu $s0, $s1, $t9 -/* 01E3C 8098ACBC 92020172 */ lbu $v0, 0x0172($s0) ## 00000172 -/* 01E40 8098ACC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01E44 8098ACC4 10400007 */ beq $v0, $zero, .L8098ACE4 -/* 01E48 8098ACC8 4612E581 */ sub.s $f22, $f28, $f18 -/* 01E4C 8098ACCC 10410035 */ beq $v0, $at, .L8098ADA4 -/* 01E50 8098ACD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E54 8098ACD4 50410084 */ beql $v0, $at, .L8098AEE8 -/* 01E58 8098ACD8 862B001C */ lh $t3, 0x001C($s1) ## 0000001C -/* 01E5C 8098ACDC 10000096 */ beq $zero, $zero, .L8098AF38 -/* 01E60 8098ACE0 00000000 */ nop -.L8098ACE4: -/* 01E64 8098ACE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01E68 8098ACE8 A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 01E6C 8098ACEC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01E70 8098ACF0 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 01E74 8098ACF4 46180201 */ sub.s $f8, $f0, $f24 -/* 01E78 8098ACF8 461A4402 */ mul.s $f16, $f8, $f26 -/* 01E7C 8098ACFC 00000000 */ nop -/* 01E80 8098AD00 46168182 */ mul.s $f6, $f16, $f22 -/* 01E84 8098AD04 4600328D */ trunc.w.s $f10, $f6 -/* 01E88 8098AD08 44095000 */ mfc1 $t1, $f10 -/* 01E8C 8098AD0C 00000000 */ nop -/* 01E90 8098AD10 00095400 */ sll $t2, $t1, 16 -/* 01E94 8098AD14 000A5C03 */ sra $t3, $t2, 16 -/* 01E98 8098AD18 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 01E9C 8098AD1C 00000000 */ nop -/* 01EA0 8098AD20 46809120 */ cvt.s.w $f4, $f18 -/* 01EA4 8098AD24 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01EA8 8098AD28 E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 -/* 01EAC 8098AD2C 46180201 */ sub.s $f8, $f0, $f24 -/* 01EB0 8098AD30 461A4402 */ mul.s $f16, $f8, $f26 -/* 01EB4 8098AD34 00000000 */ nop -/* 01EB8 8098AD38 46168182 */ mul.s $f6, $f16, $f22 -/* 01EBC 8098AD3C 4600328D */ trunc.w.s $f10, $f6 -/* 01EC0 8098AD40 440D5000 */ mfc1 $t5, $f10 -/* 01EC4 8098AD44 00000000 */ nop -/* 01EC8 8098AD48 000D7400 */ sll $t6, $t5, 16 -/* 01ECC 8098AD4C 000E7C03 */ sra $t7, $t6, 16 -/* 01ED0 8098AD50 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01ED4 8098AD54 00000000 */ nop -/* 01ED8 8098AD58 46809120 */ cvt.s.w $f4, $f18 -/* 01EDC 8098AD5C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01EE0 8098AD60 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 01EE4 8098AD64 46180201 */ sub.s $f8, $f0, $f24 -/* 01EE8 8098AD68 920A0172 */ lbu $t2, 0x0172($s0) ## 00000172 -/* 01EEC 8098AD6C A2000173 */ sb $zero, 0x0173($s0) ## 00000173 -/* 01EF0 8098AD70 461A4402 */ mul.s $f16, $f8, $f26 -/* 01EF4 8098AD74 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 01EF8 8098AD78 A20B0172 */ sb $t3, 0x0172($s0) ## 00000172 -/* 01EFC 8098AD7C 46168182 */ mul.s $f6, $f16, $f22 -/* 01F00 8098AD80 4600328D */ trunc.w.s $f10, $f6 -/* 01F04 8098AD84 44195000 */ mfc1 $t9, $f10 -/* 01F08 8098AD88 00000000 */ nop -/* 01F0C 8098AD8C 00194400 */ sll $t0, $t9, 16 -/* 01F10 8098AD90 00084C03 */ sra $t1, $t0, 16 -/* 01F14 8098AD94 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01F18 8098AD98 00000000 */ nop -/* 01F1C 8098AD9C 46809120 */ cvt.s.w $f4, $f18 -/* 01F20 8098ADA0 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L8098ADA4: -/* 01F24 8098ADA4 862C001C */ lh $t4, 0x001C($s1) ## 0000001C -/* 01F28 8098ADA8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01F2C 8098ADAC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01F30 8098ADB0 16AC001E */ bne $s5, $t4, .L8098AE2C -/* 01F34 8098ADB4 240420A7 */ addiu $a0, $zero, 0x20A7 ## $a0 = 000020A7 -/* 01F38 8098ADB8 3C058099 */ lui $a1, %hi(D_8098CF88) ## $a1 = 80990000 -/* 01F3C 8098ADBC 3C068099 */ lui $a2, %hi(D_8098CF8C) ## $a2 = 80990000 -/* 01F40 8098ADC0 3C078099 */ lui $a3, %hi(D_8098C330) ## $a3 = 80990000 -/* 01F44 8098ADC4 260D0170 */ addiu $t5, $s0, 0x0170 ## $t5 = 00000170 -/* 01F48 8098ADC8 260E016C */ addiu $t6, $s0, 0x016C ## $t6 = 0000016C -/* 01F4C 8098ADCC AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F50 8098ADD0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F54 8098ADD4 24E7C330 */ addiu $a3, $a3, %lo(D_8098C330) ## $a3 = 8098C330 -/* 01F58 8098ADD8 24C6CF8C */ addiu $a2, $a2, %lo(D_8098CF8C) ## $a2 = 8098CF8C -/* 01F5C 8098ADDC 24A5CF88 */ addiu $a1, $a1, %lo(D_8098CF88) ## $a1 = 8098CF88 -/* 01F60 8098ADE0 0C02ECAD */ jal func_800BB2B4 -/* 01F64 8098ADE4 02C02025 */ or $a0, $s6, $zero ## $a0 = FFFFFFE0 -/* 01F68 8098ADE8 50400005 */ beql $v0, $zero, .L8098AE00 -/* 01F6C 8098ADEC 865900A4 */ lh $t9, 0x00A4($s2) ## 000000A4 -/* 01F70 8098ADF0 920F0172 */ lbu $t7, 0x0172($s0) ## 00000172 -/* 01F74 8098ADF4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01F78 8098ADF8 A2180172 */ sb $t8, 0x0172($s0) ## 00000172 -/* 01F7C 8098ADFC 865900A4 */ lh $t9, 0x00A4($s2) ## 000000A4 -.L8098AE00: -/* 01F80 8098AE00 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 01F84 8098AE04 5721002E */ bnel $t9, $at, .L8098AEC0 -/* 01F88 8098AE08 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 01F8C 8098AE0C 96481D74 */ lhu $t0, 0x1D74($s2) ## 00001D74 -/* 01F90 8098AE10 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01F94 8098AE14 5501002A */ bnel $t0, $at, .L8098AEC0 -/* 01F98 8098AE18 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 01F9C 8098AE1C 92090172 */ lbu $t1, 0x0172($s0) ## 00000172 -/* 01FA0 8098AE20 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01FA4 8098AE24 10000025 */ beq $zero, $zero, .L8098AEBC -/* 01FA8 8098AE28 A20A0172 */ sb $t2, 0x0172($s0) ## 00000172 -.L8098AE2C: -/* 01FAC 8098AE2C 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 01FB0 8098AE30 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 01FB4 8098AE34 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01FB8 8098AE38 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01FBC 8098AE3C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01FC0 8098AE40 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FC4 8098AE44 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01FC8 8098AE48 AFA70010 */ sw $a3, 0x0010($sp) -/* 01FCC 8098AE4C 3C058099 */ lui $a1, %hi(D_8098CF88) ## $a1 = 80990000 -/* 01FD0 8098AE50 3C068099 */ lui $a2, %hi(D_8098CF8C) ## $a2 = 80990000 -/* 01FD4 8098AE54 3C078099 */ lui $a3, %hi(D_8098C410) ## $a3 = 80990000 -/* 01FD8 8098AE58 260C0170 */ addiu $t4, $s0, 0x0170 ## $t4 = 00000170 -/* 01FDC 8098AE5C 260D016C */ addiu $t5, $s0, 0x016C ## $t5 = 0000016C -/* 01FE0 8098AE60 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01FE4 8098AE64 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01FE8 8098AE68 24E7C410 */ addiu $a3, $a3, %lo(D_8098C410) ## $a3 = 8098C410 -/* 01FEC 8098AE6C 24C6CF8C */ addiu $a2, $a2, %lo(D_8098CF8C) ## $a2 = 8098CF8C -/* 01FF0 8098AE70 24A5CF88 */ addiu $a1, $a1, %lo(D_8098CF88) ## $a1 = 8098CF88 -/* 01FF4 8098AE74 0C02ECAD */ jal func_800BB2B4 -/* 01FF8 8098AE78 02C02025 */ or $a0, $s6, $zero ## $a0 = FFFFFFE0 -/* 01FFC 8098AE7C 10400004 */ beq $v0, $zero, .L8098AE90 -/* 02000 8098AE80 3C188099 */ lui $t8, %hi(D_8098CF84) ## $t8 = 80990000 -/* 02004 8098AE84 920E0172 */ lbu $t6, 0x0172($s0) ## 00000172 -/* 02008 8098AE88 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0200C 8098AE8C A20F0172 */ sb $t7, 0x0172($s0) ## 00000172 -.L8098AE90: -/* 02010 8098AE90 8718CF84 */ lh $t8, %lo(D_8098CF84)($t8) -/* 02014 8098AE94 96591D74 */ lhu $t9, 0x1D74($s2) ## 00001D74 -/* 02018 8098AE98 0319082A */ slt $at, $t8, $t9 -/* 0201C 8098AE9C 50200008 */ beql $at, $zero, .L8098AEC0 -/* 02020 8098AEA0 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02024 8098AEA4 8628001C */ lh $t0, 0x001C($s1) ## 0000001C -/* 02028 8098AEA8 56A80005 */ bnel $s5, $t0, .L8098AEC0 -/* 0202C 8098AEAC 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02030 8098AEB0 92090172 */ lbu $t1, 0x0172($s0) ## 00000172 -/* 02034 8098AEB4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 02038 8098AEB8 A20A0172 */ sb $t2, 0x0172($s0) ## 00000172 -.L8098AEBC: -/* 0203C 8098AEBC 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -.L8098AEC0: -/* 02040 8098AEC0 0C00BBC5 */ jal Actor_GetWorld -/* 02044 8098AEC4 8FA500E4 */ lw $a1, 0x00E4($sp) -/* 02048 8098AEC8 3C068099 */ lui $a2, %hi(D_8098CF98) ## $a2 = 80990000 -/* 0204C 8098AECC 24C6CF98 */ addiu $a2, $a2, %lo(D_8098CF98) ## $a2 = 8098CF98 -/* 02050 8098AED0 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFC0 -/* 02054 8098AED4 0C262ADA */ jal func_8098AB68 -/* 02058 8098AED8 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE0 -/* 0205C 8098AEDC 10000016 */ beq $zero, $zero, .L8098AF38 -/* 02060 8098AEE0 00000000 */ nop -/* 02064 8098AEE4 862B001C */ lh $t3, 0x001C($s1) ## 0000001C -.L8098AEE8: -/* 02068 8098AEE8 268E0001 */ addiu $t6, $s4, 0x0001 ## $t6 = 00000002 -/* 0206C 8098AEEC 16AB0009 */ bne $s5, $t3, .L8098AF14 -/* 02070 8098AEF0 00000000 */ nop -/* 02074 8098AEF4 16800010 */ bne $s4, $zero, .L8098AF38 -/* 02078 8098AEF8 00000000 */ nop -/* 0207C 8098AEFC 0C01DDB9 */ jal func_800776E4 -/* 02080 8098AF00 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02084 8098AF04 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 02088 8098AF08 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0208C 8098AF0C 1000000A */ beq $zero, $zero, .L8098AF38 -/* 02090 8098AF10 A20D0172 */ sb $t5, 0x0172($s0) ## 00000172 -.L8098AF14: -/* 02094 8098AF14 15C30008 */ bne $t6, $v1, .L8098AF38 -/* 02098 8098AF18 00000000 */ nop -/* 0209C 8098AF1C 924F1D6C */ lbu $t7, 0x1D6C($s2) ## 00001D6C -/* 020A0 8098AF20 15E00005 */ bne $t7, $zero, .L8098AF38 -/* 020A4 8098AF24 00000000 */ nop -/* 020A8 8098AF28 0C0222BC */ jal func_80088AF0 -/* 020AC 8098AF2C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 020B0 8098AF30 0C00B55C */ jal Actor_Kill - -/* 020B4 8098AF34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8098AF38: -/* 020B8 8098AF38 3C018099 */ lui $at, %hi(D_8098CF98) ## $at = 80990000 -/* 020BC 8098AF3C C428CF98 */ lwc1 $f8, %lo(D_8098CF98)($at) -/* 020C0 8098AF40 92020173 */ lbu $v0, 0x0173($s0) ## 00000173 -/* 020C4 8098AF44 E608015C */ swc1 $f8, 0x015C($s0) ## 0000015C -/* 020C8 8098AF48 C430CF9C */ lwc1 $f16, %lo(D_8098CF9C)($at) -/* 020CC 8098AF4C 3C018099 */ lui $at, %hi(D_8098CFA0) ## $at = 80990000 -/* 020D0 8098AF50 E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 -/* 020D4 8098AF54 C426CFA0 */ lwc1 $f6, %lo(D_8098CFA0)($at) -/* 020D8 8098AF58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 020DC 8098AF5C 10400007 */ beq $v0, $zero, .L8098AF7C -/* 020E0 8098AF60 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 020E4 8098AF64 1041000B */ beq $v0, $at, .L8098AF94 -/* 020E8 8098AF68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 020EC 8098AF6C 1041001A */ beq $v0, $at, .L8098AFD8 -/* 020F0 8098AF70 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 020F4 8098AF74 10000054 */ beq $zero, $zero, .L8098B0C8 -/* 020F8 8098AF78 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098AF7C: -/* 020FC 8098AF7C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02100 8098AF80 00000000 */ nop -/* 02104 8098AF84 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 -/* 02108 8098AF88 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0210C 8098AF8C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02110 8098AF90 A2190173 */ sb $t9, 0x0173($s0) ## 00000173 -.L8098AF94: -/* 02114 8098AF94 3C018099 */ lui $at, %hi(D_8098CB44) ## $at = 80990000 -/* 02118 8098AF98 C42ACB44 */ lwc1 $f10, %lo(D_8098CB44)($at) -/* 0211C 8098AF9C 4405E000 */ mfc1 $a1, $f28 -/* 02120 8098AFA0 4406C000 */ mfc1 $a2, $f24 -/* 02124 8098AFA4 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 02128 8098AFA8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 0212C 8098AFAC 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 02130 8098AFB0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02134 8098AFB4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02138 8098AFB8 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 -/* 0213C 8098AFBC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02140 8098AFC0 4612E03E */ c.le.s $f28, $f18 -/* 02144 8098AFC4 00000000 */ nop -/* 02148 8098AFC8 4502003F */ bc1fl .L8098B0C8 -/* 0214C 8098AFCC 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 02150 8098AFD0 1000003C */ beq $zero, $zero, .L8098B0C4 -/* 02154 8098AFD4 A2080173 */ sb $t0, 0x0173($s0) ## 00000173 -.L8098AFD8: -/* 02158 8098AFD8 3C018099 */ lui $at, %hi(D_8098CB48) ## $at = 80990000 -/* 0215C 8098AFDC C424CB48 */ lwc1 $f4, %lo(D_8098CB48)($at) -/* 02160 8098AFE0 4405F000 */ mfc1 $a1, $f30 -/* 02164 8098AFE4 4406C000 */ mfc1 $a2, $f24 -/* 02168 8098AFE8 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 0216C 8098AFEC 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 02170 8098AFF0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02174 8098AFF4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02178 8098AFF8 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 -/* 0217C 8098AFFC 461E403E */ c.le.s $f8, $f30 -/* 02180 8098B000 00000000 */ nop -/* 02184 8098B004 45020030 */ bc1fl .L8098B0C8 -/* 02188 8098B008 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 0218C 8098B00C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02190 8098B010 00000000 */ nop -/* 02194 8098B014 46180401 */ sub.s $f16, $f0, $f24 -/* 02198 8098B018 461A8182 */ mul.s $f6, $f16, $f26 -/* 0219C 8098B01C 00000000 */ nop -/* 021A0 8098B020 46163282 */ mul.s $f10, $f6, $f22 -/* 021A4 8098B024 4600548D */ trunc.w.s $f18, $f10 -/* 021A8 8098B028 440A9000 */ mfc1 $t2, $f18 -/* 021AC 8098B02C 00000000 */ nop -/* 021B0 8098B030 000A5C00 */ sll $t3, $t2, 16 -/* 021B4 8098B034 000B6403 */ sra $t4, $t3, 16 -/* 021B8 8098B038 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 021BC 8098B03C 00000000 */ nop -/* 021C0 8098B040 46802220 */ cvt.s.w $f8, $f4 -/* 021C4 8098B044 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 021C8 8098B048 E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 021CC 8098B04C 46180401 */ sub.s $f16, $f0, $f24 -/* 021D0 8098B050 461A8182 */ mul.s $f6, $f16, $f26 -/* 021D4 8098B054 00000000 */ nop -/* 021D8 8098B058 46163282 */ mul.s $f10, $f6, $f22 -/* 021DC 8098B05C 4600548D */ trunc.w.s $f18, $f10 -/* 021E0 8098B060 440E9000 */ mfc1 $t6, $f18 -/* 021E4 8098B064 00000000 */ nop -/* 021E8 8098B068 000E7C00 */ sll $t7, $t6, 16 -/* 021EC 8098B06C 000FC403 */ sra $t8, $t7, 16 -/* 021F0 8098B070 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 021F4 8098B074 00000000 */ nop -/* 021F8 8098B078 46802220 */ cvt.s.w $f8, $f4 -/* 021FC 8098B07C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02200 8098B080 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -/* 02204 8098B084 46180401 */ sub.s $f16, $f0, $f24 -/* 02208 8098B088 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0220C 8098B08C E61E0168 */ swc1 $f30, 0x0168($s0) ## 00000168 -/* 02210 8098B090 A20B0173 */ sb $t3, 0x0173($s0) ## 00000173 -/* 02214 8098B094 461A8182 */ mul.s $f6, $f16, $f26 -/* 02218 8098B098 00000000 */ nop -/* 0221C 8098B09C 46163282 */ mul.s $f10, $f6, $f22 -/* 02220 8098B0A0 4600548D */ trunc.w.s $f18, $f10 -/* 02224 8098B0A4 44089000 */ mfc1 $t0, $f18 -/* 02228 8098B0A8 00000000 */ nop -/* 0222C 8098B0AC 00084C00 */ sll $t1, $t0, 16 -/* 02230 8098B0B0 00095403 */ sra $t2, $t1, 16 -/* 02234 8098B0B4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 02238 8098B0B8 00000000 */ nop -/* 0223C 8098B0BC 46802220 */ cvt.s.w $f8, $f4 -/* 02240 8098B0C0 E6080158 */ swc1 $f8, 0x0158($s0) ## 00000158 -.L8098B0C4: -/* 02244 8098B0C4 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B0C8: -/* 02248 8098B0C8 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -/* 0224C 8098B0CC C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 02250 8098B0D0 C60E0154 */ lwc1 $f14, 0x0154($s0) ## 00000154 -/* 02254 8098B0D4 C60A0160 */ lwc1 $f10, 0x0160($s0) ## 00000160 -/* 02258 8098B0D8 46109300 */ add.s $f12, $f18, $f16 -/* 0225C 8098B0DC C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 02260 8098B0E0 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 02264 8098B0E4 460A7500 */ add.s $f20, $f14, $f10 -/* 02268 8098B0E8 29810002 */ slti $at, $t4, 0x0002 -/* 0226C 8098B0EC 1020007E */ beq $at, $zero, .L8098B2E8 -/* 02270 8098B0F0 46128000 */ add.s $f0, $f16, $f18 -/* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp) -/* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gEffFlash1DL) ## $t5 = 04010000 -/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gEffFlash1DL) ## $t5 = 04010130 -/* 02288 8098B108 02417021 */ addu $t6, $s2, $at -/* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp) -/* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130 -/* 02294 8098B114 AFAD0080 */ sw $t5, 0x0080($sp) -/* 02298 8098B118 44060000 */ mfc1 $a2, $f0 -/* 0229C 8098B11C 4600A386 */ mov.s $f14, $f20 -/* 022A0 8098B120 0C034261 */ jal Matrix_Translate -/* 022A4 8098B124 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 022A8 8098B128 10000007 */ beq $zero, $zero, .L8098B148 -/* 022AC 8098B12C 00000000 */ nop -.L8098B130: -/* 022B0 8098B130 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 022B4 8098B134 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 022B8 8098B138 44060000 */ mfc1 $a2, $f0 -/* 022BC 8098B13C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 022C0 8098B140 0C034261 */ jal Matrix_Translate -/* 022C4 8098B144 4610A380 */ add.s $f14, $f20, $f16 -.L8098B148: -/* 022C8 8098B148 3C018099 */ lui $at, %hi(D_8098CB4C) ## $at = 80990000 -/* 022CC 8098B14C C42ACB4C */ lwc1 $f10, %lo(D_8098CB4C)($at) -/* 022D0 8098B150 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 022D4 8098B154 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 022D8 8098B158 46165482 */ mul.s $f18, $f10, $f22 -/* 022DC 8098B15C 00000000 */ nop -/* 022E0 8098B160 46123302 */ mul.s $f12, $f6, $f18 -/* 022E4 8098B164 44066000 */ mfc1 $a2, $f12 -/* 022E8 8098B168 0C0342A3 */ jal Matrix_Scale -/* 022EC 8098B16C 46006386 */ mov.s $f14, $f12 -/* 022F0 8098B170 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 022F4 8098B174 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 022F8 8098B178 37390080 */ ori $t9, $t9, 0x0080 ## $t9 = FA000080 -/* 022FC 8098B17C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02300 8098B180 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 02304 8098B184 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 02308 8098B188 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 0230C 8098B18C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02310 8098B190 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -/* 02314 8098B194 3C0A8099 */ lui $t2, %hi(D_8098C31C) ## $t2 = 80990000 -/* 02318 8098B198 3C058016 */ lui $a1, %hi(gSaveContext+0x1397) -/* 0231C 8098B19C 16A90019 */ bne $s5, $t1, .L8098B204 -/* 02320 8098B1A0 254AC31C */ addiu $t2, $t2, %lo(D_8098C31C) ## $t2 = 8098C31C -/* 02324 8098B1A4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02328 8098B1A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0232C 8098B1AC 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 02330 8098B1B0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02334 8098B1B4 AE6A02D0 */ sw $t2, 0x02D0($s3) ## 000002D0 -/* 02338 8098B1B8 02412821 */ addu $a1, $s2, $at -/* 0233C 8098B1BC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02340 8098B1C0 94AC04C4 */ lhu $t4, 0x04C4($a1) -/* 02344 8098B1C4 3C0E8099 */ lui $t6, %hi(D_8098C31C) ## $t6 = 80990000 -/* 02348 8098B1C8 25CEC31C */ addiu $t6, $t6, %lo(D_8098C31C) ## $t6 = 8098C31C -/* 0234C 8098B1CC 000C6880 */ sll $t5, $t4, 2 -/* 02350 8098B1D0 01AC6823 */ subu $t5, $t5, $t4 -/* 02354 8098B1D4 01AE1821 */ addu $v1, $t5, $t6 -/* 02358 8098B1D8 90780002 */ lbu $t8, 0x0002($v1) ## 00000002 -/* 0235C 8098B1DC 90690000 */ lbu $t1, 0x0000($v1) ## 00000000 -/* 02360 8098B1E0 906D0001 */ lbu $t5, 0x0001($v1) ## 00000001 -/* 02364 8098B1E4 0018CA00 */ sll $t9, $t8, 8 -/* 02368 8098B1E8 00095600 */ sll $t2, $t1, 24 -/* 0236C 8098B1EC 032A5825 */ or $t3, $t9, $t2 ## $t3 = FA000088 -/* 02370 8098B1F0 000D7400 */ sll $t6, $t5, 16 -/* 02374 8098B1F4 016E7825 */ or $t7, $t3, $t6 ## $t7 = FA98C39C -/* 02378 8098B1F8 35F800FF */ ori $t8, $t7, 0x00FF ## $t8 = FA98C3FF -/* 0237C 8098B1FC 10000014 */ beq $zero, $zero, .L8098B250 -/* 02380 8098B200 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L8098B204: -/* 02384 8098B204 80A5F9F7 */ lb $a1, %lo(gSaveContext+0x1397)($a1) -/* 02388 8098B208 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 0238C 8098B20C 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 02390 8098B210 0005C880 */ sll $t9, $a1, 2 -/* 02394 8098B214 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02398 8098B218 AE6802D0 */ sw $t0, 0x02D0($s3) ## 000002D0 -/* 0239C 8098B21C 0325C823 */ subu $t9, $t9, $a1 -/* 023A0 8098B220 032A1821 */ addu $v1, $t9, $t2 -/* 023A4 8098B224 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 023A8 8098B228 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 023AC 8098B22C 906D0002 */ lbu $t5, 0x0002($v1) ## 00000002 -/* 023B0 8098B230 90790001 */ lbu $t9, 0x0001($v1) ## 00000001 -/* 023B4 8098B234 000FC600 */ sll $t8, $t7, 24 -/* 023B8 8098B238 000D5A00 */ sll $t3, $t5, 8 -/* 023BC 8098B23C 01784025 */ or $t0, $t3, $t8 ## $t0 = FA98C3FF -/* 023C0 8098B240 00195400 */ sll $t2, $t9, 16 -/* 023C4 8098B244 010A6025 */ or $t4, $t0, $t2 ## $t4 = FA98C3FF -/* 023C8 8098B248 358D00FF */ ori $t5, $t4, 0x00FF ## $t5 = FA98C3FF -/* 023CC 8098B24C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L8098B250: -/* 023D0 8098B250 0C024F61 */ jal func_80093D84 -/* 023D4 8098B254 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 023D8 8098B258 8FA40078 */ lw $a0, 0x0078($sp) -/* 023DC 8098B25C 0C03424C */ jal Matrix_Mult -/* 023E0 8098B260 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 023E4 8098B264 860E0174 */ lh $t6, 0x0174($s0) ## 00000174 -/* 023E8 8098B268 3C018099 */ lui $at, %hi(D_8098CB50) ## $at = 80990000 -/* 023EC 8098B26C C430CB50 */ lwc1 $f16, %lo(D_8098CB50)($at) -/* 023F0 8098B270 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 023F4 8098B274 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 023F8 8098B278 46802220 */ cvt.s.w $f8, $f4 -/* 023FC 8098B27C 46104302 */ mul.s $f12, $f8, $f16 -/* 02400 8098B280 0C0343B5 */ jal Matrix_RotateZ -/* 02404 8098B284 00000000 */ nop -/* 02408 8098B288 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 0240C 8098B28C 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 02410 8098B290 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 02414 8098B294 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02418 8098B298 AE6F02D0 */ sw $t7, 0x02D0($s3) ## 000002D0 -/* 0241C 8098B29C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02420 8098B2A0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02424 8098B2A4 3C058099 */ lui $a1, %hi(D_8098C9EC) ## $a1 = 80990000 -/* 02428 8098B2A8 24A5C9EC */ addiu $a1, $a1, %lo(D_8098C9EC) ## $a1 = 8098C9EC -/* 0242C 8098B2AC 240607DB */ addiu $a2, $zero, 0x07DB ## $a2 = 000007DB -/* 02430 8098B2B0 0C0346A2 */ jal Matrix_NewMtx -/* 02434 8098B2B4 AFA2008C */ sw $v0, 0x008C($sp) -/* 02438 8098B2B8 8FA3008C */ lw $v1, 0x008C($sp) -/* 0243C 8098B2BC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 02440 8098B2C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02444 8098B2C4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02448 8098B2C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0244C 8098B2CC AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 02450 8098B2D0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02454 8098B2D4 8FB90080 */ lw $t9, 0x0080($sp) -/* 02458 8098B2D8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0245C 8098B2DC 86080174 */ lh $t0, 0x0174($s0) ## 00000174 -/* 02460 8098B2E0 250A0190 */ addiu $t2, $t0, 0x0190 ## $t2 = 00000190 -/* 02464 8098B2E4 A60A0174 */ sh $t2, 0x0174($s0) ## 00000174 -.L8098B2E8: -/* 02468 8098B2E8 2694FFFF */ addiu $s4, $s4, 0xFFFF ## $s4 = 00000000 -/* 0246C 8098B2EC 0014A400 */ sll $s4, $s4, 16 -/* 02470 8098B2F0 0014A403 */ sra $s4, $s4, 16 -/* 02474 8098B2F4 0683FE63 */ bgezl $s4, .L8098AC84 -/* 02478 8098B2F8 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B2FC: -/* 0247C 8098B2FC 3C068099 */ lui $a2, %hi(D_8098CA00) ## $a2 = 80990000 -/* 02480 8098B300 24C6CA00 */ addiu $a2, $a2, %lo(D_8098CA00) ## $a2 = 8098CA00 -/* 02484 8098B304 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 -/* 02488 8098B308 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0248C 8098B30C 0C031AD5 */ jal Graph_CloseDisps -/* 02490 8098B310 240707E3 */ addiu $a3, $zero, 0x07E3 ## $a3 = 000007E3 -/* 02494 8098B314 8FBF006C */ lw $ra, 0x006C($sp) -/* 02498 8098B318 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 0249C 8098B31C D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 024A0 8098B320 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 024A4 8098B324 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 024A8 8098B328 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 024AC 8098B32C D7BE0048 */ ldc1 $f30, 0x0048($sp) -/* 024B0 8098B330 8FB00050 */ lw $s0, 0x0050($sp) -/* 024B4 8098B334 8FB10054 */ lw $s1, 0x0054($sp) -/* 024B8 8098B338 8FB20058 */ lw $s2, 0x0058($sp) -/* 024BC 8098B33C 8FB3005C */ lw $s3, 0x005C($sp) -/* 024C0 8098B340 8FB40060 */ lw $s4, 0x0060($sp) -/* 024C4 8098B344 8FB50064 */ lw $s5, 0x0064($sp) -/* 024C8 8098B348 8FB60068 */ lw $s6, 0x0068($sp) -/* 024CC 8098B34C 03E00008 */ jr $ra -/* 024D0 8098B350 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s deleted file mode 100644 index 23740dae4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ /dev/null @@ -1,417 +0,0 @@ -.rdata -glabel D_8098CA14 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA28 - .asciz "../z_demo_kankyo.c" - .balign 4 - -glabel D_8098CA3C - .asciz "../z_demo_kankyo.c" - .balign 4 - -.late_rodata -glabel D_8098CB54 - .float 0.2 - -glabel D_8098CB58 - .float 0.02 - -glabel D_8098CB5C - .word 0x3C8EFA35 - -.text -glabel func_8098B354 -/* 024D4 8098B354 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 024D8 8098B358 AFB60068 */ sw $s6, 0x0068($sp) -/* 024DC 8098B35C 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 024E0 8098B360 AFBF0074 */ sw $ra, 0x0074($sp) -/* 024E4 8098B364 AFBE0070 */ sw $s8, 0x0070($sp) -/* 024E8 8098B368 AFB7006C */ sw $s7, 0x006C($sp) -/* 024EC 8098B36C AFB50064 */ sw $s5, 0x0064($sp) -/* 024F0 8098B370 AFB40060 */ sw $s4, 0x0060($sp) -/* 024F4 8098B374 AFB3005C */ sw $s3, 0x005C($sp) -/* 024F8 8098B378 AFB20058 */ sw $s2, 0x0058($sp) -/* 024FC 8098B37C AFB10054 */ sw $s1, 0x0054($sp) -/* 02500 8098B380 AFB00050 */ sw $s0, 0x0050($sp) -/* 02504 8098B384 F7BE0048 */ sdc1 $f30, 0x0048($sp) -/* 02508 8098B388 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 0250C 8098B38C F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 02510 8098B390 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 02514 8098B394 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 02518 8098B398 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0251C 8098B39C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02520 8098B3A0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02524 8098B3A4 3C068099 */ lui $a2, %hi(D_8098CA14) ## $a2 = 80990000 -/* 02528 8098B3A8 24C6CA14 */ addiu $a2, $a2, %lo(D_8098CA14) ## $a2 = 8098CA14 -/* 0252C 8098B3AC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 -/* 02530 8098B3B0 24070982 */ addiu $a3, $zero, 0x0982 ## $a3 = 00000982 -/* 02534 8098B3B4 0C031AB1 */ jal Graph_OpenDisps -/* 02538 8098B3B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0253C 8098B3BC 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -/* 02540 8098B3C0 3C178099 */ lui $s7, %hi(D_8098C4F0) ## $s7 = 80990000 -/* 02544 8098B3C4 26F7C4F0 */ addiu $s7, $s7, %lo(D_8098C4F0) ## $s7 = 8098C4F0 -/* 02548 8098B3C8 28610014 */ slti $at, $v1, 0x0014 -/* 0254C 8098B3CC 10200004 */ beq $at, $zero, .L8098B3E0 -/* 02550 8098B3D0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 02554 8098B3D4 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 02558 8098B3D8 A22E014D */ sb $t6, 0x014D($s1) ## 0000014D -/* 0255C 8098B3DC 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 00000001 -.L8098B3E0: -/* 02560 8098B3E0 2454FFFF */ addiu $s4, $v0, 0xFFFF ## $s4 = 00000000 -/* 02564 8098B3E4 0014A400 */ sll $s4, $s4, 16 -/* 02568 8098B3E8 0014A403 */ sra $s4, $s4, 16 -/* 0256C 8098B3EC 0680012F */ bltz $s4, .L8098B8AC -/* 02570 8098B3F0 3C018099 */ lui $at, %hi(D_8098CB54) ## $at = 80990000 -/* 02574 8098B3F4 C43ECB54 */ lwc1 $f30, %lo(D_8098CB54)($at) -/* 02578 8098B3F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0257C 8098B3FC 4481D000 */ mtc1 $at, $f26 ## $f26 = 1.00 -/* 02580 8098B400 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 02584 8098B404 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 02588 8098B408 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0258C 8098B40C 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 02590 8098B410 4480E000 */ mtc1 $zero, $f28 ## $f28 = 0.00 -/* 02594 8098B414 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 -/* 02598 8098B418 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B41C: -/* 0259C 8098B41C 44942000 */ mtc1 $s4, $f4 ## $f4 = 0.00 -/* 025A0 8098B420 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 025A4 8098B424 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 025A8 8098B428 468021A0 */ cvt.s.w $f6, $f4 -/* 025AC 8098B42C 04610004 */ bgez $v1, .L8098B440 -/* 025B0 8098B430 468042A0 */ cvt.s.w $f10, $f8 -/* 025B4 8098B434 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 025B8 8098B438 00000000 */ nop -/* 025BC 8098B43C 46105280 */ add.s $f10, $f10, $f16 -.L8098B440: -/* 025C0 8098B440 460A3483 */ div.s $f18, $f6, $f10 -/* 025C4 8098B444 00147880 */ sll $t7, $s4, 2 -/* 025C8 8098B448 01F47821 */ addu $t7, $t7, $s4 -/* 025CC 8098B44C 000F78C0 */ sll $t7, $t7, 3 -/* 025D0 8098B450 022F8021 */ addu $s0, $s1, $t7 -/* 025D4 8098B454 92020172 */ lbu $v0, 0x0172($s0) ## 00000172 -/* 025D8 8098B458 10400007 */ beq $v0, $zero, .L8098B478 -/* 025DC 8098B45C 4612D501 */ sub.s $f20, $f26, $f18 -/* 025E0 8098B460 105E0035 */ beq $v0, $s8, .L8098B538 -/* 025E4 8098B464 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 025E8 8098B468 1041004D */ beq $v0, $at, .L8098B5A0 -/* 025EC 8098B46C 268E0001 */ addiu $t6, $s4, 0x0001 ## $t6 = 00000001 -/* 025F0 8098B470 10000052 */ beq $zero, $zero, .L8098B5BC -/* 025F4 8098B474 00000000 */ nop -.L8098B478: -/* 025F8 8098B478 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 025FC 8098B47C A6000170 */ sh $zero, 0x0170($s0) ## 00000170 -/* 02600 8098B480 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02604 8098B484 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 02608 8098B488 46160201 */ sub.s $f8, $f0, $f22 -/* 0260C 8098B48C 46184402 */ mul.s $f16, $f8, $f24 -/* 02610 8098B490 00000000 */ nop -/* 02614 8098B494 46148182 */ mul.s $f6, $f16, $f20 -/* 02618 8098B498 4600328D */ trunc.w.s $f10, $f6 -/* 0261C 8098B49C 44195000 */ mfc1 $t9, $f10 -/* 02620 8098B4A0 00000000 */ nop -/* 02624 8098B4A4 00194400 */ sll $t0, $t9, 16 -/* 02628 8098B4A8 00084C03 */ sra $t1, $t0, 16 -/* 0262C 8098B4AC 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 02630 8098B4B0 00000000 */ nop -/* 02634 8098B4B4 46809120 */ cvt.s.w $f4, $f18 -/* 02638 8098B4B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0263C 8098B4BC E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 -/* 02640 8098B4C0 46160201 */ sub.s $f8, $f0, $f22 -/* 02644 8098B4C4 46184402 */ mul.s $f16, $f8, $f24 -/* 02648 8098B4C8 00000000 */ nop -/* 0264C 8098B4CC 46148182 */ mul.s $f6, $f16, $f20 -/* 02650 8098B4D0 4600328D */ trunc.w.s $f10, $f6 -/* 02654 8098B4D4 440B5000 */ mfc1 $t3, $f10 -/* 02658 8098B4D8 00000000 */ nop -/* 0265C 8098B4DC 000B6400 */ sll $t4, $t3, 16 -/* 02660 8098B4E0 000C6C03 */ sra $t5, $t4, 16 -/* 02664 8098B4E4 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 02668 8098B4E8 00000000 */ nop -/* 0266C 8098B4EC 46809120 */ cvt.s.w $f4, $f18 -/* 02670 8098B4F0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02674 8098B4F4 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 02678 8098B4F8 46160201 */ sub.s $f8, $f0, $f22 -/* 0267C 8098B4FC 92080172 */ lbu $t0, 0x0172($s0) ## 00000172 -/* 02680 8098B500 A2000173 */ sb $zero, 0x0173($s0) ## 00000173 -/* 02684 8098B504 46184402 */ mul.s $f16, $f8, $f24 -/* 02688 8098B508 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 0268C 8098B50C A2090172 */ sb $t1, 0x0172($s0) ## 00000172 -/* 02690 8098B510 46148182 */ mul.s $f6, $f16, $f20 -/* 02694 8098B514 4600328D */ trunc.w.s $f10, $f6 -/* 02698 8098B518 440F5000 */ mfc1 $t7, $f10 -/* 0269C 8098B51C 00000000 */ nop -/* 026A0 8098B520 000FC400 */ sll $t8, $t7, 16 -/* 026A4 8098B524 0018CC03 */ sra $t9, $t8, 16 -/* 026A8 8098B528 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 026AC 8098B52C 00000000 */ nop -/* 026B0 8098B530 46809120 */ cvt.s.w $f4, $f18 -/* 026B4 8098B534 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -.L8098B538: -/* 026B8 8098B538 3C058099 */ lui $a1, %hi(D_8098CFA4) ## $a1 = 80990000 -/* 026BC 8098B53C 3C068099 */ lui $a2, %hi(D_8098CFA8) ## $a2 = 80990000 -/* 026C0 8098B540 3C078099 */ lui $a3, %hi(D_8098C504) ## $a3 = 80990000 -/* 026C4 8098B544 260A0170 */ addiu $t2, $s0, 0x0170 ## $t2 = 00000170 -/* 026C8 8098B548 260B016C */ addiu $t3, $s0, 0x016C ## $t3 = 0000016C -/* 026CC 8098B54C AFAB0014 */ sw $t3, 0x0014($sp) -/* 026D0 8098B550 AFAA0010 */ sw $t2, 0x0010($sp) -/* 026D4 8098B554 24E7C504 */ addiu $a3, $a3, %lo(D_8098C504) ## $a3 = 8098C504 -/* 026D8 8098B558 24C6CFA8 */ addiu $a2, $a2, %lo(D_8098CFA8) ## $a2 = 8098CFA8 -/* 026DC 8098B55C 24A5CFA4 */ addiu $a1, $a1, %lo(D_8098CFA4) ## $a1 = 8098CFA4 -/* 026E0 8098B560 0C02ECAD */ jal func_800BB2B4 -/* 026E4 8098B564 27A400D4 */ addiu $a0, $sp, 0x00D4 ## $a0 = FFFFFFE4 -/* 026E8 8098B568 10400004 */ beq $v0, $zero, .L8098B57C -/* 026EC 8098B56C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 -/* 026F0 8098B570 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 026F4 8098B574 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 026F8 8098B578 A20D0172 */ sb $t5, 0x0172($s0) ## 00000172 -.L8098B57C: -/* 026FC 8098B57C 0C00BBC5 */ jal Actor_GetWorld -/* 02700 8098B580 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02704 8098B584 3C068099 */ lui $a2, %hi(D_8098CFB8) ## $a2 = 80990000 -/* 02708 8098B588 24C6CFB8 */ addiu $a2, $a2, %lo(D_8098CFB8) ## $a2 = 8098CFB8 -/* 0270C 8098B58C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 -/* 02710 8098B590 0C262ADA */ jal func_8098AB68 -/* 02714 8098B594 27A500D4 */ addiu $a1, $sp, 0x00D4 ## $a1 = FFFFFFE4 -/* 02718 8098B598 10000008 */ beq $zero, $zero, .L8098B5BC -/* 0271C 8098B59C 00000000 */ nop -.L8098B5A0: -/* 02720 8098B5A0 15C30006 */ bne $t6, $v1, .L8098B5BC -/* 02724 8098B5A4 00000000 */ nop -/* 02728 8098B5A8 92CF1D6C */ lbu $t7, 0x1D6C($s6) ## 00001D6C -/* 0272C 8098B5AC 15E00003 */ bne $t7, $zero, .L8098B5BC -/* 02730 8098B5B0 00000000 */ nop -/* 02734 8098B5B4 0C00B55C */ jal Actor_Kill - -/* 02738 8098B5B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8098B5BC: -/* 0273C 8098B5BC 3C018099 */ lui $at, %hi(D_8098CFB8) ## $at = 80990000 -/* 02740 8098B5C0 C428CFB8 */ lwc1 $f8, %lo(D_8098CFB8)($at) -/* 02744 8098B5C4 92020173 */ lbu $v0, 0x0173($s0) ## 00000173 -/* 02748 8098B5C8 E608015C */ swc1 $f8, 0x015C($s0) ## 0000015C -/* 0274C 8098B5CC C430CFBC */ lwc1 $f16, %lo(D_8098CFBC)($at) -/* 02750 8098B5D0 3C018099 */ lui $at, %hi(D_8098CFC0) ## $at = 80990000 -/* 02754 8098B5D4 E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 -/* 02758 8098B5D8 C426CFC0 */ lwc1 $f6, %lo(D_8098CFC0)($at) -/* 0275C 8098B5DC 10400007 */ beq $v0, $zero, .L8098B5FC -/* 02760 8098B5E0 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 02764 8098B5E4 105E000B */ beq $v0, $s8, .L8098B614 -/* 02768 8098B5E8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0276C 8098B5EC 10410018 */ beq $v0, $at, .L8098B650 -/* 02770 8098B5F0 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 02774 8098B5F4 10000050 */ beq $zero, $zero, .L8098B738 -/* 02778 8098B5F8 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B5FC: -/* 0277C 8098B5FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02780 8098B600 00000000 */ nop -/* 02784 8098B604 92180173 */ lbu $t8, 0x0173($s0) ## 00000173 -/* 02788 8098B608 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0278C 8098B60C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02790 8098B610 A2190173 */ sb $t9, 0x0173($s0) ## 00000173 -.L8098B614: -/* 02794 8098B614 4405D000 */ mfc1 $a1, $f26 -/* 02798 8098B618 4406B000 */ mfc1 $a2, $f22 -/* 0279C 8098B61C 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 027A0 8098B620 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 027A4 8098B624 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 027A8 8098B628 0C01E0C4 */ jal Math_SmoothStepToF - -/* 027AC 8098B62C E7BE0010 */ swc1 $f30, 0x0010($sp) -/* 027B0 8098B630 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 027B4 8098B634 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 027B8 8098B638 460AD03E */ c.le.s $f26, $f10 -/* 027BC 8098B63C 00000000 */ nop -/* 027C0 8098B640 4502003D */ bc1fl .L8098B738 -/* 027C4 8098B644 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 027C8 8098B648 1000003A */ beq $zero, $zero, .L8098B734 -/* 027CC 8098B64C A2080173 */ sb $t0, 0x0173($s0) ## 00000173 -.L8098B650: -/* 027D0 8098B650 4405E000 */ mfc1 $a1, $f28 -/* 027D4 8098B654 4406B000 */ mfc1 $a2, $f22 -/* 027D8 8098B658 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 027DC 8098B65C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 027E0 8098B660 0C01E0C4 */ jal Math_SmoothStepToF - -/* 027E4 8098B664 E7BE0010 */ swc1 $f30, 0x0010($sp) -/* 027E8 8098B668 C6120168 */ lwc1 $f18, 0x0168($s0) ## 00000168 -/* 027EC 8098B66C 461C903E */ c.le.s $f18, $f28 -/* 027F0 8098B670 00000000 */ nop -/* 027F4 8098B674 45020030 */ bc1fl .L8098B738 -/* 027F8 8098B678 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -/* 027FC 8098B67C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02800 8098B680 00000000 */ nop -/* 02804 8098B684 46160101 */ sub.s $f4, $f0, $f22 -/* 02808 8098B688 46182202 */ mul.s $f8, $f4, $f24 -/* 0280C 8098B68C 00000000 */ nop -/* 02810 8098B690 46144402 */ mul.s $f16, $f8, $f20 -/* 02814 8098B694 4600818D */ trunc.w.s $f6, $f16 -/* 02818 8098B698 440A3000 */ mfc1 $t2, $f6 -/* 0281C 8098B69C 00000000 */ nop -/* 02820 8098B6A0 000A5C00 */ sll $t3, $t2, 16 -/* 02824 8098B6A4 000B6403 */ sra $t4, $t3, 16 -/* 02828 8098B6A8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0282C 8098B6AC 00000000 */ nop -/* 02830 8098B6B0 468054A0 */ cvt.s.w $f18, $f10 -/* 02834 8098B6B4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02838 8098B6B8 E6120150 */ swc1 $f18, 0x0150($s0) ## 00000150 -/* 0283C 8098B6BC 46160101 */ sub.s $f4, $f0, $f22 -/* 02840 8098B6C0 46182202 */ mul.s $f8, $f4, $f24 -/* 02844 8098B6C4 00000000 */ nop -/* 02848 8098B6C8 46144402 */ mul.s $f16, $f8, $f20 -/* 0284C 8098B6CC 4600818D */ trunc.w.s $f6, $f16 -/* 02850 8098B6D0 440E3000 */ mfc1 $t6, $f6 -/* 02854 8098B6D4 00000000 */ nop -/* 02858 8098B6D8 000E7C00 */ sll $t7, $t6, 16 -/* 0285C 8098B6DC 000FC403 */ sra $t8, $t7, 16 -/* 02860 8098B6E0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 02864 8098B6E4 00000000 */ nop -/* 02868 8098B6E8 468054A0 */ cvt.s.w $f18, $f10 -/* 0286C 8098B6EC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02870 8098B6F0 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -/* 02874 8098B6F4 46160101 */ sub.s $f4, $f0, $f22 -/* 02878 8098B6F8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0287C 8098B6FC E61C0168 */ swc1 $f28, 0x0168($s0) ## 00000168 -/* 02880 8098B700 A20B0173 */ sb $t3, 0x0173($s0) ## 00000173 -/* 02884 8098B704 46182202 */ mul.s $f8, $f4, $f24 -/* 02888 8098B708 00000000 */ nop -/* 0288C 8098B70C 46144402 */ mul.s $f16, $f8, $f20 -/* 02890 8098B710 4600818D */ trunc.w.s $f6, $f16 -/* 02894 8098B714 44083000 */ mfc1 $t0, $f6 -/* 02898 8098B718 00000000 */ nop -/* 0289C 8098B71C 00084C00 */ sll $t1, $t0, 16 -/* 028A0 8098B720 00095403 */ sra $t2, $t1, 16 -/* 028A4 8098B724 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 028A8 8098B728 00000000 */ nop -/* 028AC 8098B72C 468054A0 */ cvt.s.w $f18, $f10 -/* 028B0 8098B730 E6120158 */ swc1 $f18, 0x0158($s0) ## 00000158 -.L8098B734: -/* 028B4 8098B734 920C0172 */ lbu $t4, 0x0172($s0) ## 00000172 -.L8098B738: -/* 028B8 8098B738 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -/* 028BC 8098B73C C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 028C0 8098B740 C60A0154 */ lwc1 $f10, 0x0154($s0) ## 00000154 -/* 028C4 8098B744 C6080160 */ lwc1 $f8, 0x0160($s0) ## 00000160 -/* 028C8 8098B748 46109300 */ add.s $f12, $f18, $f16 -/* 028CC 8098B74C C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 028D0 8098B750 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 028D4 8098B754 46085380 */ add.s $f14, $f10, $f8 -/* 028D8 8098B758 29810002 */ slti $at, $t4, 0x0002 -/* 028DC 8098B75C 1020004E */ beq $at, $zero, .L8098B898 -/* 028E0 8098B760 46128000 */ add.s $f0, $f16, $f18 -/* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0 -/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gEffFlash1DL) ## $s5 = 04010000 -/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gEffFlash1DL) ## $s5 = 04010130 -/* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at -/* 028FC 8098B77C 0C034261 */ jal Matrix_Translate -/* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02904 8098B784 3C018099 */ lui $at, %hi(D_8098CB58) ## $at = 80990000 -/* 02908 8098B788 C428CB58 */ lwc1 $f8, %lo(D_8098CB58)($at) -/* 0290C 8098B78C C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 02910 8098B790 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02914 8098B794 46144402 */ mul.s $f16, $f8, $f20 -/* 02918 8098B798 00000000 */ nop -/* 0291C 8098B79C 46102302 */ mul.s $f12, $f4, $f16 -/* 02920 8098B7A0 44066000 */ mfc1 $a2, $f12 -/* 02924 8098B7A4 0C0342A3 */ jal Matrix_Scale -/* 02928 8098B7A8 46006386 */ mov.s $f14, $f12 -/* 0292C 8098B7AC 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02930 8098B7B0 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 02934 8098B7B4 35CE0080 */ ori $t6, $t6, 0x0080 ## $t6 = FA000080 -/* 02938 8098B7B8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0293C 8098B7BC AE6D02D0 */ sw $t5, 0x02D0($s3) ## 000002D0 -/* 02940 8098B7C0 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02944 8098B7C4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02948 8098B7C8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0294C 8098B7CC 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 02950 8098B7D0 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 02954 8098B7D4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02958 8098B7D8 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 0295C 8098B7DC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02960 8098B7E0 92EC0009 */ lbu $t4, 0x0009($s7) ## 8098C4F9 -/* 02964 8098B7E4 92E9000B */ lbu $t1, 0x000B($s7) ## 8098C4FB -/* 02968 8098B7E8 92F8000A */ lbu $t8, 0x000A($s7) ## 8098C4FA -/* 0296C 8098B7EC 000C6E00 */ sll $t5, $t4, 24 -/* 02970 8098B7F0 00095200 */ sll $t2, $t1, 8 -/* 02974 8098B7F4 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000008 -/* 02978 8098B7F8 0018CC00 */ sll $t9, $t8, 16 -/* 0297C 8098B7FC 01D94025 */ or $t0, $t6, $t9 ## $t0 = FB000008 -/* 02980 8098B800 350900FF */ ori $t1, $t0, 0x00FF ## $t1 = FB0000FF -/* 02984 8098B804 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02988 8098B808 0C024F61 */ jal func_80093D84 -/* 0298C 8098B80C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 02990 8098B810 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02994 8098B814 0C03424C */ jal Matrix_Mult -/* 02998 8098B818 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0299C 8098B81C 860B0174 */ lh $t3, 0x0174($s0) ## 00000174 -/* 029A0 8098B820 3C018099 */ lui $at, %hi(D_8098CB5C) ## $at = 80990000 -/* 029A4 8098B824 C432CB5C */ lwc1 $f18, %lo(D_8098CB5C)($at) -/* 029A8 8098B828 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 029AC 8098B82C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 029B0 8098B830 468032A0 */ cvt.s.w $f10, $f6 -/* 029B4 8098B834 46125302 */ mul.s $f12, $f10, $f18 -/* 029B8 8098B838 0C0343B5 */ jal Matrix_RotateZ -/* 029BC 8098B83C 00000000 */ nop -/* 029C0 8098B840 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 029C4 8098B844 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 029C8 8098B848 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 029CC 8098B84C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 029D0 8098B850 AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 -/* 029D4 8098B854 3C058099 */ lui $a1, %hi(D_8098CA28) ## $a1 = 80990000 -/* 029D8 8098B858 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 029DC 8098B85C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 029E0 8098B860 24A5CA28 */ addiu $a1, $a1, %lo(D_8098CA28) ## $a1 = 8098CA28 -/* 029E4 8098B864 24060A0C */ addiu $a2, $zero, 0x0A0C ## $a2 = 00000A0C -/* 029E8 8098B868 0C0346A2 */ jal Matrix_NewMtx -/* 029EC 8098B86C 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 029F0 8098B870 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 -/* 029F4 8098B874 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 029F8 8098B878 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 029FC 8098B87C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02A00 8098B880 AE6D02D0 */ sw $t5, 0x02D0($s3) ## 000002D0 -/* 02A04 8098B884 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 02A08 8098B888 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02A0C 8098B88C 86180174 */ lh $t8, 0x0174($s0) ## 00000174 -/* 02A10 8098B890 270E0190 */ addiu $t6, $t8, 0x0190 ## $t6 = 00000190 -/* 02A14 8098B894 A60E0174 */ sh $t6, 0x0174($s0) ## 00000174 -.L8098B898: -/* 02A18 8098B898 2694FFFF */ addiu $s4, $s4, 0xFFFF ## $s4 = FFFFFFFF -/* 02A1C 8098B89C 0014A400 */ sll $s4, $s4, 16 -/* 02A20 8098B8A0 0014A403 */ sra $s4, $s4, 16 -/* 02A24 8098B8A4 0683FEDD */ bgezl $s4, .L8098B41C -/* 02A28 8098B8A8 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D -.L8098B8AC: -/* 02A2C 8098B8AC 3C068099 */ lui $a2, %hi(D_8098CA3C) ## $a2 = 80990000 -/* 02A30 8098B8B0 24C6CA3C */ addiu $a2, $a2, %lo(D_8098CA3C) ## $a2 = 8098CA3C -/* 02A34 8098B8B4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 -/* 02A38 8098B8B8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02A3C 8098B8BC 0C031AD5 */ jal Graph_CloseDisps -/* 02A40 8098B8C0 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 -/* 02A44 8098B8C4 8FBF0074 */ lw $ra, 0x0074($sp) -/* 02A48 8098B8C8 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 02A4C 8098B8CC D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 02A50 8098B8D0 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 02A54 8098B8D4 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 02A58 8098B8D8 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 02A5C 8098B8DC D7BE0048 */ ldc1 $f30, 0x0048($sp) -/* 02A60 8098B8E0 8FB00050 */ lw $s0, 0x0050($sp) -/* 02A64 8098B8E4 8FB10054 */ lw $s1, 0x0054($sp) -/* 02A68 8098B8E8 8FB20058 */ lw $s2, 0x0058($sp) -/* 02A6C 8098B8EC 8FB3005C */ lw $s3, 0x005C($sp) -/* 02A70 8098B8F0 8FB40060 */ lw $s4, 0x0060($sp) -/* 02A74 8098B8F4 8FB50064 */ lw $s5, 0x0064($sp) -/* 02A78 8098B8F8 8FB60068 */ lw $s6, 0x0068($sp) -/* 02A7C 8098B8FC 8FB7006C */ lw $s7, 0x006C($sp) -/* 02A80 8098B900 8FBE0070 */ lw $s8, 0x0070($sp) -/* 02A84 8098B904 03E00008 */ jr $ra -/* 02A88 8098B908 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 -/* 02A8C 8098B90C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s deleted file mode 100644 index e4c4f39143..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnCs_Destroy -/* 002B4 809E1B64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002B8 809E1B68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002BC 809E1B6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 809E1B70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002C4 809E1B74 0C0170EB */ jal Collider_DestroyCylinder - -/* 002C8 809E1B78 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 002CC 809E1B7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D0 809E1B80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D4 809E1B84 03E00008 */ jr $ra -/* 002D8 809E1B88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s deleted file mode 100644 index a7c81f4c4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ /dev/null @@ -1,141 +0,0 @@ -.rdata -glabel D_809E2980 - .asciz "../z_en_cs.c" - .balign 4 - -glabel D_809E2990 - .asciz "../z_en_cs.c" - .balign 4 - -glabel D_809E29A0 - .asciz "../z_en_cs.c" - .balign 4 - -.text -glabel EnCs_Draw -/* 00CE4 809E2594 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) -/* 00CEC 809E259C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00CF0 809E25A0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CF4 809E25A4 AFB20030 */ sw $s2, 0x0030($sp) -/* 00CF8 809E25A8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CFC 809E25AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00D00 809E25B0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00D04 809E25B4 3C06809E */ lui $a2, %hi(D_809E2980) ## $a2 = 809E0000 -/* 00D08 809E25B8 24C62980 */ addiu $a2, $a2, %lo(D_809E2980) ## $a2 = 809E2980 -/* 00D0C 809E25BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00D10 809E25C0 240703C8 */ addiu $a3, $zero, 0x03C8 ## $a3 = 000003C8 -/* 00D14 809E25C4 0C031AB1 */ jal Graph_OpenDisps -/* 00D18 809E25C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 -/* 00D20 809E25D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00D24 809E25D4 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00D28 809E25D8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00D2C 809E25DC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00D30 809E25E0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00D34 809E25E4 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00D38 809E25E8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 00D3C 809E25EC 8E5801E4 */ lw $t8, 0x01E4($s2) ## 000001E4 -/* 00D40 809E25F0 3C04809E */ lui $a0, %hi(D_809E2964) ## $a0 = 809E0000 -/* 00D44 809E25F4 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 -/* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 -/* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) -/* 00D54 809E2604 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00D58 809E2608 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D5C 809E260C 00044900 */ sll $t1, $a0, 4 -/* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 -/* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 -/* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 -/* 00D6C 809E261C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00D70 809E2620 00814024 */ and $t0, $a0, $at -/* 00D74 809E2624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 -/* 00D7C 809E262C 01A17021 */ addu $t6, $t5, $at -/* 00D80 809E2630 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00D84 809E2634 9247014E */ lbu $a3, 0x014E($s2) ## 0000014E -/* 00D88 809E2638 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C -/* 00D8C 809E263C 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 00D90 809E2640 3C18809E */ lui $t8, %hi(func_809E2814) ## $t8 = 809E0000 -/* 00D94 809E2644 3C0F809E */ lui $t7, %hi(func_809E2784) ## $t7 = 809E0000 -/* 00D98 809E2648 25EF2784 */ addiu $t7, $t7, %lo(func_809E2784) ## $t7 = 809E2784 -/* 00D9C 809E264C 27182814 */ addiu $t8, $t8, %lo(func_809E2814) ## $t8 = 809E2814 -/* 00DA0 809E2650 AFB80014 */ sw $t8, 0x0014($sp) -/* 00DA4 809E2654 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) -/* 00DAC 809E265C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 00DB0 809E2660 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DB4 809E2664 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) -/* 00DB8 809E2668 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) -/* 00DBC 809E266C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DC0 809E2670 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00DC4 809E2674 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 -/* 00DC8 809E2678 11200036 */ beq $t1, $zero, .L809E2754 -/* 00DCC 809E267C 02212021 */ addu $a0, $s1, $at -/* 00DD0 809E2680 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00DD4 809E2684 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 00DD8 809E2688 04400032 */ bltz $v0, .L809E2754 -/* 00DDC 809E268C AFA20054 */ sw $v0, 0x0054($sp) -/* 00DE0 809E2690 0C03423F */ jal Matrix_Put -/* 00DE4 809E2694 26440218 */ addiu $a0, $s2, 0x0218 ## $a0 = 00000218 -/* 00DE8 809E2698 3C05809E */ lui $a1, %hi(D_809E2990) ## $a1 = 809E0000 -/* 00DEC 809E269C 24A52990 */ addiu $a1, $a1, %lo(D_809E2990) ## $a1 = 809E2990 -/* 00DF0 809E26A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00DF4 809E26A4 0C0346A2 */ jal Matrix_NewMtx -/* 00DF8 809E26A8 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 -/* 00DFC 809E26AC 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00E00 809E26B0 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 -/* 00E04 809E26B4 34A50018 */ ori $a1, $a1, 0x0018 ## $a1 = DB060018 -/* 00E08 809E26B8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 00E0C 809E26BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 00E10 809E26C0 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 00E14 809E26C4 8FAB0054 */ lw $t3, 0x0054($sp) -/* 00E18 809E26C8 24060044 */ addiu $a2, $zero, 0x0044 ## $a2 = 00000044 -/* 00E1C 809E26CC 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00E20 809E26D0 01660019 */ multu $t3, $a2 -/* 00E24 809E26D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00E28 809E26D8 37180034 */ ori $t8, $t8, 0x0034 ## $t8 = DB060034 -/* 00E2C 809E26DC 2459FE40 */ addiu $t9, $v0, 0xFE40 ## $t9 = FFFFFE40 -/* 00E30 809E26E0 3C0B0603 */ lui $t3, %hi(D_0602AF70) ## $t3 = 06030000 -/* 00E34 809E26E4 256BAF70 */ addiu $t3, $t3, %lo(D_0602AF70) ## $t3 = 0602AF70 -/* 00E38 809E26E8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00E3C 809E26EC 00004012 */ mflo $t0 -/* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 -/* 00E44 809E26F4 01876821 */ addu $t5, $t4, $a3 -/* 00E48 809E26F8 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 -/* 00E4C 809E26FC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00E50 809E2700 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00E54 809E2704 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 00E58 809E2708 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00E5C 809E270C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 00E60 809E2710 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00E64 809E2714 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00E68 809E2718 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 00E6C 809E271C AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 00E70 809E2720 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 00E74 809E2724 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 00E78 809E2728 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00E7C 809E272C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 00E80 809E2730 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 00E84 809E2734 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 00E88 809E2738 824C001E */ lb $t4, 0x001E($s2) ## 0000001E -/* 00E8C 809E273C 01860019 */ multu $t4, $a2 -/* 00E90 809E2740 00006812 */ mflo $t5 -/* 00E94 809E2744 022D7021 */ addu $t6, $s1, $t5 -/* 00E98 809E2748 01C77821 */ addu $t7, $t6, $a3 -/* 00E9C 809E274C 8DF817B4 */ lw $t8, 0x17B4($t7) ## 000017BC -/* 00EA0 809E2750 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -.L809E2754: -/* 00EA4 809E2754 3C06809E */ lui $a2, %hi(D_809E29A0) ## $a2 = 809E0000 -/* 00EA8 809E2758 24C629A0 */ addiu $a2, $a2, %lo(D_809E29A0) ## $a2 = 809E29A0 -/* 00EAC 809E275C 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00EB0 809E2760 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EB4 809E2764 0C031AD5 */ jal Graph_CloseDisps -/* 00EB8 809E2768 240703F7 */ addiu $a3, $zero, 0x03F7 ## $a3 = 000003F7 -/* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EC4 809E2774 8FB1002C */ lw $s1, 0x002C($sp) -/* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) -/* 00ECC 809E277C 03E00008 */ jr $ra -/* 00ED0 809E2780 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s deleted file mode 100644 index ae3dc0d7ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel EnCs_Init -/* 00120 809E19D0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 00124 809E19D4 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 00128 809E19D8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) -/* 00130 809E19E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00134 809E19E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00138 809E19E8 11C00005 */ beq $t6, $zero, .L809E1A00 -/* 0013C 809E19EC AFA5004C */ sw $a1, 0x004C($sp) -/* 00140 809E19F0 0C00B55C */ jal Actor_Kill - -/* 00144 809E19F4 00000000 */ nop -/* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 -/* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) -.L809E1A00: -/* 00150 809E1A00 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00154 809E1A04 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00158 809E1A08 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0015C 809E1A0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00160 809E1A10 0C00AC78 */ jal ActorShape_Init - -/* 00164 809E1A14 3C074198 */ lui $a3, 0x4198 ## $a3 = 41980000 -/* 00168 809E1A18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0016C 809E1A1C 3C060601 */ lui $a2, %hi(D_06008540) ## $a2 = 06010000 -/* 00170 809E1A20 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 -/* 00174 809E1A24 261802E4 */ addiu $t8, $s0, 0x02E4 ## $t8 = 000002E4 -/* 00178 809E1A28 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) -/* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) -/* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00188 809E1A38 24C68540 */ addiu $a2, $a2, %lo(D_06008540) ## $a2 = 06008540 -/* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) -/* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) -/* 00194 809E1A44 0C0291BE */ jal SkelAnime_InitFlex -/* 00198 809E1A48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0019C 809E1A4C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) -/* 001A4 809E1A54 0C0170D9 */ jal Collider_InitCylinder - -/* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) -/* 001AC 809E1A5C 3C07809E */ lui $a3, %hi(D_809E28C0) ## $a3 = 809E0000 -/* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) -/* 001B4 809E1A64 24E728C0 */ addiu $a3, $a3, %lo(D_809E28C0) ## $a3 = 809E28C0 -/* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) -/* 001BC 809E1A6C 0C01712B */ jal Collider_SetCylinder - -/* 001C0 809E1A70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 001C4 809E1A74 3C05809E */ lui $a1, %hi(D_809E28F8) ## $a1 = 809E0000 -/* 001C8 809E1A78 3C06809E */ lui $a2, %hi(D_809E28EC) ## $a2 = 809E0000 -/* 001CC 809E1A7C 24C628EC */ addiu $a2, $a2, %lo(D_809E28EC) ## $a2 = 809E28EC -/* 001D0 809E1A80 24A528F8 */ addiu $a1, $a1, %lo(D_809E28F8) ## $a1 = 809E28F8 -/* 001D4 809E1A84 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 001D8 809E1A88 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 001DC 809E1A8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 001E0 809E1A90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 001E4 809E1A94 AFA80014 */ sw $t0, 0x0014($sp) -/* 001E8 809E1A98 44060000 */ mfc1 $a2, $f0 -/* 001EC 809E1A9C 44070000 */ mfc1 $a3, $f0 -/* 001F0 809E1AA0 8FA4004C */ lw $a0, 0x004C($sp) -/* 001F4 809E1AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001F8 809E1AA8 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 001FC 809E1AAC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00200 809E1AB0 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 -/* 00204 809E1AB4 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 -/* 00208 809E1AB8 0C028800 */ jal Animation_GetLastFrame - -/* 0020C 809E1ABC 8C640000 */ lw $a0, 0x0000($v1) ## 809E2918 -/* 00210 809E1AC0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00214 809E1AC4 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 -/* 00218 809E1AC8 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 -/* 0021C 809E1ACC 468021A0 */ cvt.s.w $f6, $f4 -/* 00220 809E1AD0 90690008 */ lbu $t1, 0x0008($v1) ## 809E2920 -/* 00224 809E1AD4 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E2924 -/* 00228 809E1AD8 8C650000 */ lw $a1, 0x0000($v1) ## 809E2918 -/* 0022C 809E1ADC 8FA40038 */ lw $a0, 0x0038($sp) -/* 00230 809E1AE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00234 809E1AE4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00238 809E1AE8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0023C 809E1AEC AFA90014 */ sw $t1, 0x0014($sp) -/* 00240 809E1AF0 0C029468 */ jal Animation_Change - -/* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00248 809E1AF8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 0024C 809E1AFC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00250 809E1B00 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 00254 809E1B04 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00258 809E1B08 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 0025C 809E1B0C 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 00260 809E1B10 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 00264 809E1B14 AE0C01F4 */ sw $t4, 0x01F4($s0) ## 000001F4 -/* 00268 809E1B18 AE0001EC */ sw $zero, 0x01EC($s0) ## 000001EC -/* 0026C 809E1B1C AE0001E0 */ sw $zero, 0x01E0($s0) ## 000001E0 -/* 00270 809E1B20 AE0D0210 */ sw $t5, 0x0210($s0) ## 00000210 -/* 00274 809E1B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00278 809E1B28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0027C 809E1B2C 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00280 809E1B30 0C27862C */ jal func_809E18B0 -/* 00284 809E1B34 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00288 809E1B38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0028C 809E1B3C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00290 809E1B40 3C0E809E */ lui $t6, %hi(func_809E2134) ## $t6 = 809E0000 -/* 00294 809E1B44 25CE2134 */ addiu $t6, $t6, %lo(func_809E2134) ## $t6 = 809E2134 -/* 00298 809E1B48 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 0029C 809E1B4C E610020C */ swc1 $f16, 0x020C($s0) ## 0000020C -/* 002A0 809E1B50 8FBF002C */ lw $ra, 0x002C($sp) -.L809E1B54: -/* 002A4 809E1B54 8FB00028 */ lw $s0, 0x0028($sp) -/* 002A8 809E1B58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002AC 809E1B5C 03E00008 */ jr $ra -/* 002B0 809E1B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s deleted file mode 100644 index 825c164cae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel EnCs_Update -/* 00B74 809E2424 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B78 809E2428 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B7C 809E242C AFB00018 */ sw $s0, 0x0018($sp) -/* 00B80 809E2430 AFA50034 */ sw $a1, 0x0034($sp) -/* 00B84 809E2434 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -/* 00B88 809E2438 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B8C 809E243C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00B90 809E2440 1440000F */ bne $v0, $zero, .L809E2480 -/* 00B94 809E2444 00000000 */ nop -/* 00B98 809E2448 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00B9C 809E244C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00BA0 809E2450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA4 809E2454 4600218D */ trunc.w.s $f6, $f4 -/* 00BA8 809E2458 44023000 */ mfc1 $v0, $f6 -/* 00BAC 809E245C 00000000 */ nop -/* 00BB0 809E2460 10410003 */ beq $v0, $at, .L809E2470 -/* 00BB4 809E2464 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 00BB8 809E2468 54410023 */ bnel $v0, $at, .L809E24F8 -/* 00BBC 809E246C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E2470: -/* 00BC0 809E2470 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BC4 809E2474 240528EF */ addiu $a1, $zero, 0x28EF ## $a1 = 000028EF -/* 00BC8 809E2478 1000001F */ beq $zero, $zero, .L809E24F8 -/* 00BCC 809E247C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E2480: -/* 00BD0 809E2480 54410010 */ bnel $v0, $at, .L809E24C4 -/* 00BD4 809E2484 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00BD8 809E2488 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 00BDC 809E248C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00BE0 809E2490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BE4 809E2494 4600428D */ trunc.w.s $f10, $f8 -/* 00BE8 809E2498 44025000 */ mfc1 $v0, $f10 -/* 00BEC 809E249C 00000000 */ nop -/* 00BF0 809E24A0 10410003 */ beq $v0, $at, .L809E24B0 -/* 00BF4 809E24A4 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 00BF8 809E24A8 54410013 */ bnel $v0, $at, .L809E24F8 -/* 00BFC 809E24AC 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E24B0: -/* 00C00 809E24B0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C04 809E24B4 240528EF */ addiu $a1, $zero, 0x28EF ## $a1 = 000028EF -/* 00C08 809E24B8 1000000F */ beq $zero, $zero, .L809E24F8 -/* 00C0C 809E24BC 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00C10 809E24C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L809E24C4: -/* 00C14 809E24C4 5441000C */ bnel $v0, $at, .L809E24F8 -/* 00C18 809E24C8 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00C1C 809E24CC C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 00C20 809E24D0 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00C24 809E24D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C28 809E24D8 4600848D */ trunc.w.s $f18, $f16 -/* 00C2C 809E24DC 44199000 */ mfc1 $t9, $f18 -/* 00C30 809E24E0 00000000 */ nop -/* 00C34 809E24E4 57210004 */ bnel $t9, $at, .L809E24F8 -/* 00C38 809E24E8 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00C3C 809E24EC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C40 809E24F0 240528EF */ addiu $a1, $zero, 0x28EF ## $a1 = 000028EF -/* 00C44 809E24F4 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E24F8: -/* 00C48 809E24F8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 00C4C 809E24FC AFA60024 */ sw $a2, 0x0024($sp) -/* 00C50 809E2500 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00C54 809E2504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C58 809E2508 8FA40034 */ lw $a0, 0x0034($sp) -/* 00C5C 809E250C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C60 809E2510 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00C64 809E2514 8FA60024 */ lw $a2, 0x0024($sp) -/* 00C68 809E2518 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00C6C 809E251C 00812821 */ addu $a1, $a0, $at -/* 00C70 809E2520 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 00C74 809E2524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C78 809E2528 8FA50034 */ lw $a1, 0x0034($sp) -/* 00C7C 809E252C 0320F809 */ jalr $ra, $t9 -/* 00C80 809E2530 00000000 */ nop -/* 00C84 809E2534 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C88 809E2538 0C27874E */ jal func_809E1D38 -/* 00C8C 809E253C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00C90 809E2540 8E0901E8 */ lw $t1, 0x01E8($s0) ## 000001E8 -/* 00C94 809E2544 3C0F809E */ lui $t7, %hi(D_809E2958) ## $t7 = 809E0000 -/* 00C98 809E2548 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00C9C 809E254C 0541000C */ bgez $t2, .L809E2580 -/* 00CA0 809E2550 AE0A01E8 */ sw $t2, 0x01E8($s0) ## 000001E8 -/* 00CA4 809E2554 8E0C01E4 */ lw $t4, 0x01E4($s0) ## 000001E4 -/* 00CA8 809E2558 25820001 */ addiu $v0, $t4, 0x0001 ## $v0 = 00000001 -/* 00CAC 809E255C 28410003 */ slti $at, $v0, 0x0003 -/* 00CB0 809E2560 14200003 */ bne $at, $zero, .L809E2570 -/* 00CB4 809E2564 AE0201E4 */ sw $v0, 0x01E4($s0) ## 000001E4 -/* 00CB8 809E2568 AE0001E4 */ sw $zero, 0x01E4($s0) ## 000001E4 -/* 00CBC 809E256C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809E2570: -/* 00CC0 809E2570 00027080 */ sll $t6, $v0, 2 -/* 00CC4 809E2574 01EE7821 */ addu $t7, $t7, $t6 -/* 00CC8 809E2578 8DEF2958 */ lw $t7, %lo(D_809E2958)($t7) -/* 00CCC 809E257C AE0F01E8 */ sw $t7, 0x01E8($s0) ## 000001E8 -.L809E2580: -/* 00CD0 809E2580 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CD4 809E2584 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CD8 809E2588 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00CDC 809E258C 03E00008 */ jr $ra -/* 00CE0 809E2590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s deleted file mode 100644 index 4cb998e5b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_809E18B0 -/* 00000 809E18B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E18B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809E18B8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809E18BC AFA60040 */ sw $a2, 0x0040($sp) -/* 00010 809E18C0 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 -/* 00014 809E18C4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00018 809E18C8 00057900 */ sll $t7, $a1, 4 -/* 0001C 809E18CC 04400003 */ bltz $v0, .L809E18DC -/* 00020 809E18D0 3C18809E */ lui $t8, %hi(D_809E2918) ## $t8 = 809E0000 -/* 00024 809E18D4 14A20005 */ bne $a1, $v0, .L809E18EC -/* 00028 809E18D8 0005C900 */ sll $t9, $a1, 4 -.L809E18DC: -/* 0002C 809E18DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00030 809E18E0 27182918 */ addiu $t8, $t8, %lo(D_809E2918) ## $t8 = 809E2918 -/* 00034 809E18E4 10000005 */ beq $zero, $zero, .L809E18FC -/* 00038 809E18E8 01F81821 */ addu $v1, $t7, $t8 -.L809E18EC: -/* 0003C 809E18EC 3C08809E */ lui $t0, %hi(D_809E2918) ## $t0 = 809E0000 -/* 00040 809E18F0 25082918 */ addiu $t0, $t0, %lo(D_809E2918) ## $t0 = 809E2918 -/* 00044 809E18F4 03281821 */ addu $v1, $t9, $t0 -/* 00048 809E18F8 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C -.L809E18FC: -/* 0004C 809E18FC C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 00050 809E1900 4604303E */ c.le.s $f6, $f4 -/* 00054 809E1904 00000000 */ nop -/* 00058 809E1908 45020017 */ bc1fl .L809E1968 -/* 0005C 809E190C 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00060 809E1910 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00064 809E1914 AFA3002C */ sw $v1, 0x002C($sp) -/* 00068 809E1918 AFA5003C */ sw $a1, 0x003C($sp) -/* 0006C 809E191C 0C028800 */ jal Animation_GetLastFrame - -/* 00070 809E1920 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00074 809E1924 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00078 809E1928 8FA3002C */ lw $v1, 0x002C($sp) -/* 0007C 809E192C C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00080 809E1930 468042A0 */ cvt.s.w $f10, $f8 -/* 00084 809E1934 8FA40038 */ lw $a0, 0x0038($sp) -/* 00088 809E1938 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 -/* 0008C 809E193C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00090 809E1940 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00094 809E1944 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 00098 809E1948 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0009C 809E194C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 000A0 809E1950 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000A4 809E1954 0C029468 */ jal Animation_Change - -/* 000A8 809E1958 AFA90014 */ sw $t1, 0x0014($sp) -/* 000AC 809E195C 10000016 */ beq $zero, $zero, .L809E19B8 -/* 000B0 809E1960 8FAB003C */ lw $t3, 0x003C($sp) -/* 000B4 809E1964 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -.L809E1968: -/* 000B8 809E1968 AFA3002C */ sw $v1, 0x002C($sp) -/* 000BC 809E196C AFA5003C */ sw $a1, 0x003C($sp) -/* 000C0 809E1970 0C028800 */ jal Animation_GetLastFrame - -/* 000C4 809E1974 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 000C8 809E1978 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 000CC 809E197C 8FA3002C */ lw $v1, 0x002C($sp) -/* 000D0 809E1980 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 000D4 809E1984 46808420 */ cvt.s.w $f16, $f16 -/* 000D8 809E1988 8FA40038 */ lw $a0, 0x0038($sp) -/* 000DC 809E198C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 000E0 809E1990 906A0008 */ lbu $t2, 0x0008($v1) ## 00000008 -/* 000E4 809E1994 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 000E8 809E1998 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 000EC 809E199C 44078000 */ mfc1 $a3, $f16 -/* 000F0 809E19A0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 000F4 809E19A4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000F8 809E19A8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000FC 809E19AC 0C029468 */ jal Animation_Change - -/* 00100 809E19B0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00104 809E19B4 8FAB003C */ lw $t3, 0x003C($sp) -.L809E19B8: -/* 00108 809E19B8 8FAC0040 */ lw $t4, 0x0040($sp) -/* 0010C 809E19BC AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 -/* 00110 809E19C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00114 809E19C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 809E19C8 03E00008 */ jr $ra -/* 0011C 809E19CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s deleted file mode 100644 index ca042454fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel jtbl_809E29B0 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1CA4 -.word L809E1BD4 -.word L809E1CA4 -.word L809E1C3C - -.text -glabel func_809E1B8C -/* 002DC 809E1B8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 002E0 809E1B90 AFB00018 */ sw $s0, 0x0018($sp) -/* 002E4 809E1B94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002E8 809E1B98 AFBF001C */ sw $ra, 0x001C($sp) -/* 002EC 809E1B9C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 002F0 809E1BA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 002F4 809E1BA4 AFA30024 */ sw $v1, 0x0024($sp) -/* 002F8 809E1BA8 0C042F6F */ jal func_8010BDBC -/* 002FC 809E1BAC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00300 809E1BB0 2C410007 */ sltiu $at, $v0, 0x0007 -/* 00304 809E1BB4 1020003B */ beq $at, $zero, .L809E1CA4 -/* 00308 809E1BB8 8FA30024 */ lw $v1, 0x0024($sp) -/* 0030C 809E1BBC 00027080 */ sll $t6, $v0, 2 -/* 00310 809E1BC0 3C01809E */ lui $at, %hi(jtbl_809E29B0) ## $at = 809E0000 -/* 00314 809E1BC4 002E0821 */ addu $at, $at, $t6 -/* 00318 809E1BC8 8C2E29B0 */ lw $t6, %lo(jtbl_809E29B0)($at) -/* 0031C 809E1BCC 01C00008 */ jr $t6 -/* 00320 809E1BD0 00000000 */ nop -glabel L809E1BD4 -/* 00324 809E1BD4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00328 809E1BD8 0C041AF2 */ jal func_80106BC8 -/* 0032C 809E1BDC AFA30024 */ sw $v1, 0x0024($sp) -/* 00330 809E1BE0 10400030 */ beq $v0, $zero, .L809E1CA4 -/* 00334 809E1BE4 8FA30024 */ lw $v1, 0x0024($sp) -/* 00338 809E1BE8 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0033C 809E1BEC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00340 809E1BF0 24082024 */ addiu $t0, $zero, 0x2024 ## $t0 = 00002024 -/* 00344 809E1BF4 030FC021 */ addu $t8, $t8, $t7 -/* 00348 809E1BF8 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD -/* 0034C 809E1BFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00350 809E1C00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00354 809E1C04 17000009 */ bne $t8, $zero, .L809E1C2C -/* 00358 809E1C08 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 0035C 809E1C0C 24192026 */ addiu $t9, $zero, 0x2026 ## $t9 = 00002026 -/* 00360 809E1C10 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00364 809E1C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00368 809E1C18 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 0036C 809E1C1C 0C27862C */ jal func_809E18B0 -/* 00370 809E1C20 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00374 809E1C24 1000001F */ beq $zero, $zero, .L809E1CA4 -/* 00378 809E1C28 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L809E1C2C: -/* 0037C 809E1C2C 0C27862C */ jal func_809E18B0 -/* 00380 809E1C30 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00384 809E1C34 1000001B */ beq $zero, $zero, .L809E1CA4 -/* 00388 809E1C38 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -glabel L809E1C3C -/* 0038C 809E1C3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00390 809E1C40 0C041AF2 */ jal func_80106BC8 -/* 00394 809E1C44 AFA30024 */ sw $v1, 0x0024($sp) -/* 00398 809E1C48 10400016 */ beq $v0, $zero, .L809E1CA4 -/* 0039C 809E1C4C 8FA30024 */ lw $v1, 0x0024($sp) -/* 003A0 809E1C50 9609010E */ lhu $t1, 0x010E($s0) ## 0000010E -/* 003A4 809E1C54 24012026 */ addiu $at, $zero, 0x2026 ## $at = 00002026 -/* 003A8 809E1C58 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 003AC 809E1C5C 15210011 */ bne $t1, $at, .L809E1CA4 -/* 003B0 809E1C60 00000000 */ nop -/* 003B4 809E1C64 0C023C23 */ jal Player_UnsetMask -/* 003B8 809E1C68 8FA40034 */ lw $a0, 0x0034($sp) -/* 003BC 809E1C6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 003C0 809E1C70 0C021344 */ jal Item_Give -/* 003C4 809E1C74 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 003C8 809E1C78 3C038016 */ lui $v1, %hi(gSaveContext) -/* 003CC 809E1C7C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 003D0 809E1C80 946A0EF6 */ lhu $t2, 0x0EF6($v1) ## 8015F556 -/* 003D4 809E1C84 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 003D8 809E1C88 354B0400 */ ori $t3, $t2, 0x0400 ## $t3 = 00000400 -/* 003DC 809E1C8C 0C021CC3 */ jal Rupees_ChangeBy -/* 003E0 809E1C90 A46B0EF6 */ sh $t3, 0x0EF6($v1) ## 8015F556 -/* 003E4 809E1C94 240C2027 */ addiu $t4, $zero, 0x2027 ## $t4 = 00002027 -/* 003E8 809E1C98 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 003EC 809E1C9C 10000001 */ beq $zero, $zero, .L809E1CA4 -/* 003F0 809E1CA0 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -glabel L809E1CA4 -.L809E1CA4: -/* 003F4 809E1CA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 003F8 809E1CA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 003FC 809E1CAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00400 809E1CB0 03E00008 */ jr $ra -/* 00404 809E1CB4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s deleted file mode 100644 index 7ae855e101..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809E1CB8 -/* 00408 809E1CB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0040C 809E1CBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00410 809E1CC0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00414 809E1CC4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00418 809E1CC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0041C 809E1CCC 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F -/* 00420 809E1CD0 0C01B0D8 */ jal Text_GetFaceReaction -/* 00424 809E1CD4 AFAE001C */ sw $t6, 0x001C($sp) -/* 00428 809E1CD8 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) -/* 0042C 809E1CDC 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) -/* 00430 809E1CE0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00434 809E1CE4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00438 809E1CE8 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 -/* 0043C 809E1CEC 13000005 */ beq $t8, $zero, .L809E1D04 -/* 00440 809E1CF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00444 809E1CF4 5440000E */ bnel $v0, $zero, .L809E1D30 -/* 00448 809E1CF8 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 0044C 809E1CFC 1000000B */ beq $zero, $zero, .L809E1D2C -/* 00450 809E1D00 24042028 */ addiu $a0, $zero, 0x2028 ## $a0 = 00002028 -.L809E1D04: -/* 00454 809E1D04 8FB9001C */ lw $t9, 0x001C($sp) -/* 00458 809E1D08 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0045C 809E1D0C 9328015F */ lbu $t0, 0x015F($t9) ## 0000015F -/* 00460 809E1D10 15010003 */ bne $t0, $at, .L809E1D20 -/* 00464 809E1D14 00000000 */ nop -/* 00468 809E1D18 10000004 */ beq $zero, $zero, .L809E1D2C -/* 0046C 809E1D1C 24042023 */ addiu $a0, $zero, 0x2023 ## $a0 = 00002023 -.L809E1D20: -/* 00470 809E1D20 54600003 */ bnel $v1, $zero, .L809E1D30 -/* 00474 809E1D24 00801025 */ or $v0, $a0, $zero ## $v0 = 00002023 -/* 00478 809E1D28 24042022 */ addiu $a0, $zero, 0x2022 ## $a0 = 00002022 -.L809E1D2C: -/* 0047C 809E1D2C 00801025 */ or $v0, $a0, $zero ## $v0 = 00002022 -.L809E1D30: -/* 00480 809E1D30 03E00008 */ jr $ra -/* 00484 809E1D34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s deleted file mode 100644 index 96794d8557..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_809E1D38 -/* 00488 809E1D38 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0048C 809E1D3C AFBF001C */ sw $ra, 0x001C($sp) -/* 00490 809E1D40 AFB00018 */ sw $s0, 0x0018($sp) -/* 00494 809E1D44 8C8201E0 */ lw $v0, 0x01E0($a0) ## 000001E0 -/* 00498 809E1D48 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0049C 809E1D4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A0 809E1D50 14410007 */ bne $v0, $at, .L809E1D70 -/* 004A4 809E1D54 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004A8 809E1D58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004AC 809E1D5C 0C042DC8 */ jal func_8010B720 -/* 004B0 809E1D60 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 004B4 809E1D64 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 004B8 809E1D68 10000040 */ beq $zero, $zero, .L809E1E6C -/* 004BC 809E1D6C AE0E01E0 */ sw $t6, 0x01E0($s0) ## 000001E0 -.L809E1D70: -/* 004C0 809E1D70 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 004C4 809E1D74 14410006 */ bne $v0, $at, .L809E1D90 -/* 004C8 809E1D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004CC 809E1D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 809E1D80 0C2786E3 */ jal func_809E1B8C -/* 004D4 809E1D84 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 004D8 809E1D88 10000038 */ beq $zero, $zero, .L809E1E6C -/* 004DC 809E1D8C AE0201E0 */ sw $v0, 0x01E0($s0) ## 000001E0 -.L809E1D90: -/* 004E0 809E1D90 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 004E4 809E1D94 0C00BC65 */ jal func_8002F194 -/* 004E8 809E1D98 AFA60034 */ sw $a2, 0x0034($sp) -/* 004EC 809E1D9C 1040001E */ beq $v0, $zero, .L809E1E18 -/* 004F0 809E1DA0 8FA40034 */ lw $a0, 0x0034($sp) -/* 004F4 809E1DA4 9602010E */ lhu $v0, 0x010E($s0) ## 0000010E -/* 004F8 809E1DA8 24032022 */ addiu $v1, $zero, 0x2022 ## $v1 = 00002022 -/* 004FC 809E1DAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00500 809E1DB0 10620005 */ beq $v1, $v0, .L809E1DC8 -/* 00504 809E1DB4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00508 809E1DB8 10620006 */ beq $v1, $v0, .L809E1DD4 -/* 0050C 809E1DBC 24012028 */ addiu $at, $zero, 0x2028 ## $at = 00002028 -/* 00510 809E1DC0 50410005 */ beql $v0, $at, .L809E1DD8 -/* 00514 809E1DC4 24012023 */ addiu $at, $zero, 0x2023 ## $at = 00002023 -.L809E1DC8: -/* 00518 809E1DC8 0C27862C */ jal func_809E18B0 -/* 0051C 809E1DCC 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00520 809E1DD0 9602010E */ lhu $v0, 0x010E($s0) ## 0000010E -.L809E1DD4: -/* 00524 809E1DD4 24012023 */ addiu $at, $zero, 0x2023 ## $at = 00002023 -.L809E1DD8: -/* 00528 809E1DD8 10410003 */ beq $v0, $at, .L809E1DE8 -/* 0052C 809E1DDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00530 809E1DE0 24012028 */ addiu $at, $zero, 0x2028 ## $at = 00002028 -/* 00534 809E1DE4 14410004 */ bne $v0, $at, .L809E1DF8 -.L809E1DE8: -/* 00538 809E1DE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0053C 809E1DEC 0C27862C */ jal func_809E18B0 -/* 00540 809E1DF0 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00544 809E1DF4 9602010E */ lhu $v0, 0x010E($s0) ## 0000010E -.L809E1DF8: -/* 00548 809E1DF8 24012023 */ addiu $at, $zero, 0x2023 ## $at = 00002023 -/* 0054C 809E1DFC 54410004 */ bnel $v0, $at, .L809E1E10 -/* 00550 809E1E00 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00554 809E1E04 0C01E221 */ jal func_80078884 -/* 00558 809E1E08 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 0055C 809E1E0C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -.L809E1E10: -/* 00560 809E1E10 10000016 */ beq $zero, $zero, .L809E1E6C -/* 00564 809E1E14 AE0F01E0 */ sw $t7, 0x01E0($s0) ## 000001E0 -.L809E1E18: -/* 00568 809E1E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0056C 809E1E1C 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 00570 809E1E20 0C00BCDD */ jal func_8002F374 -/* 00574 809E1E24 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFF8 -/* 00578 809E1E28 87A2002A */ lh $v0, 0x002A($sp) -/* 0057C 809E1E2C 0440000F */ bltz $v0, .L809E1E6C -/* 00580 809E1E30 28410141 */ slti $at, $v0, 0x0141 -/* 00584 809E1E34 1020000D */ beq $at, $zero, .L809E1E6C -/* 00588 809E1E38 87A20028 */ lh $v0, 0x0028($sp) -/* 0058C 809E1E3C 0440000B */ bltz $v0, .L809E1E6C -/* 00590 809E1E40 284100F1 */ slti $at, $v0, 0x00F1 -/* 00594 809E1E44 10200009 */ beq $at, $zero, .L809E1E6C -/* 00598 809E1E48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0059C 809E1E4C 8FA50034 */ lw $a1, 0x0034($sp) -/* 005A0 809E1E50 0C00BCB3 */ jal func_8002F2CC -/* 005A4 809E1E54 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 005A8 809E1E58 10400004 */ beq $v0, $zero, .L809E1E6C -/* 005AC 809E1E5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005B0 809E1E60 0C27872E */ jal func_809E1CB8 -/* 005B4 809E1E64 8FA50034 */ lw $a1, 0x0034($sp) -/* 005B8 809E1E68 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -.L809E1E6C: -/* 005BC 809E1E6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 005C0 809E1E70 8FB00018 */ lw $s0, 0x0018($sp) -/* 005C4 809E1E74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005C8 809E1E78 03E00008 */ jr $ra -/* 005CC 809E1E7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s deleted file mode 100644 index 056aac8cca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_809E1E80 -/* 005D0 809E1E80 000570C0 */ sll $t6, $a1, 3 -/* 005D4 809E1E84 01C47821 */ addu $t7, $t6, $a0 -/* 005D8 809E1E88 03E00008 */ jr $ra -/* 005DC 809E1E8C 91E20000 */ lbu $v0, 0x0000($t7) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s deleted file mode 100644 index d235c0f2f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809E1E90 -/* 005E0 809E1E90 000670C0 */ sll $t6, $a2, 3 -/* 005E4 809E1E94 008E7821 */ addu $t7, $a0, $t6 -/* 005E8 809E1E98 8DE80004 */ lw $t0, 0x0004($t7) ## 00000004 -/* 005EC 809E1E9C 3C0A8016 */ lui $t2, %hi(gSegments) -/* 005F0 809E1EA0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 005F4 809E1EA4 0008C100 */ sll $t8, $t0, 4 -/* 005F8 809E1EA8 0018CF02 */ srl $t9, $t8, 28 -/* 005FC 809E1EAC 00194880 */ sll $t1, $t9, 2 -/* 00600 809E1EB0 01495021 */ addu $t2, $t2, $t1 -/* 00604 809E1EB4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00608 809E1EB8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0060C 809E1EBC 00076880 */ sll $t5, $a3, 2 -/* 00610 809E1EC0 01A76823 */ subu $t5, $t5, $a3 -/* 00614 809E1EC4 01015824 */ and $t3, $t0, $at -/* 00618 809E1EC8 000D6840 */ sll $t5, $t5, 1 -/* 0061C 809E1ECC 014B6021 */ addu $t4, $t2, $t3 -/* 00620 809E1ED0 018D1821 */ addu $v1, $t4, $t5 -/* 00624 809E1ED4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00628 809E1ED8 00611821 */ addu $v1, $v1, $at -/* 0062C 809E1EDC 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00630 809E1EE0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00634 809E1EE4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00638 809E1EE8 00000000 */ nop -/* 0063C 809E1EEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00640 809E1EF0 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 00644 809E1EF4 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 -/* 00648 809E1EF8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0064C 809E1EFC 00000000 */ nop -/* 00650 809E1F00 468042A0 */ cvt.s.w $f10, $f8 -/* 00654 809E1F04 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 00658 809E1F08 84780004 */ lh $t8, 0x0004($v1) ## 00000004 -/* 0065C 809E1F0C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00660 809E1F10 00000000 */ nop -/* 00664 809E1F14 468084A0 */ cvt.s.w $f18, $f16 -/* 00668 809E1F18 03E00008 */ jr $ra -/* 0066C 809E1F1C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s deleted file mode 100644 index 4343d83d13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel D_809E29CC - .word 0x4622F983 -glabel D_809E29D0 - .word 0x41270A3D - -.text -glabel func_809E1F20 -/* 00670 809E1F20 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00674 809E1F24 AFBF004C */ sw $ra, 0x004C($sp) -/* 00678 809E1F28 AFB20048 */ sw $s2, 0x0048($sp) -/* 0067C 809E1F2C AFB10044 */ sw $s1, 0x0044($sp) -/* 00680 809E1F30 AFB00040 */ sw $s0, 0x0040($sp) -/* 00684 809E1F34 AFA5007C */ sw $a1, 0x007C($sp) -/* 00688 809E1F38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0068C 809E1F3C F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 00690 809E1F40 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00694 809E1F44 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00698 809E1F48 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0069C 809E1F4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006A0 809E1F50 27B20064 */ addiu $s2, $sp, 0x0064 ## $s2 = FFFFFFEC -/* 006A4 809E1F54 00A18821 */ addu $s1, $a1, $at -/* 006A8 809E1F58 8E241E08 */ lw $a0, 0x1E08($s1) ## 00001E08 -/* 006AC 809E1F5C 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFEC -/* 006B0 809E1F60 8E0701FC */ lw $a3, 0x01FC($s0) ## 000001FC -/* 006B4 809E1F64 0C2787A4 */ jal func_809E1E90 -/* 006B8 809E1F68 8E0601F4 */ lw $a2, 0x01F4($s0) ## 000001F4 -/* 006BC 809E1F6C C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 006C0 809E1F70 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 006C4 809E1F74 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 006C8 809E1F78 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 006CC 809E1F7C 46062501 */ sub.s $f20, $f4, $f6 -/* 006D0 809E1F80 460A4581 */ sub.s $f22, $f8, $f10 -/* 006D4 809E1F84 4600A306 */ mov.s $f12, $f20 -/* 006D8 809E1F88 0C03F494 */ jal Math_FAtan2F -/* 006DC 809E1F8C 4600B386 */ mov.s $f14, $f22 -/* 006E0 809E1F90 3C01809E */ lui $at, %hi(D_809E29CC) ## $at = 809E0000 -/* 006E4 809E1F94 C43829CC */ lwc1 $f24, %lo(D_809E29CC)($at) -/* 006E8 809E1F98 3C01809E */ lui $at, %hi(D_809E29D0) ## $at = 809E0000 -/* 006EC 809E1F9C C43A29D0 */ lwc1 $f26, %lo(D_809E29D0)($at) -/* 006F0 809E1FA0 46180402 */ mul.s $f16, $f0, $f24 -/* 006F4 809E1FA4 00000000 */ nop -/* 006F8 809E1FA8 4614A202 */ mul.s $f8, $f20, $f20 -/* 006FC 809E1FAC 00000000 */ nop -/* 00700 809E1FB0 4616B282 */ mul.s $f10, $f22, $f22 -/* 00704 809E1FB4 4600848D */ trunc.w.s $f18, $f16 -/* 00708 809E1FB8 460A4000 */ add.s $f0, $f8, $f10 -/* 0070C 809E1FBC 440F9000 */ mfc1 $t7, $f18 -/* 00710 809E1FC0 46000004 */ sqrt.s $f0, $f0 -/* 00714 809E1FC4 000FC400 */ sll $t8, $t7, 16 -/* 00718 809E1FC8 0018CC03 */ sra $t9, $t8, 16 -/* 0071C 809E1FCC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00720 809E1FD0 00000000 */ nop -/* 00724 809E1FD4 468021A0 */ cvt.s.w $f6, $f4 -/* 00728 809E1FD8 E6000208 */ swc1 $f0, 0x0208($s0) ## 00000208 -/* 0072C 809E1FDC 461A003E */ c.le.s $f0, $f26 -/* 00730 809E1FE0 E6060204 */ swc1 $f6, 0x0204($s0) ## 00000204 -/* 00734 809E1FE4 4500002E */ bc1f .L809E20A0 -/* 00738 809E1FE8 00000000 */ nop -.L809E1FEC: -/* 0073C 809E1FEC 8E0801FC */ lw $t0, 0x01FC($s0) ## 000001FC -/* 00740 809E1FF0 8E0501F4 */ lw $a1, 0x01F4($s0) ## 000001F4 -/* 00744 809E1FF4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00748 809E1FF8 AE0901FC */ sw $t1, 0x01FC($s0) ## 000001FC -/* 0074C 809E1FFC 0C2787A0 */ jal func_809E1E80 -/* 00750 809E2000 8E241E08 */ lw $a0, 0x1E08($s1) ## 00001E08 -/* 00754 809E2004 8E0701FC */ lw $a3, 0x01FC($s0) ## 000001FC -/* 00758 809E2008 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFEC -/* 0075C 809E200C 04E00003 */ bltz $a3, .L809E201C -/* 00760 809E2010 00E2082A */ slt $at, $a3, $v0 -/* 00764 809E2014 54200004 */ bnel $at, $zero, .L809E2028 -/* 00768 809E2018 8E241E08 */ lw $a0, 0x1E08($s1) ## 00001E08 -.L809E201C: -/* 0076C 809E201C AE0001FC */ sw $zero, 0x01FC($s0) ## 000001FC -/* 00770 809E2020 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00774 809E2024 8E241E08 */ lw $a0, 0x1E08($s1) ## 00001E08 -.L809E2028: -/* 00778 809E2028 0C2787A4 */ jal func_809E1E90 -/* 0077C 809E202C 8E0601F4 */ lw $a2, 0x01F4($s0) ## 000001F4 -/* 00780 809E2030 C7B00064 */ lwc1 $f16, 0x0064($sp) -/* 00784 809E2034 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 00788 809E2038 C7A4006C */ lwc1 $f4, 0x006C($sp) -/* 0078C 809E203C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00790 809E2040 46128501 */ sub.s $f20, $f16, $f18 -/* 00794 809E2044 46062581 */ sub.s $f22, $f4, $f6 -/* 00798 809E2048 4600A306 */ mov.s $f12, $f20 -/* 0079C 809E204C 0C03F494 */ jal Math_FAtan2F -/* 007A0 809E2050 4600B386 */ mov.s $f14, $f22 -/* 007A4 809E2054 46180202 */ mul.s $f8, $f0, $f24 -/* 007A8 809E2058 00000000 */ nop -/* 007AC 809E205C 4614A102 */ mul.s $f4, $f20, $f20 -/* 007B0 809E2060 00000000 */ nop -/* 007B4 809E2064 4616B182 */ mul.s $f6, $f22, $f22 -/* 007B8 809E2068 4600428D */ trunc.w.s $f10, $f8 -/* 007BC 809E206C 46062000 */ add.s $f0, $f4, $f6 -/* 007C0 809E2070 440B5000 */ mfc1 $t3, $f10 -/* 007C4 809E2074 46000004 */ sqrt.s $f0, $f0 -/* 007C8 809E2078 000B6400 */ sll $t4, $t3, 16 -/* 007CC 809E207C 000C6C03 */ sra $t5, $t4, 16 -/* 007D0 809E2080 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 007D4 809E2084 00000000 */ nop -/* 007D8 809E2088 468084A0 */ cvt.s.w $f18, $f16 -/* 007DC 809E208C E6000208 */ swc1 $f0, 0x0208($s0) ## 00000208 -/* 007E0 809E2090 461A003E */ c.le.s $f0, $f26 -/* 007E4 809E2094 E6120204 */ swc1 $f18, 0x0204($s0) ## 00000204 -/* 007E8 809E2098 4501FFD4 */ bc1t .L809E1FEC -/* 007EC 809E209C 00000000 */ nop -.L809E20A0: -/* 007F0 809E20A0 C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 -/* 007F4 809E20A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 007F8 809E20A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 007FC 809E20AC 4600428D */ trunc.w.s $f10, $f8 -/* 00800 809E20B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00804 809E20B4 240709C4 */ addiu $a3, $zero, 0x09C4 ## $a3 = 000009C4 -/* 00808 809E20B8 44055000 */ mfc1 $a1, $f10 -/* 0080C 809E20BC 00000000 */ nop -/* 00810 809E20C0 00052C00 */ sll $a1, $a1, 16 -/* 00814 809E20C4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00818 809E20C8 00052C03 */ sra $a1, $a1, 16 -/* 0081C 809E20CC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00820 809E20D0 C610020C */ lwc1 $f16, 0x020C($s0) ## 0000020C -/* 00824 809E20D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00828 809E20D8 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 0082C 809E20DC 0C00B638 */ jal Actor_MoveForward - -/* 00830 809E20E0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00834 809E20E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00838 809E20E8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 0083C 809E20EC AFB80014 */ sw $t8, 0x0014($sp) -/* 00840 809E20F0 44060000 */ mfc1 $a2, $f0 -/* 00844 809E20F4 44070000 */ mfc1 $a3, $f0 -/* 00848 809E20F8 8FA4007C */ lw $a0, 0x007C($sp) -/* 0084C 809E20FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00850 809E2100 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00854 809E2104 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00858 809E2108 8FBF004C */ lw $ra, 0x004C($sp) -/* 0085C 809E210C D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00860 809E2110 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 00864 809E2114 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 00868 809E2118 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 0086C 809E211C 8FB00040 */ lw $s0, 0x0040($sp) -/* 00870 809E2120 8FB10044 */ lw $s1, 0x0044($sp) -/* 00874 809E2124 8FB20048 */ lw $s2, 0x0048($sp) -/* 00878 809E2128 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 0087C 809E212C 03E00008 */ jr $ra -/* 00880 809E2130 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s deleted file mode 100644 index 76996f7044..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_809E2134 -/* 00884 809E2134 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00888 809E2138 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0088C 809E213C AFA5001C */ sw $a1, 0x001C($sp) -/* 00890 809E2140 8C8E01E0 */ lw $t6, 0x01E0($a0) ## 000001E0 -/* 00894 809E2144 3C0F809E */ lui $t7, %hi(func_809E2360) ## $t7 = 809E0000 -/* 00898 809E2148 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0089C 809E214C 11C00003 */ beq $t6, $zero, .L809E215C -/* 008A0 809E2150 25EF2360 */ addiu $t7, $t7, %lo(func_809E2360) ## $t7 = 809E2360 -/* 008A4 809E2154 1000005B */ beq $zero, $zero, .L809E22C4 -/* 008A8 809E2158 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -.L809E215C: -/* 008AC 809E215C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 008B0 809E2160 0C02927F */ jal SkelAnime_Update - -/* 008B4 809E2164 AFA70018 */ sw $a3, 0x0018($sp) -/* 008B8 809E2168 1040003B */ beq $v0, $zero, .L809E2258 -/* 008BC 809E216C 8FA70018 */ lw $a3, 0x0018($sp) -/* 008C0 809E2170 8CF801E0 */ lw $t8, 0x01E0($a3) ## 000001E0 -/* 008C4 809E2174 8CE50210 */ lw $a1, 0x0210($a3) ## 00000210 -/* 008C8 809E2178 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) -/* 008CC 809E217C 57000032 */ bnel $t8, $zero, .L809E2248 -/* 008D0 809E2180 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 008D4 809E2184 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) -/* 008D8 809E2188 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 008DC 809E218C 1100000B */ beq $t0, $zero, .L809E21BC -/* 008E0 809E2190 00000000 */ nop -/* 008E4 809E2194 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 008E8 809E2198 AFA70018 */ sw $a3, 0x0018($sp) -/* 008EC 809E219C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008F0 809E21A0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 008F4 809E21A4 8FA70018 */ lw $a3, 0x0018($sp) -/* 008F8 809E21A8 46040182 */ mul.s $f6, $f0, $f4 -/* 008FC 809E21AC 4600320D */ trunc.w.s $f8, $f6 -/* 00900 809E21B0 44024000 */ mfc1 $v0, $f8 -/* 00904 809E21B4 1000000A */ beq $zero, $zero, .L809E21E0 -/* 00908 809E21B8 00000000 */ nop -.L809E21BC: -/* 0090C 809E21BC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00910 809E21C0 AFA70018 */ sw $a3, 0x0018($sp) -/* 00914 809E21C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00918 809E21C8 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0091C 809E21CC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00920 809E21D0 460A0402 */ mul.s $f16, $f0, $f10 -/* 00924 809E21D4 4600848D */ trunc.w.s $f18, $f16 -/* 00928 809E21D8 44029000 */ mfc1 $v0, $f18 -/* 0092C 809E21DC 00000000 */ nop -.L809E21E0: -/* 00930 809E21E0 14400018 */ bne $v0, $zero, .L809E2244 -/* 00934 809E21E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00938 809E21E8 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef6) -/* 0093C 809E21EC 956BF556 */ lhu $t3, %lo(gSaveContext+0xef6)($t3) -/* 00940 809E21F0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00944 809E21F4 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 -/* 00948 809E21F8 1180000E */ beq $t4, $zero, .L809E2234 -/* 0094C 809E21FC 00000000 */ nop -/* 00950 809E2200 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00954 809E2204 AFA70018 */ sw $a3, 0x0018($sp) -/* 00958 809E2208 46000100 */ add.s $f4, $f0, $f0 -/* 0095C 809E220C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00960 809E2210 4600218D */ trunc.w.s $f6, $f4 -/* 00964 809E2214 440E3000 */ mfc1 $t6, $f6 -/* 00968 809E2218 00000000 */ nop -/* 0096C 809E221C 15C00003 */ bne $t6, $zero, .L809E222C -/* 00970 809E2220 00000000 */ nop -/* 00974 809E2224 10000003 */ beq $zero, $zero, .L809E2234 -/* 00978 809E2228 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -.L809E222C: -/* 0097C 809E222C 10000001 */ beq $zero, $zero, .L809E2234 -/* 00980 809E2230 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L809E2234: -/* 00984 809E2234 3C0F809E */ lui $t7, %hi(func_809E22D4) ## $t7 = 809E0000 -/* 00988 809E2238 25EF22D4 */ addiu $t7, $t7, %lo(func_809E22D4) ## $t7 = 809E22D4 -/* 0098C 809E223C 10000001 */ beq $zero, $zero, .L809E2244 -/* 00990 809E2240 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -.L809E2244: -/* 00994 809E2244 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L809E2248: -/* 00998 809E2248 24E60210 */ addiu $a2, $a3, 0x0210 ## $a2 = 00000210 -/* 0099C 809E224C 0C27862C */ jal func_809E18B0 -/* 009A0 809E2250 AFA70018 */ sw $a3, 0x0018($sp) -/* 009A4 809E2254 8FA70018 */ lw $a3, 0x0018($sp) -.L809E2258: -/* 009A8 809E2258 8CF801E0 */ lw $t8, 0x01E0($a3) ## 000001E0 -/* 009AC 809E225C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 009B0 809E2260 57000019 */ bnel $t8, $zero, .L809E22C8 -/* 009B4 809E2264 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009B8 809E2268 C4E80164 */ lwc1 $f8, 0x0164($a3) ## 00000164 -/* 009BC 809E226C 4600428D */ trunc.w.s $f10, $f8 -/* 009C0 809E2270 44025000 */ mfc1 $v0, $f10 -/* 009C4 809E2274 00000000 */ nop -/* 009C8 809E2278 28410008 */ slti $at, $v0, 0x0008 -/* 009CC 809E227C 14200002 */ bne $at, $zero, .L809E2288 -/* 009D0 809E2280 28410010 */ slti $at, $v0, 0x0010 -/* 009D4 809E2284 14200007 */ bne $at, $zero, .L809E22A4 -.L809E2288: -/* 009D8 809E2288 28410017 */ slti $at, $v0, 0x0017 -/* 009DC 809E228C 14200003 */ bne $at, $zero, .L809E229C -/* 009E0 809E2290 2841001E */ slti $at, $v0, 0x001E -/* 009E4 809E2294 54200004 */ bnel $at, $zero, .L809E22A8 -/* 009E8 809E2298 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -.L809E229C: -/* 009EC 809E229C 14400004 */ bne $v0, $zero, .L809E22B0 -/* 009F0 809E22A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L809E22A4: -/* 009F4 809E22A4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -.L809E22A8: -/* 009F8 809E22A8 10000004 */ beq $zero, $zero, .L809E22BC -/* 009FC 809E22AC E4F0020C */ swc1 $f16, 0x020C($a3) ## 0000020C -.L809E22B0: -/* 00A00 809E22B0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00A04 809E22B4 00000000 */ nop -/* 00A08 809E22B8 E4F2020C */ swc1 $f18, 0x020C($a3) ## 0000020C -.L809E22BC: -/* 00A0C 809E22BC 0C2787C8 */ jal func_809E1F20 -/* 00A10 809E22C0 8FA5001C */ lw $a1, 0x001C($sp) -.L809E22C4: -/* 00A14 809E22C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809E22C8: -/* 00A18 809E22C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A1C 809E22CC 03E00008 */ jr $ra -/* 00A20 809E22D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s deleted file mode 100644 index a53a281e4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_809E22D4 -/* 00A24 809E22D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A28 809E22D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A2C 809E22DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00A30 809E22E0 8C8E01E0 */ lw $t6, 0x01E0($a0) ## 000001E0 -/* 00A34 809E22E4 3C0F809E */ lui $t7, %hi(func_809E2360) ## $t7 = 809E0000 -/* 00A38 809E22E8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00A3C 809E22EC 11C00003 */ beq $t6, $zero, .L809E22FC -/* 00A40 809E22F0 25EF2360 */ addiu $t7, $t7, %lo(func_809E2360) ## $t7 = 809E2360 -/* 00A44 809E22F4 10000016 */ beq $zero, $zero, .L809E2350 -/* 00A48 809E22F8 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -.L809E22FC: -/* 00A4C 809E22FC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00A50 809E2300 0C02927F */ jal SkelAnime_Update - -/* 00A54 809E2304 AFA70018 */ sw $a3, 0x0018($sp) -/* 00A58 809E2308 10400011 */ beq $v0, $zero, .L809E2350 -/* 00A5C 809E230C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00A60 809E2310 8CF801E0 */ lw $t8, 0x01E0($a3) ## 000001E0 -/* 00A64 809E2314 8CE50210 */ lw $a1, 0x0210($a3) ## 00000210 -/* 00A68 809E2318 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00A6C 809E231C 1700000A */ bne $t8, $zero, .L809E2348 -/* 00A70 809E2320 00000000 */ nop -/* 00A74 809E2324 8CE20200 */ lw $v0, 0x0200($a3) ## 00000200 -/* 00A78 809E2328 3C08809E */ lui $t0, %hi(func_809E2134) ## $t0 = 809E0000 -/* 00A7C 809E232C 25082134 */ addiu $t0, $t0, %lo(func_809E2134) ## $t0 = 809E2134 -/* 00A80 809E2330 18400003 */ blez $v0, .L809E2340 -/* 00A84 809E2334 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 00A88 809E2338 10000003 */ beq $zero, $zero, .L809E2348 -/* 00A8C 809E233C ACF90200 */ sw $t9, 0x0200($a3) ## 00000200 -.L809E2340: -/* 00A90 809E2340 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A94 809E2344 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -.L809E2348: -/* 00A98 809E2348 0C27862C */ jal func_809E18B0 -/* 00A9C 809E234C 24E60210 */ addiu $a2, $a3, 0x0210 ## $a2 = 00000210 -.L809E2350: -/* 00AA0 809E2350 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AA4 809E2354 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AA8 809E2358 03E00008 */ jr $ra -/* 00AAC 809E235C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s deleted file mode 100644 index 417026b3f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_809E2360 -/* 00AB0 809E2360 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AB4 809E2364 AFBF001C */ sw $ra, 0x001C($sp) -/* 00AB8 809E2368 AFB00018 */ sw $s0, 0x0018($sp) -/* 00ABC 809E236C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00AC0 809E2370 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AC4 809E2374 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AC8 809E2378 0C02927F */ jal SkelAnime_Update - -/* 00ACC 809E237C AFA30024 */ sw $v1, 0x0024($sp) -/* 00AD0 809E2380 10400007 */ beq $v0, $zero, .L809E23A0 -/* 00AD4 809E2384 8FA30024 */ lw $v1, 0x0024($sp) -/* 00AD8 809E2388 8E050210 */ lw $a1, 0x0210($s0) ## 00000210 -/* 00ADC 809E238C AFA30024 */ sw $v1, 0x0024($sp) -/* 00AE0 809E2390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE4 809E2394 0C27862C */ jal func_809E18B0 -/* 00AE8 809E2398 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00AEC 809E239C 8FA30024 */ lw $v1, 0x0024($sp) -.L809E23A0: -/* 00AF0 809E23A0 8E0E0280 */ lw $t6, 0x0280($s0) ## 00000280 -/* 00AF4 809E23A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF8 809E23A8 26050258 */ addiu $a1, $s0, 0x0258 ## $a1 = 00000258 -/* 00AFC 809E23AC 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00B00 809E23B0 AE0F0280 */ sw $t7, 0x0280($s0) ## 00000280 -/* 00B04 809E23B4 C4640038 */ lwc1 $f4, 0x0038($v1) ## 00000038 -/* 00B08 809E23B8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B0C 809E23BC 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00B10 809E23C0 E6040270 */ swc1 $f4, 0x0270($s0) ## 00000270 -/* 00B14 809E23C4 C466003C */ lwc1 $f6, 0x003C($v1) ## 0000003C -/* 00B18 809E23C8 E6060274 */ swc1 $f6, 0x0274($s0) ## 00000274 -/* 00B1C 809E23CC C4680040 */ lwc1 $f8, 0x0040($v1) ## 00000040 -/* 00B20 809E23D0 0C00D285 */ jal func_80034A14 -/* 00B24 809E23D4 E6080278 */ swc1 $f8, 0x0278($s0) ## 00000278 -/* 00B28 809E23D8 8E1801E0 */ lw $t8, 0x01E0($s0) ## 000001E0 -/* 00B2C 809E23DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B30 809E23E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B34 809E23E4 5700000B */ bnel $t8, $zero, .L809E2414 -/* 00B38 809E23E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B3C 809E23EC 0C27862C */ jal func_809E18B0 -/* 00B40 809E23F0 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00B44 809E23F4 8E080280 */ lw $t0, 0x0280($s0) ## 00000280 -/* 00B48 809E23F8 3C19809E */ lui $t9, %hi(func_809E2134) ## $t9 = 809E0000 -/* 00B4C 809E23FC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00B50 809E2400 27392134 */ addiu $t9, $t9, %lo(func_809E2134) ## $t9 = 809E2134 -/* 00B54 809E2404 01014824 */ and $t1, $t0, $at -/* 00B58 809E2408 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00B5C 809E240C AE090280 */ sw $t1, 0x0280($s0) ## 00000280 -/* 00B60 809E2410 8FBF001C */ lw $ra, 0x001C($sp) -.L809E2414: -/* 00B64 809E2414 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B68 809E2418 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B6C 809E241C 03E00008 */ jr $ra -/* 00B70 809E2420 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s deleted file mode 100644 index dc374461ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_809E2784 -/* 00ED4 809E2784 AFA40000 */ sw $a0, 0x0000($sp) -/* 00ED8 809E2788 8FA40014 */ lw $a0, 0x0014($sp) -/* 00EDC 809E278C AFA60008 */ sw $a2, 0x0008($sp) -/* 00EE0 809E2790 AFA7000C */ sw $a3, 0x000C($sp) -/* 00EE4 809E2794 8C8E0280 */ lw $t6, 0x0280($a0) ## 00000280 -/* 00EE8 809E2798 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00EEC 809E279C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00EF0 809E27A0 11E0001A */ beq $t7, $zero, .L809E280C -/* 00EF4 809E27A4 00000000 */ nop -/* 00EF8 809E27A8 10A10006 */ beq $a1, $at, .L809E27C4 -/* 00EFC 809E27AC 8FA20010 */ lw $v0, 0x0010($sp) -/* 00F00 809E27B0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00F04 809E27B4 10A1000D */ beq $a1, $at, .L809E27EC -/* 00F08 809E27B8 8FA20010 */ lw $v0, 0x0010($sp) -/* 00F0C 809E27BC 03E00008 */ jr $ra -/* 00F10 809E27C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809E27C4: -/* 00F14 809E27C4 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 00F18 809E27C8 84990268 */ lh $t9, 0x0268($a0) ## 00000268 -/* 00F1C 809E27CC 84490002 */ lh $t1, 0x0002($v0) ## 00000002 -/* 00F20 809E27D0 03194021 */ addu $t0, $t8, $t9 -/* 00F24 809E27D4 A4480000 */ sh $t0, 0x0000($v0) ## 00000000 -/* 00F28 809E27D8 848A0266 */ lh $t2, 0x0266($a0) ## 00000266 -/* 00F2C 809E27DC 012A5823 */ subu $t3, $t1, $t2 -/* 00F30 809E27E0 A44B0002 */ sh $t3, 0x0002($v0) ## 00000002 -/* 00F34 809E27E4 03E00008 */ jr $ra -/* 00F38 809E27E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809E27EC: -/* 00F3C 809E27EC 844C0000 */ lh $t4, 0x0000($v0) ## 00000000 -/* 00F40 809E27F0 848D0262 */ lh $t5, 0x0262($a0) ## 00000262 -/* 00F44 809E27F4 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 00F48 809E27F8 018D7021 */ addu $t6, $t4, $t5 -/* 00F4C 809E27FC A44E0000 */ sh $t6, 0x0000($v0) ## 00000000 -/* 00F50 809E2800 84980260 */ lh $t8, 0x0260($a0) ## 00000260 -/* 00F54 809E2804 01F8C821 */ addu $t9, $t7, $t8 -/* 00F58 809E2808 A4590004 */ sh $t9, 0x0004($v0) ## 00000004 -.L809E280C: -/* 00F5C 809E280C 03E00008 */ jr $ra -/* 00F60 809E2810 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s deleted file mode 100644 index e93d5f5925..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -glabel D_809E29D4 - .word 0x3FDF66F3, 0x00000000, 0x00000000 - -.text -glabel func_809E2814 -/* 00F64 809E2814 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F68 809E2818 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00F6C 809E281C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F70 809E2820 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F74 809E2824 AFA60020 */ sw $a2, 0x0020($sp) -/* 00F78 809E2828 14A10019 */ bne $a1, $at, .L809E2890 -/* 00F7C 809E282C AFA70024 */ sw $a3, 0x0024($sp) -/* 00F80 809E2830 8FA50028 */ lw $a1, 0x0028($sp) -/* 00F84 809E2834 3C04809E */ lui $a0, %hi(D_809E2970) ## $a0 = 809E0000 -/* 00F88 809E2838 24842970 */ addiu $a0, $a0, %lo(D_809E2970) ## $a0 = 809E2970 -/* 00F8C 809E283C 0C0346BD */ jal Matrix_MultVec3f -/* 00F90 809E2840 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 00F94 809E2844 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00F98 809E2848 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 00F9C 809E284C 44817000 */ mtc1 $at, $f14 ## $f14 = -200.00 -/* 00FA0 809E2850 44066000 */ mfc1 $a2, $f12 -/* 00FA4 809E2854 0C034261 */ jal Matrix_Translate -/* 00FA8 809E2858 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FAC 809E285C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00FB0 809E2860 0C034348 */ jal Matrix_RotateY -/* 00FB4 809E2864 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00FB8 809E2868 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00FBC 809E286C 0C0342DC */ jal Matrix_RotateX -/* 00FC0 809E2870 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00FC4 809E2874 3C01809E */ lui $at, %hi(D_809E29D4) ## $at = 809E0000 -/* 00FC8 809E2878 C42C29D4 */ lwc1 $f12, %lo(D_809E29D4)($at) -/* 00FCC 809E287C 0C0343B5 */ jal Matrix_RotateZ -/* 00FD0 809E2880 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00FD4 809E2884 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FD8 809E2888 0C034236 */ jal Matrix_Get -/* 00FDC 809E288C 24840218 */ addiu $a0, $a0, 0x0218 ## $a0 = 00000218 -.L809E2890: -/* 00FE0 809E2890 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FE4 809E2894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FE8 809E2898 03E00008 */ jr $ra -/* 00FEC 809E289C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s deleted file mode 100644 index df61b9943d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnDaikuKakariko_Destroy -/* 00404 809E4724 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00408 809E4728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0040C 809E472C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00410 809E4730 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00414 809E4734 0C0170EB */ jal Collider_DestroyCylinder - -/* 00418 809E4738 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 0041C 809E473C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00420 809E4740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00424 809E4744 03E00008 */ jr $ra -/* 00428 809E4748 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s deleted file mode 100644 index 8df487e431..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s +++ /dev/null @@ -1,99 +0,0 @@ -.rdata -glabel D_809E55E0 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E55FC - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -.text -glabel EnDaikuKakariko_Draw -/* 01020 809E5340 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01028 809E5348 AFA40058 */ sw $a0, 0x0058($sp) -/* 0102C 809E534C AFA5005C */ sw $a1, 0x005C($sp) -/* 01030 809E5350 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01034 809E5354 3C06809E */ lui $a2, %hi(D_809E55E0) ## $a2 = 809E0000 -/* 01038 809E5358 24C655E0 */ addiu $a2, $a2, %lo(D_809E55E0) ## $a2 = 809E55E0 -/* 0103C 809E535C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 01040 809E5360 24070464 */ addiu $a3, $zero, 0x0464 ## $a3 = 00000464 -/* 01044 809E5364 0C031AB1 */ jal Graph_OpenDisps -/* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) -/* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) -/* 01050 809E5370 0C024F46 */ jal func_80093D18 -/* 01054 809E5374 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01058 809E5378 8FA90058 */ lw $t1, 0x0058($sp) -/* 0105C 809E537C 8FA80050 */ lw $t0, 0x0050($sp) -/* 01060 809E5380 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01064 809E5384 8522001C */ lh $v0, 0x001C($t1) ## 0000001C -/* 01068 809E5388 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0106C 809E538C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 01070 809E5390 14400009 */ bne $v0, $zero, .L809E53B8 -/* 01074 809E5394 00000000 */ nop -/* 01078 809E5398 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0107C 809E539C 3C0AAA0A */ lui $t2, 0xAA0A ## $t2 = AA0A0000 -/* 01080 809E53A0 354A46FF */ ori $t2, $t2, 0x46FF ## $t2 = AA0A46FF -/* 01084 809E53A4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01088 809E53A8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 0108C 809E53AC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01090 809E53B0 10000020 */ beq $zero, $zero, .L809E5434 -/* 01094 809E53B4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -.L809E53B8: -/* 01098 809E53B8 14410009 */ bne $v0, $at, .L809E53E0 -/* 0109C 809E53BC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 010A0 809E53C0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 010A4 809E53C4 3C0DAAC8 */ lui $t5, 0xAAC8 ## $t5 = AAC80000 -/* 010A8 809E53C8 35ADFFFF */ ori $t5, $t5, 0xFFFF ## $t5 = AAC8FFFF -/* 010AC 809E53CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 010B0 809E53D0 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 010B4 809E53D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 010B8 809E53D8 10000016 */ beq $zero, $zero, .L809E5434 -/* 010BC 809E53DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L809E53E0: -/* 010C0 809E53E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 010C4 809E53E4 14410009 */ bne $v0, $at, .L809E540C -/* 010C8 809E53E8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 010CC 809E53EC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 010D0 809E53F0 3C1800E6 */ lui $t8, 0x00E6 ## $t8 = 00E60000 -/* 010D4 809E53F4 371846FF */ ori $t8, $t8, 0x46FF ## $t8 = 00E646FF -/* 010D8 809E53F8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 010DC 809E53FC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 010E0 809E5400 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 010E4 809E5404 1000000B */ beq $zero, $zero, .L809E5434 -/* 010E8 809E5408 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -.L809E540C: -/* 010EC 809E540C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 010F0 809E5410 14410008 */ bne $v0, $at, .L809E5434 -/* 010F4 809E5414 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 010F8 809E5418 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 010FC 809E541C 3C0BC800 */ lui $t3, 0xC800 ## $t3 = C8000000 -/* 01100 809E5420 356B96FF */ ori $t3, $t3, 0x96FF ## $t3 = C80096FF -/* 01104 809E5424 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01108 809E5428 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 0110C 809E542C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01110 809E5430 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -.L809E5434: -/* 01114 809E5434 8D250150 */ lw $a1, 0x0150($t1) ## 00000150 -/* 01118 809E5438 8D26016C */ lw $a2, 0x016C($t1) ## 0000016C -/* 0111C 809E543C 9127014E */ lbu $a3, 0x014E($t1) ## 0000014E -/* 01120 809E5440 3C0C809E */ lui $t4, %hi(func_809E50B4) ## $t4 = 809E0000 -/* 01124 809E5444 3C0D809E */ lui $t5, %hi(func_809E5288) ## $t5 = 809E0000 -/* 01128 809E5448 25AD5288 */ addiu $t5, $t5, %lo(func_809E5288) ## $t5 = 809E5288 -/* 0112C 809E544C 258C50B4 */ addiu $t4, $t4, %lo(func_809E50B4) ## $t4 = 809E50B4 -/* 01130 809E5450 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01134 809E5454 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01138 809E5458 AFA90018 */ sw $t1, 0x0018($sp) -/* 0113C 809E545C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 01140 809E5460 8FA4005C */ lw $a0, 0x005C($sp) -/* 01144 809E5464 8FAE005C */ lw $t6, 0x005C($sp) -/* 01148 809E5468 3C06809E */ lui $a2, %hi(D_809E55FC) ## $a2 = 809E0000 -/* 0114C 809E546C 24C655FC */ addiu $a2, $a2, %lo(D_809E55FC) ## $a2 = 809E55FC -/* 01150 809E5470 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 01154 809E5474 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 01158 809E5478 0C031AD5 */ jal Graph_CloseDisps -/* 0115C 809E547C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01168 809E5488 03E00008 */ jr $ra -/* 0116C 809E548C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s deleted file mode 100644 index ac0f2634ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ /dev/null @@ -1,238 +0,0 @@ -glabel EnDaikuKakariko_Init -/* 000B0 809E43D0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 000B4 809E43D4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 000B8 809E43D8 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 000BC 809E43DC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) -/* 000C4 809E43E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000C8 809E43E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 000CC 809E43EC 11C00003 */ beq $t6, $zero, .L809E43FC -/* 000D0 809E43F0 AFA5004C */ sw $a1, 0x004C($sp) -/* 000D4 809E43F4 10000002 */ beq $zero, $zero, .L809E4400 -/* 000D8 809E43F8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L809E43FC: -/* 000DC 809E43FC 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L809E4400: -/* 000E0 809E4400 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 000E4 809E4404 54410025 */ bnel $v0, $at, .L809E449C -/* 000E8 809E4408 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 000EC 809E440C 8FAF004C */ lw $t7, 0x004C($sp) -/* 000F0 809E4410 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 000F4 809E4414 85E200A4 */ lh $v0, 0x00A4($t7) ## 000000A4 -/* 000F8 809E4418 10410014 */ beq $v0, $at, .L809E446C -/* 000FC 809E441C 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00100 809E4420 1041001A */ beq $v0, $at, .L809E448C -/* 00104 809E4424 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00108 809E4428 5441001C */ bnel $v0, $at, .L809E449C -/* 0010C 809E442C 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 00110 809E4430 8C780010 */ lw $t8, 0x0010($v1) ## 8015E670 -/* 00114 809E4434 57000019 */ bnel $t8, $zero, .L809E449C -/* 00118 809E4438 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 0011C 809E443C 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 00120 809E4440 96190200 */ lhu $t9, 0x0200($s0) ## 00000200 -/* 00124 809E4444 3C0D809E */ lui $t5, %hi(D_809E5568) ## $t5 = 809E0000 -/* 00128 809E4448 314B0003 */ andi $t3, $t2, 0x0003 ## $t3 = 00000000 -/* 0012C 809E444C 000B6040 */ sll $t4, $t3, 1 -/* 00130 809E4450 37290001 */ ori $t1, $t9, 0x0001 ## $t1 = 00000001 -/* 00134 809E4454 A6090200 */ sh $t1, 0x0200($s0) ## 00000200 -/* 00138 809E4458 01AC6821 */ addu $t5, $t5, $t4 -/* 0013C 809E445C 95AD5568 */ lhu $t5, %lo(D_809E5568)($t5) -/* 00140 809E4460 012D7025 */ or $t6, $t1, $t5 ## $t6 = 809E0001 -/* 00144 809E4464 1000000C */ beq $zero, $zero, .L809E4498 -/* 00148 809E4468 A60E0200 */ sh $t6, 0x0200($s0) ## 00000200 -.L809E446C: -/* 0014C 809E446C 8C6F0010 */ lw $t7, 0x0010($v1) ## 8015E670 -/* 00150 809E4470 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00154 809E4474 55E10009 */ bnel $t7, $at, .L809E449C -/* 00158 809E4478 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 0015C 809E447C 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 -/* 00160 809E4480 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 00164 809E4484 10000004 */ beq $zero, $zero, .L809E4498 -/* 00168 809E4488 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 -.L809E448C: -/* 0016C 809E448C 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 -/* 00170 809E4490 350A0004 */ ori $t2, $t0, 0x0004 ## $t2 = 00000004 -/* 00174 809E4494 A60A0200 */ sh $t2, 0x0200($s0) ## 00000200 -.L809E4498: -/* 00178 809E4498 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -.L809E449C: -/* 0017C 809E449C 316C0007 */ andi $t4, $t3, 0x0007 ## $t4 = 00000000 -/* 00180 809E44A0 55800006 */ bnel $t4, $zero, .L809E44BC -/* 00184 809E44A4 8C690010 */ lw $t1, 0x0010($v1) ## 8015E670 -/* 00188 809E44A8 0C00B55C */ jal Actor_Kill - -/* 0018C 809E44AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00190 809E44B0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00194 809E44B4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00198 809E44B8 8C690010 */ lw $t1, 0x0010($v1) ## 8015E670 -.L809E44BC: -/* 0019C 809E44BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001A0 809E44C0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 001A4 809E44C4 15210004 */ bne $t1, $at, .L809E44D8 -/* 001A8 809E44C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 001AC 809E44CC 960D0200 */ lhu $t5, 0x0200($s0) ## 00000200 -/* 001B0 809E44D0 35AE0008 */ ori $t6, $t5, 0x0008 ## $t6 = 00000008 -/* 001B4 809E44D4 A60E0200 */ sh $t6, 0x0200($s0) ## 00000200 -.L809E44D8: -/* 001B8 809E44D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 001BC 809E44DC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 001C0 809E44E0 0C00AC78 */ jal ActorShape_Init - -/* 001C4 809E44E4 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 001C8 809E44E8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 001CC 809E44EC 3C060600 */ lui $a2, %hi(D_06007958) ## $a2 = 06000000 -/* 001D0 809E44F0 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C -/* 001D4 809E44F4 26180292 */ addiu $t8, $s0, 0x0292 ## $t8 = 00000292 -/* 001D8 809E44F8 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) -/* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) -/* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) -/* 001E8 809E4508 24C67958 */ addiu $a2, $a2, %lo(D_06007958) ## $a2 = 06007958 -/* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) -/* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) -/* 001F4 809E4514 0C0291BE */ jal SkelAnime_InitFlex -/* 001F8 809E4518 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001FC 809E451C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) -/* 00204 809E4524 0C0170D9 */ jal Collider_InitCylinder - -/* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) -/* 0020C 809E452C 3C07809E */ lui $a3, %hi(D_809E54B0) ## $a3 = 809E0000 -/* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) -/* 00214 809E4534 24E754B0 */ addiu $a3, $a3, %lo(D_809E54B0) ## $a3 = 809E54B0 -/* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) -/* 0021C 809E453C 0C01712B */ jal Collider_SetCylinder - -/* 00220 809E4540 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00224 809E4544 3C05809E */ lui $a1, %hi(D_809E54E8) ## $a1 = 809E0000 -/* 00228 809E4548 3C06809E */ lui $a2, %hi(D_809E54DC) ## $a2 = 809E0000 -/* 0022C 809E454C 24C654DC */ addiu $a2, $a2, %lo(D_809E54DC) ## $a2 = 809E54DC -/* 00230 809E4550 24A554E8 */ addiu $a1, $a1, %lo(D_809E54E8) ## $a1 = 809E54E8 -/* 00234 809E4554 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 00238 809E4558 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0023C 809E455C 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 -/* 00240 809E4560 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 -/* 00244 809E4564 0C028800 */ jal Animation_GetLastFrame - -/* 00248 809E4568 8C640000 */ lw $a0, 0x0000($v1) ## 809E5508 -/* 0024C 809E456C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00250 809E4570 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 -/* 00254 809E4574 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 -/* 00258 809E4578 468021A0 */ cvt.s.w $f6, $f4 -/* 0025C 809E457C 90680008 */ lbu $t0, 0x0008($v1) ## 809E5510 -/* 00260 809E4580 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E5514 -/* 00264 809E4584 8C650000 */ lw $a1, 0x0000($v1) ## 809E5508 -/* 00268 809E4588 8FA40034 */ lw $a0, 0x0034($sp) -/* 0026C 809E458C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00270 809E4590 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00274 809E4594 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00278 809E4598 AFA80014 */ sw $t0, 0x0014($sp) -/* 0027C 809E459C 0C029468 */ jal Animation_Change - -/* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00284 809E45A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00288 809E45A8 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 0028C 809E45AC AFAA0014 */ sw $t2, 0x0014($sp) -/* 00290 809E45B0 44060000 */ mfc1 $a2, $f0 -/* 00294 809E45B4 44070000 */ mfc1 $a3, $f0 -/* 00298 809E45B8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0029C 809E45BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002A0 809E45C0 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 002A4 809E45C4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 002A8 809E45C8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 002AC 809E45CC 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 002B0 809E45D0 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 002B4 809E45D4 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 002B8 809E45D8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 002BC 809E45DC 44819000 */ mtc1 $at, $f18 ## $f18 = 1200.00 -/* 002C0 809E45E0 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 002C4 809E45E4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 002C8 809E45E8 30490040 */ andi $t1, $v0, 0x0040 ## $t1 = 00000000 -/* 002CC 809E45EC A20B001F */ sb $t3, 0x001F($s0) ## 0000001F -/* 002D0 809E45F0 AE0C01EC */ sw $t4, 0x01EC($s0) ## 000001EC -/* 002D4 809E45F4 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 -/* 002D8 809E45F8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 002DC 809E45FC 11200005 */ beq $t1, $zero, .L809E4614 -/* 002E0 809E4600 E61200F4 */ swc1 $f18, 0x00F4($s0) ## 000000F4 -/* 002E4 809E4604 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 002E8 809E4608 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 002EC 809E460C 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 002F0 809E4610 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -.L809E4614: -/* 002F4 809E4614 304D0010 */ andi $t5, $v0, 0x0010 ## $t5 = 00000000 -/* 002F8 809E4618 11A00009 */ beq $t5, $zero, .L809E4640 -/* 002FC 809E461C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 00300 809E4620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00304 809E4624 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00308 809E4628 0C2790C8 */ jal func_809E4320 -/* 0030C 809E462C 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00310 809E4630 3C0E809E */ lui $t6, %hi(func_809E4BC4) ## $t6 = 809E0000 -/* 00314 809E4634 25CE4BC4 */ addiu $t6, $t6, %lo(func_809E4BC4) ## $t6 = 809E4BC4 -/* 00318 809E4638 10000035 */ beq $zero, $zero, .L809E4710 -/* 0031C 809E463C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L809E4640: -/* 00320 809E4640 11E0001F */ beq $t7, $zero, .L809E46C0 -/* 00324 809E4644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00328 809E4648 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 0032C 809E464C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00330 809E4650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00334 809E4654 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00338 809E4658 10410004 */ beq $v0, $at, .L809E466C -/* 0033C 809E465C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00340 809E4660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00344 809E4664 14410007 */ bne $v0, $at, .L809E4684 -/* 00348 809E4668 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -.L809E466C: -/* 0034C 809E466C 0C2790C8 */ jal func_809E4320 -/* 00350 809E4670 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00354 809E4674 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 -/* 00358 809E4678 37190800 */ ori $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 0035C 809E467C 10000004 */ beq $zero, $zero, .L809E4690 -/* 00360 809E4680 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 -.L809E4684: -/* 00364 809E4684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00368 809E4688 0C2790C8 */ jal func_809E4320 -/* 0036C 809E468C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L809E4690: -/* 00370 809E4690 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00374 809E4694 00000000 */ nop -/* 00378 809E4698 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 0037C 809E469C 46060202 */ mul.s $f8, $f0, $f6 -/* 00380 809E46A0 4600428D */ trunc.w.s $f10, $f8 -/* 00384 809E46A4 440A5000 */ mfc1 $t2, $f10 -/* 00388 809E46A8 00000000 */ nop -/* 0038C 809E46AC 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 00390 809E46B0 00000000 */ nop -/* 00394 809E46B4 468084A0 */ cvt.s.w $f18, $f16 -/* 00398 809E46B8 1000000F */ beq $zero, $zero, .L809E46F8 -/* 0039C 809E46BC E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 -.L809E46C0: -/* 003A0 809E46C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 -/* 003A8 809E46C8 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 003AC 809E46CC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003B0 809E46D0 00000000 */ nop -/* 003B4 809E46D4 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 003B8 809E46D8 46040182 */ mul.s $f6, $f0, $f4 -/* 003BC 809E46DC 4600320D */ trunc.w.s $f8, $f6 -/* 003C0 809E46E0 440C4000 */ mfc1 $t4, $f8 -/* 003C4 809E46E4 00000000 */ nop -/* 003C8 809E46E8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 003CC 809E46EC 00000000 */ nop -/* 003D0 809E46F0 46805420 */ cvt.s.w $f16, $f10 -/* 003D4 809E46F4 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 -.L809E46F8: -/* 003D8 809E46F8 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 -/* 003DC 809E46FC 3C0E809E */ lui $t6, %hi(func_809E4A7C) ## $t6 = 809E0000 -/* 003E0 809E4700 25CE4A7C */ addiu $t6, $t6, %lo(func_809E4A7C) ## $t6 = 809E4A7C -/* 003E4 809E4704 352D0100 */ ori $t5, $t1, 0x0100 ## $t5 = 00000100 -/* 003E8 809E4708 A60D0200 */ sh $t5, 0x0200($s0) ## 00000200 -/* 003EC 809E470C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L809E4710: -/* 003F0 809E4710 8FBF002C */ lw $ra, 0x002C($sp) -/* 003F4 809E4714 8FB00028 */ lw $s0, 0x0028($sp) -/* 003F8 809E4718 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 003FC 809E471C 03E00008 */ jr $ra -/* 00400 809E4720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s deleted file mode 100644 index 52444c1cfd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel EnDaikuKakariko_Update -/* 00C20 809E4F40 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00C24 809E4F44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C28 809E4F48 AFB00020 */ sw $s0, 0x0020($sp) -/* 00C2C 809E4F4C AFA50044 */ sw $a1, 0x0044($sp) -/* 00C30 809E4F50 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00C34 809E4F54 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00C38 809E4F58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C3C 809E4F5C AFAF0034 */ sw $t7, 0x0034($sp) -/* 00C40 809E4F60 8C9801EC */ lw $t8, 0x01EC($a0) ## 000001EC -/* 00C44 809E4F64 5701000E */ bnel $t8, $at, .L809E4FA0 -/* 00C48 809E4F68 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00C4C 809E4F6C C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00C50 809E4F70 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00C54 809E4F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C58 809E4F78 4600218D */ trunc.w.s $f6, $f4 -/* 00C5C 809E4F7C 44023000 */ mfc1 $v0, $f6 -/* 00C60 809E4F80 00000000 */ nop -/* 00C64 809E4F84 10410003 */ beq $v0, $at, .L809E4F94 -/* 00C68 809E4F88 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00C6C 809E4F8C 54410004 */ bnel $v0, $at, .L809E4FA0 -/* 00C70 809E4F90 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E4F94: -/* 00C74 809E4F94 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C78 809E4F98 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 -/* 00C7C 809E4F9C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L809E4FA0: -/* 00C80 809E4FA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 00C84 809E4FA4 AFA6002C */ sw $a2, 0x002C($sp) -/* 00C88 809E4FA8 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00C8C 809E4FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C90 809E4FB0 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 -/* 00C94 809E4FB4 8FA6002C */ lw $a2, 0x002C($sp) -/* 00C98 809E4FB8 240E003F */ addiu $t6, $zero, 0x003F ## $t6 = 0000003F -/* 00C9C 809E4FBC 31090004 */ andi $t1, $t0, 0x0004 ## $t1 = 00000000 -/* 00CA0 809E4FC0 11200008 */ beq $t1, $zero, .L809E4FE4 -/* 00CA4 809E4FC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00CA8 809E4FC8 860A01DA */ lh $t2, 0x01DA($s0) ## 000001DA -/* 00CAC 809E4FCC 860C01DE */ lh $t4, 0x01DE($s0) ## 000001DE -/* 00CB0 809E4FD0 A60E01D4 */ sh $t6, 0x01D4($s0) ## 000001D4 -/* 00CB4 809E4FD4 254BFFE5 */ addiu $t3, $t2, 0xFFE5 ## $t3 = FFFFFFE5 -/* 00CB8 809E4FD8 258DFFE5 */ addiu $t5, $t4, 0xFFE5 ## $t5 = FFFFFFE5 -/* 00CBC 809E4FDC A60B01DA */ sh $t3, 0x01DA($s0) ## 000001DA -/* 00CC0 809E4FE0 A60D01DE */ sh $t5, 0x01DE($s0) ## 000001DE -.L809E4FE4: -/* 00CC4 809E4FE4 8FA40044 */ lw $a0, 0x0044($sp) -/* 00CC8 809E4FE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00CCC 809E4FEC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00CD0 809E4FF0 00812821 */ addu $a1, $a0, $at -/* 00CD4 809E4FF4 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 00CD8 809E4FF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CDC 809E4FFC 8FA50044 */ lw $a1, 0x0044($sp) -/* 00CE0 809E5000 0320F809 */ jalr $ra, $t9 -/* 00CE4 809E5004 00000000 */ nop -/* 00CE8 809E5008 8FA30034 */ lw $v1, 0x0034($sp) -/* 00CEC 809E500C 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 00CF0 809E5010 2418170C */ addiu $t8, $zero, 0x170C ## $t8 = 0000170C -/* 00CF4 809E5014 C4680038 */ lwc1 $f8, 0x0038($v1) ## 00000038 -/* 00CF8 809E5018 304F0100 */ andi $t7, $v0, 0x0100 ## $t7 = 00000000 -/* 00CFC 809E501C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D00 809E5020 E608021C */ swc1 $f8, 0x021C($s0) ## 0000021C -/* 00D04 809E5024 C46A003C */ lwc1 $f10, 0x003C($v1) ## 0000003C -/* 00D08 809E5028 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 -/* 00D0C 809E502C 34481000 */ ori $t0, $v0, 0x1000 ## $t0 = 00001000 -/* 00D10 809E5030 E60A0220 */ swc1 $f10, 0x0220($s0) ## 00000220 -/* 00D14 809E5034 C4700040 */ lwc1 $f16, 0x0040($v1) ## 00000040 -/* 00D18 809E5038 30490200 */ andi $t1, $v0, 0x0200 ## $t1 = 00000000 -/* 00D1C 809E503C 11E00008 */ beq $t7, $zero, .L809E5060 -/* 00D20 809E5040 E6100224 */ swc1 $f16, 0x0224($s0) ## 00000224 -/* 00D24 809E5044 A6180302 */ sh $t8, 0x0302($s0) ## 00000302 -/* 00D28 809E5048 A6080200 */ sh $t0, 0x0200($s0) ## 00000200 -/* 00D2C 809E504C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D30 809E5050 0C00D285 */ jal func_80034A14 -/* 00D34 809E5054 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00D38 809E5058 1000000C */ beq $zero, $zero, .L809E508C -/* 00D3C 809E505C 86050302 */ lh $a1, 0x0302($s0) ## 00000302 -.L809E5060: -/* 00D40 809E5060 11200009 */ beq $t1, $zero, .L809E5088 -/* 00D44 809E5064 240A170C */ addiu $t2, $zero, 0x170C ## $t2 = 0000170C -/* 00D48 809E5068 344B1000 */ ori $t3, $v0, 0x1000 ## $t3 = 00001000 -/* 00D4C 809E506C A60A0302 */ sh $t2, 0x0302($s0) ## 00000302 -/* 00D50 809E5070 A60B0200 */ sh $t3, 0x0200($s0) ## 00000200 -/* 00D54 809E5074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D58 809E5078 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 -/* 00D5C 809E507C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D60 809E5080 0C00D285 */ jal func_80034A14 -/* 00D64 809E5084 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -.L809E5088: -/* 00D68 809E5088 86050302 */ lh $a1, 0x0302($s0) ## 00000302 -.L809E508C: -/* 00D6C 809E508C AFA00010 */ sw $zero, 0x0010($sp) -/* 00D70 809E5090 260402FC */ addiu $a0, $s0, 0x02FC ## $a0 = 000002FC -/* 00D74 809E5094 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D78 809E5098 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00D7C 809E509C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C -/* 00D80 809E50A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00D84 809E50A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00D88 809E50A8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00D8C 809E50AC 03E00008 */ jr $ra -/* 00D90 809E50B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s deleted file mode 100644 index 4862aef21f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809E4320 -/* 00000 809E4320 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E4324 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809E4328 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809E432C AFA60040 */ sw $a2, 0x0040($sp) -/* 00010 809E4330 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 -/* 00014 809E4334 3C18809E */ lui $t8, %hi(D_809E5508) ## $t8 = 809E0000 -/* 00018 809E4338 27185508 */ addiu $t8, $t8, %lo(D_809E5508) ## $t8 = 809E5508 -/* 0001C 809E433C 04400003 */ bltz $v0, .L809E434C -/* 00020 809E4340 00057900 */ sll $t7, $a1, 4 -/* 00024 809E4344 14A20004 */ bne $a1, $v0, .L809E4358 -/* 00028 809E4348 0005C900 */ sll $t9, $a1, 4 -.L809E434C: -/* 0002C 809E434C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00030 809E4350 10000005 */ beq $zero, $zero, .L809E4368 -/* 00034 809E4354 01F81821 */ addu $v1, $t7, $t8 -.L809E4358: -/* 00038 809E4358 3C08809E */ lui $t0, %hi(D_809E5508) ## $t0 = 809E0000 -/* 0003C 809E435C 25085508 */ addiu $t0, $t0, %lo(D_809E5508) ## $t0 = 809E5508 -/* 00040 809E4360 03281821 */ addu $v1, $t9, $t0 -/* 00044 809E4364 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C -.L809E4368: -/* 00048 809E4368 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 0004C 809E436C AFA3002C */ sw $v1, 0x002C($sp) -/* 00050 809E4370 AFA5003C */ sw $a1, 0x003C($sp) -/* 00054 809E4374 0C028800 */ jal Animation_GetLastFrame - -/* 00058 809E4378 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 0005C 809E437C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00060 809E4380 8FA3002C */ lw $v1, 0x002C($sp) -/* 00064 809E4384 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00068 809E4388 468021A0 */ cvt.s.w $f6, $f4 -/* 0006C 809E438C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00070 809E4390 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 -/* 00074 809E4394 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00078 809E4398 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0007C 809E439C 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00080 809E43A0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00084 809E43A4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00088 809E43A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0008C 809E43AC 0C029468 */ jal Animation_Change - -/* 00090 809E43B0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00094 809E43B4 8FAA003C */ lw $t2, 0x003C($sp) -/* 00098 809E43B8 8FAB0040 */ lw $t3, 0x0040($sp) -/* 0009C 809E43BC AD6A0000 */ sw $t2, 0x0000($t3) ## 00000000 -/* 000A0 809E43C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 000A4 809E43C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A8 809E43C8 03E00008 */ jr $ra -/* 000AC 809E43CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s deleted file mode 100644 index 43ce12f33d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809E474C -/* 0042C 809E474C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00430 809E4750 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00434 809E4754 AFA40020 */ sw $a0, 0x0020($sp) -/* 00438 809E4758 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0043C 809E475C AFA50024 */ sw $a1, 0x0024($sp) -/* 00440 809E4760 AFAE001C */ sw $t6, 0x001C($sp) -/* 00444 809E4764 0C042F6F */ jal func_8010BDBC -/* 00448 809E4768 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0044C 809E476C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00450 809E4770 5441001A */ bnel $v0, $at, .L809E47DC -/* 00454 809E4774 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00458 809E4778 0C041AF2 */ jal func_80106BC8 -/* 0045C 809E477C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00460 809E4780 10400015 */ beq $v0, $zero, .L809E47D8 -/* 00464 809E4784 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00468 809E4788 95E2010E */ lhu $v0, 0x010E($t7) ## 0000010E -/* 0046C 809E478C 24016061 */ addiu $at, $zero, 0x6061 ## $at = 00006061 -/* 00470 809E4790 10410005 */ beq $v0, $at, .L809E47A8 -/* 00474 809E4794 24016064 */ addiu $at, $zero, 0x6064 ## $at = 00006064 -/* 00478 809E4798 10410009 */ beq $v0, $at, .L809E47C0 -/* 0047C 809E479C 00000000 */ nop -/* 00480 809E47A0 1000000D */ beq $zero, $zero, .L809E47D8 -/* 00484 809E47A4 AFA0001C */ sw $zero, 0x001C($sp) -.L809E47A8: -/* 00488 809E47A8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0048C 809E47AC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00490 809E47B0 94580F26 */ lhu $t8, 0x0F26($v0) ## 8015F586 -/* 00494 809E47B4 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 -/* 00498 809E47B8 10000006 */ beq $zero, $zero, .L809E47D4 -/* 0049C 809E47BC A4590F26 */ sh $t9, 0x0F26($v0) ## 8015F586 -.L809E47C0: -/* 004A0 809E47C0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 004A4 809E47C4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 004A8 809E47C8 94480F26 */ lhu $t0, 0x0F26($v0) ## 8015F586 -/* 004AC 809E47CC 35090100 */ ori $t1, $t0, 0x0100 ## $t1 = 00000100 -/* 004B0 809E47D0 A4490F26 */ sh $t1, 0x0F26($v0) ## 8015F586 -.L809E47D4: -/* 004B4 809E47D4 AFA0001C */ sw $zero, 0x001C($sp) -.L809E47D8: -/* 004B8 809E47D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809E47DC: -/* 004BC 809E47DC 8FA2001C */ lw $v0, 0x001C($sp) -/* 004C0 809E47E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004C4 809E47E4 03E00008 */ jr $ra -/* 004C8 809E47E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s deleted file mode 100644 index 1fd044c14d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_809E47EC -/* 004CC 809E47EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D0 809E47F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 004D4 809E47F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 004D8 809E47F8 8C8E01E0 */ lw $t6, 0x01E0($a0) ## 000001E0 -/* 004DC 809E47FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004E0 809E4800 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004E4 809E4804 55C10006 */ bnel $t6, $at, .L809E4820 -/* 004E8 809E4808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004EC 809E480C 0C2791D3 */ jal func_809E474C -/* 004F0 809E4810 00000000 */ nop -/* 004F4 809E4814 1000005F */ beq $zero, $zero, .L809E4994 -/* 004F8 809E4818 AE0201E0 */ sw $v0, 0x01E0($s0) ## 000001E0 -/* 004FC 809E481C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809E4820: -/* 00500 809E4820 0C00BC65 */ jal func_8002F194 -/* 00504 809E4824 AFA5002C */ sw $a1, 0x002C($sp) -/* 00508 809E4828 10400004 */ beq $v0, $zero, .L809E483C -/* 0050C 809E482C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00510 809E4830 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00514 809E4834 10000057 */ beq $zero, $zero, .L809E4994 -/* 00518 809E4838 AE0F01E0 */ sw $t7, 0x01E0($s0) ## 000001E0 -.L809E483C: -/* 0051C 809E483C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00520 809E4840 27A60026 */ addiu $a2, $sp, 0x0026 ## $a2 = FFFFFFFE -/* 00524 809E4844 0C00BCDD */ jal func_8002F374 -/* 00528 809E4848 27A70024 */ addiu $a3, $sp, 0x0024 ## $a3 = FFFFFFFC -/* 0052C 809E484C 87A20026 */ lh $v0, 0x0026($sp) -/* 00530 809E4850 04400050 */ bltz $v0, .L809E4994 -/* 00534 809E4854 28410141 */ slti $at, $v0, 0x0141 -/* 00538 809E4858 1020004E */ beq $at, $zero, .L809E4994 -/* 0053C 809E485C 87A20024 */ lh $v0, 0x0024($sp) -/* 00540 809E4860 0440004C */ bltz $v0, .L809E4994 -/* 00544 809E4864 284100F1 */ slti $at, $v0, 0x00F1 -/* 00548 809E4868 5020004B */ beql $at, $zero, .L809E4998 -/* 0054C 809E486C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00550 809E4870 8E1801E0 */ lw $t8, 0x01E0($s0) ## 000001E0 -/* 00554 809E4874 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00558 809E4878 8FA5002C */ lw $a1, 0x002C($sp) -/* 0055C 809E487C 57000046 */ bnel $t8, $zero, .L809E4998 -/* 00560 809E4880 8FBF001C */ lw $ra, 0x001C($sp) -/* 00564 809E4884 0C00BCB3 */ jal func_8002F2CC -/* 00568 809E4888 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 0056C 809E488C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00570 809E4890 54410041 */ bnel $v0, $at, .L809E4998 -/* 00574 809E4894 8FBF001C */ lw $ra, 0x001C($sp) -/* 00578 809E4898 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0057C 809E489C 3C05809E */ lui $a1, %hi(D_809E5570) ## $a1 = 809E0000 -/* 00580 809E48A0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00584 809E48A4 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000 -/* 00588 809E48A8 00084880 */ sll $t1, $t0, 2 -/* 0058C 809E48AC 00A92821 */ addu $a1, $a1, $t1 -/* 00590 809E48B0 0C01B0D8 */ jal Text_GetFaceReaction -/* 00594 809E48B4 8CA55570 */ lw $a1, %lo(D_809E5570)($a1) -/* 00598 809E48B8 304AFFFF */ andi $t2, $v0, 0xFFFF ## $t2 = 00000000 -/* 0059C 809E48BC 15400035 */ bne $t2, $zero, .L809E4994 -/* 005A0 809E48C0 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 005A4 809E48C4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 005A8 809E48C8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 005AC 809E48CC 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 005B0 809E48D0 5040000A */ beql $v0, $zero, .L809E48FC -/* 005B4 809E48D4 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 005B8 809E48D8 10410011 */ beq $v0, $at, .L809E4920 -/* 005BC 809E48DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 005C0 809E48E0 10410019 */ beq $v0, $at, .L809E4948 -/* 005C4 809E48E4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 005C8 809E48E8 50410022 */ beql $v0, $at, .L809E4974 -/* 005CC 809E48EC 960D0200 */ lhu $t5, 0x0200($s0) ## 00000200 -/* 005D0 809E48F0 10000029 */ beq $zero, $zero, .L809E4998 -/* 005D4 809E48F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 005D8 809E48F8 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -.L809E48FC: -/* 005DC 809E48FC 240D5076 */ addiu $t5, $zero, 0x5076 ## $t5 = 00005076 -/* 005E0 809E4900 240E5075 */ addiu $t6, $zero, 0x5075 ## $t6 = 00005075 -/* 005E4 809E4904 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 005E8 809E4908 11800003 */ beq $t4, $zero, .L809E4918 -/* 005EC 809E490C 00000000 */ nop -/* 005F0 809E4910 10000020 */ beq $zero, $zero, .L809E4994 -/* 005F4 809E4914 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -.L809E4918: -/* 005F8 809E4918 1000001E */ beq $zero, $zero, .L809E4994 -/* 005FC 809E491C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -.L809E4920: -/* 00600 809E4920 960F0200 */ lhu $t7, 0x0200($s0) ## 00000200 -/* 00604 809E4924 2419502A */ addiu $t9, $zero, 0x502A ## $t9 = 0000502A -/* 00608 809E4928 24085074 */ addiu $t0, $zero, 0x5074 ## $t0 = 00005074 -/* 0060C 809E492C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00610 809E4930 13000003 */ beq $t8, $zero, .L809E4940 -/* 00614 809E4934 00000000 */ nop -/* 00618 809E4938 10000016 */ beq $zero, $zero, .L809E4994 -/* 0061C 809E493C A619010E */ sh $t9, 0x010E($s0) ## 0000010E -.L809E4940: -/* 00620 809E4940 10000014 */ beq $zero, $zero, .L809E4994 -/* 00624 809E4944 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -.L809E4948: -/* 00628 809E4948 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 -/* 0062C 809E494C 240B506A */ addiu $t3, $zero, 0x506A ## $t3 = 0000506A -/* 00630 809E4950 240C506B */ addiu $t4, $zero, 0x506B ## $t4 = 0000506B -/* 00634 809E4954 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00638 809E4958 11400003 */ beq $t2, $zero, .L809E4968 -/* 0063C 809E495C 00000000 */ nop -/* 00640 809E4960 1000000C */ beq $zero, $zero, .L809E4994 -/* 00644 809E4964 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -.L809E4968: -/* 00648 809E4968 1000000A */ beq $zero, $zero, .L809E4994 -/* 0064C 809E496C A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 00650 809E4970 960D0200 */ lhu $t5, 0x0200($s0) ## 00000200 -.L809E4974: -/* 00654 809E4974 240F5077 */ addiu $t7, $zero, 0x5077 ## $t7 = 00005077 -/* 00658 809E4978 24185078 */ addiu $t8, $zero, 0x5078 ## $t8 = 00005078 -/* 0065C 809E497C 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 00660 809E4980 51C00004 */ beql $t6, $zero, .L809E4994 -/* 00664 809E4984 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00668 809E4988 10000002 */ beq $zero, $zero, .L809E4994 -/* 0066C 809E498C A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 00670 809E4990 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -.L809E4994: -/* 00674 809E4994 8FBF001C */ lw $ra, 0x001C($sp) -.L809E4998: -/* 00678 809E4998 8FB00018 */ lw $s0, 0x0018($sp) -/* 0067C 809E499C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00680 809E49A0 03E00008 */ jr $ra -/* 00684 809E49A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s deleted file mode 100644 index 577076a4b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809E49A8 -/* 00688 809E49A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0068C 809E49AC AFB00018 */ sw $s0, 0x0018($sp) -/* 00690 809E49B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00694 809E49B4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00698 809E49B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0069C 809E49BC 0C02927F */ jal SkelAnime_Update - -/* 006A0 809E49C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006A4 809E49C4 10400004 */ beq $v0, $zero, .L809E49D8 -/* 006A8 809E49C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006AC 809E49CC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 006B0 809E49D0 0C2790C8 */ jal func_809E4320 -/* 006B4 809E49D4 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -.L809E49D8: -/* 006B8 809E49D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006BC 809E49DC 0C2791FB */ jal func_809E47EC -/* 006C0 809E49E0 8FA50024 */ lw $a1, 0x0024($sp) -/* 006C4 809E49E4 8E0E01E0 */ lw $t6, 0x01E0($s0) ## 000001E0 -/* 006C8 809E49E8 55C00020 */ bnel $t6, $zero, .L809E4A6C -/* 006CC 809E49EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 006D0 809E49F0 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 006D4 809E49F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 809E49F8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 006DC 809E49FC 304F0010 */ andi $t7, $v0, 0x0010 ## $t7 = 00000000 -/* 006E0 809E4A00 11E0000A */ beq $t7, $zero, .L809E4A2C -/* 006E4 809E4A04 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 006E8 809E4A08 0C2790C8 */ jal func_809E4320 -/* 006EC 809E4A0C 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 006F0 809E4A10 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 -/* 006F4 809E4A14 3C08809E */ lui $t0, %hi(func_809E4BC4) ## $t0 = 809E0000 -/* 006F8 809E4A18 25084BC4 */ addiu $t0, $t0, %lo(func_809E4BC4) ## $t0 = 809E4BC4 -/* 006FC 809E4A1C 3319FCFF */ andi $t9, $t8, 0xFCFF ## $t9 = 00000000 -/* 00700 809E4A20 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 -/* 00704 809E4A24 10000010 */ beq $zero, $zero, .L809E4A68 -/* 00708 809E4A28 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809E4A2C: -/* 0070C 809E4A2C 15200005 */ bne $t1, $zero, .L809E4A44 -/* 00710 809E4A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00714 809E4A34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00718 809E4A38 0C2790C8 */ jal func_809E4320 -/* 0071C 809E4A3C 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00720 809E4A40 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -.L809E4A44: -/* 00724 809E4A44 304A0800 */ andi $t2, $v0, 0x0800 ## $t2 = 00000000 -/* 00728 809E4A48 15400005 */ bne $t2, $zero, .L809E4A60 -/* 0072C 809E4A4C 3C0E809E */ lui $t6, %hi(func_809E4A7C) ## $t6 = 809E0000 -/* 00730 809E4A50 304CFDFF */ andi $t4, $v0, 0xFDFF ## $t4 = 00000000 -/* 00734 809E4A54 A60C0200 */ sh $t4, 0x0200($s0) ## 00000200 -/* 00738 809E4A58 358D0100 */ ori $t5, $t4, 0x0100 ## $t5 = 00000100 -/* 0073C 809E4A5C A60D0200 */ sh $t5, 0x0200($s0) ## 00000200 -.L809E4A60: -/* 00740 809E4A60 25CE4A7C */ addiu $t6, $t6, %lo(func_809E4A7C) ## $t6 = 809E4A7C -/* 00744 809E4A64 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L809E4A68: -/* 00748 809E4A68 8FBF001C */ lw $ra, 0x001C($sp) -.L809E4A6C: -/* 0074C 809E4A6C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00750 809E4A70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00754 809E4A74 03E00008 */ jr $ra -/* 00758 809E4A78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s deleted file mode 100644 index aa52ee26ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809E4A7C -/* 0075C 809E4A7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00760 809E4A80 AFBF001C */ sw $ra, 0x001C($sp) -/* 00764 809E4A84 AFB00018 */ sw $s0, 0x0018($sp) -/* 00768 809E4A88 0C2791FB */ jal func_809E47EC -/* 0076C 809E4A8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00770 809E4A90 0C02927F */ jal SkelAnime_Update - -/* 00774 809E4A94 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00778 809E4A98 10400004 */ beq $v0, $zero, .L809E4AAC -/* 0077C 809E4A9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00780 809E4AA0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00784 809E4AA4 0C2790C8 */ jal func_809E4320 -/* 00788 809E4AA8 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -.L809E4AAC: -/* 0078C 809E4AAC 8E0E01E0 */ lw $t6, 0x01E0($s0) ## 000001E0 -/* 00790 809E4AB0 51C00014 */ beql $t6, $zero, .L809E4B04 -/* 00794 809E4AB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00798 809E4AB8 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 0079C 809E4ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007A0 809E4AC0 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 007A4 809E4AC4 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 007A8 809E4AC8 55E00005 */ bnel $t7, $zero, .L809E4AE0 -/* 007AC 809E4ACC 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 -/* 007B0 809E4AD0 0C2790C8 */ jal func_809E4320 -/* 007B4 809E4AD4 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 007B8 809E4AD8 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 007BC 809E4ADC 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 -.L809E4AE0: -/* 007C0 809E4AE0 17000005 */ bne $t8, $zero, .L809E4AF8 -/* 007C4 809E4AE4 3C0A809E */ lui $t2, %hi(func_809E49A8) ## $t2 = 809E0000 -/* 007C8 809E4AE8 34480200 */ ori $t0, $v0, 0x0200 ## $t0 = 00000200 -/* 007CC 809E4AEC A6080200 */ sh $t0, 0x0200($s0) ## 00000200 -/* 007D0 809E4AF0 3109FEFF */ andi $t1, $t0, 0xFEFF ## $t1 = 00000200 -/* 007D4 809E4AF4 A6090200 */ sh $t1, 0x0200($s0) ## 00000200 -.L809E4AF8: -/* 007D8 809E4AF8 254A49A8 */ addiu $t2, $t2, %lo(func_809E49A8) ## $t2 = 809E49A8 -/* 007DC 809E4AFC AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 007E0 809E4B00 8FBF001C */ lw $ra, 0x001C($sp) -.L809E4B04: -/* 007E4 809E4B04 8FB00018 */ lw $s0, 0x0018($sp) -/* 007E8 809E4B08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 007EC 809E4B0C 03E00008 */ jr $ra -/* 007F0 809E4B10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s deleted file mode 100644 index 4ab3697c11..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809E4B14 -/* 007F4 809E4B14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007F8 809E4B18 AFB00018 */ sw $s0, 0x0018($sp) -/* 007FC 809E4B1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00800 809E4B20 AFBF001C */ sw $ra, 0x001C($sp) -/* 00804 809E4B24 AFA50024 */ sw $a1, 0x0024($sp) -/* 00808 809E4B28 0C02927F */ jal SkelAnime_Update - -/* 0080C 809E4B2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00810 809E4B30 50400010 */ beql $v0, $zero, .L809E4B74 -/* 00814 809E4B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00818 809E4B38 8E0E02F8 */ lw $t6, 0x02F8($s0) ## 000002F8 -/* 0081C 809E4B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00820 809E4B40 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00824 809E4B44 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00828 809E4B48 1DE00007 */ bgtz $t7, .L809E4B68 -/* 0082C 809E4B4C AE0F02F8 */ sw $t7, 0x02F8($s0) ## 000002F8 -/* 00830 809E4B50 0C2790C8 */ jal func_809E4320 -/* 00834 809E4B54 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00838 809E4B58 3C19809E */ lui $t9, %hi(func_809E4BC4) ## $t9 = 809E0000 -/* 0083C 809E4B5C 27394BC4 */ addiu $t9, $t9, %lo(func_809E4BC4) ## $t9 = 809E4BC4 -/* 00840 809E4B60 10000003 */ beq $zero, $zero, .L809E4B70 -/* 00844 809E4B64 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809E4B68: -/* 00848 809E4B68 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 0084C 809E4B6C E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -.L809E4B70: -/* 00850 809E4B70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809E4B74: -/* 00854 809E4B74 0C2791FB */ jal func_809E47EC -/* 00858 809E4B78 8FA50024 */ lw $a1, 0x0024($sp) -/* 0085C 809E4B7C 8E0801E0 */ lw $t0, 0x01E0($s0) ## 000001E0 -/* 00860 809E4B80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00864 809E4B84 5100000B */ beql $t0, $zero, .L809E4BB4 -/* 00868 809E4B88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0086C 809E4B8C 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 -/* 00870 809E4B90 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00874 809E4B94 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00878 809E4B98 352A0200 */ ori $t2, $t1, 0x0200 ## $t2 = 00000200 -/* 0087C 809E4B9C 0C2790C8 */ jal func_809E4320 -/* 00880 809E4BA0 A60A0200 */ sh $t2, 0x0200($s0) ## 00000200 -/* 00884 809E4BA4 3C0B809E */ lui $t3, %hi(func_809E49A8) ## $t3 = 809E0000 -/* 00888 809E4BA8 256B49A8 */ addiu $t3, $t3, %lo(func_809E49A8) ## $t3 = 809E49A8 -/* 0088C 809E4BAC AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00890 809E4BB0 8FBF001C */ lw $ra, 0x001C($sp) -.L809E4BB4: -/* 00894 809E4BB4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00898 809E4BB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0089C 809E4BBC 03E00008 */ jr $ra -/* 008A0 809E4BC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s deleted file mode 100644 index 64d02f9a83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s +++ /dev/null @@ -1,247 +0,0 @@ -.late_rodata -glabel D_809E5618 - .word 0x4622F983 - -.text -glabel func_809E4BC4 -/* 008A4 809E4BC4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 008A8 809E4BC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008AC 809E4BCC AFB30038 */ sw $s3, 0x0038($sp) -/* 008B0 809E4BD0 AFB0002C */ sw $s0, 0x002C($sp) -/* 008B4 809E4BD4 00A13021 */ addu $a2, $a1, $at -/* 008B8 809E4BD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008BC 809E4BDC AFBF003C */ sw $ra, 0x003C($sp) -/* 008C0 809E4BE0 AFB20034 */ sw $s2, 0x0034($sp) -/* 008C4 809E4BE4 AFB10030 */ sw $s1, 0x0030($sp) -/* 008C8 809E4BE8 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 008CC 809E4BEC F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 008D0 809E4BF0 AFA5006C */ sw $a1, 0x006C($sp) -/* 008D4 809E4BF4 AFA60040 */ sw $a2, 0x0040($sp) -/* 008D8 809E4BF8 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001 -/* 008DC 809E4BFC 8FA60040 */ lw $a2, 0x0040($sp) -.L809E4C00: -/* 008E0 809E4C00 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 008E4 809E4C04 3C0C8016 */ lui $t4, %hi(gSegments) -/* 008E8 809E4C08 8CCE1E08 */ lw $t6, 0x1E08($a2) ## 00001E08 -/* 008EC 809E4C0C 000FC203 */ sra $t8, $t7, 8 -/* 008F0 809E4C10 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 008F4 809E4C14 001940C0 */ sll $t0, $t9, 3 -/* 008F8 809E4C18 01C88821 */ addu $s1, $t6, $t0 -/* 008FC 809E4C1C 8E230004 */ lw $v1, 0x0004($s1) ## 00000004 -/* 00900 809E4C20 8E1801E4 */ lw $t8, 0x01E4($s0) ## 000001E4 -/* 00904 809E4C24 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00908 809E4C28 00034900 */ sll $t1, $v1, 4 -/* 0090C 809E4C2C 00095702 */ srl $t2, $t1, 28 -/* 00910 809E4C30 000A5880 */ sll $t3, $t2, 2 -/* 00914 809E4C34 018B6021 */ addu $t4, $t4, $t3 -/* 00918 809E4C38 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 0091C 809E4C3C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00920 809E4C40 0018C880 */ sll $t9, $t8, 2 -/* 00924 809E4C44 00616824 */ and $t5, $v1, $at -/* 00928 809E4C48 0338C823 */ subu $t9, $t9, $t8 -/* 0092C 809E4C4C 0019C840 */ sll $t9, $t9, 1 -/* 00930 809E4C50 018D7821 */ addu $t7, $t4, $t5 -/* 00934 809E4C54 01F91021 */ addu $v0, $t7, $t9 -/* 00938 809E4C58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0093C 809E4C5C 00411021 */ addu $v0, $v0, $at -/* 00940 809E4C60 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 00944 809E4C64 84480004 */ lh $t0, 0x0004($v0) ## 00000004 -/* 00948 809E4C68 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 0094C 809E4C6C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00950 809E4C70 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00954 809E4C74 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00958 809E4C78 468021A0 */ cvt.s.w $f6, $f4 -/* 0095C 809E4C7C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00960 809E4C80 46805420 */ cvt.s.w $f16, $f10 -/* 00964 809E4C84 46083501 */ sub.s $f20, $f6, $f8 -/* 00968 809E4C88 46128581 */ sub.s $f22, $f16, $f18 -/* 0096C 809E4C8C 4600A306 */ mov.s $f12, $f20 -/* 00970 809E4C90 0C03F494 */ jal Math_FAtan2F -/* 00974 809E4C94 4600B386 */ mov.s $f14, $f22 -/* 00978 809E4C98 3C01809E */ lui $at, %hi(D_809E5618) ## $at = 809E0000 -/* 0097C 809E4C9C C4245618 */ lwc1 $f4, %lo(D_809E5618)($at) -/* 00980 809E4CA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00984 809E4CA4 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00988 809E4CA8 46040182 */ mul.s $f6, $f0, $f4 -/* 0098C 809E4CAC 00000000 */ nop -/* 00990 809E4CB0 4614A282 */ mul.s $f10, $f20, $f20 -/* 00994 809E4CB4 00000000 */ nop -/* 00998 809E4CB8 4616B402 */ mul.s $f16, $f22, $f22 -/* 0099C 809E4CBC 4600320D */ trunc.w.s $f8, $f6 -/* 009A0 809E4CC0 46105000 */ add.s $f0, $f10, $f16 -/* 009A4 809E4CC4 44054000 */ mfc1 $a1, $f8 -/* 009A8 809E4CC8 46000084 */ sqrt.s $f2, $f0 -/* 009AC 809E4CCC 00052C00 */ sll $a1, $a1, 16 -/* 009B0 809E4CD0 00052C03 */ sra $a1, $a1, 16 -/* 009B4 809E4CD4 4612103E */ c.le.s $f2, $f18 -/* 009B8 809E4CD8 00000000 */ nop -/* 009BC 809E4CDC 45000039 */ bc1f .L809E4DC4 -/* 009C0 809E4CE0 00000000 */ nop -/* 009C4 809E4CE4 8E0A01F8 */ lw $t2, 0x01F8($s0) ## 000001F8 -/* 009C8 809E4CE8 55400022 */ bnel $t2, $zero, .L809E4D74 -/* 009CC 809E4CEC 8E0901E4 */ lw $t1, 0x01E4($s0) ## 000001E4 -/* 009D0 809E4CF0 8E0B01E4 */ lw $t3, 0x01E4($s0) ## 000001E4 -/* 009D4 809E4CF4 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 009D8 809E4CF8 AE0C01E4 */ sw $t4, 0x01E4($s0) ## 000001E4 -/* 009DC 809E4CFC 92230000 */ lbu $v1, 0x0000($s1) ## 00000000 -/* 009E0 809E4D00 0183082A */ slt $at, $t4, $v1 -/* 009E4 809E4D04 54200018 */ bnel $at, $zero, .L809E4D68 -/* 009E8 809E4D08 02609025 */ or $s2, $s3, $zero ## $s2 = 00000001 -/* 009EC 809E4D0C 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 009F0 809E4D10 246FFFFE */ addiu $t7, $v1, 0xFFFE ## $t7 = FFFFFFFE -/* 009F4 809E4D14 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 009F8 809E4D18 1300000F */ beq $t8, $zero, .L809E4D58 -/* 009FC 809E4D1C 30590400 */ andi $t9, $v0, 0x0400 ## $t9 = 00000000 -/* 00A00 809E4D20 AE0F01E4 */ sw $t7, 0x01E4($s0) ## 000001E4 -/* 00A04 809E4D24 AE1301F8 */ sw $s3, 0x01F8($s0) ## 000001F8 -/* 00A08 809E4D28 13200026 */ beq $t9, $zero, .L809E4DC4 -/* 00A0C 809E4D2C AE0001FC */ sw $zero, 0x01FC($s0) ## 000001FC -/* 00A10 809E4D30 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A14 809E4D34 AE0E02F8 */ sw $t6, 0x02F8($s0) ## 000002F8 -/* 00A18 809E4D38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A1C 809E4D3C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A20 809E4D40 0C2790C8 */ jal func_809E4320 -/* 00A24 809E4D44 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00A28 809E4D48 3C08809E */ lui $t0, %hi(func_809E4B14) ## $t0 = 809E0000 -/* 00A2C 809E4D4C 25084B14 */ addiu $t0, $t0, %lo(func_809E4B14) ## $t0 = 809E4B14 -/* 00A30 809E4D50 10000072 */ beq $zero, $zero, .L809E4F1C -/* 00A34 809E4D54 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809E4D58: -/* 00A38 809E4D58 AE0001E4 */ sw $zero, 0x01E4($s0) ## 000001E4 -/* 00A3C 809E4D5C 10000019 */ beq $zero, $zero, .L809E4DC4 -/* 00A40 809E4D60 02609025 */ or $s2, $s3, $zero ## $s2 = 00000001 -/* 00A44 809E4D64 02609025 */ or $s2, $s3, $zero ## $s2 = 00000001 -.L809E4D68: -/* 00A48 809E4D68 10000016 */ beq $zero, $zero, .L809E4DC4 -/* 00A4C 809E4D6C AE1301FC */ sw $s3, 0x01FC($s0) ## 000001FC -/* 00A50 809E4D70 8E0901E4 */ lw $t1, 0x01E4($s0) ## 000001E4 -.L809E4D74: -/* 00A54 809E4D74 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00A58 809E4D78 05410011 */ bgez $t2, .L809E4DC0 -/* 00A5C 809E4D7C AE0A01E4 */ sw $t2, 0x01E4($s0) ## 000001E4 -/* 00A60 809E4D80 960C0200 */ lhu $t4, 0x0200($s0) ## 00000200 -/* 00A64 809E4D84 AE1301E4 */ sw $s3, 0x01E4($s0) ## 000001E4 -/* 00A68 809E4D88 AE0001F8 */ sw $zero, 0x01F8($s0) ## 000001F8 -/* 00A6C 809E4D8C 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 -/* 00A70 809E4D90 11A0000C */ beq $t5, $zero, .L809E4DC4 -/* 00A74 809E4D94 AE0001FC */ sw $zero, 0x01FC($s0) ## 000001FC -/* 00A78 809E4D98 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00A7C 809E4D9C AE1802F8 */ sw $t8, 0x02F8($s0) ## 000002F8 -/* 00A80 809E4DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A84 809E4DA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A88 809E4DA8 0C2790C8 */ jal func_809E4320 -/* 00A8C 809E4DAC 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00A90 809E4DB0 3C0F809E */ lui $t7, %hi(func_809E4B14) ## $t7 = 809E0000 -/* 00A94 809E4DB4 25EF4B14 */ addiu $t7, $t7, %lo(func_809E4B14) ## $t7 = 809E4B14 -/* 00A98 809E4DB8 10000058 */ beq $zero, $zero, .L809E4F1C -/* 00A9C 809E4DBC AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -.L809E4DC0: -/* 00AA0 809E4DC0 02609025 */ or $s2, $s3, $zero ## $s2 = 00000001 -.L809E4DC4: -/* 00AA4 809E4DC4 5640FF8E */ bnel $s2, $zero, .L809E4C00 -/* 00AA8 809E4DC8 8FA60040 */ lw $a2, 0x0040($sp) -/* 00AAC 809E4DCC 00133400 */ sll $a2, $s3, 16 -/* 00AB0 809E4DD0 00063403 */ sra $a2, $a2, 16 -/* 00AB4 809E4DD4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00AB8 809E4DD8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00ABC 809E4DDC AFA00010 */ sw $zero, 0x0010($sp) -/* 00AC0 809E4DE0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00AC4 809E4DE4 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 00AC8 809E4DE8 8E0301FC */ lw $v1, 0x01FC($s0) ## 000001FC -/* 00ACC 809E4DEC 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00AD0 809E4DF0 C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 00AD4 809E4DF4 14600008 */ bne $v1, $zero, .L809E4E18 -/* 00AD8 809E4DF8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00ADC 809E4DFC 14400003 */ bne $v0, $zero, .L809E4E0C -/* 00AE0 809E4E00 02601825 */ or $v1, $s3, $zero ## $v1 = 00000001 -/* 00AE4 809E4E04 10000004 */ beq $zero, $zero, .L809E4E18 -/* 00AE8 809E4E08 AE1301FC */ sw $s3, 0x01FC($s0) ## 000001FC -.L809E4E0C: -/* 00AEC 809E4E0C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00AF0 809E4E10 8E0301FC */ lw $v1, 0x01FC($s0) ## 000001FC -/* 00AF4 809E4E14 E6140068 */ swc1 $f20, 0x0068($s0) ## 00000068 -.L809E4E18: -/* 00AF8 809E4E18 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00AFC 809E4E1C 16630007 */ bne $s3, $v1, .L809E4E3C -/* 00B00 809E4E20 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00B04 809E4E24 8E0501E8 */ lw $a1, 0x01E8($s0) ## 000001E8 -/* 00B08 809E4E28 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 00B0C 809E4E2C 44071000 */ mfc1 $a3, $f2 -/* 00B10 809E4E30 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 00B14 809E4E34 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00B18 809E4E38 E7B40010 */ swc1 $f20, 0x0010($sp) -.L809E4E3C: -/* 00B1C 809E4E3C 0C00B638 */ jal Actor_MoveForward - -/* 00B20 809E4E40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B24 809E4E44 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 -/* 00B28 809E4E48 8FA4006C */ lw $a0, 0x006C($sp) -/* 00B2C 809E4E4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B30 809E4E50 304E0040 */ andi $t6, $v0, 0x0040 ## $t6 = 00000000 -/* 00B34 809E4E54 11C00009 */ beq $t6, $zero, .L809E4E7C -/* 00B38 809E4E58 30490080 */ andi $t1, $v0, 0x0080 ## $t1 = 00000000 -/* 00B3C 809E4E5C 4406A000 */ mfc1 $a2, $f20 -/* 00B40 809E4E60 4407A000 */ mfc1 $a3, $f20 -/* 00B44 809E4E64 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00B48 809E4E68 AFA80014 */ sw $t0, 0x0014($sp) -/* 00B4C 809E4E6C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00B50 809E4E70 E7B40010 */ swc1 $f20, 0x0010($sp) -/* 00B54 809E4E74 10000017 */ beq $zero, $zero, .L809E4ED4 -/* 00B58 809E4E78 00000000 */ nop -.L809E4E7C: -/* 00B5C 809E4E7C 51200008 */ beql $t1, $zero, .L809E4EA0 -/* 00B60 809E4E80 960D0202 */ lhu $t5, 0x0202($s0) ## 00000202 -/* 00B64 809E4E84 960A0202 */ lhu $t2, 0x0202($s0) ## 00000202 -/* 00B68 809E4E88 304CFF7F */ andi $t4, $v0, 0xFF7F ## $t4 = 00000000 -/* 00B6C 809E4E8C A60C0200 */ sh $t4, 0x0200($s0) ## 00000200 -/* 00B70 809E4E90 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00B74 809E4E94 1000000F */ beq $zero, $zero, .L809E4ED4 -/* 00B78 809E4E98 A60B0202 */ sh $t3, 0x0202($s0) ## 00000202 -/* 00B7C 809E4E9C 960D0202 */ lhu $t5, 0x0202($s0) ## 00000202 -.L809E4EA0: -/* 00B80 809E4EA0 8FA4006C */ lw $a0, 0x006C($sp) -/* 00B84 809E4EA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B88 809E4EA8 31B80001 */ andi $t8, $t5, 0x0001 ## $t8 = 00000000 -/* 00B8C 809E4EAC 13000009 */ beq $t8, $zero, .L809E4ED4 -/* 00B90 809E4EB0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00B94 809E4EB4 4406A000 */ mfc1 $a2, $f20 -/* 00B98 809E4EB8 4407A000 */ mfc1 $a3, $f20 -/* 00B9C 809E4EBC E7B40010 */ swc1 $f20, 0x0010($sp) -/* 00BA0 809E4EC0 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00BA4 809E4EC4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00BA8 809E4EC8 96190202 */ lhu $t9, 0x0202($s0) ## 00000202 -/* 00BAC 809E4ECC 332EFFFE */ andi $t6, $t9, 0xFFFE ## $t6 = 00000000 -/* 00BB0 809E4ED0 A60E0202 */ sh $t6, 0x0202($s0) ## 00000202 -.L809E4ED4: -/* 00BB4 809E4ED4 0C02927F */ jal SkelAnime_Update - -/* 00BB8 809E4ED8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00BBC 809E4EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC0 809E4EE0 0C2791FB */ jal func_809E47EC -/* 00BC4 809E4EE4 8FA5006C */ lw $a1, 0x006C($sp) -/* 00BC8 809E4EE8 8E0801E0 */ lw $t0, 0x01E0($s0) ## 000001E0 -/* 00BCC 809E4EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD0 809E4EF0 5100000B */ beql $t0, $zero, .L809E4F20 -/* 00BD4 809E4EF4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00BD8 809E4EF8 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 -/* 00BDC 809E4EFC 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00BE0 809E4F00 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC -/* 00BE4 809E4F04 352A0200 */ ori $t2, $t1, 0x0200 ## $t2 = 00000200 -/* 00BE8 809E4F08 0C2790C8 */ jal func_809E4320 -/* 00BEC 809E4F0C A60A0200 */ sh $t2, 0x0200($s0) ## 00000200 -/* 00BF0 809E4F10 3C0B809E */ lui $t3, %hi(func_809E49A8) ## $t3 = 809E0000 -/* 00BF4 809E4F14 256B49A8 */ addiu $t3, $t3, %lo(func_809E49A8) ## $t3 = 809E49A8 -/* 00BF8 809E4F18 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -.L809E4F1C: -/* 00BFC 809E4F1C 8FBF003C */ lw $ra, 0x003C($sp) -.L809E4F20: -/* 00C00 809E4F20 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00C04 809E4F24 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00C08 809E4F28 8FB0002C */ lw $s0, 0x002C($sp) -/* 00C0C 809E4F2C 8FB10030 */ lw $s1, 0x0030($sp) -/* 00C10 809E4F30 8FB20034 */ lw $s2, 0x0034($sp) -/* 00C14 809E4F34 8FB30038 */ lw $s3, 0x0038($sp) -/* 00C18 809E4F38 03E00008 */ jr $ra -/* 00C1C 809E4F3C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s deleted file mode 100644 index b864ef7796..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s +++ /dev/null @@ -1,149 +0,0 @@ -.rdata -glabel D_809E55A0 - .asciz "<%d>\n" - .balign 4 - -.late_rodata -glabel D_809E561C - .float 9.58738019108e-05 - -glabel D_809E5620 - .float 9.58738019108e-05 - -glabel D_809E5624 - .float 9.58738019108e-05 - -glabel D_809E5628 - .float 9.58738019108e-05 - -glabel D_809E562C - .float 9.58738019108e-05 - -glabel D_809E5630 - .float 9.58738019108e-05 - -.text -glabel func_809E50B4 -/* 00D94 809E50B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D98 809E50B8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00D9C 809E50BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DA0 809E50C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DA4 809E50C4 AFA60030 */ sw $a2, 0x0030($sp) -/* 00DA8 809E50C8 10A10006 */ beq $a1, $at, .L809E50E4 -/* 00DAC 809E50CC AFA70034 */ sw $a3, 0x0034($sp) -/* 00DB0 809E50D0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00DB4 809E50D4 50A10020 */ beql $a1, $at, .L809E5158 -/* 00DB8 809E50D8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00DBC 809E50DC 10000066 */ beq $zero, $zero, .L809E5278 -/* 00DC0 809E50E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809E50E4: -/* 00DC4 809E50E4 8FAF003C */ lw $t7, 0x003C($sp) -/* 00DC8 809E50E8 27AE001C */ addiu $t6, $sp, 0x001C ## $t6 = FFFFFFF4 -/* 00DCC 809E50EC 3C01809E */ lui $at, %hi(D_809E561C) ## $at = 809E0000 -/* 00DD0 809E50F0 89F90212 */ lwl $t9, 0x0212($t7) ## 00000212 -/* 00DD4 809E50F4 99F90215 */ lwr $t9, 0x0215($t7) ## 00000215 -/* 00DD8 809E50F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00DDC 809E50FC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00DE0 809E5100 95F90216 */ lhu $t9, 0x0216($t7) ## 00000216 -/* 00DE4 809E5104 A5D90004 */ sh $t9, 0x0004($t6) ## FFFFFFF8 -/* 00DE8 809E5108 87A8001E */ lh $t0, 0x001E($sp) -/* 00DEC 809E510C C428561C */ lwc1 $f8, %lo(D_809E561C)($at) -/* 00DF0 809E5110 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00DF4 809E5114 00000000 */ nop -/* 00DF8 809E5118 468021A0 */ cvt.s.w $f6, $f4 -/* 00DFC 809E511C 46083302 */ mul.s $f12, $f6, $f8 -/* 00E00 809E5120 0C0342DC */ jal Matrix_RotateX -/* 00E04 809E5124 46006307 */ neg.s $f12, $f12 -/* 00E08 809E5128 87A9001C */ lh $t1, 0x001C($sp) -/* 00E0C 809E512C 3C01809E */ lui $at, %hi(D_809E5620) ## $at = 809E0000 -/* 00E10 809E5130 C4325620 */ lwc1 $f18, %lo(D_809E5620)($at) -/* 00E14 809E5134 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 00E18 809E5138 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00E1C 809E513C 46805420 */ cvt.s.w $f16, $f10 -/* 00E20 809E5140 46128302 */ mul.s $f12, $f16, $f18 -/* 00E24 809E5144 0C0343B5 */ jal Matrix_RotateZ -/* 00E28 809E5148 46006307 */ neg.s $f12, $f12 -/* 00E2C 809E514C 1000004A */ beq $zero, $zero, .L809E5278 -/* 00E30 809E5150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E34 809E5154 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -.L809E5158: -/* 00E38 809E5158 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 00E3C 809E515C 44816000 */ mtc1 $at, $f12 ## $f12 = 1400.00 -/* 00E40 809E5160 44067000 */ mfc1 $a2, $f14 -/* 00E44 809E5164 0C034261 */ jal Matrix_Translate -/* 00E48 809E5168 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E4C 809E516C 8FA2003C */ lw $v0, 0x003C($sp) -/* 00E50 809E5170 27AA001C */ addiu $t2, $sp, 0x001C ## $t2 = FFFFFFF4 -/* 00E54 809E5174 3C04809E */ lui $a0, %hi(D_809E55A0) ## $a0 = 809E0000 -/* 00E58 809E5178 884C020C */ lwl $t4, 0x020C($v0) ## 0000020C -/* 00E5C 809E517C 984C020F */ lwr $t4, 0x020F($v0) ## 0000020F -/* 00E60 809E5180 248455A0 */ addiu $a0, $a0, %lo(D_809E55A0) ## $a0 = 809E55A0 -/* 00E64 809E5184 AD4C0000 */ sw $t4, 0x0000($t2) ## FFFFFFF4 -/* 00E68 809E5188 944C0210 */ lhu $t4, 0x0210($v0) ## 00000210 -/* 00E6C 809E518C A54C0004 */ sh $t4, 0x0004($t2) ## FFFFFFF8 -/* 00E70 809E5190 944D0200 */ lhu $t5, 0x0200($v0) ## 00000200 -/* 00E74 809E5194 31AE1000 */ andi $t6, $t5, 0x1000 ## $t6 = 00000000 -/* 00E78 809E5198 11C0001F */ beq $t6, $zero, .L809E5218 -/* 00E7C 809E519C 87AD001E */ lh $t5, 0x001E($sp) -/* 00E80 809E51A0 0C00084C */ jal osSyncPrintf - -/* 00E84 809E51A4 844502FC */ lh $a1, 0x02FC($v0) ## 000002FC -/* 00E88 809E51A8 8FB8003C */ lw $t8, 0x003C($sp) -/* 00E8C 809E51AC 87AF001E */ lh $t7, 0x001E($sp) -/* 00E90 809E51B0 3C01809E */ lui $at, %hi(D_809E5624) ## $at = 809E0000 -/* 00E94 809E51B4 871902FE */ lh $t9, 0x02FE($t8) ## 000002FE -/* 00E98 809E51B8 C4285624 */ lwc1 $f8, %lo(D_809E5624)($at) -/* 00E9C 809E51BC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00EA0 809E51C0 01F94021 */ addu $t0, $t7, $t9 -/* 00EA4 809E51C4 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00EA8 809E51C8 00000000 */ nop -/* 00EAC 809E51CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00EB0 809E51D0 46083302 */ mul.s $f12, $f6, $f8 -/* 00EB4 809E51D4 0C0342DC */ jal Matrix_RotateX -/* 00EB8 809E51D8 00000000 */ nop -/* 00EBC 809E51DC 8FAA003C */ lw $t2, 0x003C($sp) -/* 00EC0 809E51E0 87A9001C */ lh $t1, 0x001C($sp) -/* 00EC4 809E51E4 3C01809E */ lui $at, %hi(D_809E5628) ## $at = 809E0000 -/* 00EC8 809E51E8 854B02FC */ lh $t3, 0x02FC($t2) ## 000002FC -/* 00ECC 809E51EC C4325628 */ lwc1 $f18, %lo(D_809E5628)($at) -/* 00ED0 809E51F0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00ED4 809E51F4 012B6021 */ addu $t4, $t1, $t3 -/* 00ED8 809E51F8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 00EDC 809E51FC 00000000 */ nop -/* 00EE0 809E5200 46805420 */ cvt.s.w $f16, $f10 -/* 00EE4 809E5204 46128302 */ mul.s $f12, $f16, $f18 -/* 00EE8 809E5208 0C0343B5 */ jal Matrix_RotateZ -/* 00EEC 809E520C 00000000 */ nop -/* 00EF0 809E5210 10000013 */ beq $zero, $zero, .L809E5260 -/* 00EF4 809E5214 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -.L809E5218: -/* 00EF8 809E5218 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 00EFC 809E521C 3C01809E */ lui $at, %hi(D_809E562C) ## $at = 809E0000 -/* 00F00 809E5220 C428562C */ lwc1 $f8, %lo(D_809E562C)($at) -/* 00F04 809E5224 468021A0 */ cvt.s.w $f6, $f4 -/* 00F08 809E5228 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00F0C 809E522C 46083302 */ mul.s $f12, $f6, $f8 -/* 00F10 809E5230 0C0342DC */ jal Matrix_RotateX -/* 00F14 809E5234 00000000 */ nop -/* 00F18 809E5238 87AE001C */ lh $t6, 0x001C($sp) -/* 00F1C 809E523C 3C01809E */ lui $at, %hi(D_809E5630) ## $at = 809E0000 -/* 00F20 809E5240 C4325630 */ lwc1 $f18, %lo(D_809E5630)($at) -/* 00F24 809E5244 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 00F28 809E5248 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00F2C 809E524C 46805420 */ cvt.s.w $f16, $f10 -/* 00F30 809E5250 46128302 */ mul.s $f12, $f16, $f18 -/* 00F34 809E5254 0C0343B5 */ jal Matrix_RotateZ -/* 00F38 809E5258 00000000 */ nop -/* 00F3C 809E525C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -.L809E5260: -/* 00F40 809E5260 3C01C4AF */ lui $at, 0xC4AF ## $at = C4AF0000 -/* 00F44 809E5264 44816000 */ mtc1 $at, $f12 ## $f12 = -1400.00 -/* 00F48 809E5268 44067000 */ mfc1 $a2, $f14 -/* 00F4C 809E526C 0C034261 */ jal Matrix_Translate -/* 00F50 809E5270 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F54 809E5274 8FBF0014 */ lw $ra, 0x0014($sp) -.L809E5278: -/* 00F58 809E5278 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F5C 809E527C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00F60 809E5280 03E00008 */ jr $ra -/* 00F64 809E5284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s deleted file mode 100644 index ed08f0a495..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s +++ /dev/null @@ -1,58 +0,0 @@ -.rdata -glabel D_809E55A8 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -glabel D_809E55C4 - .asciz "../z_en_daiku_kakariko.c" - .balign 4 - -.text -glabel func_809E5288 -/* 00F68 809E5288 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00F6C 809E528C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F70 809E5290 AFA40038 */ sw $a0, 0x0038($sp) -/* 00F74 809E5294 AFA5003C */ sw $a1, 0x003C($sp) -/* 00F78 809E5298 AFA60040 */ sw $a2, 0x0040($sp) -/* 00F7C 809E529C AFA70044 */ sw $a3, 0x0044($sp) -/* 00F80 809E52A0 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00F84 809E52A4 3C06809E */ lui $a2, %hi(D_809E55A8) ## $a2 = 809E0000 -/* 00F88 809E52A8 24C655A8 */ addiu $a2, $a2, %lo(D_809E55A8) ## $a2 = 809E55A8 -/* 00F8C 809E52AC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 -/* 00F90 809E52B0 24070450 */ addiu $a3, $zero, 0x0450 ## $a3 = 00000450 -/* 00F94 809E52B4 0C031AB1 */ jal Graph_OpenDisps -/* 00F98 809E52B8 AFA50030 */ sw $a1, 0x0030($sp) -/* 00F9C 809E52BC 8FAF003C */ lw $t7, 0x003C($sp) -/* 00FA0 809E52C0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00FA4 809E52C4 3C04809E */ lui $a0, %hi(D_809E5590) ## $a0 = 809E0000 -/* 00FA8 809E52C8 15E10012 */ bne $t7, $at, .L809E5314 -/* 00FAC 809E52CC 8FA50048 */ lw $a1, 0x0048($sp) -/* 00FB0 809E52D0 24845590 */ addiu $a0, $a0, %lo(D_809E5590) ## $a0 = 809E5590 -/* 00FB4 809E52D4 0C0346BD */ jal Matrix_MultVec3f -/* 00FB8 809E52D8 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 00FBC 809E52DC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00FC0 809E52E0 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 00FC4 809E52E4 3C0C809E */ lui $t4, %hi(D_809E5580) ## $t4 = 809E0000 -/* 00FC8 809E52E8 8C8302C0 */ lw $v1, 0x02C0($a0) ## 000002C0 -/* 00FCC 809E52EC 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00FD0 809E52F0 AC9802C0 */ sw $t8, 0x02C0($a0) ## 000002C0 -/* 00FD4 809E52F4 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00FD8 809E52F8 8FA80048 */ lw $t0, 0x0048($sp) -/* 00FDC 809E52FC 8509001C */ lh $t1, 0x001C($t0) ## 0000001C -/* 00FE0 809E5300 312A0003 */ andi $t2, $t1, 0x0003 ## $t2 = 00000000 -/* 00FE4 809E5304 000A5880 */ sll $t3, $t2, 2 -/* 00FE8 809E5308 018B6021 */ addu $t4, $t4, $t3 -/* 00FEC 809E530C 8D8C5580 */ lw $t4, %lo(D_809E5580)($t4) -/* 00FF0 809E5310 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -.L809E5314: -/* 00FF4 809E5314 8FAD0038 */ lw $t5, 0x0038($sp) -/* 00FF8 809E5318 3C06809E */ lui $a2, %hi(D_809E55C4) ## $a2 = 809E0000 -/* 00FFC 809E531C 24C655C4 */ addiu $a2, $a2, %lo(D_809E55C4) ## $a2 = 809E55C4 -/* 01000 809E5320 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 -/* 01004 809E5324 24070459 */ addiu $a3, $zero, 0x0459 ## $a3 = 00000459 -/* 01008 809E5328 0C031AD5 */ jal Graph_CloseDisps -/* 0100C 809E532C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 01010 809E5330 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01014 809E5334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01018 809E5338 03E00008 */ jr $ra -/* 0101C 809E533C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s deleted file mode 100644 index 5dc319613e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnDodojr_Destroy -/* 000E8 809F64A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000EC 809F64AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000F0 809F64B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F4 809F64B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000F8 809F64B8 0C0170EB */ jal Collider_DestroyCylinder - -/* 000FC 809F64BC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 00100 809F64C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00104 809F64C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00108 809F64C8 03E00008 */ jr $ra -/* 0010C 809F64CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s deleted file mode 100644 index 785a19214f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EnDodojr_Draw -/* 01A50 809F7E10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A54 809F7E14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A58 809F7E18 AFB00020 */ sw $s0, 0x0020($sp) -/* 01A5C 809F7E1C AFA5002C */ sw $a1, 0x002C($sp) -/* 01A60 809F7E20 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 01A64 809F7E24 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 01A68 809F7E28 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 01A6C 809F7E2C 11C20011 */ beq $t6, $v0, .L809F7E74 -/* 01A70 809F7E30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A74 809F7E34 3C0F809F */ lui $t7, %hi(func_809F7BE4) ## $t7 = 809F0000 -/* 01A78 809F7E38 25EF7BE4 */ addiu $t7, $t7, %lo(func_809F7BE4) ## $t7 = 809F7BE4 -/* 01A7C 809F7E3C 51E2000E */ beql $t7, $v0, .L809F7E78 -/* 01A80 809F7E40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01A84 809F7E44 0C024F46 */ jal func_80093D18 -/* 01A88 809F7E48 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01A8C 809F7E4C 3C19809F */ lui $t9, %hi(func_809F7DFC) ## $t9 = 809F0000 -/* 01A90 809F7E50 27397DFC */ addiu $t9, $t9, %lo(func_809F7DFC) ## $t9 = 809F7DFC -/* 01A94 809F7E54 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01A98 809F7E58 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01A9C 809F7E5C 3C07809F */ lui $a3, %hi(func_809F7D50) ## $a3 = 809F0000 -/* 01AA0 809F7E60 24E77D50 */ addiu $a3, $a3, %lo(func_809F7D50) ## $a3 = 809F7D50 -/* 01AA4 809F7E64 AFB00014 */ sw $s0, 0x0014($sp) -/* 01AA8 809F7E68 AFB90010 */ sw $t9, 0x0010($sp) -/* 01AAC 809F7E6C 0C028572 */ jal SkelAnime_DrawOpa - -/* 01AB0 809F7E70 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7E74: -/* 01AB4 809F7E74 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F7E78: -/* 01AB8 809F7E78 8FB00020 */ lw $s0, 0x0020($sp) -/* 01ABC 809F7E7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AC0 809F7E80 03E00008 */ jr $ra -/* 01AC4 809F7E84 00000000 */ nop -/* 01AC8 809F7E88 00000000 */ nop -/* 01ACC 809F7E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s deleted file mode 100644 index b8fb93d85f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel EnDodojr_Init -/* 00000 809F63C0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809F63C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 809F63C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809F63CC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 809F63D0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 809F63D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00018 809F63D8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 0001C 809F63DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00020 809F63E0 0C00AC78 */ jal ActorShape_Init - -/* 00024 809F63E4 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 -/* 00028 809F63E8 3C060600 */ lui $a2, %hi(D_060020E0) ## $a2 = 06000000 -/* 0002C 809F63EC 3C070600 */ lui $a3, %hi(D_060009D4) ## $a3 = 06000000 -/* 00030 809F63F0 260E020C */ addiu $t6, $s0, 0x020C ## $t6 = 0000020C -/* 00034 809F63F4 260F0266 */ addiu $t7, $s0, 0x0266 ## $t7 = 00000266 -/* 00038 809F63F8 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 0003C 809F63FC AFB80018 */ sw $t8, 0x0018($sp) -/* 00040 809F6400 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00044 809F6404 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00048 809F6408 24E709D4 */ addiu $a3, $a3, %lo(D_060009D4) ## $a3 = 060009D4 -/* 0004C 809F640C 24C620E0 */ addiu $a2, $a2, %lo(D_060020E0) ## $a2 = 060020E0 -/* 00050 809F6410 8FA40044 */ lw $a0, 0x0044($sp) -/* 00054 809F6414 0C02915F */ jal SkelAnime_Init - -/* 00058 809F6418 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0005C 809F641C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00060 809F6420 AFA50034 */ sw $a1, 0x0034($sp) -/* 00064 809F6424 0C0170D9 */ jal Collider_InitCylinder - -/* 00068 809F6428 8FA40044 */ lw $a0, 0x0044($sp) -/* 0006C 809F642C 3C07809F */ lui $a3, %hi(D_809F7EB0) ## $a3 = 809F0000 -/* 00070 809F6430 8FA50034 */ lw $a1, 0x0034($sp) -/* 00074 809F6434 24E77EB0 */ addiu $a3, $a3, %lo(D_809F7EB0) ## $a3 = 809F7EB0 -/* 00078 809F6438 8FA40044 */ lw $a0, 0x0044($sp) -/* 0007C 809F643C 0C01712B */ jal Collider_SetCylinder - -/* 00080 809F6440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00084 809F6444 0C016C80 */ jal DamageTable_Get - -/* 00088 809F6448 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 0008C 809F644C 3C06809F */ lui $a2, %hi(D_809F7EDC) ## $a2 = 809F0000 -/* 00090 809F6450 24C67EDC */ addiu $a2, $a2, %lo(D_809F7EDC) ## $a2 = 809F7EDC -/* 00094 809F6454 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00098 809F6458 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 0009C 809F645C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 000A0 809F6460 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 000A4 809F6464 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000A8 809F6468 2419000E */ addiu $t9, $zero, 0x000E ## $t9 = 0000000E -/* 000AC 809F646C 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 000B0 809F6470 01014824 */ and $t1, $t0, $at -/* 000B4 809F6474 A2190117 */ sb $t9, 0x0117($s0) ## 00000117 -/* 000B8 809F6478 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 000BC 809F647C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 000C0 809F6480 0C00B58B */ jal Actor_SetScale - -/* 000C4 809F6484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C8 809F6488 3C0A809F */ lui $t2, %hi(func_809F73AC) ## $t2 = 809F0000 -/* 000CC 809F648C 254A73AC */ addiu $t2, $t2, %lo(func_809F73AC) ## $t2 = 809F73AC -/* 000D0 809F6490 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 000D4 809F6494 8FBF002C */ lw $ra, 0x002C($sp) -/* 000D8 809F6498 8FB00028 */ lw $s0, 0x0028($sp) -/* 000DC 809F649C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000E0 809F64A0 03E00008 */ jr $ra -/* 000E4 809F64A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s deleted file mode 100644 index 1692b97aea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel EnDodojr_Update -/* 018D0 809F7C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 018D4 809F7C94 AFB00020 */ sw $s0, 0x0020($sp) -/* 018D8 809F7C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018DC 809F7C9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 018E0 809F7CA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 018E4 809F7CA4 0C02927F */ jal SkelAnime_Update - -/* 018E8 809F7CA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018EC 809F7CAC 0C00B638 */ jal Actor_MoveForward - -/* 018F0 809F7CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F4 809F7CB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 809F7CB8 0C27DC3A */ jal func_809F70E8 -/* 018FC 809F7CBC 8FA5002C */ lw $a1, 0x002C($sp) -/* 01900 809F7CC0 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 01904 809F7CC4 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 01908 809F7CC8 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 0190C 809F7CCC 51C20013 */ beql $t6, $v0, .L809F7D1C -/* 01910 809F7CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01914 809F7CD4 860F01D4 */ lh $t7, 0x01D4($s0) ## 000001D4 -/* 01918 809F7CD8 861801D6 */ lh $t8, 0x01D6($s0) ## 000001D6 -/* 0191C 809F7CDC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01920 809F7CE0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01924 809F7CE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 01928 809F7CE8 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 0192C 809F7CEC 46802120 */ cvt.s.w $f4, $f4 -/* 01930 809F7CF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 01934 809F7CF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 01938 809F7CF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0193C 809F7CFC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01940 809F7D00 468031A0 */ cvt.s.w $f6, $f6 -/* 01944 809F7D04 44062000 */ mfc1 $a2, $f4 -/* 01948 809F7D08 44073000 */ mfc1 $a3, $f6 -/* 0194C 809F7D0C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 01950 809F7D10 00000000 */ nop -/* 01954 809F7D14 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 01958 809F7D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7D1C: -/* 0195C 809F7D1C 0040F809 */ jalr $ra, $v0 -/* 01960 809F7D20 8FA5002C */ lw $a1, 0x002C($sp) -/* 01964 809F7D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01968 809F7D28 0C00B56E */ jal Actor_SetFocus - -/* 0196C 809F7D2C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 01970 809F7D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 809F7D34 0C27DCA9 */ jal func_809F72A4 -/* 01978 809F7D38 8FA5002C */ lw $a1, 0x002C($sp) -/* 0197C 809F7D3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01980 809F7D40 8FB00020 */ lw $s0, 0x0020($sp) -/* 01984 809F7D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01988 809F7D48 03E00008 */ jr $ra -/* 0198C 809F7D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s deleted file mode 100644 index f0f6095371..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_809F64D0 -/* 00110 809F64D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00114 809F64D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00118 809F64D8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0011C 809F64DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00120 809F64E0 2405180E */ addiu $a1, $zero, 0x180E ## $a1 = 0000180E -/* 00124 809F64E4 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00128 809F64E8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0012C 809F64EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00130 809F64F0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00134 809F64F4 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00138 809F64F8 0C00D09B */ jal func_8003426C -/* 0013C 809F64FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00140 809F6500 8FBF001C */ lw $ra, 0x001C($sp) -/* 00144 809F6504 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00148 809F6508 03E00008 */ jr $ra -/* 0014C 809F650C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s deleted file mode 100644 index 7fd307f57b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s +++ /dev/null @@ -1,146 +0,0 @@ -glabel func_809F6510 -/* 00150 809F6510 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 00154 809F6514 3C0E809F */ lui $t6, %hi(D_809F7EE8) ## $t6 = 809F0000 -/* 00158 809F6518 AFBF006C */ sw $ra, 0x006C($sp) -/* 0015C 809F651C AFBE0068 */ sw $s8, 0x0068($sp) -/* 00160 809F6520 AFB70064 */ sw $s7, 0x0064($sp) -/* 00164 809F6524 AFB60060 */ sw $s6, 0x0060($sp) -/* 00168 809F6528 AFB5005C */ sw $s5, 0x005C($sp) -/* 0016C 809F652C AFB40058 */ sw $s4, 0x0058($sp) -/* 00170 809F6530 AFB30054 */ sw $s3, 0x0054($sp) -/* 00174 809F6534 AFB20050 */ sw $s2, 0x0050($sp) -/* 00178 809F6538 AFB1004C */ sw $s1, 0x004C($sp) -/* 0017C 809F653C AFB00048 */ sw $s0, 0x0048($sp) -/* 00180 809F6540 F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00184 809F6544 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00188 809F6548 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 0018C 809F654C 25CE7EE8 */ addiu $t6, $t6, %lo(D_809F7EE8) ## $t6 = 809F7EE8 -/* 00190 809F6550 8DD80000 */ lw $t8, 0x0000($t6) ## 809F7EE8 -/* 00194 809F6554 27B500A4 */ addiu $s5, $sp, 0x00A4 ## $s5 = FFFFFFFC -/* 00198 809F6558 3C19809F */ lui $t9, %hi(D_809F7EEC) ## $t9 = 809F0000 -/* 0019C 809F655C 27397EEC */ addiu $t9, $t9, %lo(D_809F7EEC) ## $t9 = 809F7EEC -/* 001A0 809F6560 AEB80000 */ sw $t8, 0x0000($s5) ## FFFFFFFC -/* 001A4 809F6564 8F290000 */ lw $t1, 0x0000($t9) ## 809F7EEC -/* 001A8 809F6568 27B600A0 */ addiu $s6, $sp, 0x00A0 ## $s6 = FFFFFFF8 -/* 001AC 809F656C 3C0A809F */ lui $t2, %hi(D_809F7EF0) ## $t2 = 809F0000 -/* 001B0 809F6570 254A7EF0 */ addiu $t2, $t2, %lo(D_809F7EF0) ## $t2 = 809F7EF0 -/* 001B4 809F6574 AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFF8 -/* 001B8 809F6578 8D4C0000 */ lw $t4, 0x0000($t2) ## 809F7EF0 -/* 001BC 809F657C 27B70094 */ addiu $s7, $sp, 0x0094 ## $s7 = FFFFFFEC -/* 001C0 809F6580 3C0D809F */ lui $t5, %hi(D_809F7EFC) ## $t5 = 809F0000 -/* 001C4 809F6584 AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFEC -/* 001C8 809F6588 8D4B0004 */ lw $t3, 0x0004($t2) ## 809F7EF4 -/* 001CC 809F658C 25AD7EFC */ addiu $t5, $t5, %lo(D_809F7EFC) ## $t5 = 809F7EFC -/* 001D0 809F6590 27BE0088 */ addiu $s8, $sp, 0x0088 ## $s8 = FFFFFFE0 -/* 001D4 809F6594 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFF0 -/* 001D8 809F6598 8D4C0008 */ lw $t4, 0x0008($t2) ## 809F7EF8 -/* 001DC 809F659C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 001E0 809F65A0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 001E4 809F65A4 AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFF4 -/* 001E8 809F65A8 8DAF0000 */ lw $t7, 0x0000($t5) ## 809F7EFC -/* 001EC 809F65AC AFCF0000 */ sw $t7, 0x0000($s8) ## FFFFFFE0 -/* 001F0 809F65B0 8DAE0004 */ lw $t6, 0x0004($t5) ## 809F7F00 -/* 001F4 809F65B4 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 -/* 001F8 809F65B8 8DAF0008 */ lw $t7, 0x0008($t5) ## 809F7F04 -/* 001FC 809F65BC AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 00200 809F65C0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00204 809F65C4 AFA600B0 */ sw $a2, 0x00B0($sp) -/* 00208 809F65C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0020C 809F65CC 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 00210 809F65D0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 00214 809F65D4 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 -/* 00218 809F65D8 46140101 */ sub.s $f4, $f0, $f20 -/* 0021C 809F65DC 8FA600B0 */ lw $a2, 0x00B0($sp) -/* 00220 809F65E0 C65001F4 */ lwc1 $f16, 0x01F4($s2) ## 000001F4 -/* 00224 809F65E4 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00228 809F65E8 46062202 */ mul.s $f8, $f4, $f6 -/* 0022C 809F65EC 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00230 809F65F0 E7B00080 */ swc1 $f16, 0x0080($sp) -/* 00234 809F65F4 4600428D */ trunc.w.s $f10, $f8 -/* 00238 809F65F8 44105000 */ mfc1 $s0, $f10 -/* 0023C 809F65FC 00000000 */ nop -/* 00240 809F6600 00108400 */ sll $s0, $s0, 16 -/* 00244 809F6604 04C0003B */ bltz $a2, .L809F66F4 -/* 00248 809F6608 00108403 */ sra $s0, $s0, 16 -/* 0024C 809F660C 0326001A */ div $zero, $t9, $a2 -/* 00250 809F6610 14C00002 */ bne $a2, $zero, .L809F661C -/* 00254 809F6614 00000000 */ nop -/* 00258 809F6618 0007000D */ break 7 -.L809F661C: -/* 0025C 809F661C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00260 809F6620 14C10004 */ bne $a2, $at, .L809F6634 -/* 00264 809F6624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00268 809F6628 17210002 */ bne $t9, $at, .L809F6634 -/* 0026C 809F662C 00000000 */ nop -/* 00270 809F6630 0006000D */ break 6 -.L809F6634: -/* 00274 809F6634 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 00278 809F6638 4481C000 */ mtc1 $at, $f24 ## $f24 = 22.00 -/* 0027C 809F663C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00280 809F6640 00009812 */ mflo $s3 -/* 00284 809F6644 00139C00 */ sll $s3, $s3, 16 -/* 00288 809F6648 4481B000 */ mtc1 $at, $f22 ## $f22 = 4.00 -/* 0028C 809F664C 00139C03 */ sra $s3, $s3, 16 -.L809F6650: -/* 00290 809F6650 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00294 809F6654 00000000 */ nop -/* 00298 809F6658 46140481 */ sub.s $f18, $f0, $f20 -/* 0029C 809F665C 46169102 */ mul.s $f4, $f18, $f22 -/* 002A0 809F6660 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 002A4 809F6664 E7A40088 */ swc1 $f4, 0x0088($sp) -/* 002A8 809F6668 46140181 */ sub.s $f6, $f0, $f20 -/* 002AC 809F666C 00102400 */ sll $a0, $s0, 16 -/* 002B0 809F6670 00042403 */ sra $a0, $a0, 16 -/* 002B4 809F6674 46163202 */ mul.s $f8, $f6, $f22 -/* 002B8 809F6678 0C01DE1C */ jal Math_SinS - ## sins? -/* 002BC 809F667C E7A80090 */ swc1 $f8, 0x0090($sp) -/* 002C0 809F6680 46180282 */ mul.s $f10, $f0, $f24 -/* 002C4 809F6684 C65001F0 */ lwc1 $f16, 0x01F0($s2) ## 000001F0 -/* 002C8 809F6688 00102400 */ sll $a0, $s0, 16 -/* 002CC 809F668C 00042403 */ sra $a0, $a0, 16 -/* 002D0 809F6690 46105480 */ add.s $f18, $f10, $f16 -/* 002D4 809F6694 0C01DE0D */ jal Math_CosS - ## coss? -/* 002D8 809F6698 E7B2007C */ swc1 $f18, 0x007C($sp) -/* 002DC 809F669C 46180102 */ mul.s $f4, $f0, $f24 -/* 002E0 809F66A0 C64601F8 */ lwc1 $f6, 0x01F8($s2) ## 000001F8 -/* 002E4 809F66A4 24080078 */ addiu $t0, $zero, 0x0078 ## $t0 = 00000078 -/* 002E8 809F66A8 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 -/* 002EC 809F66AC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 002F0 809F66B0 AFAA0020 */ sw $t2, 0x0020($sp) -/* 002F4 809F66B4 AFA9001C */ sw $t1, 0x001C($sp) -/* 002F8 809F66B8 46062200 */ add.s $f8, $f4, $f6 -/* 002FC 809F66BC AFA80018 */ sw $t0, 0x0018($sp) -/* 00300 809F66C0 AFB60014 */ sw $s6, 0x0014($sp) -/* 00304 809F66C4 AFB50010 */ sw $s5, 0x0010($sp) -/* 00308 809F66C8 E7A80084 */ swc1 $f8, 0x0084($sp) -/* 0030C 809F66CC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00310 809F66D0 27A5007C */ addiu $a1, $sp, 0x007C ## $a1 = FFFFFFD4 -/* 00314 809F66D4 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFEC -/* 00318 809F66D8 0C00A0DB */ jal func_8002836C -/* 0031C 809F66DC 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFE0 -/* 00320 809F66E0 02138021 */ addu $s0, $s0, $s3 -/* 00324 809F66E4 00108400 */ sll $s0, $s0, 16 -/* 00328 809F66E8 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = FFFFFFFF -/* 0032C 809F66EC 0621FFD8 */ bgez $s1, .L809F6650 -/* 00330 809F66F0 00108403 */ sra $s0, $s0, 16 -.L809F66F4: -/* 00334 809F66F4 8FBF006C */ lw $ra, 0x006C($sp) -/* 00338 809F66F8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0033C 809F66FC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00340 809F6700 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00344 809F6704 8FB00048 */ lw $s0, 0x0048($sp) -/* 00348 809F6708 8FB1004C */ lw $s1, 0x004C($sp) -/* 0034C 809F670C 8FB20050 */ lw $s2, 0x0050($sp) -/* 00350 809F6710 8FB30054 */ lw $s3, 0x0054($sp) -/* 00354 809F6714 8FB40058 */ lw $s4, 0x0058($sp) -/* 00358 809F6718 8FB5005C */ lw $s5, 0x005C($sp) -/* 0035C 809F671C 8FB60060 */ lw $s6, 0x0060($sp) -/* 00360 809F6720 8FB70064 */ lw $s7, 0x0064($sp) -/* 00364 809F6724 8FBE0068 */ lw $s8, 0x0068($sp) -/* 00368 809F6728 03E00008 */ jr $ra -/* 0036C 809F672C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s deleted file mode 100644 index e08f319fc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_809F6730 -/* 00370 809F6730 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00374 809F6734 3C0E809F */ lui $t6, %hi(D_809F7F08) ## $t6 = 809F0000 -/* 00378 809F6738 3C0F809F */ lui $t7, %hi(D_809F7F0C) ## $t7 = 809F0000 -/* 0037C 809F673C 8DCE7F08 */ lw $t6, %lo(D_809F7F08)($t6) -/* 00380 809F6740 8DEF7F0C */ lw $t7, %lo(D_809F7F0C)($t7) -/* 00384 809F6744 3C19809F */ lui $t9, %hi(D_809F7F10) ## $t9 = 809F0000 -/* 00388 809F6748 AFBF002C */ sw $ra, 0x002C($sp) -/* 0038C 809F674C AFA40060 */ sw $a0, 0x0060($sp) -/* 00390 809F6750 AFA50064 */ sw $a1, 0x0064($sp) -/* 00394 809F6754 AFA60068 */ sw $a2, 0x0068($sp) -/* 00398 809F6758 27397F10 */ addiu $t9, $t9, %lo(D_809F7F10) ## $t9 = 809F7F10 -/* 0039C 809F675C AFAE005C */ sw $t6, 0x005C($sp) -/* 003A0 809F6760 AFAF0058 */ sw $t7, 0x0058($sp) -/* 003A4 809F6764 8F290000 */ lw $t1, 0x0000($t9) ## 809F7F10 -/* 003A8 809F6768 27B8004C */ addiu $t8, $sp, 0x004C ## $t8 = FFFFFFEC -/* 003AC 809F676C 8F280004 */ lw $t0, 0x0004($t9) ## 809F7F14 -/* 003B0 809F6770 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFEC -/* 003B4 809F6774 8F290008 */ lw $t1, 0x0008($t9) ## 809F7F18 -/* 003B8 809F6778 3C0B809F */ lui $t3, %hi(D_809F7F1C) ## $t3 = 809F0000 -/* 003BC 809F677C 256B7F1C */ addiu $t3, $t3, %lo(D_809F7F1C) ## $t3 = 809F7F1C -/* 003C0 809F6780 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFF0 -/* 003C4 809F6784 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFF4 -/* 003C8 809F6788 8D6D0000 */ lw $t5, 0x0000($t3) ## 809F7F1C -/* 003CC 809F678C 27AA0040 */ addiu $t2, $sp, 0x0040 ## $t2 = FFFFFFE0 -/* 003D0 809F6790 8D6C0004 */ lw $t4, 0x0004($t3) ## 809F7F20 -/* 003D4 809F6794 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFE0 -/* 003D8 809F6798 8D6D0008 */ lw $t5, 0x0008($t3) ## 809F7F24 -/* 003DC 809F679C AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFE4 -/* 003E0 809F67A0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003E4 809F67A4 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFE8 -/* 003E8 809F67A8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003EC 809F67AC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 003F0 809F67B0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 003F4 809F67B4 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 003F8 809F67B8 46040181 */ sub.s $f6, $f0, $f4 -/* 003FC 809F67BC 8FB80060 */ lw $t8, 0x0060($sp) -/* 00400 809F67C0 46083282 */ mul.s $f10, $f6, $f8 -/* 00404 809F67C4 4600540D */ trunc.w.s $f16, $f10 -/* 00408 809F67C8 440F8000 */ mfc1 $t7, $f16 -/* 0040C 809F67CC 00000000 */ nop -/* 00410 809F67D0 A7AF0032 */ sh $t7, 0x0032($sp) -/* 00414 809F67D4 C7120080 */ lwc1 $f18, 0x0080($t8) ## 00000080 -/* 00418 809F67D8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0041C 809F67DC E7B20038 */ swc1 $f18, 0x0038($sp) -/* 00420 809F67E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00424 809F67E4 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00428 809F67E8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0042C 809F67EC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00430 809F67F0 46040181 */ sub.s $f6, $f0, $f4 -/* 00434 809F67F4 46083282 */ mul.s $f10, $f6, $f8 -/* 00438 809F67F8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0043C 809F67FC E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 00440 809F6800 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00444 809F6804 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00448 809F6808 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0044C 809F680C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00450 809F6810 46100481 */ sub.s $f18, $f0, $f16 -/* 00454 809F6814 87A40032 */ lh $a0, 0x0032($sp) -/* 00458 809F6818 46049182 */ mul.s $f6, $f18, $f4 -/* 0045C 809F681C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00460 809F6820 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 00464 809F6824 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 00468 809F6828 44814000 */ mtc1 $at, $f8 ## $f8 = 11.00 -/* 0046C 809F682C 8FB90068 */ lw $t9, 0x0068($sp) -/* 00470 809F6830 87A40032 */ lh $a0, 0x0032($sp) -/* 00474 809F6834 46080282 */ mul.s $f10, $f0, $f8 -/* 00478 809F6838 C7300000 */ lwc1 $f16, 0x0000($t9) ## 00000000 -/* 0047C 809F683C 46105480 */ add.s $f18, $f10, $f16 -/* 00480 809F6840 0C01DE0D */ jal Math_CosS - ## coss? -/* 00484 809F6844 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 00488 809F6848 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 0048C 809F684C 44812000 */ mtc1 $at, $f4 ## $f4 = 11.00 -/* 00490 809F6850 8FA80068 */ lw $t0, 0x0068($sp) -/* 00494 809F6854 27A9005C */ addiu $t1, $sp, 0x005C ## $t1 = FFFFFFFC -/* 00498 809F6858 46040182 */ mul.s $f6, $f0, $f4 -/* 0049C 809F685C C5080008 */ lwc1 $f8, 0x0008($t0) ## 00000008 -/* 004A0 809F6860 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFF8 -/* 004A4 809F6864 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 004A8 809F6868 240C003C */ addiu $t4, $zero, 0x003C ## $t4 = 0000003C -/* 004AC 809F686C 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 004B0 809F6870 AFAD0020 */ sw $t5, 0x0020($sp) -/* 004B4 809F6874 46083280 */ add.s $f10, $f6, $f8 -/* 004B8 809F6878 AFAC001C */ sw $t4, 0x001C($sp) -/* 004BC 809F687C AFAB0018 */ sw $t3, 0x0018($sp) -/* 004C0 809F6880 AFAA0014 */ sw $t2, 0x0014($sp) -/* 004C4 809F6884 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 004C8 809F6888 AFA90010 */ sw $t1, 0x0010($sp) -/* 004CC 809F688C 8FA40064 */ lw $a0, 0x0064($sp) -/* 004D0 809F6890 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFD4 -/* 004D4 809F6894 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFEC -/* 004D8 809F6898 0C00A0DB */ jal func_8002836C -/* 004DC 809F689C 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFE0 -/* 004E0 809F68A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 004E4 809F68A4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 004E8 809F68A8 03E00008 */ jr $ra -/* 004EC 809F68AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s deleted file mode 100644 index 506006d569..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_809F68B0 -/* 004F0 809F68B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 809F68B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F8 809F68B8 AFA5001C */ sw $a1, 0x001C($sp) -/* 004FC 809F68BC C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00500 809F68C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00504 809F68C4 00000000 */ nop -/* 00508 809F68C8 4604303E */ c.le.s $f6, $f4 -/* 0050C 809F68CC 00000000 */ nop -/* 00510 809F68D0 45020004 */ bc1fl .L809F68E4 -/* 00514 809F68D4 848E01FC */ lh $t6, 0x01FC($a0) ## 000001FC -/* 00518 809F68D8 1000002A */ beq $zero, $zero, .L809F6984 -/* 0051C 809F68DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00520 809F68E0 848E01FC */ lh $t6, 0x01FC($a0) ## 000001FC -.L809F68E4: -/* 00524 809F68E4 55C00004 */ bnel $t6, $zero, .L809F68F8 -/* 00528 809F68E8 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -/* 0052C 809F68EC 10000025 */ beq $zero, $zero, .L809F6984 -/* 00530 809F68F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00534 809F68F4 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -.L809F68F8: -/* 00538 809F68F8 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 0053C 809F68FC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00540 809F6900 53000020 */ beql $t8, $zero, .L809F6984 -/* 00544 809F6904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00548 809F6908 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0054C 809F690C AFA40018 */ sw $a0, 0x0018($sp) -/* 00550 809F6910 8FA40018 */ lw $a0, 0x0018($sp) -/* 00554 809F6914 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00558 809F6918 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -/* 0055C 809F691C 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 00560 809F6920 AC8801F0 */ sw $t0, 0x01F0($a0) ## 000001F0 -/* 00564 809F6924 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C -/* 00568 809F6928 AC9901F4 */ sw $t9, 0x01F4($a0) ## 000001F4 -/* 0056C 809F692C AC8801F8 */ sw $t0, 0x01F8($a0) ## 000001F8 -/* 00570 809F6930 0C27D944 */ jal func_809F6510 -/* 00574 809F6934 8FA5001C */ lw $a1, 0x001C($sp) -/* 00578 809F6938 8FA40018 */ lw $a0, 0x0018($sp) -/* 0057C 809F693C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 00580 809F6940 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00584 809F6944 848201FC */ lh $v0, 0x01FC($a0) ## 000001FC -/* 00588 809F6948 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0058C 809F694C 01225023 */ subu $t2, $t1, $v0 -/* 00590 809F6950 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 00594 809F6954 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 00598 809F6958 A48B01FC */ sh $t3, 0x01FC($a0) ## 000001FC -/* 0059C 809F695C 46805420 */ cvt.s.w $f16, $f10 -/* 005A0 809F6960 848C01FC */ lh $t4, 0x01FC($a0) ## 000001FC -/* 005A4 809F6964 46104483 */ div.s $f18, $f8, $f16 -/* 005A8 809F6968 15800005 */ bne $t4, $zero, .L809F6980 -/* 005AC 809F696C E4920060 */ swc1 $f18, 0x0060($a0) ## 00000060 -/* 005B0 809F6970 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 005B4 809F6974 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 005B8 809F6978 10000002 */ beq $zero, $zero, .L809F6984 -/* 005BC 809F697C E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -.L809F6980: -/* 005C0 809F6980 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F6984: -/* 005C4 809F6984 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C8 809F6988 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005CC 809F698C 03E00008 */ jr $ra -/* 005D0 809F6990 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s deleted file mode 100644 index 566a115da0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_809F7F70 - .word 0x40266666 -glabel D_809F7F74 - .float -0.8 - -.text -glabel func_809F6994 -/* 005D4 809F6994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) -/* 005DC 809F699C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E0 809F69A0 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 -/* 005E4 809F69A4 0C028800 */ jal Animation_GetLastFrame - -/* 005E8 809F69A8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 -/* 005EC 809F69AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005F0 809F69B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005F4 809F69B4 8FA30028 */ lw $v1, 0x0028($sp) -/* 005F8 809F69B8 468021A0 */ cvt.s.w $f6, $f4 -/* 005FC 809F69BC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00600 809F69C0 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 -/* 00604 809F69C4 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 -/* 00608 809F69C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0060C 809F69CC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00610 809F69D0 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 00614 809F69D4 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 -/* 00618 809F69D8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0061C 809F69DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00620 809F69E0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00624 809F69E4 0C029468 */ jal Animation_Change - -/* 00628 809F69E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0062C 809F69EC 8FA30028 */ lw $v1, 0x0028($sp) -/* 00630 809F69F0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00634 809F69F4 3C01809F */ lui $at, %hi(D_809F7F70) ## $at = 809F0000 -/* 00638 809F69F8 E46A0060 */ swc1 $f10, 0x0060($v1) ## 00000060 -/* 0063C 809F69FC C4307F70 */ lwc1 $f16, %lo(D_809F7F70)($at) -/* 00640 809F6A00 3C01809F */ lui $at, %hi(D_809F7F74) ## $at = 809F0000 -/* 00644 809F6A04 E4700068 */ swc1 $f16, 0x0068($v1) ## 00000068 -/* 00648 809F6A08 C4327F74 */ lwc1 $f18, %lo(D_809F7F74)($at) -/* 0064C 809F6A0C E472006C */ swc1 $f18, 0x006C($v1) ## 0000006C -/* 00650 809F6A10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00654 809F6A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00658 809F6A18 03E00008 */ jr $ra -/* 0065C 809F6A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s deleted file mode 100644 index eba32065ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_809F7F78 - .float -0.8 - -.text -glabel func_809F6A20 -/* 00660 809F6A20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) -/* 00668 809F6A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0066C 809F6A2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00670 809F6A30 3C040600 */ lui $a0, %hi(D_060004A0) ## $a0 = 06000000 -/* 00674 809F6A34 0C028800 */ jal Animation_GetLastFrame - -/* 00678 809F6A38 248404A0 */ addiu $a0, $a0, %lo(D_060004A0) ## $a0 = 060004A0 -/* 0067C 809F6A3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00680 809F6A40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00684 809F6A44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00688 809F6A48 468021A0 */ cvt.s.w $f6, $f4 -/* 0068C 809F6A4C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00690 809F6A50 3C050600 */ lui $a1, %hi(D_060004A0) ## $a1 = 06000000 -/* 00694 809F6A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00698 809F6A58 44070000 */ mfc1 $a3, $f0 -/* 0069C 809F6A5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 006A0 809F6A60 24A504A0 */ addiu $a1, $a1, %lo(D_060004A0) ## $a1 = 060004A0 -/* 006A4 809F6A64 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006A8 809F6A68 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006AC 809F6A6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006B0 809F6A70 0C029468 */ jal Animation_Change - -/* 006B4 809F6A74 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 006B8 809F6A78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006BC 809F6A7C 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC -/* 006C0 809F6A80 3C01809F */ lui $at, %hi(D_809F7F78) ## $at = 809F0000 -/* 006C4 809F6A84 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 006C8 809F6A88 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 006CC 809F6A8C E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 006D0 809F6A90 C42A7F78 */ lwc1 $f10, %lo(D_809F7F78)($at) -/* 006D4 809F6A94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006D8 809F6A98 15E00005 */ bne $t7, $zero, .L809F6AB0 -/* 006DC 809F6A9C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 006E0 809F6AA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 006E4 809F6AA4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 006E8 809F6AA8 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 006EC 809F6AAC E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -.L809F6AB0: -/* 006F0 809F6AB0 8FBF002C */ lw $ra, 0x002C($sp) -/* 006F4 809F6AB4 8FB00028 */ lw $s0, 0x0028($sp) -/* 006F8 809F6AB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006FC 809F6ABC 03E00008 */ jr $ra -/* 00700 809F6AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s deleted file mode 100644 index 2829bcaae2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s +++ /dev/null @@ -1,37 +0,0 @@ -.late_rodata -glabel D_809F7F7C - .float -0.8 - -.text -glabel func_809F6AC4 -/* 00704 809F6AC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0070C 809F6ACC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00710 809F6AD0 3C040600 */ lui $a0, %hi(D_060005F0) ## $a0 = 06000000 -/* 00714 809F6AD4 0C028800 */ jal Animation_GetLastFrame - -/* 00718 809F6AD8 248405F0 */ addiu $a0, $a0, %lo(D_060005F0) ## $a0 = 060005F0 -/* 0071C 809F6ADC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00720 809F6AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00724 809F6AE4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00728 809F6AE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0072C 809F6AEC 3C050600 */ lui $a1, %hi(D_060005F0) ## $a1 = 06000000 -/* 00730 809F6AF0 44070000 */ mfc1 $a3, $f0 -/* 00734 809F6AF4 24A505F0 */ addiu $a1, $a1, %lo(D_060005F0) ## $a1 = 060005F0 -/* 00738 809F6AF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0073C 809F6AFC AFA00014 */ sw $zero, 0x0014($sp) -/* 00740 809F6B00 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00744 809F6B04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00748 809F6B08 0C029468 */ jal Animation_Change - -/* 0074C 809F6B0C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00750 809F6B10 8FA20028 */ lw $v0, 0x0028($sp) -/* 00754 809F6B14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00758 809F6B18 3C01809F */ lui $at, %hi(D_809F7F7C) ## $at = 809F0000 -/* 0075C 809F6B1C E4480060 */ swc1 $f8, 0x0060($v0) ## 00000060 -/* 00760 809F6B20 C42A7F7C */ lwc1 $f10, %lo(D_809F7F7C)($at) -/* 00764 809F6B24 E44A006C */ swc1 $f10, 0x006C($v0) ## 0000006C -/* 00768 809F6B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0076C 809F6B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00770 809F6B30 03E00008 */ jr $ra -/* 00774 809F6B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s deleted file mode 100644 index bfefe9cde2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s +++ /dev/null @@ -1,41 +0,0 @@ -.late_rodata -glabel D_809F7F80 - .float -0.8 - -.text -glabel func_809F6B38 -/* 00778 809F6B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) -/* 00780 809F6B40 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00784 809F6B44 3C040600 */ lui $a0, %hi(D_06000724) ## $a0 = 06000000 -/* 00788 809F6B48 0C028800 */ jal Animation_GetLastFrame - -/* 0078C 809F6B4C 24840724 */ addiu $a0, $a0, %lo(D_06000724) ## $a0 = 06000724 -/* 00790 809F6B50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00794 809F6B54 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00798 809F6B58 8FA30028 */ lw $v1, 0x0028($sp) -/* 0079C 809F6B5C 468021A0 */ cvt.s.w $f6, $f4 -/* 007A0 809F6B60 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 007A4 809F6B64 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 -/* 007A8 809F6B68 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 -/* 007AC 809F6B6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007B0 809F6B70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007B4 809F6B74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007B8 809F6B78 AFA00014 */ sw $zero, 0x0014($sp) -/* 007BC 809F6B7C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 007C0 809F6B80 0C029468 */ jal Animation_Change - -/* 007C4 809F6B84 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 007C8 809F6B88 3C01809F */ lui $at, %hi(D_809F7F80) ## $at = 809F0000 -/* 007CC 809F6B8C 8FA30028 */ lw $v1, 0x0028($sp) -/* 007D0 809F6B90 C42A7F80 */ lwc1 $f10, %lo(D_809F7F80)($at) -/* 007D4 809F6B94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 007D8 809F6B98 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 007DC 809F6B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 007E0 809F6BA0 A46E01FC */ sh $t6, 0x01FC($v1) ## 000001FC -/* 007E4 809F6BA4 E46A006C */ swc1 $f10, 0x006C($v1) ## 0000006C -/* 007E8 809F6BA8 E4700060 */ swc1 $f16, 0x0060($v1) ## 00000060 -/* 007EC 809F6BAC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007F0 809F6BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007F4 809F6BB4 03E00008 */ jr $ra -/* 007F8 809F6BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s deleted file mode 100644 index 322a32879c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s +++ /dev/null @@ -1,32 +0,0 @@ -.late_rodata -glabel D_809F7F84 - .float -0.8 - -.text -glabel func_809F6BBC -/* 007FC 809F6BBC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00800 809F6BC0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00804 809F6BC4 AC8000C0 */ sw $zero, 0x00C0($a0) ## 000000C0 -/* 00808 809F6BC8 01C17824 */ and $t7, $t6, $at -/* 0080C 809F6BCC AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00810 809F6BD0 24820024 */ addiu $v0, $a0, 0x0024 ## $v0 = 00000024 -/* 00814 809F6BD4 8C590000 */ lw $t9, 0x0000($v0) ## 00000024 -/* 00818 809F6BD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0081C 809F6BDC 3C01809F */ lui $at, %hi(D_809F7F84) ## $at = 809F0000 -/* 00820 809F6BE0 AC990008 */ sw $t9, 0x0008($a0) ## 00000008 -/* 00824 809F6BE4 8C580004 */ lw $t8, 0x0004($v0) ## 00000028 -/* 00828 809F6BE8 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0082C 809F6BEC AC98000C */ sw $t8, 0x000C($a0) ## 0000000C -/* 00830 809F6BF0 8C590008 */ lw $t9, 0x0008($v0) ## 0000002C -/* 00834 809F6BF4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00838 809F6BF8 AC990010 */ sw $t9, 0x0010($a0) ## 00000010 -/* 0083C 809F6BFC C4267F84 */ lwc1 $f6, %lo(D_809F7F84)($at) -/* 00840 809F6C00 A4880202 */ sh $t0, 0x0202($a0) ## 00000202 -/* 00844 809F6C04 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C -/* 00848 809F6C08 8C4A0000 */ lw $t2, 0x0000($v0) ## 00000024 -/* 0084C 809F6C0C AC8A01F0 */ sw $t2, 0x01F0($a0) ## 000001F0 -/* 00850 809F6C10 8C490004 */ lw $t1, 0x0004($v0) ## 00000028 -/* 00854 809F6C14 AC8901F4 */ sw $t1, 0x01F4($a0) ## 000001F4 -/* 00858 809F6C18 8C4A0008 */ lw $t2, 0x0008($v0) ## 0000002C -/* 0085C 809F6C1C 03E00008 */ jr $ra -/* 00860 809F6C20 AC8A01F8 */ sw $t2, 0x01F8($a0) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s deleted file mode 100644 index 39276efc10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_809F7F88 - .float -0.8 - -.text -glabel func_809F6C24 -/* 00864 809F6C24 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00868 809F6C28 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0086C 809F6C2C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 00870 809F6C30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00874 809F6C34 AFB00028 */ sw $s0, 0x0028($sp) -/* 00878 809F6C38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0087C 809F6C3C AFBF002C */ sw $ra, 0x002C($sp) -/* 00880 809F6C40 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 -/* 00884 809F6C44 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00888 809F6C48 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0088C 809F6C4C 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 -/* 00890 809F6C50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00894 809F6C54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00898 809F6C58 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 0089C 809F6C5C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 008A0 809F6C60 0C029468 */ jal Animation_Change - -/* 008A4 809F6C64 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 008A8 809F6C68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008AC 809F6C6C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 008B0 809F6C70 24053826 */ addiu $a1, $zero, 0x3826 ## $a1 = 00003826 -/* 008B4 809F6C74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008B8 809F6C78 3C01809F */ lui $at, %hi(D_809F7F88) ## $at = 809F0000 -/* 008BC 809F6C7C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 008C0 809F6C80 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 008C4 809F6C84 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 008C8 809F6C88 C4287F88 */ lwc1 $f8, %lo(D_809F7F88)($at) -/* 008CC 809F6C8C E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 008D0 809F6C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 008D4 809F6C94 8FB00028 */ lw $s0, 0x0028($sp) -/* 008D8 809F6C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008DC 809F6C9C 03E00008 */ jr $ra -/* 008E0 809F6CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s deleted file mode 100644 index 6339c9a6b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_809F6CA4 -/* 008E4 809F6CA4 3C0E809F */ lui $t6, %hi(D_809F7F28) ## $t6 = 809F0000 -/* 008E8 809F6CA8 25CE7F28 */ addiu $t6, $t6, %lo(D_809F7F28) ## $t6 = 809F7F28 -/* 008EC 809F6CAC 8DD80000 */ lw $t8, 0x0000($t6) ## 809F7F28 -/* 008F0 809F6CB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 008F4 809F6CB4 27A60020 */ addiu $a2, $sp, 0x0020 ## $a2 = FFFFFFF0 -/* 008F8 809F6CB8 ACD80000 */ sw $t8, 0x0000($a2) ## FFFFFFF0 -/* 008FC 809F6CBC 8DCF0004 */ lw $t7, 0x0004($t6) ## 809F7F2C -/* 00900 809F6CC0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00904 809F6CC4 ACCF0004 */ sw $t7, 0x0004($a2) ## FFFFFFF4 -/* 00908 809F6CC8 8DD80008 */ lw $t8, 0x0008($t6) ## 809F7F30 -/* 0090C 809F6CCC ACD80008 */ sw $t8, 0x0008($a2) ## FFFFFFF8 -/* 00910 809F6CD0 8CA21C4C */ lw $v0, 0x1C4C($a1) ## 00001C4C -/* 00914 809F6CD4 AC8001E0 */ sw $zero, 0x01E0($a0) ## 000001E0 -/* 00918 809F6CD8 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 0091C 809F6CDC 5040003A */ beql $v0, $zero, .L809F6DC8 -/* 00920 809F6CE0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00924 809F6CE4 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -.L809F6CE8: -/* 00928 809F6CE8 17200007 */ bne $t9, $zero, .L809F6D08 -/* 0092C 809F6CEC 00000000 */ nop -/* 00930 809F6CF0 8C480118 */ lw $t0, 0x0118($v0) ## 00000118 -/* 00934 809F6CF4 15000004 */ bne $t0, $zero, .L809F6D08 -/* 00938 809F6CF8 00000000 */ nop -/* 0093C 809F6CFC 8C490130 */ lw $t1, 0x0130($v0) ## 00000130 -/* 00940 809F6D00 55200004 */ bnel $t1, $zero, .L809F6D14 -/* 00944 809F6D04 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -.L809F6D08: -/* 00948 809F6D08 1000002C */ beq $zero, $zero, .L809F6DBC -/* 0094C 809F6D0C 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00950 809F6D10 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -.L809F6D14: -/* 00954 809F6D14 50AA0004 */ beql $a1, $t2, .L809F6D28 -/* 00958 809F6D18 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 0095C 809F6D1C 10000027 */ beq $zero, $zero, .L809F6DBC -/* 00960 809F6D20 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00964 809F6D24 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -.L809F6D28: -/* 00968 809F6D28 C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 0096C 809F6D2C C7A00020 */ lwc1 $f0, 0x0020($sp) -/* 00970 809F6D30 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 00974 809F6D34 46062081 */ sub.s $f2, $f4, $f6 -/* 00978 809F6D38 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 0097C 809F6D3C C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 00980 809F6D40 46000005 */ abs.s $f0, $f0 -/* 00984 809F6D44 46001405 */ abs.s $f16, $f2 -/* 00988 809F6D48 C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 0098C 809F6D4C 4610003E */ c.le.s $f0, $f16 -/* 00990 809F6D50 C7A00024 */ lwc1 $f0, 0x0024($sp) -/* 00994 809F6D54 460A4301 */ sub.s $f12, $f8, $f10 -/* 00998 809F6D58 4501000D */ bc1t .L809F6D90 -/* 0099C 809F6D5C 46049381 */ sub.s $f14, $f18, $f4 -/* 009A0 809F6D60 46006085 */ abs.s $f2, $f12 -/* 009A4 809F6D64 46000005 */ abs.s $f0, $f0 -/* 009A8 809F6D68 4602003E */ c.le.s $f0, $f2 -/* 009AC 809F6D6C C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 009B0 809F6D70 45010007 */ bc1t .L809F6D90 -/* 009B4 809F6D74 00000000 */ nop -/* 009B8 809F6D78 46007085 */ abs.s $f2, $f14 -/* 009BC 809F6D7C 46000005 */ abs.s $f0, $f0 -/* 009C0 809F6D80 4602003E */ c.le.s $f0, $f2 -/* 009C4 809F6D84 00000000 */ nop -/* 009C8 809F6D88 45020004 */ bc1fl .L809F6D9C -/* 009CC 809F6D8C AC8201E0 */ sw $v0, 0x01E0($a0) ## 000001E0 -.L809F6D90: -/* 009D0 809F6D90 1000000A */ beq $zero, $zero, .L809F6DBC -/* 009D4 809F6D94 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 009D8 809F6D98 AC8201E0 */ sw $v0, 0x01E0($a0) ## 000001E0 -.L809F6D9C: -/* 009DC 809F6D9C 8C4C0024 */ lw $t4, 0x0024($v0) ## 00000024 -/* 009E0 809F6DA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 009E4 809F6DA4 ACCC0000 */ sw $t4, 0x0000($a2) ## FFFFFFF0 -/* 009E8 809F6DA8 8C4B0028 */ lw $t3, 0x0028($v0) ## 00000028 -/* 009EC 809F6DAC ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFFF4 -/* 009F0 809F6DB0 8C4C002C */ lw $t4, 0x002C($v0) ## 0000002C -/* 009F4 809F6DB4 ACCC0008 */ sw $t4, 0x0008($a2) ## FFFFFFF8 -/* 009F8 809F6DB8 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L809F6DBC: -/* 009FC 809F6DBC 5440FFCA */ bnel $v0, $zero, .L809F6CE8 -/* 00A00 809F6DC0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 00A04 809F6DC4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 -.L809F6DC8: -/* 00A08 809F6DC8 03E00008 */ jr $ra -/* 00A0C 809F6DCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s deleted file mode 100644 index 4f29589629..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809F6DD0 -/* 00A10 809F6DD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A14 809F6DD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A18 809F6DD8 8C8201E0 */ lw $v0, 0x01E0($a0) ## 000001E0 -/* 00A1C 809F6DDC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A20 809F6DE0 54400004 */ bnel $v0, $zero, .L809F6DF4 -/* 00A24 809F6DE4 8C4E0118 */ lw $t6, 0x0118($v0) ## 00000118 -/* 00A28 809F6DE8 10000016 */ beq $zero, $zero, .L809F6E44 -/* 00A2C 809F6DEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A30 809F6DF0 8C4E0118 */ lw $t6, 0x0118($v0) ## 00000118 -.L809F6DF4: -/* 00A34 809F6DF4 24C40024 */ addiu $a0, $a2, 0x0024 ## $a0 = 00000024 -/* 00A38 809F6DF8 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 00A3C 809F6DFC 11C00003 */ beq $t6, $zero, .L809F6E0C -/* 00A40 809F6E00 00000000 */ nop -/* 00A44 809F6E04 1000000F */ beq $zero, $zero, .L809F6E44 -/* 00A48 809F6E08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F6E0C: -/* 00A4C 809F6E0C 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00A50 809F6E10 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A54 809F6E14 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00A58 809F6E18 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00A5C 809F6E1C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A60 809F6E20 4600203C */ c.lt.s $f4, $f0 -/* 00A64 809F6E24 00000000 */ nop -/* 00A68 809F6E28 45020004 */ bc1fl .L809F6E3C -/* 00A6C 809F6E2C 8CCF01E0 */ lw $t7, 0x01E0($a2) ## 000001E0 -/* 00A70 809F6E30 10000004 */ beq $zero, $zero, .L809F6E44 -/* 00A74 809F6E34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A78 809F6E38 8CCF01E0 */ lw $t7, 0x01E0($a2) ## 000001E0 -.L809F6E3C: -/* 00A7C 809F6E3C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A80 809F6E40 ADE60118 */ sw $a2, 0x0118($t7) ## 00000118 -.L809F6E44: -/* 00A84 809F6E44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A88 809F6E48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A8C 809F6E4C 03E00008 */ jr $ra -/* 00A90 809F6E50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s deleted file mode 100644 index e89b3e356c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_809F6E54 -/* 00A94 809F6E54 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00A98 809F6E58 3C0F809F */ lui $t7, %hi(D_809F7F34) ## $t7 = 809F0000 -/* 00A9C 809F6E5C AFB00020 */ sw $s0, 0x0020($sp) -/* 00AA0 809F6E60 25EF7F34 */ addiu $t7, $t7, %lo(D_809F7F34) ## $t7 = 809F7F34 -/* 00AA4 809F6E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AA8 809F6E68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AAC 809F6E6C AFA50084 */ sw $a1, 0x0084($sp) -/* 00AB0 809F6E70 25E80030 */ addiu $t0, $t7, 0x0030 ## $t0 = 809F7F64 -/* 00AB4 809F6E74 27AE0050 */ addiu $t6, $sp, 0x0050 ## $t6 = FFFFFFD0 -.L809F6E78: -/* 00AB8 809F6E78 8DF90000 */ lw $t9, 0x0000($t7) ## 809F7F34 -/* 00ABC 809F6E7C 25EF000C */ addiu $t7, $t7, 0x000C ## $t7 = 809F7F40 -/* 00AC0 809F6E80 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = FFFFFFDC -/* 00AC4 809F6E84 ADD9FFF4 */ sw $t9, -0x000C($t6) ## FFFFFFD0 -/* 00AC8 809F6E88 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 809F7F38 -/* 00ACC 809F6E8C ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFD4 -/* 00AD0 809F6E90 8DF9FFFC */ lw $t9, -0x0004($t7) ## 809F7F3C -/* 00AD4 809F6E94 15E8FFF8 */ bne $t7, $t0, .L809F6E78 -/* 00AD8 809F6E98 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFD8 -/* 00ADC 809F6E9C 8E0301E0 */ lw $v1, 0x01E0($s0) ## 000001E0 -/* 00AE0 809F6EA0 8FA90084 */ lw $t1, 0x0084($sp) -/* 00AE4 809F6EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE8 809F6EA8 10600009 */ beq $v1, $zero, .L809F6ED0 -/* 00AEC 809F6EAC 8D261C44 */ lw $a2, 0x1C44($t1) ## 00001C44 -/* 00AF0 809F6EB0 8C6A0130 */ lw $t2, 0x0130($v1) ## 00000130 -/* 00AF4 809F6EB4 51400007 */ beql $t2, $zero, .L809F6ED4 -/* 00AF8 809F6EB8 8FA50084 */ lw $a1, 0x0084($sp) -/* 00AFC 809F6EBC 10600009 */ beq $v1, $zero, .L809F6EE4 -/* 00B00 809F6EC0 00000000 */ nop -/* 00B04 809F6EC4 8C6B0118 */ lw $t3, 0x0118($v1) ## 00000118 -/* 00B08 809F6EC8 11600006 */ beq $t3, $zero, .L809F6EE4 -/* 00B0C 809F6ECC 00000000 */ nop -.L809F6ED0: -/* 00B10 809F6ED0 8FA50084 */ lw $a1, 0x0084($sp) -.L809F6ED4: -/* 00B14 809F6ED4 0C27DB29 */ jal func_809F6CA4 -/* 00B18 809F6ED8 AFA60048 */ sw $a2, 0x0048($sp) -/* 00B1C 809F6EDC 8FA60048 */ lw $a2, 0x0048($sp) -/* 00B20 809F6EE0 8E0301E0 */ lw $v1, 0x01E0($s0) ## 000001E0 -.L809F6EE4: -/* 00B24 809F6EE4 10600009 */ beq $v1, $zero, .L809F6F0C -/* 00B28 809F6EE8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00B2C 809F6EEC 8C680024 */ lw $t0, 0x0024($v1) ## 00000024 -/* 00B30 809F6EF0 27AC003C */ addiu $t4, $sp, 0x003C ## $t4 = FFFFFFBC -/* 00B34 809F6EF4 AD880000 */ sw $t0, 0x0000($t4) ## FFFFFFBC -/* 00B38 809F6EF8 8C6D0028 */ lw $t5, 0x0028($v1) ## 00000028 -/* 00B3C 809F6EFC AD8D0004 */ sw $t5, 0x0004($t4) ## FFFFFFC0 -/* 00B40 809F6F00 8C68002C */ lw $t0, 0x002C($v1) ## 0000002C -/* 00B44 809F6F04 10000008 */ beq $zero, $zero, .L809F6F28 -/* 00B48 809F6F08 AD880008 */ sw $t0, 0x0008($t4) ## FFFFFFC4 -.L809F6F0C: -/* 00B4C 809F6F0C 8CD80024 */ lw $t8, 0x0024($a2) ## 00000024 -/* 00B50 809F6F10 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFBC -/* 00B54 809F6F14 ADF80000 */ sw $t8, 0x0000($t7) ## FFFFFFBC -/* 00B58 809F6F18 8CCE0028 */ lw $t6, 0x0028($a2) ## 00000028 -/* 00B5C 809F6F1C ADEE0004 */ sw $t6, 0x0004($t7) ## FFFFFFC0 -/* 00B60 809F6F20 8CD8002C */ lw $t8, 0x002C($a2) ## 0000002C -/* 00B64 809F6F24 ADF80008 */ sw $t8, 0x0008($t7) ## FFFFFFC4 -.L809F6F28: -/* 00B68 809F6F28 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFBC -/* 00B6C 809F6F2C 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00B70 809F6F30 AFA4002C */ sw $a0, 0x002C($sp) -/* 00B74 809F6F34 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00B78 809F6F38 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 00B7C 809F6F3C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00B80 809F6F40 27AD0050 */ addiu $t5, $sp, 0x0050 ## $t5 = FFFFFFD0 -/* 00B84 809F6F44 4600203C */ c.lt.s $f4, $f0 -/* 00B88 809F6F48 00000000 */ nop -/* 00B8C 809F6F4C 45020036 */ bc1fl .L809F7028 -/* 00B90 809F6F50 8FA4002C */ lw $a0, 0x002C($sp) -/* 00B94 809F6F54 8FB90084 */ lw $t9, 0x0084($sp) -/* 00B98 809F6F58 C6060008 */ lwc1 $f6, 0x0008($s0) ## 00000008 -/* 00B9C 809F6F5C C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00BA0 809F6F60 8F29009C */ lw $t1, 0x009C($t9) ## 0000009C -/* 00BA4 809F6F64 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00BA8 809F6F68 46083280 */ add.s $f10, $f6, $f8 -/* 00BAC 809F6F6C 0121001B */ divu $zero, $t1, $at -/* 00BB0 809F6F70 00005012 */ mflo $t2 -/* 00BB4 809F6F74 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00BB8 809F6F78 46105480 */ add.s $f18, $f10, $f16 -/* 00BBC 809F6F7C 05410005 */ bgez $t2, .L809F6F94 -/* 00BC0 809F6F80 468021A0 */ cvt.s.w $f6, $f4 -/* 00BC4 809F6F84 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00BC8 809F6F88 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 00BCC 809F6F8C 00000000 */ nop -/* 00BD0 809F6F90 46083180 */ add.s $f6, $f6, $f8 -.L809F6F94: -/* 00BD4 809F6F94 46069280 */ add.s $f10, $f18, $f6 -/* 00BD8 809F6F98 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00BDC 809F6F9C 4600540D */ trunc.w.s $f16, $f10 -/* 00BE0 809F6FA0 44028000 */ mfc1 $v0, $f16 -/* 00BE4 809F6FA4 00000000 */ nop -/* 00BE8 809F6FA8 00021400 */ sll $v0, $v0, 16 -/* 00BEC 809F6FAC 00021403 */ sra $v0, $v0, 16 -/* 00BF0 809F6FB0 0041001A */ div $zero, $v0, $at -/* 00BF4 809F6FB4 00001010 */ mfhi $v0 -/* 00BF8 809F6FB8 00021400 */ sll $v0, $v0, 16 -/* 00BFC 809F6FBC 00021403 */ sra $v0, $v0, 16 -/* 00C00 809F6FC0 04430005 */ bgezl $v0, .L809F6FD8 -/* 00C04 809F6FC4 00026080 */ sll $t4, $v0, 2 -/* 00C08 809F6FC8 00021023 */ subu $v0, $zero, $v0 -/* 00C0C 809F6FCC 00021400 */ sll $v0, $v0, 16 -/* 00C10 809F6FD0 00021403 */ sra $v0, $v0, 16 -/* 00C14 809F6FD4 00026080 */ sll $t4, $v0, 2 -.L809F6FD8: -/* 00C18 809F6FD8 018D1821 */ addu $v1, $t4, $t5 -/* 00C1C 809F6FDC C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 00C20 809F6FE0 0C0400A4 */ jal sinf - -/* 00C24 809F6FE4 AFA30028 */ sw $v1, 0x0028($sp) -/* 00C28 809F6FE8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00C2C 809F6FEC 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 00C30 809F6FF0 C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 00C34 809F6FF4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00C38 809F6FF8 46004482 */ mul.s $f18, $f8, $f0 -/* 00C3C 809F6FFC 46122180 */ add.s $f6, $f4, $f18 -/* 00C40 809F7000 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00C44 809F7004 0C041184 */ jal cosf - -/* 00C48 809F7008 C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 00C4C 809F700C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00C50 809F7010 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 00C54 809F7014 C7AA0044 */ lwc1 $f10, 0x0044($sp) -/* 00C58 809F7018 46008202 */ mul.s $f8, $f16, $f0 -/* 00C5C 809F701C 46085100 */ add.s $f4, $f10, $f8 -/* 00C60 809F7020 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 00C64 809F7024 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7028: -/* 00C68 809F7028 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00C6C 809F702C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFBC -/* 00C70 809F7030 00022C00 */ sll $a1, $v0, 16 -/* 00C74 809F7034 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00C78 809F7038 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C7C 809F703C 00052C03 */ sra $a1, $a1, 16 -/* 00C80 809F7040 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00C84 809F7044 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00C88 809F7048 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00C8C 809F704C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00C90 809F7050 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 00C94 809F7054 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00C98 809F7058 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C9C 809F705C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00CA0 809F7060 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 00CA4 809F7064 03E00008 */ jr $ra -/* 00CA8 809F7068 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s deleted file mode 100644 index 2fe07df412..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809F706C -/* 00CAC 809F706C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00CB0 809F7070 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 00CB4 809F7074 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 00CB8 809F7078 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00CBC 809F707C 4606203C */ c.lt.s $f4, $f6 -/* 00CC0 809F7080 00000000 */ nop -/* 00CC4 809F7084 45000003 */ bc1f .L809F7094 -/* 00CC8 809F7088 00000000 */ nop -/* 00CCC 809F708C 03E00008 */ jr $ra -/* 00CD0 809F7090 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F7094: -/* 00CD4 809F7094 03E00008 */ jr $ra -/* 00CD8 809F7098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s deleted file mode 100644 index d09352435f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809F709C -/* 00CDC 809F709C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CE0 809F70A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CE4 809F70A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CE8 809F70A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00CEC 809F70AC 24053821 */ addiu $a1, $zero, 0x3821 ## $a1 = 00003821 -/* 00CF0 809F70B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CF4 809F70B4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00CF8 809F70B8 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00CFC 809F70BC 01C17824 */ and $t7, $t6, $at -/* 00D00 809F70C0 0C27DA88 */ jal func_809F6A20 -/* 00D04 809F70C4 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00D08 809F70C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D0C 809F70CC 3C18809F */ lui $t8, %hi(func_809F7AB8) ## $t8 = 809F0000 -/* 00D10 809F70D0 27187AB8 */ addiu $t8, $t8, %lo(func_809F7AB8) ## $t8 = 809F7AB8 -/* 00D14 809F70D4 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -/* 00D18 809F70D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D1C 809F70DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D20 809F70E0 03E00008 */ jr $ra -/* 00D24 809F70E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s deleted file mode 100644 index f158391e09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_809F70E8 -/* 00D28 809F70E8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D2C 809F70EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D30 809F70F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D34 809F70F4 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 00D38 809F70F8 3C0E809F */ lui $t6, %hi(func_809F773C) ## $t6 = 809F0000 -/* 00D3C 809F70FC 25CE773C */ addiu $t6, $t6, %lo(func_809F773C) ## $t6 = 809F773C -/* 00D40 809F7100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D44 809F7104 11C20014 */ beq $t6, $v0, .L809F7158 -/* 00D48 809F7108 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00D4C 809F710C 3C0F809F */ lui $t7, %hi(func_809F77AC) ## $t7 = 809F0000 -/* 00D50 809F7110 25EF77AC */ addiu $t7, $t7, %lo(func_809F77AC) ## $t7 = 809F77AC -/* 00D54 809F7114 11E20010 */ beq $t7, $v0, .L809F7158 -/* 00D58 809F7118 3C18809F */ lui $t8, %hi(func_809F784C) ## $t8 = 809F0000 -/* 00D5C 809F711C 2718784C */ addiu $t8, $t8, %lo(func_809F784C) ## $t8 = 809F784C -/* 00D60 809F7120 1302000D */ beq $t8, $v0, .L809F7158 -/* 00D64 809F7124 3C19809F */ lui $t9, %hi(func_809F7A00) ## $t9 = 809F0000 -/* 00D68 809F7128 27397A00 */ addiu $t9, $t9, %lo(func_809F7A00) ## $t9 = 809F7A00 -/* 00D6C 809F712C 1322000A */ beq $t9, $v0, .L809F7158 -/* 00D70 809F7130 3C08809F */ lui $t0, %hi(func_809F7AB8) ## $t0 = 809F0000 -/* 00D74 809F7134 25087AB8 */ addiu $t0, $t0, %lo(func_809F7AB8) ## $t0 = 809F7AB8 -/* 00D78 809F7138 11020007 */ beq $t0, $v0, .L809F7158 -/* 00D7C 809F713C 3C09809F */ lui $t1, %hi(func_809F7B3C) ## $t1 = 809F0000 -/* 00D80 809F7140 25297B3C */ addiu $t1, $t1, %lo(func_809F7B3C) ## $t1 = 809F7B3C -/* 00D84 809F7144 11220004 */ beq $t1, $v0, .L809F7158 -/* 00D88 809F7148 3C0A809F */ lui $t2, %hi(func_809F7BE4) ## $t2 = 809F0000 -/* 00D8C 809F714C 254A7BE4 */ addiu $t2, $t2, %lo(func_809F7BE4) ## $t2 = 809F7BE4 -/* 00D90 809F7150 55420004 */ bnel $t2, $v0, .L809F7164 -/* 00D94 809F7154 90CB1C26 */ lbu $t3, 0x1C26($a2) ## 00001C26 -.L809F7158: -/* 00D98 809F7158 1000004D */ beq $zero, $zero, .L809F7290 -/* 00D9C 809F715C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DA0 809F7160 90CB1C26 */ lbu $t3, 0x1C26($a2) ## 00001C26 -.L809F7164: -/* 00DA4 809F7164 3C0C809F */ lui $t4, %hi(func_809F73AC) ## $t4 = 809F0000 -/* 00DA8 809F7168 258C73AC */ addiu $t4, $t4, %lo(func_809F73AC) ## $t4 = 809F73AC -/* 00DAC 809F716C 5160000D */ beql $t3, $zero, .L809F71A4 -/* 00DB0 809F7170 920301A5 */ lbu $v1, 0x01A5($s0) ## 000001A5 -/* 00DB4 809F7174 11820008 */ beq $t4, $v0, .L809F7198 -/* 00DB8 809F7178 3C0D809F */ lui $t5, %hi(func_809F74C4) ## $t5 = 809F0000 -/* 00DBC 809F717C 25AD74C4 */ addiu $t5, $t5, %lo(func_809F74C4) ## $t5 = 809F74C4 -/* 00DC0 809F7180 15A20003 */ bne $t5, $v0, .L809F7190 -/* 00DC4 809F7184 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawCircle) -/* 00DC8 809F7188 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawCircle) -/* 00DCC 809F718C AE0E00C0 */ sw $t6, 0x00C0($s0) ## 000000C0 -.L809F7190: -/* 00DD0 809F7190 0C27DC27 */ jal func_809F709C -/* 00DD4 809F7194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7198: -/* 00DD8 809F7198 1000003D */ beq $zero, $zero, .L809F7290 -/* 00DDC 809F719C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DE0 809F71A0 920301A5 */ lbu $v1, 0x01A5($s0) ## 000001A5 -.L809F71A4: -/* 00DE4 809F71A4 3C19809F */ lui $t9, %hi(func_809F73AC) ## $t9 = 809F0000 -/* 00DE8 809F71A8 273973AC */ addiu $t9, $t9, %lo(func_809F73AC) ## $t9 = 809F73AC -/* 00DEC 809F71AC 306F0002 */ andi $t7, $v1, 0x0002 ## $t7 = 00000000 -/* 00DF0 809F71B0 15E00003 */ bne $t7, $zero, .L809F71C0 -/* 00DF4 809F71B4 3078FFFD */ andi $t8, $v1, 0xFFFD ## $t8 = 00000000 -/* 00DF8 809F71B8 10000035 */ beq $zero, $zero, .L809F7290 -/* 00DFC 809F71BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F71C0: -/* 00E00 809F71C0 13220004 */ beq $t9, $v0, .L809F71D4 -/* 00E04 809F71C4 A21801A5 */ sb $t8, 0x01A5($s0) ## 000001A5 -/* 00E08 809F71C8 3C08809F */ lui $t0, %hi(func_809F74C4) ## $t0 = 809F0000 -/* 00E0C 809F71CC 250874C4 */ addiu $t0, $t0, %lo(func_809F74C4) ## $t0 = 809F74C4 -/* 00E10 809F71D0 15020003 */ bne $t0, $v0, .L809F71E0 -.L809F71D4: -/* 00E14 809F71D4 3C098003 */ lui $t1, %hi(ActorShadow_DrawCircle) -/* 00E18 809F71D8 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawCircle) -/* 00E1C 809F71DC AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 -.L809F71E0: -/* 00E20 809F71E0 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 00E24 809F71E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00E28 809F71E8 1440000E */ bne $v0, $zero, .L809F7224 -/* 00E2C 809F71EC 00000000 */ nop -/* 00E30 809F71F0 920A00B0 */ lbu $t2, 0x00B0($s0) ## 000000B0 -/* 00E34 809F71F4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00E38 809F71F8 1140000A */ beq $t2, $zero, .L809F7224 -/* 00E3C 809F71FC 00000000 */ nop -/* 00E40 809F7200 0C00CB1F */ jal func_80032C7C -/* 00E44 809F7204 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E48 809F7208 3C0C809F */ lui $t4, %hi(func_809F7C48) ## $t4 = 809F0000 -/* 00E4C 809F720C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00E50 809F7210 258C7C48 */ addiu $t4, $t4, %lo(func_809F7C48) ## $t4 = 809F7C48 -/* 00E54 809F7214 A60B0200 */ sh $t3, 0x0200($s0) ## 00000200 -/* 00E58 809F7218 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00E5C 809F721C 1000001C */ beq $zero, $zero, .L809F7290 -/* 00E60 809F7220 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809F7224: -/* 00E64 809F7224 5441001A */ bnel $v0, $at, .L809F7290 -/* 00E68 809F7228 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E6C 809F722C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 00E70 809F7230 3C0D809F */ lui $t5, %hi(func_809F78EC) ## $t5 = 809F0000 -/* 00E74 809F7234 25AD78EC */ addiu $t5, $t5, %lo(func_809F78EC) ## $t5 = 809F78EC -/* 00E78 809F7238 11A20014 */ beq $t5, $v0, .L809F728C -/* 00E7C 809F723C 3C03809F */ lui $v1, %hi(func_809F786C) ## $v1 = 809F0000 -/* 00E80 809F7240 2463786C */ addiu $v1, $v1, %lo(func_809F786C) ## $v1 = 809F786C -/* 00E84 809F7244 10620011 */ beq $v1, $v0, .L809F728C -/* 00E88 809F7248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E8C 809F724C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 00E90 809F7250 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E94 809F7254 AFA30028 */ sw $v1, 0x0028($sp) -/* 00E98 809F7258 240E0078 */ addiu $t6, $zero, 0x0078 ## $t6 = 00000078 -/* 00E9C 809F725C A60E01FE */ sh $t6, 0x01FE($s0) ## 000001FE -/* 00EA0 809F7260 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 00EA4 809F7264 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00EA8 809F7268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EAC 809F726C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EB0 809F7270 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00EB4 809F7274 0C00D09B */ jal func_8003426C -/* 00EB8 809F7278 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EBC 809F727C 0C27DA88 */ jal func_809F6A20 -/* 00EC0 809F7280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC4 809F7284 8FB80028 */ lw $t8, 0x0028($sp) -/* 00EC8 809F7288 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L809F728C: -/* 00ECC 809F728C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F7290: -/* 00ED0 809F7290 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ED4 809F7294 8FB00020 */ lw $s0, 0x0020($sp) -/* 00ED8 809F7298 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EDC 809F729C 03E00008 */ jr $ra -/* 00EE0 809F72A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s deleted file mode 100644 index 6073be6d22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_809F72A4 -/* 00EE4 809F72A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00EE8 809F72A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00EEC 809F72AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EF0 809F72B0 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 -/* 00EF4 809F72B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EF8 809F72B8 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00EFC 809F72BC AFA40028 */ sw $a0, 0x0028($sp) -/* 00F00 809F72C0 8FA70028 */ lw $a3, 0x0028($sp) -/* 00F04 809F72C4 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 00F08 809F72C8 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 00F0C 809F72CC 8CE20190 */ lw $v0, 0x0190($a3) ## 00000190 -/* 00F10 809F72D0 3C0F809F */ lui $t7, %hi(func_809F7BE4) ## $t7 = 809F0000 -/* 00F14 809F72D4 25EF7BE4 */ addiu $t7, $t7, %lo(func_809F7BE4) ## $t7 = 809F7BE4 -/* 00F18 809F72D8 51C20031 */ beql $t6, $v0, .L809F73A0 -/* 00F1C 809F72DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F20 809F72E0 11E2002E */ beq $t7, $v0, .L809F739C -/* 00F24 809F72E4 3C03809F */ lui $v1, %hi(func_809F74C4) ## $v1 = 809F0000 -/* 00F28 809F72E8 246374C4 */ addiu $v1, $v1, %lo(func_809F74C4) ## $v1 = 809F74C4 -/* 00F2C 809F72EC 10620007 */ beq $v1, $v0, .L809F730C -/* 00F30 809F72F0 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 00F34 809F72F4 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 00F38 809F72F8 13020004 */ beq $t8, $v0, .L809F730C -/* 00F3C 809F72FC 3C19809F */ lui $t9, %hi(func_809F799C) ## $t9 = 809F0000 -/* 00F40 809F7300 2739799C */ addiu $t9, $t9, %lo(func_809F799C) ## $t9 = 809F799C -/* 00F44 809F7304 5722000D */ bnel $t9, $v0, .L809F733C -/* 00F48 809F7308 8FA4002C */ lw $a0, 0x002C($sp) -.L809F730C: -/* 00F4C 809F730C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00F50 809F7310 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F54 809F7314 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00F58 809F7318 8FA60024 */ lw $a2, 0x0024($sp) -/* 00F5C 809F731C AFA3001C */ sw $v1, 0x001C($sp) -/* 00F60 809F7320 AFA70028 */ sw $a3, 0x0028($sp) -/* 00F64 809F7324 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00F68 809F7328 00812821 */ addu $a1, $a0, $at -/* 00F6C 809F732C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00F70 809F7330 8FA3001C */ lw $v1, 0x001C($sp) -/* 00F74 809F7334 8CE20190 */ lw $v0, 0x0190($a3) ## 00000190 -/* 00F78 809F7338 8FA4002C */ lw $a0, 0x002C($sp) -.L809F733C: -/* 00F7C 809F733C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F80 809F7340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00F84 809F7344 1062000E */ beq $v1, $v0, .L809F7380 -/* 00F88 809F7348 00812821 */ addu $a1, $a0, $at -/* 00F8C 809F734C 3C08809F */ lui $t0, %hi(func_809F758C) ## $t0 = 809F0000 -/* 00F90 809F7350 2508758C */ addiu $t0, $t0, %lo(func_809F758C) ## $t0 = 809F758C -/* 00F94 809F7354 1102000A */ beq $t0, $v0, .L809F7380 -/* 00F98 809F7358 3C09809F */ lui $t1, %hi(func_809F786C) ## $t1 = 809F0000 -/* 00F9C 809F735C 2529786C */ addiu $t1, $t1, %lo(func_809F786C) ## $t1 = 809F786C -/* 00FA0 809F7360 11220007 */ beq $t1, $v0, .L809F7380 -/* 00FA4 809F7364 3C0A809F */ lui $t2, %hi(func_809F78EC) ## $t2 = 809F0000 -/* 00FA8 809F7368 254A78EC */ addiu $t2, $t2, %lo(func_809F78EC) ## $t2 = 809F78EC -/* 00FAC 809F736C 11420004 */ beq $t2, $v0, .L809F7380 -/* 00FB0 809F7370 3C0B809F */ lui $t3, %hi(func_809F799C) ## $t3 = 809F0000 -/* 00FB4 809F7374 256B799C */ addiu $t3, $t3, %lo(func_809F799C) ## $t3 = 809F799C -/* 00FB8 809F7378 15620006 */ bne $t3, $v0, .L809F7394 -/* 00FBC 809F737C 00000000 */ nop -.L809F7380: -/* 00FC0 809F7380 8FA60024 */ lw $a2, 0x0024($sp) -/* 00FC4 809F7384 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00FC8 809F7388 AFA50018 */ sw $a1, 0x0018($sp) -/* 00FCC 809F738C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00FD0 809F7390 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7394: -/* 00FD4 809F7394 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00FD8 809F7398 8FA60024 */ lw $a2, 0x0024($sp) -.L809F739C: -/* 00FDC 809F739C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F73A0: -/* 00FE0 809F73A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FE4 809F73A4 03E00008 */ jr $ra -/* 00FE8 809F73A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s deleted file mode 100644 index 1d8cd1315d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_809F73AC -/* 00FEC 809F73AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FF0 809F73B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00FF4 809F73B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FF8 809F73B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00FFC 809F73BC 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 -/* 01000 809F73C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 01004 809F73C4 0C028800 */ jal Animation_GetLastFrame - -/* 01008 809F73C8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 -/* 0100C 809F73CC 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 01010 809F73D0 44814000 */ mtc1 $at, $f8 ## $f8 = 320.00 -/* 01014 809F73D4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 01018 809F73D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0101C 809F73DC 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01020 809F73E0 4606403E */ c.le.s $f8, $f6 -/* 01024 809F73E4 468020A0 */ cvt.s.w $f2, $f4 -/* 01028 809F73E8 8DC31C44 */ lw $v1, 0x1C44($t6) ## 00001C44 -/* 0102C 809F73EC 45030031 */ bc1tl .L809F74B4 -/* 01030 809F73F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01034 809F73F4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 01038 809F73F8 C4700028 */ lwc1 $f16, 0x0028($v1) ## 00000028 -/* 0103C 809F73FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01040 809F7400 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01044 809F7404 46105001 */ sub.s $f0, $f10, $f16 -/* 01048 809F7408 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 -/* 0104C 809F740C 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 -/* 01050 809F7410 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 01054 809F7414 4600903E */ c.le.s $f18, $f0 -/* 01058 809F7418 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 -/* 0105C 809F741C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01060 809F7420 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01064 809F7424 45010022 */ bc1t .L809F74B0 -/* 01068 809F7428 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0106C 809F742C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01070 809F7430 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01074 809F7434 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01078 809F7438 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0107C 809F743C 0C029468 */ jal Animation_Change - -/* 01080 809F7440 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01084 809F7444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01088 809F7448 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0108C 809F744C 24053824 */ addiu $a1, $zero, 0x3824 ## $a1 = 00003824 -/* 01090 809F7450 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01094 809F7454 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 01098 809F7458 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0109C 809F745C 86080030 */ lh $t0, 0x0030($s0) ## 00000030 -/* 010A0 809F7460 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 -/* 010A4 809F7464 46083281 */ sub.s $f10, $f6, $f8 -/* 010A8 809F7468 2509C000 */ addiu $t1, $t0, 0xC000 ## $t1 = FFFFC000 -/* 010AC 809F746C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 010B0 809F7470 A6090030 */ sh $t1, 0x0030($s0) ## 00000030 -/* 010B4 809F7474 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 010B8 809F7478 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 010BC 809F747C AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -/* 010C0 809F7480 860A0030 */ lh $t2, 0x0030($s0) ## 00000030 -/* 010C4 809F7484 8E0C002C */ lw $t4, 0x002C($s0) ## 0000002C -/* 010C8 809F7488 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 010CC 809F748C 3C0D809F */ lui $t5, %hi(func_809F74C4) ## $t5 = 809F0000 -/* 010D0 809F7490 25AD74C4 */ addiu $t5, $t5, %lo(func_809F74C4) ## $t5 = 809F74C4 -/* 010D4 809F7494 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 010D8 809F7498 AE0B01F4 */ sw $t3, 0x01F4($s0) ## 000001F4 -/* 010DC 809F749C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 010E0 809F74A0 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 010E4 809F74A4 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 010E8 809F74A8 AE0C01F8 */ sw $t4, 0x01F8($s0) ## 000001F8 -/* 010EC 809F74AC E61001F4 */ swc1 $f16, 0x01F4($s0) ## 000001F4 -.L809F74B0: -/* 010F0 809F74B0 8FBF002C */ lw $ra, 0x002C($sp) -.L809F74B4: -/* 010F4 809F74B4 8FB00028 */ lw $s0, 0x0028($sp) -/* 010F8 809F74B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010FC 809F74BC 03E00008 */ jr $ra -/* 01100 809F74C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s deleted file mode 100644 index 93c2695c48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_809F7F8C - .word 0x40266666 - -.text -glabel func_809F74C4 -/* 01104 809F74C4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01108 809F74C8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0110C 809F74CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01110 809F74D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01114 809F74D4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01118 809F74D8 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 0111C 809F74DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 01120 809F74E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01124 809F74E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01128 809F74E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0112C 809F74EC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01130 809F74F0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01134 809F74F4 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 -/* 01138 809F74F8 3C014680 */ lui $at, 0x4680 ## $at = 46800000 -/* 0113C 809F74FC 44813000 */ mtc1 $at, $f6 ## $f6 = 16384.00 -/* 01140 809F7500 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01144 809F7504 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01148 809F7508 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 0114C 809F750C 46802020 */ cvt.s.w $f0, $f4 -/* 01150 809F7510 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 01154 809F7514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01158 809F7518 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0115C 809F751C 46060003 */ div.s $f0, $f0, $f6 -/* 01160 809F7520 46005402 */ mul.s $f16, $f10, $f0 -/* 01164 809F7524 46104480 */ add.s $f18, $f8, $f16 -/* 01168 809F7528 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 0116C 809F752C E7A0002C */ swc1 $f0, 0x002C($sp) -/* 01170 809F7530 0C27D944 */ jal func_809F6510 -/* 01174 809F7534 8FA50034 */ lw $a1, 0x0034($sp) -/* 01178 809F7538 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 0117C 809F753C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01180 809F7540 3C188003 */ lui $t8, %hi(ActorShadow_DrawCircle) -/* 01184 809F7544 2718B5EC */ addiu $t8, %lo(ActorShadow_DrawCircle) -/* 01188 809F7548 46040032 */ c.eq.s $f0, $f4 -/* 0118C 809F754C 3C01809F */ lui $at, %hi(D_809F7F8C) ## $at = 809F0000 -/* 01190 809F7550 4502000A */ bc1fl .L809F757C -/* 01194 809F7554 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01198 809F7558 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 -/* 0119C 809F755C AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 -/* 011A0 809F7560 3C08809F */ lui $t0, %hi(func_809F758C) ## $t0 = 809F0000 -/* 011A4 809F7564 A6190030 */ sh $t9, 0x0030($s0) ## 00000030 -/* 011A8 809F7568 C4267F8C */ lwc1 $f6, %lo(D_809F7F8C)($at) -/* 011AC 809F756C 2508758C */ addiu $t0, $t0, %lo(func_809F758C) ## $t0 = 809F758C -/* 011B0 809F7570 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 011B4 809F7574 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 011B8 809F7578 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F757C: -/* 011BC 809F757C 8FB00020 */ lw $s0, 0x0020($sp) -/* 011C0 809F7580 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 011C4 809F7584 03E00008 */ jr $ra -/* 011C8 809F7588 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s deleted file mode 100644 index 45d2895c23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_809F758C -/* 011CC 809F758C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011D0 809F7590 AFBF001C */ sw $ra, 0x001C($sp) -/* 011D4 809F7594 AFB00018 */ sw $s0, 0x0018($sp) -/* 011D8 809F7598 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011DC 809F759C 0C00B61A */ jal func_8002D868 -/* 011E0 809F75A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 011E4 809F75A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 809F75A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 011EC 809F75AC 0C27D9CC */ jal func_809F6730 -/* 011F0 809F75B0 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 011F4 809F75B4 86020204 */ lh $v0, 0x0204($s0) ## 00000204 -/* 011F8 809F75B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011FC 809F75BC 14400003 */ bne $v0, $zero, .L809F75CC -/* 01200 809F75C0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01204 809F75C4 10000003 */ beq $zero, $zero, .L809F75D4 -/* 01208 809F75C8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F75CC: -/* 0120C 809F75CC A60E0204 */ sh $t6, 0x0204($s0) ## 00000204 -/* 01210 809F75D0 86030204 */ lh $v1, 0x0204($s0) ## 00000204 -.L809F75D4: -/* 01214 809F75D4 14600005 */ bne $v1, $zero, .L809F75EC -/* 01218 809F75D8 00000000 */ nop -/* 0121C 809F75DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01220 809F75E0 24053822 */ addiu $a1, $zero, 0x3822 ## $a1 = 00003822 -/* 01224 809F75E4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 01228 809F75E8 A60F0204 */ sh $t7, 0x0204($s0) ## 00000204 -.L809F75EC: -/* 0122C 809F75EC 0C27DB74 */ jal func_809F6DD0 -/* 01230 809F75F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01234 809F75F4 10400007 */ beq $v0, $zero, .L809F7614 -/* 01238 809F75F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0123C 809F75FC 0C27DB09 */ jal func_809F6C24 -/* 01240 809F7600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01244 809F7604 3C18809F */ lui $t8, %hi(func_809F768C) ## $t8 = 809F0000 -/* 01248 809F7608 2718768C */ addiu $t8, $t8, %lo(func_809F768C) ## $t8 = 809F768C -/* 0124C 809F760C 1000001A */ beq $zero, $zero, .L809F7678 -/* 01250 809F7610 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L809F7614: -/* 01254 809F7614 0C27DB95 */ jal func_809F6E54 -/* 01258 809F7618 8FA50024 */ lw $a1, 0x0024($sp) -/* 0125C 809F761C 0C27DC1B */ jal func_809F706C -/* 01260 809F7620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01264 809F7624 10400008 */ beq $v0, $zero, .L809F7648 -/* 01268 809F7628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0126C 809F762C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01270 809F7630 24053820 */ addiu $a1, $zero, 0x3820 ## $a1 = 00003820 -/* 01274 809F7634 0C27DACE */ jal func_809F6B38 -/* 01278 809F7638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 809F763C 3C19809F */ lui $t9, %hi(func_809F799C) ## $t9 = 809F0000 -/* 01280 809F7640 2739799C */ addiu $t9, $t9, %lo(func_809F799C) ## $t9 = 809F799C -/* 01284 809F7644 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809F7648: -/* 01288 809F7648 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 0128C 809F764C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01290 809F7650 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 01294 809F7654 51200009 */ beql $t1, $zero, .L809F767C -/* 01298 809F7658 8FBF001C */ lw $ra, 0x001C($sp) -/* 0129C 809F765C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012A0 809F7660 24053823 */ addiu $a1, $zero, 0x3823 ## $a1 = 00003823 -/* 012A4 809F7664 0C27DAEF */ jal func_809F6BBC -/* 012A8 809F7668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012AC 809F766C 3C0A809F */ lui $t2, %hi(func_809F7A00) ## $t2 = 809F0000 -/* 012B0 809F7670 254A7A00 */ addiu $t2, $t2, %lo(func_809F7A00) ## $t2 = 809F7A00 -/* 012B4 809F7674 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -.L809F7678: -/* 012B8 809F7678 8FBF001C */ lw $ra, 0x001C($sp) -.L809F767C: -/* 012BC 809F767C 8FB00018 */ lw $s0, 0x0018($sp) -/* 012C0 809F7680 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 012C4 809F7684 03E00008 */ jr $ra -/* 012C8 809F7688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s deleted file mode 100644 index 006d4c3947..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809F768C -/* 012CC 809F768C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 809F7690 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012D4 809F7694 AFA5001C */ sw $a1, 0x001C($sp) -/* 012D8 809F7698 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 012DC 809F769C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012E0 809F76A0 24053850 */ addiu $a1, $zero, 0x3850 ## $a1 = 00003850 -/* 012E4 809F76A4 4600218D */ trunc.w.s $f6, $f4 -/* 012E8 809F76A8 440F3000 */ mfc1 $t7, $f6 -/* 012EC 809F76AC 00000000 */ nop -/* 012F0 809F76B0 000FC400 */ sll $t8, $t7, 16 -/* 012F4 809F76B4 0018CC03 */ sra $t9, $t8, 16 -/* 012F8 809F76B8 2728FFF8 */ addiu $t0, $t9, 0xFFF8 ## $t0 = FFFFFFF8 -/* 012FC 809F76BC 29010004 */ slti $at, $t0, 0x0004 -/* 01300 809F76C0 5020000E */ beql $at, $zero, .L809F76FC -/* 01304 809F76C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01308 809F76C8 8C8201E0 */ lw $v0, 0x01E0($a0) ## 000001E0 -/* 0130C 809F76CC 844901F8 */ lh $t1, 0x01F8($v0) ## 000001F8 -/* 01310 809F76D0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01314 809F76D4 A44A01F8 */ sh $t2, 0x01F8($v0) ## 000001F8 -/* 01318 809F76D8 8C8D01E4 */ lw $t5, 0x01E4($a0) ## 000001E4 -/* 0131C 809F76DC 8C8B01E0 */ lw $t3, 0x01E0($a0) ## 000001E0 -/* 01320 809F76E0 AD6D0024 */ sw $t5, 0x0024($t3) ## 00000024 -/* 01324 809F76E4 8C8C01E8 */ lw $t4, 0x01E8($a0) ## 000001E8 -/* 01328 809F76E8 AD6C0028 */ sw $t4, 0x0028($t3) ## 00000028 -/* 0132C 809F76EC 8C8D01EC */ lw $t5, 0x01EC($a0) ## 000001EC -/* 01330 809F76F0 1000000E */ beq $zero, $zero, .L809F772C -/* 01334 809F76F4 AD6D002C */ sw $t5, 0x002C($t3) ## 0000002C -/* 01338 809F76F8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L809F76FC: -/* 0133C 809F76FC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01340 809F7700 AFA60018 */ sw $a2, 0x0018($sp) -/* 01344 809F7704 8FA60018 */ lw $a2, 0x0018($sp) -/* 01348 809F7708 0C00B55C */ jal Actor_Kill - -/* 0134C 809F770C 8CC401E0 */ lw $a0, 0x01E0($a2) ## 000001E0 -/* 01350 809F7710 8FA60018 */ lw $a2, 0x0018($sp) -/* 01354 809F7714 3C0F809F */ lui $t7, %hi(func_809F773C) ## $t7 = 809F0000 -/* 01358 809F7718 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 0135C 809F771C 25EF773C */ addiu $t7, $t7, %lo(func_809F773C) ## $t7 = 809F773C -/* 01360 809F7720 A4CE0202 */ sh $t6, 0x0202($a2) ## 00000202 -/* 01364 809F7724 A4C001FC */ sh $zero, 0x01FC($a2) ## 000001FC -/* 01368 809F7728 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -.L809F772C: -/* 0136C 809F772C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01370 809F7730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01374 809F7734 03E00008 */ jr $ra -/* 01378 809F7738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s deleted file mode 100644 index 5ccdc1e522..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809F773C -/* 0137C 809F773C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01380 809F7740 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01384 809F7744 AFA5001C */ sw $a1, 0x001C($sp) -/* 01388 809F7748 84820202 */ lh $v0, 0x0202($a0) ## 00000202 -/* 0138C 809F774C 14400003 */ bne $v0, $zero, .L809F775C -/* 01390 809F7750 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01394 809F7754 10000003 */ beq $zero, $zero, .L809F7764 -/* 01398 809F7758 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F775C: -/* 0139C 809F775C A48E0202 */ sh $t6, 0x0202($a0) ## 00000202 -/* 013A0 809F7760 84830202 */ lh $v1, 0x0202($a0) ## 00000202 -.L809F7764: -/* 013A4 809F7764 5460000E */ bnel $v1, $zero, .L809F77A0 -/* 013A8 809F7768 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013AC 809F776C 0C27D934 */ jal func_809F64D0 -/* 013B0 809F7770 AFA40018 */ sw $a0, 0x0018($sp) -/* 013B4 809F7774 8FA40018 */ lw $a0, 0x0018($sp) -/* 013B8 809F7778 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 013BC 809F777C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 013C0 809F7780 01E1C024 */ and $t8, $t7, $at -/* 013C4 809F7784 0C27DA88 */ jal func_809F6A20 -/* 013C8 809F7788 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 013CC 809F778C 8FA40018 */ lw $a0, 0x0018($sp) -/* 013D0 809F7790 3C19809F */ lui $t9, %hi(func_809F77AC) ## $t9 = 809F0000 -/* 013D4 809F7794 273977AC */ addiu $t9, $t9, %lo(func_809F77AC) ## $t9 = 809F77AC -/* 013D8 809F7798 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -/* 013DC 809F779C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F77A0: -/* 013E0 809F77A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013E4 809F77A4 03E00008 */ jr $ra -/* 013E8 809F77A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s deleted file mode 100644 index 9e7c24afb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_809F7F90 - .float 1.2 - -.text -glabel func_809F77AC -/* 013EC 809F77AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013F0 809F77B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 013F4 809F77B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 013F8 809F77B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 013FC 809F77BC 908E0114 */ lbu $t6, 0x0114($a0) ## 00000114 -/* 01400 809F77C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01404 809F77C4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01408 809F77C8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0140C 809F77CC 05C10004 */ bgez $t6, .L809F77E0 -/* 01410 809F77D0 468021A0 */ cvt.s.w $f6, $f4 -/* 01414 809F77D4 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 01418 809F77D8 00000000 */ nop -/* 0141C 809F77DC 46083180 */ add.s $f6, $f6, $f8 -.L809F77E0: -/* 01420 809F77E0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01424 809F77E4 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 01428 809F77E8 3C01809F */ lui $at, %hi(D_809F7F90) ## $at = 809F0000 -/* 0142C 809F77EC C4327F90 */ lwc1 $f18, %lo(D_809F7F90)($at) -/* 01430 809F77F0 460A3403 */ div.s $f16, $f6, $f10 -/* 01434 809F77F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01438 809F77F8 46109102 */ mul.s $f4, $f18, $f16 -/* 0143C 809F77FC 0C00B61A */ jal func_8002D868 -/* 01440 809F7800 E6040208 */ swc1 $f4, 0x0208($s0) ## 00000208 -/* 01444 809F7804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01448 809F7808 0C27DA2C */ jal func_809F68B0 -/* 0144C 809F780C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01450 809F7810 10400009 */ beq $v0, $zero, .L809F7838 -/* 01454 809F7814 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 01458 809F7818 A60F0202 */ sh $t7, 0x0202($s0) ## 00000202 -/* 0145C 809F781C 0C27DAB1 */ jal func_809F6AC4 -/* 01460 809F7820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01464 809F7824 3C19809F */ lui $t9, %hi(func_809F784C) ## $t9 = 809F0000 -/* 01468 809F7828 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0146C 809F782C 2739784C */ addiu $t9, $t9, %lo(func_809F784C) ## $t9 = 809F784C -/* 01470 809F7830 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 01474 809F7834 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809F7838: -/* 01478 809F7838 8FBF001C */ lw $ra, 0x001C($sp) -/* 0147C 809F783C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01480 809F7840 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01484 809F7844 03E00008 */ jr $ra -/* 01488 809F7848 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s deleted file mode 100644 index 3a4533f71e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809F784C -/* 0148C 809F784C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01490 809F7850 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01494 809F7854 0C27DECF */ jal func_809F7B3C -/* 01498 809F7858 00000000 */ nop -/* 0149C 809F785C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014A0 809F7860 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014A4 809F7864 03E00008 */ jr $ra -/* 014A8 809F7868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s deleted file mode 100644 index 251ccfb234..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809F786C -/* 014AC 809F786C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 014B0 809F7870 AFBF0024 */ sw $ra, 0x0024($sp) -/* 014B4 809F7874 AFB00020 */ sw $s0, 0x0020($sp) -/* 014B8 809F7878 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014BC 809F787C 0C00B61A */ jal func_8002D868 -/* 014C0 809F7880 AFA5002C */ sw $a1, 0x002C($sp) -/* 014C4 809F7884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C8 809F7888 0C27DA2C */ jal func_809F68B0 -/* 014CC 809F788C 8FA5002C */ lw $a1, 0x002C($sp) -/* 014D0 809F7890 50400007 */ beql $v0, $zero, .L809F78B0 -/* 014D4 809F7894 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 014D8 809F7898 0C27DAB1 */ jal func_809F6AC4 -/* 014DC 809F789C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E0 809F78A0 3C0E809F */ lui $t6, %hi(func_809F78EC) ## $t6 = 809F0000 -/* 014E4 809F78A4 25CE78EC */ addiu $t6, $t6, %lo(func_809F78EC) ## $t6 = 809F78EC -/* 014E8 809F78A8 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 014EC 809F78AC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -.L809F78B0: -/* 014F0 809F78B0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 014F4 809F78B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 014F8 809F78B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 014FC 809F78BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01500 809F78C0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01504 809F78C4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01508 809F78C8 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 -/* 0150C 809F78CC 861901FE */ lh $t9, 0x01FE($s0) ## 000001FE -/* 01510 809F78D0 A6180030 */ sh $t8, 0x0030($s0) ## 00000030 -/* 01514 809F78D4 A2190114 */ sb $t9, 0x0114($s0) ## 00000114 -/* 01518 809F78D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0151C 809F78DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01520 809F78E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01524 809F78E4 03E00008 */ jr $ra -/* 01528 809F78E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s deleted file mode 100644 index 7282647454..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809F78EC -/* 0152C 809F78EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01530 809F78F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01534 809F78F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01538 809F78F8 848201FE */ lh $v0, 0x01FE($a0) ## 000001FE -/* 0153C 809F78FC 14400003 */ bne $v0, $zero, .L809F790C -/* 01540 809F7900 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01544 809F7904 10000004 */ beq $zero, $zero, .L809F7918 -/* 01548 809F7908 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F790C: -/* 0154C 809F790C A48E01FE */ sh $t6, 0x01FE($a0) ## 000001FE -/* 01550 809F7910 848201FE */ lh $v0, 0x01FE($a0) ## 000001FE -/* 01554 809F7914 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809F7918: -/* 01558 809F7918 10600016 */ beq $v1, $zero, .L809F7974 -/* 0155C 809F791C 2841001E */ slti $at, $v0, 0x001E -/* 01560 809F7920 1020001A */ beq $at, $zero, .L809F798C -/* 01564 809F7924 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 01568 809F7928 11E0000A */ beq $t7, $zero, .L809F7954 -/* 0156C 809F792C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01570 809F7930 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01574 809F7934 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 01578 809F7938 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0157C 809F793C C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 01580 809F7940 46002180 */ add.s $f6, $f4, $f0 -/* 01584 809F7944 46004280 */ add.s $f10, $f8, $f0 -/* 01588 809F7948 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 0158C 809F794C 1000000F */ beq $zero, $zero, .L809F798C -/* 01590 809F7950 E48A002C */ swc1 $f10, 0x002C($a0) ## 0000002C -.L809F7954: -/* 01594 809F7954 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 01598 809F7958 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 0159C 809F795C C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 015A0 809F7960 46008481 */ sub.s $f18, $f16, $f0 -/* 015A4 809F7964 46002181 */ sub.s $f6, $f4, $f0 -/* 015A8 809F7968 E4920024 */ swc1 $f18, 0x0024($a0) ## 00000024 -/* 015AC 809F796C 10000007 */ beq $zero, $zero, .L809F798C -/* 015B0 809F7970 E486002C */ swc1 $f6, 0x002C($a0) ## 0000002C -.L809F7974: -/* 015B4 809F7974 0C27DA65 */ jal func_809F6994 -/* 015B8 809F7978 AFA40018 */ sw $a0, 0x0018($sp) -/* 015BC 809F797C 8FA40018 */ lw $a0, 0x0018($sp) -/* 015C0 809F7980 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 015C4 809F7984 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 015C8 809F7988 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -.L809F798C: -/* 015CC 809F798C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015D0 809F7990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015D4 809F7994 03E00008 */ jr $ra -/* 015D8 809F7998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s deleted file mode 100644 index 36a004eb4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809F799C -/* 015DC 809F799C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015E0 809F79A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 015E4 809F79A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 015E8 809F79A8 AFA50024 */ sw $a1, 0x0024($sp) -/* 015EC 809F79AC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 015F0 809F79B0 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 015F4 809F79B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015F8 809F79B8 01C17825 */ or $t7, $t6, $at ## $t7 = 01000000 -/* 015FC 809F79BC 0C00B61A */ jal func_8002D868 -/* 01600 809F79C0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 01604 809F79C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01608 809F79C8 0C27DA2C */ jal func_809F68B0 -/* 0160C 809F79CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 01610 809F79D0 50400007 */ beql $v0, $zero, .L809F79F0 -/* 01614 809F79D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01618 809F79D8 0C27DA65 */ jal func_809F6994 -/* 0161C 809F79DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01620 809F79E0 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 01624 809F79E4 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 01628 809F79E8 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0162C 809F79EC 8FBF001C */ lw $ra, 0x001C($sp) -.L809F79F0: -/* 01630 809F79F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01634 809F79F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01638 809F79F8 03E00008 */ jr $ra -/* 0163C 809F79FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s deleted file mode 100644 index 1edd610764..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_809F7A00 -/* 01640 809F7A00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01644 809F7A04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01648 809F7A08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0164C 809F7A0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01650 809F7A10 AFA5002C */ sw $a1, 0x002C($sp) -/* 01654 809F7A14 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01658 809F7A18 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0165C 809F7A1C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01660 809F7A20 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01664 809F7A24 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01668 809F7A28 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0166C 809F7A2C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01670 809F7A30 86020202 */ lh $v0, 0x0202($s0) ## 00000202 -/* 01674 809F7A34 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 01678 809F7A38 14400003 */ bne $v0, $zero, .L809F7A48 -/* 0167C 809F7A3C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01680 809F7A40 10000004 */ beq $zero, $zero, .L809F7A54 -/* 01684 809F7A44 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7A48: -/* 01688 809F7A48 A60F0202 */ sh $t7, 0x0202($s0) ## 00000202 -/* 0168C 809F7A4C 86020202 */ lh $v0, 0x0202($s0) ## 00000202 -/* 01690 809F7A50 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809F7A54: -/* 01694 809F7A54 1060000D */ beq $v1, $zero, .L809F7A8C -/* 01698 809F7A58 0302C823 */ subu $t9, $t8, $v0 -/* 0169C 809F7A5C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 016A0 809F7A60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 016A4 809F7A64 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 016A8 809F7A68 468021A0 */ cvt.s.w $f6, $f4 -/* 016AC 809F7A6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 016B0 809F7A70 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 016B4 809F7A74 C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C -/* 016B8 809F7A78 46083003 */ div.s $f0, $f6, $f8 -/* 016BC 809F7A7C 46008482 */ mul.s $f18, $f16, $f0 -/* 016C0 809F7A80 46125101 */ sub.s $f4, $f10, $f18 -/* 016C4 809F7A84 10000003 */ beq $zero, $zero, .L809F7A94 -/* 016C8 809F7A88 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -.L809F7A8C: -/* 016CC 809F7A8C 0C00B55C */ jal Actor_Kill - -/* 016D0 809F7A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7A94: -/* 016D4 809F7A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D8 809F7A98 8FA5002C */ lw $a1, 0x002C($sp) -/* 016DC 809F7A9C 0C27D944 */ jal func_809F6510 -/* 016E0 809F7AA0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 016E4 809F7AA4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016E8 809F7AA8 8FB00020 */ lw $s0, 0x0020($sp) -/* 016EC 809F7AAC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016F0 809F7AB0 03E00008 */ jr $ra -/* 016F4 809F7AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s deleted file mode 100644 index 83da537a05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_809F7AB8 -/* 016F8 809F7AB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 016FC 809F7ABC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01700 809F7AC0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01704 809F7AC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01708 809F7AC8 0C00B61A */ jal func_8002D868 -/* 0170C 809F7ACC AFA5002C */ sw $a1, 0x002C($sp) -/* 01710 809F7AD0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01714 809F7AD4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01718 809F7AD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0171C 809F7ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01720 809F7AE0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01724 809F7AE4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01728 809F7AE8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0172C 809F7AEC 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 -/* 01730 809F7AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01734 809F7AF4 A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 -/* 01738 809F7AF8 0C27DA2C */ jal func_809F68B0 -/* 0173C 809F7AFC 8FA5002C */ lw $a1, 0x002C($sp) -/* 01740 809F7B00 10400009 */ beq $v0, $zero, .L809F7B28 -/* 01744 809F7B04 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 01748 809F7B08 A6180202 */ sh $t8, 0x0202($s0) ## 00000202 -/* 0174C 809F7B0C 0C27DAB1 */ jal func_809F6AC4 -/* 01750 809F7B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01754 809F7B14 3C08809F */ lui $t0, %hi(func_809F7B3C) ## $t0 = 809F0000 -/* 01758 809F7B18 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 0175C 809F7B1C 25087B3C */ addiu $t0, $t0, %lo(func_809F7B3C) ## $t0 = 809F7B3C -/* 01760 809F7B20 A61901FC */ sh $t9, 0x01FC($s0) ## 000001FC -/* 01764 809F7B24 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809F7B28: -/* 01768 809F7B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0176C 809F7B2C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01770 809F7B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01774 809F7B34 03E00008 */ jr $ra -/* 01778 809F7B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s deleted file mode 100644 index 7cb2366496..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F7B3C -/* 0177C 809F7B3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01780 809F7B40 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01784 809F7B44 AFB00030 */ sw $s0, 0x0030($sp) -/* 01788 809F7B48 848201FC */ lh $v0, 0x01FC($a0) ## 000001FC -/* 0178C 809F7B4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01790 809F7B50 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01794 809F7B54 5040000D */ beql $v0, $zero, .L809F7B8C -/* 01798 809F7B58 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0179C 809F7B5C 908E0114 */ lbu $t6, 0x0114($a0) ## 00000114 -/* 017A0 809F7B60 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 017A4 809F7B64 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 017A8 809F7B68 15C00019 */ bne $t6, $zero, .L809F7BD0 -/* 017AC 809F7B6C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 017B0 809F7B70 0C00D09B */ jal func_8003426C -/* 017B4 809F7B74 AFA20010 */ sw $v0, 0x0010($sp) -/* 017B8 809F7B78 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC -/* 017BC 809F7B7C 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 017C0 809F7B80 10000013 */ beq $zero, $zero, .L809F7BD0 -/* 017C4 809F7B84 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 017C8 809F7B88 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L809F7B8C: -/* 017CC 809F7B8C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 017D0 809F7B90 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 017D4 809F7B94 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 017D8 809F7B98 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 017DC 809F7B9C AFA00024 */ sw $zero, 0x0024($sp) -/* 017E0 809F7BA0 AFA00020 */ sw $zero, 0x0020($sp) -/* 017E4 809F7BA4 AFA0001C */ sw $zero, 0x001C($sp) -/* 017E8 809F7BA8 AFA00018 */ sw $zero, 0x0018($sp) -/* 017EC 809F7BAC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 017F0 809F7BB0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 017F4 809F7BB4 10400002 */ beq $v0, $zero, .L809F7BC0 -/* 017F8 809F7BB8 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 017FC 809F7BBC A44001F8 */ sh $zero, 0x01F8($v0) ## 000001F8 -.L809F7BC0: -/* 01800 809F7BC0 3C08809F */ lui $t0, %hi(func_809F7BE4) ## $t0 = 809F0000 -/* 01804 809F7BC4 25087BE4 */ addiu $t0, $t0, %lo(func_809F7BE4) ## $t0 = 809F7BE4 -/* 01808 809F7BC8 A6190202 */ sh $t9, 0x0202($s0) ## 00000202 -/* 0180C 809F7BCC AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809F7BD0: -/* 01810 809F7BD0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01814 809F7BD4 8FB00030 */ lw $s0, 0x0030($sp) -/* 01818 809F7BD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0181C 809F7BDC 03E00008 */ jr $ra -/* 01820 809F7BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s deleted file mode 100644 index ea31351c45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809F7BE4 -/* 01824 809F7BE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01828 809F7BE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0182C 809F7BEC AFB00018 */ sw $s0, 0x0018($sp) -/* 01830 809F7BF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 01834 809F7BF4 84820202 */ lh $v0, 0x0202($a0) ## 00000202 -/* 01838 809F7BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0183C 809F7BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01840 809F7C00 14400003 */ bne $v0, $zero, .L809F7C10 -/* 01844 809F7C04 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01848 809F7C08 10000003 */ beq $zero, $zero, .L809F7C18 -/* 0184C 809F7C0C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7C10: -/* 01850 809F7C10 A60E0202 */ sh $t6, 0x0202($s0) ## 00000202 -/* 01854 809F7C14 86030202 */ lh $v1, 0x0202($s0) ## 00000202 -.L809F7C18: -/* 01858 809F7C18 14600006 */ bne $v1, $zero, .L809F7C34 -/* 0185C 809F7C1C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01860 809F7C20 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01864 809F7C24 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01868 809F7C28 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 0186C 809F7C2C 0C00B55C */ jal Actor_Kill - -/* 01870 809F7C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7C34: -/* 01874 809F7C34 8FBF001C */ lw $ra, 0x001C($sp) -/* 01878 809F7C38 8FB00018 */ lw $s0, 0x0018($sp) -/* 0187C 809F7C3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01880 809F7C40 03E00008 */ jr $ra -/* 01884 809F7C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s deleted file mode 100644 index 79e8e9617f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_809F7C48 -/* 01888 809F7C48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0188C 809F7C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01890 809F7C50 AFA5001C */ sw $a1, 0x001C($sp) -/* 01894 809F7C54 84820200 */ lh $v0, 0x0200($a0) ## 00000200 -/* 01898 809F7C58 14400003 */ bne $v0, $zero, .L809F7C68 -/* 0189C 809F7C5C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 018A0 809F7C60 10000003 */ beq $zero, $zero, .L809F7C70 -/* 018A4 809F7C64 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7C68: -/* 018A8 809F7C68 A48E0200 */ sh $t6, 0x0200($a0) ## 00000200 -/* 018AC 809F7C6C 84830200 */ lh $v1, 0x0200($a0) ## 00000200 -.L809F7C70: -/* 018B0 809F7C70 54600004 */ bnel $v1, $zero, .L809F7C84 -/* 018B4 809F7C74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018B8 809F7C78 0C27DC27 */ jal func_809F709C -/* 018BC 809F7C7C 00000000 */ nop -/* 018C0 809F7C80 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F7C84: -/* 018C4 809F7C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 809F7C88 03E00008 */ jr $ra -/* 018CC 809F7C8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s deleted file mode 100644 index b90be2a9f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809F7D50 -/* 01990 809F7D50 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01994 809F7D54 3C0F809F */ lui $t7, %hi(D_809F7F64) ## $t7 = 809F0000 -/* 01998 809F7D58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0199C 809F7D5C AFA40030 */ sw $a0, 0x0030($sp) -/* 019A0 809F7D60 AFA60038 */ sw $a2, 0x0038($sp) -/* 019A4 809F7D64 AFA7003C */ sw $a3, 0x003C($sp) -/* 019A8 809F7D68 25EF7F64 */ addiu $t7, $t7, %lo(D_809F7F64) ## $t7 = 809F7F64 -/* 019AC 809F7D6C 8DF90000 */ lw $t9, 0x0000($t7) ## 809F7F64 -/* 019B0 809F7D70 27AE0020 */ addiu $t6, $sp, 0x0020 ## $t6 = FFFFFFF0 -/* 019B4 809F7D74 8DF80004 */ lw $t8, 0x0004($t7) ## 809F7F68 -/* 019B8 809F7D78 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 019BC 809F7D7C 8DF90008 */ lw $t9, 0x0008($t7) ## 809F7F6C -/* 019C0 809F7D80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 019C4 809F7D84 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 019C8 809F7D88 14A10010 */ bne $a1, $at, .L809F7DCC -/* 019CC 809F7D8C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 019D0 809F7D90 8FA80044 */ lw $t0, 0x0044($sp) -/* 019D4 809F7D94 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 019D8 809F7D98 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 019DC 809F7D9C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 019E0 809F7DA0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 019E4 809F7DA4 C5000208 */ lwc1 $f0, 0x0208($t0) ## 00000208 -/* 019E8 809F7DA8 AFA50034 */ sw $a1, 0x0034($sp) -/* 019EC 809F7DAC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 019F0 809F7DB0 46040182 */ mul.s $f6, $f0, $f4 -/* 019F4 809F7DB4 46020380 */ add.s $f14, $f0, $f2 -/* 019F8 809F7DB8 46023300 */ add.s $f12, $f6, $f2 -/* 019FC 809F7DBC 44066000 */ mfc1 $a2, $f12 -/* 01A00 809F7DC0 0C0342A3 */ jal Matrix_Scale -/* 01A04 809F7DC4 00000000 */ nop -/* 01A08 809F7DC8 8FA50034 */ lw $a1, 0x0034($sp) -.L809F7DCC: -/* 01A0C 809F7DCC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01A10 809F7DD0 54A10006 */ bnel $a1, $at, .L809F7DEC -/* 01A14 809F7DD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A18 809F7DD8 8FA50044 */ lw $a1, 0x0044($sp) -/* 01A1C 809F7DDC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFF0 -/* 01A20 809F7DE0 0C0346BD */ jal Matrix_MultVec3f -/* 01A24 809F7DE4 24A501E4 */ addiu $a1, $a1, 0x01E4 ## $a1 = 000001E4 -/* 01A28 809F7DE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F7DEC: -/* 01A2C 809F7DEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A30 809F7DF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01A34 809F7DF4 03E00008 */ jr $ra -/* 01A38 809F7DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s deleted file mode 100644 index e87e501eef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_809F7DFC -/* 01A3C 809F7DFC AFA40000 */ sw $a0, 0x0000($sp) -/* 01A40 809F7E00 AFA50004 */ sw $a1, 0x0004($sp) -/* 01A44 809F7E04 AFA60008 */ sw $a2, 0x0008($sp) -/* 01A48 809F7E08 03E00008 */ jr $ra -/* 01A4C 809F7E0C AFA7000C */ sw $a3, 0x000C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s deleted file mode 100644 index ca391c5992..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnDu_Destroy -/* 0074C 809FE37C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00750 809FE380 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00754 809FE384 AFA40018 */ sw $a0, 0x0018($sp) -/* 00758 809FE388 AFA5001C */ sw $a1, 0x001C($sp) -/* 0075C 809FE38C 0C0295BC */ jal SkelAnime_Free -/* 00760 809FE390 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) -/* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) -/* 0076C 809FE39C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00770 809FE3A0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 809FE3A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 809FE3AC 03E00008 */ jr $ra -/* 00780 809FE3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s deleted file mode 100644 index 420f101b7c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s +++ /dev/null @@ -1,114 +0,0 @@ -.rdata -glabel D_809FF440 - .asciz "../z_en_du.c" - .balign 4 - -glabel D_809FF450 - .asciz "../z_en_du.c" - .balign 4 - -.text -glabel EnDu_Draw -/* 01444 809FF074 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01448 809FF078 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0144C 809FF07C AFB00020 */ sw $s0, 0x0020($sp) -/* 01450 809FF080 AFA50054 */ sw $a1, 0x0054($sp) -/* 01454 809FF084 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01458 809FF088 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0145C 809FF08C 3C0680A0 */ lui $a2, %hi(D_809FF440) ## $a2 = 80A00000 -/* 01460 809FF090 24C6F440 */ addiu $a2, $a2, %lo(D_809FF440) ## $a2 = 809FF440 -/* 01464 809FF094 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01468 809FF098 240705BE */ addiu $a3, $zero, 0x05BE ## $a3 = 000005BE -/* 0146C 809FF09C 0C031AB1 */ jal Graph_OpenDisps -/* 01470 809FF0A0 AFA50048 */ sw $a1, 0x0048($sp) -/* 01474 809FF0A4 8FA80048 */ lw $t0, 0x0048($sp) -/* 01478 809FF0A8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0147C 809FF0AC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01480 809FF0B0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01484 809FF0B4 3C0480A0 */ lui $a0, %hi(D_809FF418) ## $a0 = 80A00000 -/* 01488 809FF0B8 3C068016 */ lui $a2, %hi(gSegments) -/* 0148C 809FF0BC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01490 809FF0C0 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01494 809FF0C4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01498 809FF0C8 921901EF */ lbu $t9, 0x01EF($s0) ## 000001EF -/* 0149C 809FF0CC 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 014A0 809FF0D0 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 014A4 809FF0D4 00194880 */ sll $t1, $t9, 2 -/* 014A8 809FF0D8 00892021 */ addu $a0, $a0, $t1 -/* 014AC 809FF0DC 8C84F418 */ lw $a0, %lo(D_809FF418)($a0) -/* 014B0 809FF0E0 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 014B4 809FF0E4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 014B8 809FF0E8 00045900 */ sll $t3, $a0, 4 -/* 014BC 809FF0EC 000B6702 */ srl $t4, $t3, 28 -/* 014C0 809FF0F0 000C6880 */ sll $t5, $t4, 2 -/* 014C4 809FF0F4 00CD7021 */ addu $t6, $a2, $t5 -/* 014C8 809FF0F8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 014CC 809FF0FC 00855024 */ and $t2, $a0, $a1 -/* 014D0 809FF100 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 014D4 809FF104 014FC021 */ addu $t8, $t2, $t7 -/* 014D8 809FF108 0307C821 */ addu $t9, $t8, $a3 -/* 014DC 809FF10C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 014E0 809FF110 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 014E4 809FF114 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 014E8 809FF118 3C0480A0 */ lui $a0, %hi(D_809FF428) ## $a0 = 80A00000 -/* 014EC 809FF11C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 014F0 809FF120 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 014F4 809FF124 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 014F8 809FF128 920C01F0 */ lbu $t4, 0x01F0($s0) ## 000001F0 -/* 014FC 809FF12C 000C6880 */ sll $t5, $t4, 2 -/* 01500 809FF130 008D2021 */ addu $a0, $a0, $t5 -/* 01504 809FF134 8C84F428 */ lw $a0, %lo(D_809FF428)($a0) -/* 01508 809FF138 00045100 */ sll $t2, $a0, 4 -/* 0150C 809FF13C 000A7F02 */ srl $t7, $t2, 28 -/* 01510 809FF140 000FC080 */ sll $t8, $t7, 2 -/* 01514 809FF144 00D8C821 */ addu $t9, $a2, $t8 -/* 01518 809FF148 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 0151C 809FF14C 00857024 */ and $t6, $a0, $a1 -/* 01520 809FF150 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01524 809FF154 01C95821 */ addu $t3, $t6, $t1 -/* 01528 809FF158 01676021 */ addu $t4, $t3, $a3 -/* 0152C 809FF15C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01530 809FF160 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01534 809FF164 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 01538 809FF168 3C0480A0 */ lui $a0, %hi(D_809FF438) ## $a0 = 80A00000 -/* 0153C 809FF16C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01540 809FF170 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01544 809FF174 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01548 809FF178 920F01F1 */ lbu $t7, 0x01F1($s0) ## 000001F1 -/* 0154C 809FF17C 000FC080 */ sll $t8, $t7, 2 -/* 01550 809FF180 00982021 */ addu $a0, $a0, $t8 -/* 01554 809FF184 8C84F438 */ lw $a0, %lo(D_809FF438)($a0) -/* 01558 809FF188 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 0155C 809FF18C 00047100 */ sll $t6, $a0, 4 -/* 01560 809FF190 000E4F02 */ srl $t1, $t6, 28 -/* 01564 809FF194 00095880 */ sll $t3, $t1, 2 -/* 01568 809FF198 00CB6021 */ addu $t4, $a2, $t3 -/* 0156C 809FF19C 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 01570 809FF1A0 0085C824 */ and $t9, $a0, $a1 -/* 01574 809FF1A4 3C0680A0 */ lui $a2, %hi(func_809FEEA4) ## $a2 = 80A00000 -/* 01578 809FF1A8 032D5021 */ addu $t2, $t9, $t5 -/* 0157C 809FF1AC 01477821 */ addu $t7, $t2, $a3 -/* 01580 809FF1B0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01584 809FF1B4 3C0780A0 */ lui $a3, %hi(func_809FF018) ## $a3 = 80A00000 -/* 01588 809FF1B8 24E7F018 */ addiu $a3, $a3, %lo(func_809FF018) ## $a3 = 809FF018 -/* 0158C 809FF1BC AFB80014 */ sw $t8, 0x0014($sp) -/* 01590 809FF1C0 AFB00010 */ sw $s0, 0x0010($sp) -/* 01594 809FF1C4 8FA40054 */ lw $a0, 0x0054($sp) -/* 01598 809FF1C8 24C6EEA4 */ addiu $a2, $a2, %lo(func_809FEEA4) ## $a2 = 809FEEA4 -/* 0159C 809FF1CC 0C00D2E8 */ jal func_80034BA0 -/* 015A0 809FF1D0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 015A4 809FF1D4 8FAE0054 */ lw $t6, 0x0054($sp) -/* 015A8 809FF1D8 3C0680A0 */ lui $a2, %hi(D_809FF450) ## $a2 = 80A00000 -/* 015AC 809FF1DC 24C6F450 */ addiu $a2, $a2, %lo(D_809FF450) ## $a2 = 809FF450 -/* 015B0 809FF1E0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 015B4 809FF1E4 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 015B8 809FF1E8 0C031AD5 */ jal Graph_CloseDisps -/* 015BC 809FF1EC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 015C0 809FF1F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 015C4 809FF1F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 015C8 809FF1F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 015CC 809FF1FC 03E00008 */ jr $ra -/* 015D0 809FF200 00000000 */ nop -/* 015D4 809FF204 00000000 */ nop -/* 015D8 809FF208 00000000 */ nop -/* 015DC 809FF20C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s deleted file mode 100644 index 32a0f09989..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel EnDu_Init -/* 0057C 809FE1AC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00580 809FE1B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00584 809FE1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) -/* 00590 809FE1C0 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00594 809FE1C4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00598 809FE1C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0059C 809FE1CC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 005A0 809FE1D0 0C00AC78 */ jal ActorShape_Init - -/* 005A4 809FE1D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 005A8 809FE1D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 005AC 809FE1DC 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 -/* 005B0 809FE1E0 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 -/* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) -/* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) -/* 005BC 809FE1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005C0 809FE1F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005C4 809FE1F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005C8 809FE1F8 0C0291BE */ jal SkelAnime_InitFlex -/* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) -/* 005D0 809FE200 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) -/* 005D8 809FE208 0C0170D9 */ jal Collider_InitCylinder - -/* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) -/* 005E0 809FE210 3C0780A0 */ lui $a3, %hi(D_809FF230) ## $a3 = 80A00000 -/* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) -/* 005E8 809FE218 24E7F230 */ addiu $a3, $a3, %lo(D_809FF230) ## $a3 = 809FF230 -/* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) -/* 005F0 809FE220 0C01712B */ jal Collider_SetCylinder - -/* 005F4 809FE224 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 005F8 809FE228 0C016C80 */ jal DamageTable_Get - -/* 005FC 809FE22C 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 -/* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000 -/* 00604 809FE234 24C6F25C */ addiu $a2, $a2, %lo(D_809FF25C) ## $a2 = 809FF25C -/* 00608 809FE238 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0060C 809FE23C 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 00610 809FE240 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00614 809FE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 -/* 0061C 809FE24C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00620 809FE250 14400005 */ bne $v0, $zero, .L809FE268 -/* 00624 809FE254 8FA40038 */ lw $a0, 0x0038($sp) -/* 00628 809FE258 0C00B55C */ jal Actor_Kill - -/* 0062C 809FE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00630 809FE260 10000042 */ beq $zero, $zero, .L809FE36C -/* 00634 809FE264 8FBF002C */ lw $ra, 0x002C($sp) -.L809FE268: -/* 00638 809FE268 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 0063C 809FE26C 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00640 809FE270 0C00D3B0 */ jal func_80034EC0 -/* 00644 809FE274 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00648 809FE278 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0064C 809FE27C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00650 809FE280 0C00B58B */ jal Actor_SetScale - -/* 00654 809FE284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00658 809FE288 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0065C 809FE28C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00660 809FE290 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00664 809FE294 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F -/* 00668 809FE298 A60001F4 */ sh $zero, 0x01F4($s0) ## 000001F4 -/* 0066C 809FE29C 8C6F0008 */ lw $t7, 0x0008($v1) ## 8015E668 -/* 00670 809FE2A0 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 -/* 00674 809FE2A4 3C020200 */ lui $v0, %hi(D_02006930) ## $v0 = 02000000 -/* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at -/* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 -/* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) -/* 00684 809FE2B4 24426930 */ addiu $v0, $v0, %lo(D_02006930) ## $v0 = 02006930 -/* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 -/* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 -/* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 -/* 00694 809FE2C4 3C098016 */ lui $t1, %hi(gSegments) -/* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 -/* 0069C 809FE2CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 006A0 809FE2D0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 006A4 809FE2D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at -/* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) -/* 006B0 809FE2E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006B4 809FE2E4 012A5821 */ addu $t3, $t1, $t2 -/* 006B8 809FE2E8 01616021 */ addu $t4, $t3, $at -/* 006BC 809FE2EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 006C0 809FE2F0 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 -/* 006C4 809FE2F4 ADAC1D68 */ sw $t4, 0x1D68($t5) ## 00001D68 -/* 006C8 809FE2F8 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 -/* 006CC 809FE2FC 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 -/* 006D0 809FE300 0C27F70C */ jal func_809FDC30 -/* 006D4 809FE304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 809FE308 10000018 */ beq $zero, $zero, .L809FE36C -/* 006DC 809FE30C 8FBF002C */ lw $ra, 0x002C($sp) -.L809FE310: -/* 006E0 809FE310 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 -/* 006E4 809FE314 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 006E8 809FE318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 809FE31C 17010005 */ bne $t8, $at, .L809FE334 -/* 006F0 809FE320 3C0580A0 */ lui $a1, %hi(func_809FE638) ## $a1 = 80A00000 -/* 006F4 809FE324 0C27F70C */ jal func_809FDC30 -/* 006F8 809FE328 24A5E638 */ addiu $a1, $a1, %lo(func_809FE638) ## $a1 = 809FE638 -/* 006FC 809FE32C 1000000F */ beq $zero, $zero, .L809FE36C -/* 00700 809FE330 8FBF002C */ lw $ra, 0x002C($sp) -.L809FE334: -/* 00704 809FE334 8C790004 */ lw $t9, 0x0004($v1) ## 00000004 -/* 00708 809FE338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0070C 809FE33C 3C0580A0 */ lui $a1, %hi(func_809FE3B4) ## $a1 = 80A00000 -/* 00710 809FE340 13200007 */ beq $t9, $zero, .L809FE360 -/* 00714 809FE344 00000000 */ nop -/* 00718 809FE348 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 -/* 0071C 809FE34C 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 00720 809FE350 0C27F70C */ jal func_809FDC30 -/* 00724 809FE354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00728 809FE358 10000004 */ beq $zero, $zero, .L809FE36C -/* 0072C 809FE35C 8FBF002C */ lw $ra, 0x002C($sp) -.L809FE360: -/* 00730 809FE360 0C27F70C */ jal func_809FDC30 -/* 00734 809FE364 24A5E3B4 */ addiu $a1, $a1, %lo(func_809FE3B4) ## $a1 = FFFFE3B4 -/* 00738 809FE368 8FBF002C */ lw $ra, 0x002C($sp) -.L809FE36C: -/* 0073C 809FE36C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00740 809FE370 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00744 809FE374 03E00008 */ jr $ra -/* 00748 809FE378 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s deleted file mode 100644 index 36de91f064..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel EnDu_Update -/* 010EC 809FED1C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 010F0 809FED20 AFB0001C */ sw $s0, 0x001C($sp) -/* 010F4 809FED24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010F8 809FED28 AFB10020 */ sw $s1, 0x0020($sp) -/* 010FC 809FED2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01100 809FED30 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01104 809FED34 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01108 809FED38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 0110C 809FED3C 0C0189B7 */ jal Collider_UpdateCylinder - -/* 01110 809FED40 AFA6002C */ sw $a2, 0x002C($sp) -/* 01114 809FED44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01118 809FED48 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0111C 809FED4C 8FA6002C */ lw $a2, 0x002C($sp) -/* 01120 809FED50 02212821 */ addu $a1, $s1, $at -/* 01124 809FED54 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01128 809FED58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0112C 809FED5C 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 -/* 01130 809FED60 3C0E0600 */ lui $t6, %hi(D_060041F4) ## $t6 = 06000000 -/* 01134 809FED64 25CE41F4 */ addiu $t6, $t6, %lo(D_060041F4) ## $t6 = 060041F4 -/* 01138 809FED68 15CF000A */ bne $t6, $t7, .L809FED94 -/* 0113C 809FED6C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01140 809FED70 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 01144 809FED74 0C0295B2 */ jal Animation_OnFrame -/* 01148 809FED78 AFA4002C */ sw $a0, 0x002C($sp) -/* 0114C 809FED7C 10400005 */ beq $v0, $zero, .L809FED94 -/* 01150 809FED80 8FA4002C */ lw $a0, 0x002C($sp) -/* 01154 809FED84 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 01158 809FED88 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 0115C 809FED8C 0C00D3B0 */ jal func_80034EC0 -/* 01160 809FED90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L809FED94: -/* 01164 809FED94 0C02927F */ jal SkelAnime_Update - -/* 01168 809FED98 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0116C 809FED9C 0C27F7A7 */ jal func_809FDE9C -/* 01170 809FEDA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01174 809FEDA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01178 809FEDA8 0C27F789 */ jal func_809FDE24 -/* 0117C 809FEDAC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01180 809FEDB0 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 01184 809FEDB4 3C1880A0 */ lui $t8, %hi(func_809FE890) ## $t8 = 80A00000 -/* 01188 809FEDB8 2718E890 */ addiu $t8, $t8, %lo(func_809FE890) ## $t8 = 809FE890 -/* 0118C 809FEDBC 1719000E */ bne $t8, $t9, .L809FEDF8 -/* 01190 809FEDC0 00000000 */ nop -/* 01194 809FEDC4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01198 809FEDC8 C606005C */ lwc1 $f6, 0x005C($s0) ## 0000005C -/* 0119C 809FEDCC C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 011A0 809FEDD0 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 011A4 809FEDD4 46062200 */ add.s $f8, $f4, $f6 -/* 011A8 809FEDD8 C6060064 */ lwc1 $f6, 0x0064($s0) ## 00000064 -/* 011AC 809FEDDC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 011B0 809FEDE0 46105480 */ add.s $f18, $f10, $f16 -/* 011B4 809FEDE4 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 011B8 809FEDE8 46062200 */ add.s $f8, $f4, $f6 -/* 011BC 809FEDEC E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 011C0 809FEDF0 10000003 */ beq $zero, $zero, .L809FEE00 -/* 011C4 809FEDF4 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -.L809FEDF8: -/* 011C8 809FEDF8 0C00B5FB */ jal func_8002D7EC -/* 011CC 809FEDFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809FEE00: -/* 011D0 809FEE00 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011D4 809FEE04 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 011D8 809FEE08 AFA80014 */ sw $t0, 0x0014($sp) -/* 011DC 809FEE0C 44060000 */ mfc1 $a2, $f0 -/* 011E0 809FEE10 44070000 */ mfc1 $a3, $f0 -/* 011E4 809FEE14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 011E8 809FEE18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 011EC 809FEE1C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 011F0 809FEE20 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 011F4 809FEE24 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 -/* 011F8 809FEE28 3C0980A0 */ lui $t1, %hi(func_809FE4A4) ## $t1 = 80A00000 -/* 011FC 809FEE2C 2529E4A4 */ addiu $t1, $t1, %lo(func_809FE4A4) ## $t1 = 809FE4A4 -/* 01200 809FEE30 51230015 */ beql $t1, $v1, .L809FEE88 -/* 01204 809FEE34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 809FEE38 860A01D4 */ lh $t2, 0x01D4($s0) ## 000001D4 -/* 0120C 809FEE3C 3C0142E8 */ lui $at, 0x42E8 ## $at = 42E80000 -/* 01210 809FEE40 44819000 */ mtc1 $at, $f18 ## $f18 = 116.00 -/* 01214 809FEE44 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 01218 809FEE48 3C0B80A0 */ lui $t3, %hi(func_809FDC38) ## $t3 = 80A00000 -/* 0121C 809FEE4C 3C0C80A0 */ lui $t4, %hi(func_809FDCDC) ## $t4 = 80A00000 -/* 01220 809FEE50 46805420 */ cvt.s.w $f16, $f10 -/* 01224 809FEE54 258CDCDC */ addiu $t4, $t4, %lo(func_809FDCDC) ## $t4 = 809FDCDC -/* 01228 809FEE58 256BDC38 */ addiu $t3, $t3, %lo(func_809FDC38) ## $t3 = 809FDC38 -/* 0122C 809FEE5C AFAB0010 */ sw $t3, 0x0010($sp) -/* 01230 809FEE60 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01234 809FEE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01238 809FEE68 46128100 */ add.s $f4, $f16, $f18 -/* 0123C 809FEE6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01240 809FEE70 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 -/* 01244 809FEE74 44072000 */ mfc1 $a3, $f4 -/* 01248 809FEE78 0C00D0F3 */ jal func_800343CC -/* 0124C 809FEE7C 00000000 */ nop -/* 01250 809FEE80 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 -/* 01254 809FEE84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809FEE88: -/* 01258 809FEE88 0060F809 */ jalr $ra, $v1 -/* 0125C 809FEE8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01260 809FEE90 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01264 809FEE94 8FB0001C */ lw $s0, 0x001C($sp) -/* 01268 809FEE98 8FB10020 */ lw $s1, 0x0020($sp) -/* 0126C 809FEE9C 03E00008 */ jr $ra -/* 01270 809FEEA0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s deleted file mode 100644 index a1f3ff2d44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_809FDC30 -/* 00000 809FDC30 03E00008 */ jr $ra -/* 00004 809FDC34 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s deleted file mode 100644 index 15c6355765..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809FDC38 -/* 00008 809FDC38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0000C 809FDC3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00010 809FDC40 AFA5001C */ sw $a1, 0x001C($sp) -/* 00014 809FDC44 0C01B0D8 */ jal Text_GetFaceReaction -/* 00018 809FDC48 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 -/* 0001C 809FDC4C 10400003 */ beq $v0, $zero, .L809FDC5C -/* 00020 809FDC50 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 00024 809FDC54 1000001D */ beq $zero, $zero, .L809FDCCC -/* 00028 809FDC58 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L809FDC5C: -/* 0002C 809FDC5C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00030 809FDC60 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00034 809FDC64 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+8) -/* 00038 809FDC68 8DEF71B8 */ lw $t7, %lo(gUpgradeMasks+8)($t7) -/* 0003C 809FDC6C 8C4E00A0 */ lw $t6, 0x00A0($v0) ## 8015E700 -/* 00040 809FDC70 3C198012 */ lui $t9, %hi(gUpgradeShifts+2) -/* 00044 809FDC74 933971F6 */ lbu $t9, %lo(gUpgradeShifts+2)($t9) -/* 00048 809FDC78 01CFC024 */ and $t8, $t6, $t7 -/* 0004C 809FDC7C 3C098012 */ lui $t1, %hi(gBitFlags+0x4c) -/* 00050 809FDC80 03384007 */ srav $t0, $t8, $t9 -/* 00054 809FDC84 5100000B */ beql $t0, $zero, .L809FDCB4 -/* 00058 809FDC88 944C0F1A */ lhu $t4, 0x0F1A($v0) ## 8015F57A -/* 0005C 809FDC8C 8D29716C */ lw $t1, %lo(gBitFlags+0x4c)($t1) -/* 00060 809FDC90 8C4A00A4 */ lw $t2, 0x00A4($v0) ## 8015E704 -/* 00064 809FDC94 012A5824 */ and $t3, $t1, $t2 -/* 00068 809FDC98 11600003 */ beq $t3, $zero, .L809FDCA8 -/* 0006C 809FDC9C 00000000 */ nop -/* 00070 809FDCA0 1000000A */ beq $zero, $zero, .L809FDCCC -/* 00074 809FDCA4 2402301E */ addiu $v0, $zero, 0x301E ## $v0 = 0000301E -.L809FDCA8: -/* 00078 809FDCA8 10000008 */ beq $zero, $zero, .L809FDCCC -/* 0007C 809FDCAC 2402301D */ addiu $v0, $zero, 0x301D ## $v0 = 0000301D -/* 00080 809FDCB0 944C0F1A */ lhu $t4, 0x0F1A($v0) ## 00003F37 -.L809FDCB4: -/* 00084 809FDCB4 2402301A */ addiu $v0, $zero, 0x301A ## $v0 = 0000301A -/* 00088 809FDCB8 318D0008 */ andi $t5, $t4, 0x0008 ## $t5 = 00000000 -/* 0008C 809FDCBC 11A00003 */ beq $t5, $zero, .L809FDCCC -/* 00090 809FDCC0 00000000 */ nop -/* 00094 809FDCC4 10000001 */ beq $zero, $zero, .L809FDCCC -/* 00098 809FDCC8 2402301B */ addiu $v0, $zero, 0x301B ## $v0 = 0000301B -.L809FDCCC: -/* 0009C 809FDCCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000A0 809FDCD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000A4 809FDCD4 03E00008 */ jr $ra -/* 000A8 809FDCD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s deleted file mode 100644 index 5f2becd0a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel jtbl_809FF460 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDD14 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDD88 -.word L809FDDA0 -.word L809FDDA0 -.word L809FDDA0 - -.text -glabel func_809FDCDC -/* 000AC 809FDCDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B0 809FDCE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000B4 809FDCE4 AFA40018 */ sw $a0, 0x0018($sp) -/* 000B8 809FDCE8 AFA5001C */ sw $a1, 0x001C($sp) -/* 000BC 809FDCEC 0C042F6F */ jal func_8010BDBC -/* 000C0 809FDCF0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 000C4 809FDCF4 2C41000A */ sltiu $at, $v0, 0x000A -/* 000C8 809FDCF8 10200029 */ beq $at, $zero, .L809FDDA0 -/* 000CC 809FDCFC 00027080 */ sll $t6, $v0, 2 -/* 000D0 809FDD00 3C0180A0 */ lui $at, %hi(jtbl_809FF460) ## $at = 80A00000 -/* 000D4 809FDD04 002E0821 */ addu $at, $at, $t6 -/* 000D8 809FDD08 8C2EF460 */ lw $t6, %lo(jtbl_809FF460)($at) -/* 000DC 809FDD0C 01C00008 */ jr $t6 -/* 000E0 809FDD10 00000000 */ nop -glabel L809FDD14 -/* 000E4 809FDD14 8FAF001C */ lw $t7, 0x001C($sp) -/* 000E8 809FDD18 2401301A */ addiu $at, $zero, 0x301A ## $at = 0000301A -/* 000EC 809FDD1C 95E2010E */ lhu $v0, 0x010E($t7) ## 0000010E -/* 000F0 809FDD20 10410009 */ beq $v0, $at, .L809FDD48 -/* 000F4 809FDD24 2401301C */ addiu $at, $zero, 0x301C ## $at = 0000301C -/* 000F8 809FDD28 1041000E */ beq $v0, $at, .L809FDD64 -/* 000FC 809FDD2C 2401301F */ addiu $at, $zero, 0x301F ## $at = 0000301F -/* 00100 809FDD30 1041000C */ beq $v0, $at, .L809FDD64 -/* 00104 809FDD34 24013020 */ addiu $at, $zero, 0x3020 ## $at = 00003020 -/* 00108 809FDD38 1041000C */ beq $v0, $at, .L809FDD6C -/* 0010C 809FDD3C 00000000 */ nop -/* 00110 809FDD40 10000018 */ beq $zero, $zero, .L809FDDA4 -/* 00114 809FDD44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FDD48: -/* 00118 809FDD48 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0011C 809FDD4C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00120 809FDD50 94580F1A */ lhu $t8, 0x0F1A($v0) ## 8015F57A -/* 00124 809FDD54 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 00128 809FDD58 A4590F1A */ sh $t9, 0x0F1A($v0) ## 8015F57A -/* 0012C 809FDD5C 10000011 */ beq $zero, $zero, .L809FDDA4 -/* 00130 809FDD60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FDD64: -/* 00134 809FDD64 1000000F */ beq $zero, $zero, .L809FDDA4 -/* 00138 809FDD68 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L809FDD6C: -/* 0013C 809FDD6C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00140 809FDD70 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00144 809FDD74 94480ED8 */ lhu $t0, 0x0ED8($v0) ## 8015F538 -/* 00148 809FDD78 35090004 */ ori $t1, $t0, 0x0004 ## $t1 = 00000004 -/* 0014C 809FDD7C A4490ED8 */ sh $t1, 0x0ED8($v0) ## 8015F538 -/* 00150 809FDD80 10000008 */ beq $zero, $zero, .L809FDDA4 -/* 00154 809FDD84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -glabel L809FDD88 -/* 00158 809FDD88 0C041AF2 */ jal func_80106BC8 -/* 0015C 809FDD8C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00160 809FDD90 50400004 */ beql $v0, $zero, .L809FDDA4 -/* 00164 809FDD94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00168 809FDD98 10000002 */ beq $zero, $zero, .L809FDDA4 -/* 0016C 809FDD9C 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -glabel L809FDDA0 -.L809FDDA0: -/* 00170 809FDDA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809FDDA4: -/* 00174 809FDDA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00178 809FDDA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0017C 809FDDAC 03E00008 */ jr $ra -/* 00180 809FDDB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s deleted file mode 100644 index 2598c7ebce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809FDDB4 -/* 00184 809FDDB4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00188 809FDDB8 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 0018C 809FDDBC 24010062 */ addiu $at, $zero, 0x0062 ## $at = 00000062 -/* 00190 809FDDC0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00194 809FDDC4 14410007 */ bne $v0, $at, .L809FDDE4 -/* 00198 809FDDC8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0019C 809FDDCC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 001A0 809FDDD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001A4 809FDDD4 15C10003 */ bne $t6, $at, .L809FDDE4 -/* 001A8 809FDDD8 00000000 */ nop -/* 001AC 809FDDDC 03E00008 */ jr $ra -/* 001B0 809FDDE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809FDDE4: -/* 001B4 809FDDE4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 001B8 809FDDE8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 001BC 809FDDEC 1441000A */ bne $v0, $at, .L809FDE18 -/* 001C0 809FDDF0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 001C4 809FDDF4 946F0F1A */ lhu $t7, 0x0F1A($v1) ## 8015F57A -/* 001C8 809FDDF8 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 -/* 001CC 809FDDFC 57000007 */ bnel $t8, $zero, .L809FDE1C -/* 001D0 809FDE00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001D4 809FDE04 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 001D8 809FDE08 57200004 */ bnel $t9, $zero, .L809FDE1C -/* 001DC 809FDE0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001E0 809FDE10 03E00008 */ jr $ra -/* 001E4 809FDE14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809FDE18: -/* 001E8 809FDE18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FDE1C: -/* 001EC 809FDE1C 03E00008 */ jr $ra -/* 001F0 809FDE20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s deleted file mode 100644 index af9e75bc7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809FDE24 -/* 001F4 809FDE24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 809FDE28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001FC 809FDE2C 848E01F4 */ lh $t6, 0x01F4($a0) ## 000001F4 -/* 00200 809FDE30 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00204 809FDE34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00208 809FDE38 55C00003 */ bnel $t6, $zero, .L809FDE48 -/* 0020C 809FDE3C 8C980190 */ lw $t8, 0x0190($a0) ## 00000190 -/* 00210 809FDE40 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00214 809FDE44 8C980190 */ lw $t8, 0x0190($a0) ## 00000190 -.L809FDE48: -/* 00218 809FDE48 3C0F80A0 */ lui $t7, %hi(func_809FE890) ## $t7 = 80A00000 -/* 0021C 809FDE4C 25EFE890 */ addiu $t7, $t7, %lo(func_809FE890) ## $t7 = 809FE890 -/* 00220 809FDE50 55F80003 */ bnel $t7, $t8, .L809FDE60 -/* 00224 809FDE54 8C480024 */ lw $t0, 0x0024($v0) ## 00000024 -/* 00228 809FDE58 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0022C 809FDE5C 8C480024 */ lw $t0, 0x0024($v0) ## 00000024 -.L809FDE60: -/* 00230 809FDE60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00234 809FDE64 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00238 809FDE68 AC88020C */ sw $t0, 0x020C($a0) ## 0000020C -/* 0023C 809FDE6C 8C590028 */ lw $t9, 0x0028($v0) ## 00000028 -/* 00240 809FDE70 248501F4 */ addiu $a1, $a0, 0x01F4 ## $a1 = 000001F4 -/* 00244 809FDE74 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00248 809FDE78 AC990210 */ sw $t9, 0x0210($a0) ## 00000210 -/* 0024C 809FDE7C 8C48002C */ lw $t0, 0x002C($v0) ## 0000002C -/* 00250 809FDE80 E4840208 */ swc1 $f4, 0x0208($a0) ## 00000208 -/* 00254 809FDE84 0C00D285 */ jal func_80034A14 -/* 00258 809FDE88 AC880214 */ sw $t0, 0x0214($a0) ## 00000214 -/* 0025C 809FDE8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00260 809FDE90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00264 809FDE94 03E00008 */ jr $ra -/* 00268 809FDE98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s deleted file mode 100644 index 2c48c9f2b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_809FDE9C -/* 0026C 809FDE9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00270 809FDEA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00274 809FDEA4 848301F2 */ lh $v1, 0x01F2($a0) ## 000001F2 -/* 00278 809FDEA8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0027C 809FDEAC 18600003 */ blez $v1, .L809FDEBC -/* 00280 809FDEB0 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00284 809FDEB4 10000002 */ beq $zero, $zero, .L809FDEC0 -/* 00288 809FDEB8 A48E01F2 */ sh $t6, 0x01F2($a0) ## 000001F2 -.L809FDEBC: -/* 0028C 809FDEBC A4C001F2 */ sh $zero, 0x01F2($a2) ## 000001F2 -.L809FDEC0: -/* 00290 809FDEC0 84C301F2 */ lh $v1, 0x01F2($a2) ## 000001F2 -/* 00294 809FDEC4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00298 809FDEC8 28610003 */ slti $at, $v1, 0x0003 -/* 0029C 809FDECC 50200003 */ beql $at, $zero, .L809FDEDC -/* 002A0 809FDED0 90C201EC */ lbu $v0, 0x01EC($a2) ## 000001EC -/* 002A4 809FDED4 A0C301EF */ sb $v1, 0x01EF($a2) ## 000001EF -/* 002A8 809FDED8 90C201EC */ lbu $v0, 0x01EC($a2) ## 000001EC -.L809FDEDC: -/* 002AC 809FDEDC 10400009 */ beq $v0, $zero, .L809FDF04 -/* 002B0 809FDEE0 00000000 */ nop -/* 002B4 809FDEE4 10440010 */ beq $v0, $a0, .L809FDF28 -/* 002B8 809FDEE8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 002BC 809FDEEC 10410012 */ beq $v0, $at, .L809FDF38 -/* 002C0 809FDEF0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 002C4 809FDEF4 10410014 */ beq $v0, $at, .L809FDF48 -/* 002C8 809FDEF8 00000000 */ nop -/* 002CC 809FDEFC 10000016 */ beq $zero, $zero, .L809FDF58 -/* 002D0 809FDF00 90C201ED */ lbu $v0, 0x01ED($a2) ## 000001ED -.L809FDF04: -/* 002D4 809FDF04 14600006 */ bne $v1, $zero, .L809FDF20 -/* 002D8 809FDF08 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 002DC 809FDF0C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 002E0 809FDF10 0C01DF64 */ jal Rand_S16Offset - -/* 002E4 809FDF14 AFA60018 */ sw $a2, 0x0018($sp) -/* 002E8 809FDF18 8FA60018 */ lw $a2, 0x0018($sp) -/* 002EC 809FDF1C A4C201F2 */ sh $v0, 0x01F2($a2) ## 000001F2 -.L809FDF20: -/* 002F0 809FDF20 1000000C */ beq $zero, $zero, .L809FDF54 -/* 002F4 809FDF24 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L809FDF28: -/* 002F8 809FDF28 1460000A */ bne $v1, $zero, .L809FDF54 -/* 002FC 809FDF2C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00300 809FDF30 10000008 */ beq $zero, $zero, .L809FDF54 -/* 00304 809FDF34 A0CF01EF */ sb $t7, 0x01EF($a2) ## 000001EF -.L809FDF38: -/* 00308 809FDF38 14600006 */ bne $v1, $zero, .L809FDF54 -/* 0030C 809FDF3C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00310 809FDF40 10000004 */ beq $zero, $zero, .L809FDF54 -/* 00314 809FDF44 A0D801EF */ sb $t8, 0x01EF($a2) ## 000001EF -.L809FDF48: -/* 00318 809FDF48 54600003 */ bnel $v1, $zero, .L809FDF58 -/* 0031C 809FDF4C 90C201ED */ lbu $v0, 0x01ED($a2) ## 000001ED -/* 00320 809FDF50 A0C001EF */ sb $zero, 0x01EF($a2) ## 000001EF -.L809FDF54: -/* 00324 809FDF54 90C201ED */ lbu $v0, 0x01ED($a2) ## 000001ED -.L809FDF58: -/* 00328 809FDF58 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0032C 809FDF5C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00330 809FDF60 10440008 */ beq $v0, $a0, .L809FDF84 -/* 00334 809FDF64 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00338 809FDF68 10410008 */ beq $v0, $at, .L809FDF8C -/* 0033C 809FDF6C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00340 809FDF70 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00344 809FDF74 10410007 */ beq $v0, $at, .L809FDF94 -/* 00348 809FDF78 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 0034C 809FDF7C 10000006 */ beq $zero, $zero, .L809FDF98 -/* 00350 809FDF80 A0C001F0 */ sb $zero, 0x01F0($a2) ## 000001F0 -.L809FDF84: -/* 00354 809FDF84 10000004 */ beq $zero, $zero, .L809FDF98 -/* 00358 809FDF88 A0D901F0 */ sb $t9, 0x01F0($a2) ## 000001F0 -.L809FDF8C: -/* 0035C 809FDF8C 10000002 */ beq $zero, $zero, .L809FDF98 -/* 00360 809FDF90 A0C801F0 */ sb $t0, 0x01F0($a2) ## 000001F0 -.L809FDF94: -/* 00364 809FDF94 A0C901F0 */ sb $t1, 0x01F0($a2) ## 000001F0 -.L809FDF98: -/* 00368 809FDF98 90CA01EE */ lbu $t2, 0x01EE($a2) ## 000001EE -/* 0036C 809FDF9C 548A0004 */ bnel $a0, $t2, .L809FDFB0 -/* 00370 809FDFA0 A0C001F1 */ sb $zero, 0x01F1($a2) ## 000001F1 -/* 00374 809FDFA4 10000002 */ beq $zero, $zero, .L809FDFB0 -/* 00378 809FDFA8 A0CB01F1 */ sb $t3, 0x01F1($a2) ## 000001F1 -/* 0037C 809FDFAC A0C001F1 */ sb $zero, 0x01F1($a2) ## 000001F1 -.L809FDFB0: -/* 00380 809FDFB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00384 809FDFB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00388 809FDFB8 03E00008 */ jr $ra -/* 0038C 809FDFBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s deleted file mode 100644 index 7c1eaac142..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809FDFC0 -/* 00390 809FDFC0 8C8E000C */ lw $t6, 0x000C($a0) ## 0000000C -/* 00394 809FDFC4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00398 809FDFC8 00000000 */ nop -/* 0039C 809FDFCC 468021A0 */ cvt.s.w $f6, $f4 -/* 003A0 809FDFD0 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 003A4 809FDFD4 8C8F0010 */ lw $t7, 0x0010($a0) ## 00000010 -/* 003A8 809FDFD8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 003AC 809FDFDC 00000000 */ nop -/* 003B0 809FDFE0 468042A0 */ cvt.s.w $f10, $f8 -/* 003B4 809FDFE4 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 003B8 809FDFE8 8C980014 */ lw $t8, 0x0014($a0) ## 00000014 -/* 003BC 809FDFEC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 003C0 809FDFF0 00000000 */ nop -/* 003C4 809FDFF4 468084A0 */ cvt.s.w $f18, $f16 -/* 003C8 809FDFF8 03E00008 */ jr $ra -/* 003CC 809FDFFC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s deleted file mode 100644 index 0a0a62ca07..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809FE000 -/* 003D0 809FE000 8C8E0018 */ lw $t6, 0x0018($a0) ## 00000018 -/* 003D4 809FE004 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 003D8 809FE008 00000000 */ nop -/* 003DC 809FE00C 468021A0 */ cvt.s.w $f6, $f4 -/* 003E0 809FE010 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 003E4 809FE014 8C8F001C */ lw $t7, 0x001C($a0) ## 0000001C -/* 003E8 809FE018 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 003EC 809FE01C 00000000 */ nop -/* 003F0 809FE020 468042A0 */ cvt.s.w $f10, $f8 -/* 003F4 809FE024 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 003F8 809FE028 8C980020 */ lw $t8, 0x0020($a0) ## 00000020 -/* 003FC 809FE02C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00400 809FE030 00000000 */ nop -/* 00404 809FE034 468084A0 */ cvt.s.w $f18, $f16 -/* 00408 809FE038 03E00008 */ jr $ra -/* 0040C 809FE03C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s deleted file mode 100644 index bcdb8bab14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_809FE040 -/* 00410 809FE040 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00414 809FE044 3C0F80A0 */ lui $t7, %hi(D_809FF3D0) ## $t7 = 80A00000 -/* 00418 809FE048 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0041C 809FE04C 25EFF3D0 */ addiu $t7, $t7, %lo(D_809FF3D0) ## $t7 = 809FF3D0 -/* 00420 809FE050 8DF90000 */ lw $t9, 0x0000($t7) ## 809FF3D0 -/* 00424 809FE054 8DF80004 */ lw $t8, 0x0004($t7) ## 809FF3D4 -/* 00428 809FE058 27AE0020 */ addiu $t6, $sp, 0x0020 ## $t6 = FFFFFFE0 -/* 0042C 809FE05C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE0 -/* 00430 809FE060 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFE4 -/* 00434 809FE064 8DF8000C */ lw $t8, 0x000C($t7) ## 809FF3DC -/* 00438 809FE068 8DF90008 */ lw $t9, 0x0008($t7) ## 809FF3D8 -/* 0043C 809FE06C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00440 809FE070 ADD8000C */ sw $t8, 0x000C($t6) ## FFFFFFEC -/* 00444 809FE074 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFE8 -/* 00448 809FE078 8DF90010 */ lw $t9, 0x0010($t7) ## 809FF3E0 -/* 0044C 809FE07C 8DF80014 */ lw $t8, 0x0014($t7) ## 809FF3E4 -/* 00450 809FE080 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00454 809FE084 ADD90010 */ sw $t9, 0x0010($t6) ## FFFFFFF0 -/* 00458 809FE088 ADD80014 */ sw $t8, 0x0014($t6) ## FFFFFFF4 -/* 0045C 809FE08C 8DF8001C */ lw $t8, 0x001C($t7) ## 809FF3EC -/* 00460 809FE090 8DF90018 */ lw $t9, 0x0018($t7) ## 809FF3E8 -/* 00464 809FE094 ADD8001C */ sw $t8, 0x001C($t6) ## FFFFFFFC -/* 00468 809FE098 ADD90018 */ sw $t9, 0x0018($t6) ## FFFFFFF8 -/* 0046C 809FE09C 8CC5015C */ lw $a1, 0x015C($a2) ## 0000015C -/* 00470 809FE0A0 AFA60040 */ sw $a2, 0x0040($sp) -/* 00474 809FE0A4 0C0295B2 */ jal Animation_OnFrame -/* 00478 809FE0A8 AFA4001C */ sw $a0, 0x001C($sp) -/* 0047C 809FE0AC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00480 809FE0B0 10400010 */ beq $v0, $zero, .L809FE0F4 -/* 00484 809FE0B4 8FA60040 */ lw $a2, 0x0040($sp) -/* 00488 809FE0B8 84C801E6 */ lh $t0, 0x01E6($a2) ## 000001E6 -/* 0048C 809FE0BC 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00490 809FE0C0 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00494 809FE0C4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00498 809FE0C8 A4C901E6 */ sh $t1, 0x01E6($a2) ## 000001E6 -/* 0049C 809FE0CC 84C201E6 */ lh $v0, 0x01E6($a2) ## 000001E6 -/* 004A0 809FE0D0 28410008 */ slti $at, $v0, 0x0008 -/* 004A4 809FE0D4 54200004 */ bnel $at, $zero, .L809FE0E8 -/* 004A8 809FE0D8 00025080 */ sll $t2, $v0, 2 -/* 004AC 809FE0DC A4C001E6 */ sh $zero, 0x01E6($a2) ## 000001E6 -/* 004B0 809FE0E0 84C201E6 */ lh $v0, 0x01E6($a2) ## 000001E6 -/* 004B4 809FE0E4 00025080 */ sll $t2, $v0, 2 -.L809FE0E8: -/* 004B8 809FE0E8 03AA3021 */ addu $a2, $sp, $t2 -/* 004BC 809FE0EC 0C00D3B0 */ jal func_80034EC0 -/* 004C0 809FE0F0 8CC60020 */ lw $a2, 0x0020($a2) ## 00000020 -.L809FE0F4: -/* 004C4 809FE0F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004C8 809FE0F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 004CC 809FE0FC 03E00008 */ jr $ra -/* 004D0 809FE100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s deleted file mode 100644 index 87a35faf10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_809FE104 -/* 004D4 809FE104 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 004D8 809FE108 3C0F80A0 */ lui $t7, %hi(D_809FF3F0) ## $t7 = 80A00000 -/* 004DC 809FE10C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004E0 809FE110 25EFF3F0 */ addiu $t7, $t7, %lo(D_809FF3F0) ## $t7 = 809FF3F0 -/* 004E4 809FE114 8DF90000 */ lw $t9, 0x0000($t7) ## 809FF3F0 -/* 004E8 809FE118 8DF80004 */ lw $t8, 0x0004($t7) ## 809FF3F4 -/* 004EC 809FE11C 27AE0020 */ addiu $t6, $sp, 0x0020 ## $t6 = FFFFFFF0 -/* 004F0 809FE120 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 004F4 809FE124 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 004F8 809FE128 8DF8000C */ lw $t8, 0x000C($t7) ## 809FF3FC -/* 004FC 809FE12C 8DF90008 */ lw $t9, 0x0008($t7) ## 809FF3F8 -/* 00500 809FE130 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00504 809FE134 ADD8000C */ sw $t8, 0x000C($t6) ## FFFFFFFC -/* 00508 809FE138 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 0050C 809FE13C 848801E6 */ lh $t0, 0x01E6($a0) ## 000001E6 -/* 00510 809FE140 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00514 809FE144 29010004 */ slti $at, $t0, 0x0004 -/* 00518 809FE148 50200015 */ beql $at, $zero, .L809FE1A0 -/* 0051C 809FE14C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00520 809FE150 8CC5015C */ lw $a1, 0x015C($a2) ## 0000015C -/* 00524 809FE154 AFA60030 */ sw $a2, 0x0030($sp) -/* 00528 809FE158 0C0295B2 */ jal Animation_OnFrame -/* 0052C 809FE15C AFA40018 */ sw $a0, 0x0018($sp) -/* 00530 809FE160 8FA40018 */ lw $a0, 0x0018($sp) -/* 00534 809FE164 1040000D */ beq $v0, $zero, .L809FE19C -/* 00538 809FE168 8FA60030 */ lw $a2, 0x0030($sp) -/* 0053C 809FE16C 84C901E6 */ lh $t1, 0x01E6($a2) ## 000001E6 -/* 00540 809FE170 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00544 809FE174 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00548 809FE178 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 0054C 809FE17C A4CA01E6 */ sh $t2, 0x01E6($a2) ## 000001E6 -/* 00550 809FE180 84C201E6 */ lh $v0, 0x01E6($a2) ## 000001E6 -/* 00554 809FE184 28410004 */ slti $at, $v0, 0x0004 -/* 00558 809FE188 10200004 */ beq $at, $zero, .L809FE19C -/* 0055C 809FE18C 00025880 */ sll $t3, $v0, 2 -/* 00560 809FE190 03AB3021 */ addu $a2, $sp, $t3 -/* 00564 809FE194 0C00D3B0 */ jal func_80034EC0 -/* 00568 809FE198 8CC60020 */ lw $a2, 0x0020($a2) ## 00000020 -.L809FE19C: -/* 0056C 809FE19C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FE1A0: -/* 00570 809FE1A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00574 809FE1A4 03E00008 */ jr $ra -/* 00578 809FE1A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s deleted file mode 100644 index dfac861173..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809FE3B4 -/* 00784 809FE3B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00788 809FE3B8 03E00008 */ jr $ra -/* 0078C 809FE3BC AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s deleted file mode 100644 index 90cd0b7296..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809FE3C0 -/* 00790 809FE3C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00794 809FE3C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00798 809FE3C8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0079C 809FE3CC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 007A0 809FE3D0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007A4 809FE3D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007A8 809FE3D8 8C4F0680 */ lw $t7, 0x0680($v0) ## 00000680 -/* 007AC 809FE3DC 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 -/* 007B0 809FE3E0 000FC1C0 */ sll $t8, $t7, 7 -/* 007B4 809FE3E4 07030011 */ bgezl $t8, .L809FE42C -/* 007B8 809FE3E8 84E901F4 */ lh $t1, 0x01F4($a3) ## 000001F4 -/* 007BC 809FE3EC AFA2001C */ sw $v0, 0x001C($sp) -/* 007C0 809FE3F0 0C042F62 */ jal func_8010BD88 -/* 007C4 809FE3F4 AFA70020 */ sw $a3, 0x0020($sp) -/* 007C8 809FE3F8 8FA2001C */ lw $v0, 0x001C($sp) -/* 007CC 809FE3FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 007D0 809FE400 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 007D4 809FE404 8C590680 */ lw $t9, 0x0680($v0) ## 00000680 -/* 007D8 809FE408 3C0580A0 */ lui $a1, %hi(func_809FE4A4) ## $a1 = 80A00000 -/* 007DC 809FE40C 24A5E4A4 */ addiu $a1, $a1, %lo(func_809FE4A4) ## $a1 = 809FE4A4 -/* 007E0 809FE410 03214025 */ or $t0, $t9, $at ## $t0 = 02000000 -/* 007E4 809FE414 AC480680 */ sw $t0, 0x0680($v0) ## 00000680 -/* 007E8 809FE418 0C27F70C */ jal func_809FDC30 -/* 007EC 809FE41C AC4406A8 */ sw $a0, 0x06A8($v0) ## 000006A8 -/* 007F0 809FE420 1000001D */ beq $zero, $zero, .L809FE498 -/* 007F4 809FE424 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F8 809FE428 84E901F4 */ lh $t1, 0x01F4($a3) ## 000001F4 -.L809FE42C: -/* 007FC 809FE42C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00800 809FE430 8FA40024 */ lw $a0, 0x0024($sp) -/* 00804 809FE434 15210008 */ bne $t1, $at, .L809FE458 -/* 00808 809FE438 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0080C 809FE43C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00810 809FE440 AFA2001C */ sw $v0, 0x001C($sp) -/* 00814 809FE444 0C00B7D5 */ jal func_8002DF54 -/* 00818 809FE448 AFA70020 */ sw $a3, 0x0020($sp) -/* 0081C 809FE44C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00820 809FE450 8FA2001C */ lw $v0, 0x001C($sp) -/* 00824 809FE454 A4E001F4 */ sh $zero, 0x01F4($a3) ## 000001F4 -.L809FE458: -/* 00828 809FE458 84EA01D4 */ lh $t2, 0x01D4($a3) ## 000001D4 -/* 0082C 809FE45C 3C0142E8 */ lui $at, 0x42E8 ## $at = 42E80000 -/* 00830 809FE460 44813000 */ mtc1 $at, $f6 ## $f6 = 116.00 -/* 00834 809FE464 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 00838 809FE468 C4E40090 */ lwc1 $f4, 0x0090($a3) ## 00000090 -/* 0083C 809FE46C 468042A0 */ cvt.s.w $f10, $f8 -/* 00840 809FE470 460A3400 */ add.s $f16, $f6, $f10 -/* 00844 809FE474 4610203C */ c.lt.s $f4, $f16 -/* 00848 809FE478 00000000 */ nop -/* 0084C 809FE47C 45020006 */ bc1fl .L809FE498 -/* 00850 809FE480 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00854 809FE484 8C4B0680 */ lw $t3, 0x0680($v0) ## 00000680 -/* 00858 809FE488 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 0085C 809FE48C 01616025 */ or $t4, $t3, $at ## $t4 = 00800000 -/* 00860 809FE490 AC4C0680 */ sw $t4, 0x0680($v0) ## 00000680 -/* 00864 809FE494 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FE498: -/* 00868 809FE498 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0086C 809FE49C 03E00008 */ jr $ra -/* 00870 809FE4A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s deleted file mode 100644 index 5813b80c83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel func_809FE4A4 -/* 00874 809FE4A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00878 809FE4A8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0087C 809FE4AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00880 809FE4B0 AFB10020 */ sw $s1, 0x0020($sp) -/* 00884 809FE4B4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00888 809FE4B8 00451021 */ addu $v0, $v0, $a1 -/* 0088C 809FE4BC 944204C6 */ lhu $v0, 0x04C6($v0) ## 000104C6 -/* 00890 809FE4C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00894 809FE4C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00898 809FE4C8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0089C 809FE4CC 14410009 */ bne $v0, $at, .L809FE4F4 -/* 008A0 809FE4D0 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 008A4 809FE4D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008A8 809FE4D8 00250821 */ addu $at, $at, $a1 -/* 008AC 809FE4DC 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 -/* 008B0 809FE4E0 A42004C6 */ sh $zero, 0x04C6($at) ## 000104C6 -/* 008B4 809FE4E4 0C27F70C */ jal func_809FDC30 -/* 008B8 809FE4E8 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 008BC 809FE4EC 1000004E */ beq $zero, $zero, .L809FE628 -/* 008C0 809FE4F0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FE4F4: -/* 008C4 809FE4F4 28410006 */ slti $at, $v0, 0x0006 -/* 008C8 809FE4F8 1420001D */ bne $at, $zero, .L809FE570 -/* 008CC 809FE4FC 3C198016 */ lui $t9, %hi(gSegments) -/* 008D0 809FE500 3C020200 */ lui $v0, %hi(D_02007DE0) ## $v0 = 02000000 -/* 008D4 809FE504 24427DE0 */ addiu $v0, $v0, %lo(D_02007DE0) ## $v0 = 02007DE0 -/* 008D8 809FE508 00027100 */ sll $t6, $v0, 4 -/* 008DC 809FE50C 000E7F02 */ srl $t7, $t6, 28 -/* 008E0 809FE510 000FC080 */ sll $t8, $t7, 2 -/* 008E4 809FE514 0338C821 */ addu $t9, $t9, $t8 -/* 008E8 809FE518 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 008EC 809FE51C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 008F0 809FE520 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 008F4 809FE524 00414024 */ and $t0, $v0, $at -/* 008F8 809FE528 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008FC 809FE52C 03284821 */ addu $t1, $t9, $t0 -/* 00900 809FE530 01215021 */ addu $t2, $t1, $at -/* 00904 809FE534 AE0A1D68 */ sw $t2, 0x1D68($s0) ## 00001D68 -/* 00908 809FE538 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 0090C 809FE53C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00910 809FE540 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) -/* 00914 809FE544 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00918 809FE548 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 -/* 0091C 809FE54C A62C01E8 */ sh $t4, 0x01E8($s1) ## 000001E8 -/* 00920 809FE550 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 -/* 00924 809FE554 0C27F70C */ jal func_809FDC30 -/* 00928 809FE558 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0092C 809FE55C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00930 809FE560 00300821 */ addu $at, $at, $s0 -/* 00934 809FE564 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 00938 809FE568 1000002E */ beq $zero, $zero, .L809FE624 -/* 0093C 809FE56C A42D04C6 */ sh $t5, 0x04C6($at) ## 000104C6 -.L809FE570: -/* 00940 809FE570 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00944 809FE574 14410027 */ bne $v0, $at, .L809FE614 -/* 00948 809FE578 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0094C 809FE57C 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 00950 809FE580 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00954 809FE584 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00958 809FE588 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0095C 809FE58C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00960 809FE590 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00964 809FE594 AFA70010 */ sw $a3, 0x0010($sp) -/* 00968 809FE598 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 0096C 809FE59C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00970 809FE5A0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00974 809FE5A4 3C020200 */ lui $v0, %hi(D_020059E0) ## $v0 = 02000000 -/* 00978 809FE5A8 244259E0 */ addiu $v0, $v0, %lo(D_020059E0) ## $v0 = 020059E0 -/* 0097C 809FE5AC 00027900 */ sll $t7, $v0, 4 -/* 00980 809FE5B0 000FC702 */ srl $t8, $t7, 28 -/* 00984 809FE5B4 0018C880 */ sll $t9, $t8, 2 -/* 00988 809FE5B8 3C088016 */ lui $t0, %hi(gSegments) -/* 0098C 809FE5BC 01194021 */ addu $t0, $t0, $t9 -/* 00990 809FE5C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00994 809FE5C4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 00998 809FE5C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0099C 809FE5CC 00414824 */ and $t1, $v0, $at -/* 009A0 809FE5D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 009A4 809FE5D4 01095021 */ addu $t2, $t0, $t1 -/* 009A8 809FE5D8 01415821 */ addu $t3, $t2, $at -/* 009AC 809FE5DC AE0B1D68 */ sw $t3, 0x1D68($s0) ## 00001D68 -/* 009B0 809FE5E0 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 009B4 809FE5E4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 009B8 809FE5E8 A02CFA74 */ sb $t4, %lo(gSaveContext+0x1414)($at) -/* 009BC 809FE5EC 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 -/* 009C0 809FE5F0 A62001E8 */ sh $zero, 0x01E8($s1) ## 000001E8 -/* 009C4 809FE5F4 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 -/* 009C8 809FE5F8 0C27F70C */ jal func_809FDC30 -/* 009CC 809FE5FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009D0 809FE600 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009D4 809FE604 00300821 */ addu $at, $at, $s0 -/* 009D8 809FE608 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 009DC 809FE60C 10000005 */ beq $zero, $zero, .L809FE624 -/* 009E0 809FE610 A42D04C6 */ sh $t5, 0x04C6($at) ## 000104C6 -.L809FE614: -/* 009E4 809FE614 8C6E0680 */ lw $t6, 0x0680($v1) ## 00000680 -/* 009E8 809FE618 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 009EC 809FE61C 01C17825 */ or $t7, $t6, $at ## $t7 = 00800000 -/* 009F0 809FE620 AC6F0680 */ sw $t7, 0x0680($v1) ## 00000680 -.L809FE624: -/* 009F4 809FE624 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FE628: -/* 009F8 809FE628 8FB0001C */ lw $s0, 0x001C($sp) -/* 009FC 809FE62C 8FB10020 */ lw $s1, 0x0020($sp) -/* 00A00 809FE630 03E00008 */ jr $ra -/* 00A04 809FE634 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s deleted file mode 100644 index 736f3c18e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809FE638 -/* 00A08 809FE638 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A0C 809FE63C AFBF001C */ sw $ra, 0x001C($sp) -/* 00A10 809FE640 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A14 809FE644 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A18 809FE648 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00A1C 809FE64C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00A20 809FE650 24050D02 */ addiu $a1, $zero, 0x0D02 ## $a1 = 00000D02 -/* 00A24 809FE654 8C6F067C */ lw $t7, 0x067C($v1) ## 0000067C -/* 00A28 809FE658 8FA70028 */ lw $a3, 0x0028($sp) -/* 00A2C 809FE65C 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00A30 809FE660 000FC080 */ sll $t8, $t7, 2 -/* 00A34 809FE664 07020016 */ bltzl $t8, .L809FE6C0 -/* 00A38 809FE668 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A3C 809FE66C AFA00010 */ sw $zero, 0x0010($sp) -/* 00A40 809FE670 0C02003E */ jal func_800800F8 -/* 00A44 809FE674 AFA30024 */ sw $v1, 0x0024($sp) -/* 00A48 809FE678 8FB90028 */ lw $t9, 0x0028($sp) -/* 00A4C 809FE67C 8FA30024 */ lw $v1, 0x0024($sp) -/* 00A50 809FE680 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 00A54 809FE684 87220032 */ lh $v0, 0x0032($t9) ## 00000032 -/* 00A58 809FE688 24427FFF */ addiu $v0, $v0, 0x7FFF ## $v0 = 00007FFF -/* 00A5C 809FE68C 00021400 */ sll $v0, $v0, 16 -/* 00A60 809FE690 00021403 */ sra $v0, $v0, 16 -/* 00A64 809FE694 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -/* 00A68 809FE698 0C03D719 */ jal func_800F5C64 -/* 00A6C 809FE69C A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 00A70 809FE6A0 3C0580A0 */ lui $a1, %hi(func_809FE6CC) ## $a1 = 80A00000 -/* 00A74 809FE6A4 24A5E6CC */ addiu $a1, $a1, %lo(func_809FE6CC) ## $a1 = 809FE6CC -/* 00A78 809FE6A8 0C27F70C */ jal func_809FDC30 -/* 00A7C 809FE6AC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A80 809FE6B0 8FA90028 */ lw $t1, 0x0028($sp) -/* 00A84 809FE6B4 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 00A88 809FE6B8 A52801E2 */ sh $t0, 0x01E2($t1) ## 000001E2 -/* 00A8C 809FE6BC 8FBF001C */ lw $ra, 0x001C($sp) -.L809FE6C0: -/* 00A90 809FE6C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A94 809FE6C4 03E00008 */ jr $ra -/* 00A98 809FE6C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s deleted file mode 100644 index d677ddd43c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809FE6CC -/* 00A9C 809FE6CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA0 809FE6D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AA4 809FE6D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AA8 809FE6D8 848201E2 */ lh $v0, 0x01E2($a0) ## 000001E2 -/* 00AAC 809FE6DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00AB0 809FE6E0 240F3039 */ addiu $t7, $zero, 0x3039 ## $t7 = 00003039 -/* 00AB4 809FE6E4 14400003 */ bne $v0, $zero, .L809FE6F4 -/* 00AB8 809FE6E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00ABC 809FE6EC 10000003 */ beq $zero, $zero, .L809FE6FC -/* 00AC0 809FE6F0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809FE6F4: -/* 00AC4 809FE6F4 A4EE01E2 */ sh $t6, 0x01E2($a3) ## 000001E2 -/* 00AC8 809FE6F8 84E301E2 */ lh $v1, 0x01E2($a3) ## 000001E2 -.L809FE6FC: -/* 00ACC 809FE6FC 1460000C */ bne $v1, $zero, .L809FE730 -/* 00AD0 809FE700 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 00003039 -/* 00AD4 809FE704 A4EF010E */ sh $t7, 0x010E($a3) ## 0000010E -/* 00AD8 809FE708 AFA70018 */ sw $a3, 0x0018($sp) -/* 00ADC 809FE70C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AE0 809FE710 0C042DA0 */ jal func_8010B680 -/* 00AE4 809FE714 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00AE8 809FE718 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AEC 809FE71C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00AF0 809FE720 3C0580A0 */ lui $a1, %hi(func_809FE740) ## $a1 = 80A00000 -/* 00AF4 809FE724 24A5E740 */ addiu $a1, $a1, %lo(func_809FE740) ## $a1 = 809FE740 -/* 00AF8 809FE728 0C27F70C */ jal func_809FDC30 -/* 00AFC 809FE72C A49801F4 */ sh $t8, 0x01F4($a0) ## 000001F4 -.L809FE730: -/* 00B00 809FE730 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B04 809FE734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B08 809FE738 03E00008 */ jr $ra -/* 00B0C 809FE73C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s deleted file mode 100644 index 2150ba21b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809FE740 -/* 00B10 809FE740 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B14 809FE744 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B18 809FE748 848E01F4 */ lh $t6, 0x01F4($a0) ## 000001F4 -/* 00B1C 809FE74C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00B20 809FE750 55C0000E */ bnel $t6, $zero, .L809FE78C -/* 00B24 809FE754 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B28 809FE758 84AF07A0 */ lh $t7, 0x07A0($a1) ## 000007A0 -/* 00B2C 809FE75C 000FC080 */ sll $t8, $t7, 2 -/* 00B30 809FE760 00B8C821 */ addu $t9, $a1, $t8 -/* 00B34 809FE764 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 00B38 809FE768 0C016C69 */ jal func_8005B1A4 -/* 00B3C 809FE76C AFA60018 */ sw $a2, 0x0018($sp) -/* 00B40 809FE770 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B44 809FE774 2408005A */ addiu $t0, $zero, 0x005A ## $t0 = 0000005A -/* 00B48 809FE778 3C0580A0 */ lui $a1, %hi(func_809FE798) ## $a1 = 80A00000 -/* 00B4C 809FE77C 24A5E798 */ addiu $a1, $a1, %lo(func_809FE798) ## $a1 = 809FE798 -/* 00B50 809FE780 0C27F70C */ jal func_809FDC30 -/* 00B54 809FE784 A48801E2 */ sh $t0, 0x01E2($a0) ## 000001E2 -/* 00B58 809FE788 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FE78C: -/* 00B5C 809FE78C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B60 809FE790 03E00008 */ jr $ra -/* 00B64 809FE794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s deleted file mode 100644 index 773da5fc05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_809FE798 -/* 00B68 809FE798 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B6C 809FE79C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B70 809FE7A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B74 809FE7A4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00B78 809FE7A8 848301E2 */ lh $v1, 0x01E2($a0) ## 000001E2 -/* 00B7C 809FE7AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B80 809FE7B0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B84 809FE7B4 14600003 */ bne $v1, $zero, .L809FE7C4 -/* 00B88 809FE7B8 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00B8C 809FE7BC 10000004 */ beq $zero, $zero, .L809FE7D0 -/* 00B90 809FE7C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FE7C4: -/* 00B94 809FE7C4 A60E01E2 */ sh $t6, 0x01E2($s0) ## 000001E2 -/* 00B98 809FE7C8 860301E2 */ lh $v1, 0x01E2($s0) ## 000001E2 -/* 00B9C 809FE7CC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L809FE7D0: -/* 00BA0 809FE7D0 10400023 */ beq $v0, $zero, .L809FE860 -/* 00BA4 809FE7D4 00000000 */ nop -/* 00BA8 809FE7D8 10610016 */ beq $v1, $at, .L809FE834 -/* 00BAC 809FE7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB0 809FE7E0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00BB4 809FE7E4 1061000F */ beq $v1, $at, .L809FE824 -/* 00BB8 809FE7E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BBC 809FE7EC 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 00BC0 809FE7F0 10610008 */ beq $v1, $at, .L809FE814 -/* 00BC4 809FE7F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC8 809FE7F8 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 00BCC 809FE7FC 14610010 */ bne $v1, $at, .L809FE840 -/* 00BD0 809FE800 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD4 809FE804 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BD8 809FE808 240528A9 */ addiu $a1, $zero, 0x28A9 ## $a1 = 000028A9 -/* 00BDC 809FE80C 1000000C */ beq $zero, $zero, .L809FE840 -/* 00BE0 809FE810 860301E2 */ lh $v1, 0x01E2($s0) ## 000001E2 -.L809FE814: -/* 00BE4 809FE814 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BE8 809FE818 24052814 */ addiu $a1, $zero, 0x2814 ## $a1 = 00002814 -/* 00BEC 809FE81C 10000008 */ beq $zero, $zero, .L809FE840 -/* 00BF0 809FE820 860301E2 */ lh $v1, 0x01E2($s0) ## 000001E2 -.L809FE824: -/* 00BF4 809FE824 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BF8 809FE828 2405281C */ addiu $a1, $zero, 0x281C ## $a1 = 0000281C -/* 00BFC 809FE82C 10000004 */ beq $zero, $zero, .L809FE840 -/* 00C00 809FE830 860301E2 */ lh $v1, 0x01E2($s0) ## 000001E2 -.L809FE834: -/* 00C04 809FE834 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C08 809FE838 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D -/* 00C0C 809FE83C 860301E2 */ lh $v1, 0x01E2($s0) ## 000001E2 -.L809FE840: -/* 00C10 809FE840 2861003D */ slti $at, $v1, 0x003D -/* 00C14 809FE844 1420000D */ bne $at, $zero, .L809FE87C -/* 00C18 809FE848 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C1C 809FE84C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00C20 809FE850 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00C24 809FE854 46062201 */ sub.s $f8, $f4, $f6 -/* 00C28 809FE858 10000008 */ beq $zero, $zero, .L809FE87C -/* 00C2C 809FE85C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -.L809FE860: -/* 00C30 809FE860 0C00B55C */ jal Actor_Kill - -/* 00C34 809FE864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 809FE868 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00C3C 809FE86C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00C40 809FE870 944F0F1A */ lhu $t7, 0x0F1A($v0) ## 8015F57A -/* 00C44 809FE874 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 -/* 00C48 809FE878 A4580F1A */ sh $t8, 0x0F1A($v0) ## 8015F57A -.L809FE87C: -/* 00C4C 809FE87C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C50 809FE880 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C54 809FE884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C58 809FE888 03E00008 */ jr $ra -/* 00C5C 809FE88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s deleted file mode 100644 index fa276c5a97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s +++ /dev/null @@ -1,172 +0,0 @@ -glabel func_809FE890 -/* 00C60 809FE890 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00C64 809FE894 3C0F80A0 */ lui $t7, %hi(D_809FF400) ## $t7 = 80A00000 -/* 00C68 809FE898 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C6C 809FE89C AFB10018 */ sw $s1, 0x0018($sp) -/* 00C70 809FE8A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 00C74 809FE8A4 25EFF400 */ addiu $t7, $t7, %lo(D_809FF400) ## $t7 = 809FF400 -/* 00C78 809FE8A8 8DF90000 */ lw $t9, 0x0000($t7) ## 809FF400 -/* 00C7C 809FE8AC 27AE0030 */ addiu $t6, $sp, 0x0030 ## $t6 = FFFFFFD8 -/* 00C80 809FE8B0 8DF80004 */ lw $t8, 0x0004($t7) ## 809FF404 -/* 00C84 809FE8B4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFD8 -/* 00C88 809FE8B8 8DF90008 */ lw $t9, 0x0008($t7) ## 809FF408 -/* 00C8C 809FE8BC ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFDC -/* 00C90 809FE8C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C94 809FE8C4 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFE0 -/* 00C98 809FE8C8 90A81D6C */ lbu $t0, 0x1D6C($a1) ## 00001D6C -/* 00C9C 809FE8CC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00CA0 809FE8D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00CA4 809FE8D4 15000009 */ bne $t0, $zero, .L809FE8FC -/* 00CA8 809FE8D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00CAC 809FE8DC 0C00B7D5 */ jal func_8002DF54 -/* 00CB0 809FE8E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00CB4 809FE8E4 3C0580A0 */ lui $a1, %hi(func_809FEB08) ## $a1 = 80A00000 -/* 00CB8 809FE8E8 24A5EB08 */ addiu $a1, $a1, %lo(func_809FEB08) ## $a1 = 809FEB08 -/* 00CBC 809FE8EC 0C27F70C */ jal func_809FDC30 -/* 00CC0 809FE8F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CC4 809FE8F4 10000080 */ beq $zero, $zero, .L809FEAF8 -/* 00CC8 809FE8F8 8FBF001C */ lw $ra, 0x001C($sp) -.L809FE8FC: -/* 00CCC 809FE8FC 8CF11D94 */ lw $s1, 0x1D94($a3) ## 00001D94 -/* 00CD0 809FE900 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFF0 -/* 00CD4 809FE904 1220007B */ beq $s1, $zero, .L809FEAF4 -/* 00CD8 809FE908 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CDC 809FE90C 0C27F7F0 */ jal func_809FDFC0 -/* 00CE0 809FE910 AFA7005C */ sw $a3, 0x005C($sp) -/* 00CE4 809FE914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CE8 809FE918 0C27F800 */ jal func_809FE000 -/* 00CEC 809FE91C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFE4 -/* 00CF0 809FE920 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -/* 00CF4 809FE924 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CF8 809FE928 5440000C */ bnel $v0, $zero, .L809FE95C -/* 00CFC 809FE92C 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -/* 00D00 809FE930 0C27F7F0 */ jal func_809FDFC0 -/* 00D04 809FE934 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFF0 -/* 00D08 809FE938 27A90048 */ addiu $t1, $sp, 0x0048 ## $t1 = FFFFFFF0 -/* 00D0C 809FE93C 8D2B0000 */ lw $t3, 0x0000($t1) ## FFFFFFF0 -/* 00D10 809FE940 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -/* 00D14 809FE944 AE0B0024 */ sw $t3, 0x0024($s0) ## 00000024 -/* 00D18 809FE948 8D2A0004 */ lw $t2, 0x0004($t1) ## FFFFFFF4 -/* 00D1C 809FE94C AE0A0028 */ sw $t2, 0x0028($s0) ## 00000028 -/* 00D20 809FE950 8D2B0008 */ lw $t3, 0x0008($t1) ## FFFFFFF8 -/* 00D24 809FE954 AE0B002C */ sw $t3, 0x002C($s0) ## 0000002C -/* 00D28 809FE958 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -.L809FE95C: -/* 00D2C 809FE95C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D30 809FE960 50620029 */ beql $v1, $v0, .L809FEA08 -/* 00D34 809FE964 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00D38 809FE968 14610006 */ bne $v1, $at, .L809FE984 -/* 00D3C 809FE96C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D40 809FE970 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00D44 809FE974 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00D48 809FE978 0C00D3B0 */ jal func_80034EC0 -/* 00D4C 809FE97C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D50 809FE980 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -.L809FE984: -/* 00D54 809FE984 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00D58 809FE988 10610003 */ beq $v1, $at, .L809FE998 -/* 00D5C 809FE98C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D60 809FE990 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00D64 809FE994 14610006 */ bne $v1, $at, .L809FE9B0 -.L809FE998: -/* 00D68 809FE998 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00D6C 809FE99C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -/* 00D70 809FE9A0 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00D74 809FE9A4 0C00D3B0 */ jal func_80034EC0 -/* 00D78 809FE9A8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00D7C 809FE9AC 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -.L809FE9B0: -/* 00D80 809FE9B0 A60301EA */ sh $v1, 0x01EA($s0) ## 000001EA -/* 00D84 809FE9B4 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -/* 00D88 809FE9B8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00D8C 809FE9BC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00D90 809FE9C0 14410007 */ bne $v0, $at, .L809FE9E0 -/* 00D94 809FE9C4 240C000B */ addiu $t4, $zero, 0x000B ## $t4 = 0000000B -/* 00D98 809FE9C8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00D9C 809FE9CC A60C01F2 */ sh $t4, 0x01F2($s0) ## 000001F2 -/* 00DA0 809FE9D0 A20301EC */ sb $v1, 0x01EC($s0) ## 000001EC -/* 00DA4 809FE9D4 A20301ED */ sb $v1, 0x01ED($s0) ## 000001ED -/* 00DA8 809FE9D8 A20D01EE */ sb $t5, 0x01EE($s0) ## 000001EE -/* 00DAC 809FE9DC 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -.L809FE9E0: -/* 00DB0 809FE9E0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00DB4 809FE9E4 14410007 */ bne $v0, $at, .L809FEA04 -/* 00DB8 809FE9E8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 00DBC 809FE9EC 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00DC0 809FE9F0 A60E01F2 */ sh $t6, 0x01F2($s0) ## 000001F2 -/* 00DC4 809FE9F4 A20301EC */ sb $v1, 0x01EC($s0) ## 000001EC -/* 00DC8 809FE9F8 A20301ED */ sb $v1, 0x01ED($s0) ## 000001ED -/* 00DCC 809FE9FC A20001EE */ sb $zero, 0x01EE($s0) ## 000001EE -/* 00DD0 809FEA00 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -.L809FEA04: -/* 00DD4 809FEA04 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L809FEA08: -/* 00DD8 809FEA08 54410005 */ bnel $v0, $at, .L809FEA20 -/* 00DDC 809FEA0C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00DE0 809FEA10 0C27F810 */ jal func_809FE040 -/* 00DE4 809FEA14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE8 809FEA18 860201EA */ lh $v0, 0x01EA($s0) ## 000001EA -/* 00DEC 809FEA1C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -.L809FEA20: -/* 00DF0 809FEA20 54410004 */ bnel $v0, $at, .L809FEA34 -/* 00DF4 809FEA24 962F0006 */ lhu $t7, 0x0006($s1) ## 00000006 -/* 00DF8 809FEA28 0C27F841 */ jal func_809FE104 -/* 00DFC 809FEA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 809FEA30 962F0006 */ lhu $t7, 0x0006($s1) ## 00000006 -.L809FEA34: -/* 00E04 809FEA34 27A80030 */ addiu $t0, $sp, 0x0030 ## $t0 = FFFFFFD8 -/* 00E08 809FEA38 A60F00B4 */ sh $t7, 0x00B4($s0) ## 000000B4 -/* 00E0C 809FEA3C 96380008 */ lhu $t8, 0x0008($s1) ## 00000008 -/* 00E10 809FEA40 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 00E14 809FEA44 9639000A */ lhu $t9, 0x000A($s1) ## 0000000A -/* 00E18 809FEA48 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 00E1C 809FEA4C 8D0A0000 */ lw $t2, 0x0000($t0) ## FFFFFFD8 -/* 00E20 809FEA50 AE0A005C */ sw $t2, 0x005C($s0) ## 0000005C -/* 00E24 809FEA54 8D090004 */ lw $t1, 0x0004($t0) ## FFFFFFDC -/* 00E28 809FEA58 AE090060 */ sw $t1, 0x0060($s0) ## 00000060 -/* 00E2C 809FEA5C 8D0A0008 */ lw $t2, 0x0008($t0) ## FFFFFFE0 -/* 00E30 809FEA60 AE0A0064 */ sw $t2, 0x0064($s0) ## 00000064 -/* 00E34 809FEA64 8FAB005C */ lw $t3, 0x005C($sp) -/* 00E38 809FEA68 96220004 */ lhu $v0, 0x0004($s1) ## 00000004 -/* 00E3C 809FEA6C 956C1D74 */ lhu $t4, 0x1D74($t3) ## 00001D74 -/* 00E40 809FEA70 0182082A */ slt $at, $t4, $v0 -/* 00E44 809FEA74 50200020 */ beql $at, $zero, .L809FEAF8 -/* 00E48 809FEA78 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E4C 809FEA7C 962D0002 */ lhu $t5, 0x0002($s1) ## 00000002 -/* 00E50 809FEA80 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 00E54 809FEA84 C7A80048 */ lwc1 $f8, 0x0048($sp) -/* 00E58 809FEA88 004D7023 */ subu $t6, $v0, $t5 -/* 00E5C 809FEA8C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00E60 809FEA90 46083281 */ sub.s $f10, $f6, $f8 -/* 00E64 809FEA94 C6020070 */ lwc1 $f2, 0x0070($s0) ## 00000070 -/* 00E68 809FEA98 46802020 */ cvt.s.w $f0, $f4 -/* 00E6C 809FEA9C 46005403 */ div.s $f16, $f10, $f0 -/* 00E70 809FEAA0 E610005C */ swc1 $f16, 0x005C($s0) ## 0000005C -/* 00E74 809FEAA4 C7A4004C */ lwc1 $f4, 0x004C($sp) -/* 00E78 809FEAA8 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 00E7C 809FEAAC C610006C */ lwc1 $f16, 0x006C($s0) ## 0000006C -/* 00E80 809FEAB0 46049181 */ sub.s $f6, $f18, $f4 -/* 00E84 809FEAB4 46003203 */ div.s $f8, $f6, $f0 -/* 00E88 809FEAB8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 00E8C 809FEABC C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 00E90 809FEAC0 46105480 */ add.s $f18, $f10, $f16 -/* 00E94 809FEAC4 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 00E98 809FEAC8 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00E9C 809FEACC 4602203C */ c.lt.s $f4, $f2 -/* 00EA0 809FEAD0 00000000 */ nop -/* 00EA4 809FEAD4 45020003 */ bc1fl .L809FEAE4 -/* 00EA8 809FEAD8 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 00EAC 809FEADC E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 00EB0 809FEAE0 C7A60044 */ lwc1 $f6, 0x0044($sp) -.L809FEAE4: -/* 00EB4 809FEAE4 C7A80050 */ lwc1 $f8, 0x0050($sp) -/* 00EB8 809FEAE8 46083281 */ sub.s $f10, $f6, $f8 -/* 00EBC 809FEAEC 46005403 */ div.s $f16, $f10, $f0 -/* 00EC0 809FEAF0 E6100064 */ swc1 $f16, 0x0064($s0) ## 00000064 -.L809FEAF4: -/* 00EC4 809FEAF4 8FBF001C */ lw $ra, 0x001C($sp) -.L809FEAF8: -/* 00EC8 809FEAF8 8FB00014 */ lw $s0, 0x0014($sp) -/* 00ECC 809FEAFC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00ED0 809FEB00 03E00008 */ jr $ra -/* 00ED4 809FEB04 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s deleted file mode 100644 index 4a3fe52851..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_809FEB08 -/* 00ED8 809FEB08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EDC 809FEB0C AFB00018 */ sw $s0, 0x0018($sp) -/* 00EE0 809FEB10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EE4 809FEB14 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EE8 809FEB18 848F01E8 */ lh $t7, 0x01E8($a0) ## 000001E8 -/* 00EEC 809FEB1C 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00EF0 809FEB20 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EF4 809FEB24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EF8 809FEB28 A48E01F2 */ sh $t6, 0x01F2($a0) ## 000001F2 -/* 00EFC 809FEB2C A08001EC */ sb $zero, 0x01EC($a0) ## 000001EC -/* 00F00 809FEB30 A08001ED */ sb $zero, 0x01ED($a0) ## 000001ED -/* 00F04 809FEB34 15E10010 */ bne $t7, $at, .L809FEB78 -/* 00F08 809FEB38 A08001EE */ sb $zero, 0x01EE($a0) ## 000001EE -/* 00F0C 809FEB3C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F10 809FEB40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F14 809FEB44 0C00B7D5 */ jal func_8002DF54 -/* 00F18 809FEB48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00F1C 809FEB4C 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00F20 809FEB50 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00F24 809FEB54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F28 809FEB58 0C00D3B0 */ jal func_80034EC0 -/* 00F2C 809FEB5C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00F30 809FEB60 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 -/* 00F34 809FEB64 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 00F38 809FEB68 0C27F70C */ jal func_809FDC30 -/* 00F3C 809FEB6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F40 809FEB70 10000024 */ beq $zero, $zero, .L809FEC04 -/* 00F44 809FEB74 8FBF001C */ lw $ra, 0x001C($sp) -.L809FEB78: -/* 00F48 809FEB78 3C188016 */ lui $t8, %hi(gSaveContext+0xa0) -/* 00F4C 809FEB7C 3C198012 */ lui $t9, %hi(gUpgradeMasks+8) -/* 00F50 809FEB80 8F3971B8 */ lw $t9, %lo(gUpgradeMasks+8)($t9) -/* 00F54 809FEB84 8F18E700 */ lw $t8, %lo(gSaveContext+0xa0)($t8) -/* 00F58 809FEB88 3C098012 */ lui $t1, %hi(gUpgradeShifts+2) -/* 00F5C 809FEB8C 912971F6 */ lbu $t1, %lo(gUpgradeShifts+2)($t1) -/* 00F60 809FEB90 03194024 */ and $t0, $t8, $t9 -/* 00F64 809FEB94 240C301F */ addiu $t4, $zero, 0x301F ## $t4 = 0000301F -/* 00F68 809FEB98 01285007 */ srav $t2, $t0, $t1 -/* 00F6C 809FEB9C 1D400009 */ bgtz $t2, .L809FEBC4 -/* 00F70 809FEBA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F74 809FEBA4 240B301C */ addiu $t3, $zero, 0x301C ## $t3 = 0000301C -/* 00F78 809FEBA8 3C0580A0 */ lui $a1, %hi(func_809FEC14) ## $a1 = 80A00000 -/* 00F7C 809FEBAC A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 00F80 809FEBB0 24A5EC14 */ addiu $a1, $a1, %lo(func_809FEC14) ## $a1 = 809FEC14 -/* 00F84 809FEBB4 0C27F70C */ jal func_809FDC30 -/* 00F88 809FEBB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F8C 809FEBBC 10000006 */ beq $zero, $zero, .L809FEBD8 -/* 00F90 809FEBC0 8FA40024 */ lw $a0, 0x0024($sp) -.L809FEBC4: -/* 00F94 809FEBC4 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 -/* 00F98 809FEBC8 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 00F9C 809FEBCC 0C27F70C */ jal func_809FDC30 -/* 00FA0 809FEBD0 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 00FA4 809FEBD4 8FA40024 */ lw $a0, 0x0024($sp) -.L809FEBD8: -/* 00FA8 809FEBD8 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 00FAC 809FEBDC 0C042DA0 */ jal func_8010B680 -/* 00FB0 809FEBE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00FB4 809FEBE4 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 -/* 00FB8 809FEBE8 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00FBC 809FEBEC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00FC0 809FEBF0 0C00D3B0 */ jal func_80034EC0 -/* 00FC4 809FEBF4 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 00FC8 809FEBF8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00FCC 809FEBFC A60D01F4 */ sh $t5, 0x01F4($s0) ## 000001F4 -/* 00FD0 809FEC00 8FBF001C */ lw $ra, 0x001C($sp) -.L809FEC04: -/* 00FD4 809FEC04 8FB00018 */ lw $s0, 0x0018($sp) -/* 00FD8 809FEC08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FDC 809FEC0C 03E00008 */ jr $ra -/* 00FE0 809FEC10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s deleted file mode 100644 index 2ac8bad56d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FEC14 -/* 00FE4 809FEC14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FE8 809FEC18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FEC 809FEC1C AFA5001C */ sw $a1, 0x001C($sp) -/* 00FF0 809FEC20 848E01F4 */ lh $t6, 0x01F4($a0) ## 000001F4 -/* 00FF4 809FEC24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00FF8 809FEC28 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00FFC 809FEC2C 15C1000C */ bne $t6, $at, .L809FEC60 -/* 01000 809FEC30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01004 809FEC34 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 01008 809FEC38 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 0100C 809FEC3C 0C00B7D5 */ jal func_8002DF54 -/* 01010 809FEC40 AFA70018 */ sw $a3, 0x0018($sp) -/* 01014 809FEC44 3C0580A0 */ lui $a1, %hi(func_809FEC70) ## $a1 = 80A00000 -/* 01018 809FEC48 24A5EC70 */ addiu $a1, $a1, %lo(func_809FEC70) ## $a1 = 809FEC70 -/* 0101C 809FEC4C 0C27F70C */ jal func_809FDC30 -/* 01020 809FEC50 8FA40018 */ lw $a0, 0x0018($sp) -/* 01024 809FEC54 8FA40018 */ lw $a0, 0x0018($sp) -/* 01028 809FEC58 0C27FB1C */ jal func_809FEC70 -/* 0102C 809FEC5C 8FA5001C */ lw $a1, 0x001C($sp) -.L809FEC60: -/* 01030 809FEC60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01034 809FEC64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01038 809FEC68 03E00008 */ jr $ra -/* 0103C 809FEC6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s deleted file mode 100644 index 258c6ea77d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809FEC70 -/* 01040 809FEC70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01044 809FEC74 AFBF001C */ sw $ra, 0x001C($sp) -/* 01048 809FEC78 AFA50024 */ sw $a1, 0x0024($sp) -/* 0104C 809FEC7C 0C00BD04 */ jal Actor_HasParent -/* 01050 809FEC80 AFA40020 */ sw $a0, 0x0020($sp) -/* 01054 809FEC84 10400007 */ beq $v0, $zero, .L809FECA4 -/* 01058 809FEC88 8FA40020 */ lw $a0, 0x0020($sp) -/* 0105C 809FEC8C 3C0580A0 */ lui $a1, %hi(func_809FECE4) ## $a1 = 80A00000 -/* 01060 809FEC90 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 01064 809FEC94 0C27F70C */ jal func_809FDC30 -/* 01068 809FEC98 24A5ECE4 */ addiu $a1, $a1, %lo(func_809FECE4) ## $a1 = 809FECE4 -/* 0106C 809FEC9C 1000000E */ beq $zero, $zero, .L809FECD8 -/* 01070 809FECA0 8FBF001C */ lw $ra, 0x001C($sp) -.L809FECA4: -/* 01074 809FECA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01078 809FECA8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0107C 809FECAC C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 01080 809FECB0 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 01084 809FECB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01088 809FECB8 460C2080 */ add.s $f2, $f4, $f12 -/* 0108C 809FECBC 24060054 */ addiu $a2, $zero, 0x0054 ## $a2 = 00000054 -/* 01090 809FECC0 46000005 */ abs.s $f0, $f0 -/* 01094 809FECC4 44071000 */ mfc1 $a3, $f2 -/* 01098 809FECC8 460C0180 */ add.s $f6, $f0, $f12 -/* 0109C 809FECCC 0C00BD0D */ jal func_8002F434 -/* 010A0 809FECD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010A4 809FECD4 8FBF001C */ lw $ra, 0x001C($sp) -.L809FECD8: -/* 010A8 809FECD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 809FECDC 03E00008 */ jr $ra -/* 010B0 809FECE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s deleted file mode 100644 index 57054716ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_809FECE4 -/* 010B4 809FECE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B8 809FECE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010BC 809FECEC AFA5001C */ sw $a1, 0x001C($sp) -/* 010C0 809FECF0 848E01F4 */ lh $t6, 0x01F4($a0) ## 000001F4 -/* 010C4 809FECF4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 010C8 809FECF8 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 -/* 010CC 809FECFC 15C10003 */ bne $t6, $at, .L809FED0C -/* 010D0 809FED00 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 010D4 809FED04 0C27F70C */ jal func_809FDC30 -/* 010D8 809FED08 A48001F4 */ sh $zero, 0x01F4($a0) ## 000001F4 -.L809FED0C: -/* 010DC 809FED0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010E0 809FED10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010E4 809FED14 03E00008 */ jr $ra -/* 010E8 809FED18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s deleted file mode 100644 index 2186238a48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s +++ /dev/null @@ -1,110 +0,0 @@ -.late_rodata -glabel D_809FF488 - .float 3.14159274101 - -glabel D_809FF48C - .float 3.14159274101 - -glabel D_809FF490 - .float 3.14159274101 - -glabel D_809FF494 - .float 3.14159274101 - -.text -glabel func_809FEEA4 -/* 01274 809FEEA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01278 809FEEA8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0127C 809FEEAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01280 809FEEB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 01284 809FEEB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01288 809FEEB8 AFA60030 */ sw $a2, 0x0030($sp) -/* 0128C 809FEEBC 14A1002D */ bne $a1, $at, .L809FEF74 -/* 01290 809FEEC0 AFA70034 */ sw $a3, 0x0034($sp) -/* 01294 809FEEC4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01298 809FEEC8 3C014516 */ lui $at, 0x4516 ## $at = 45160000 -/* 0129C 809FEECC 44816000 */ mtc1 $at, $f12 ## $f12 = 2400.00 -/* 012A0 809FEED0 44067000 */ mfc1 $a2, $f14 -/* 012A4 809FEED4 0C034261 */ jal Matrix_Translate -/* 012A8 809FEED8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 809FEEDC 8FB8003C */ lw $t8, 0x003C($sp) -/* 012B0 809FEEE0 27AF001C */ addiu $t7, $sp, 0x001C ## $t7 = FFFFFFF4 -/* 012B4 809FEEE4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 012B8 809FEEE8 8B0801FC */ lwl $t0, 0x01FC($t8) ## 000001FC -/* 012BC 809FEEEC 9B0801FF */ lwr $t0, 0x01FF($t8) ## 000001FF -/* 012C0 809FEEF0 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 012C4 809FEEF4 3C0180A0 */ lui $at, %hi(D_809FF488) ## $at = 80A00000 -/* 012C8 809FEEF8 ADE80000 */ sw $t0, 0x0000($t7) ## FFFFFFF4 -/* 012CC 809FEEFC 97080200 */ lhu $t0, 0x0200($t8) ## 00000200 -/* 012D0 809FEF00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012D4 809FEF04 A5E80004 */ sh $t0, 0x0004($t7) ## FFFFFFF8 -/* 012D8 809FEF08 87A9001E */ lh $t1, 0x001E($sp) -/* 012DC 809FEF0C C430F488 */ lwc1 $f16, %lo(D_809FF488)($at) -/* 012E0 809FEF10 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 012E4 809FEF14 00000000 */ nop -/* 012E8 809FEF18 468021A0 */ cvt.s.w $f6, $f4 -/* 012EC 809FEF1C 46083283 */ div.s $f10, $f6, $f8 -/* 012F0 809FEF20 46105302 */ mul.s $f12, $f10, $f16 -/* 012F4 809FEF24 0C0342DC */ jal Matrix_RotateX -/* 012F8 809FEF28 00000000 */ nop -/* 012FC 809FEF2C 87AA001C */ lh $t2, 0x001C($sp) -/* 01300 809FEF30 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01304 809FEF34 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 01308 809FEF38 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 0130C 809FEF3C 3C0180A0 */ lui $at, %hi(D_809FF48C) ## $at = 80A00000 -/* 01310 809FEF40 C42AF48C */ lwc1 $f10, %lo(D_809FF48C)($at) -/* 01314 809FEF44 46809120 */ cvt.s.w $f4, $f18 -/* 01318 809FEF48 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0131C 809FEF4C 46062203 */ div.s $f8, $f4, $f6 -/* 01320 809FEF50 460A4302 */ mul.s $f12, $f8, $f10 -/* 01324 809FEF54 0C0343B5 */ jal Matrix_RotateZ -/* 01328 809FEF58 00000000 */ nop -/* 0132C 809FEF5C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01330 809FEF60 3C01C516 */ lui $at, 0xC516 ## $at = C5160000 -/* 01334 809FEF64 44816000 */ mtc1 $at, $f12 ## $f12 = -2400.00 -/* 01338 809FEF68 44067000 */ mfc1 $a2, $f14 -/* 0133C 809FEF6C 0C034261 */ jal Matrix_Translate -/* 01340 809FEF70 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L809FEF74: -/* 01344 809FEF74 8FAB002C */ lw $t3, 0x002C($sp) -/* 01348 809FEF78 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0134C 809FEF7C 8FAD003C */ lw $t5, 0x003C($sp) -/* 01350 809FEF80 55610021 */ bnel $t3, $at, .L809FF008 -/* 01354 809FEF84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01358 809FEF88 89AF0202 */ lwl $t7, 0x0202($t5) ## 00000202 -/* 0135C 809FEF8C 99AF0205 */ lwr $t7, 0x0205($t5) ## 00000205 -/* 01360 809FEF90 27AC001C */ addiu $t4, $sp, 0x001C ## $t4 = FFFFFFF4 -/* 01364 809FEF94 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01368 809FEF98 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFF4 -/* 0136C 809FEF9C 95AF0206 */ lhu $t7, 0x0206($t5) ## 00000206 -/* 01370 809FEFA0 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 01374 809FEFA4 3C0180A0 */ lui $at, %hi(D_809FF490) ## $at = 80A00000 -/* 01378 809FEFA8 A58F0004 */ sh $t7, 0x0004($t4) ## FFFFFFF8 -/* 0137C 809FEFAC 87B8001E */ lh $t8, 0x001E($sp) -/* 01380 809FEFB0 C428F490 */ lwc1 $f8, %lo(D_809FF490)($at) -/* 01384 809FEFB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01388 809FEFB8 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0138C 809FEFBC 00000000 */ nop -/* 01390 809FEFC0 468084A0 */ cvt.s.w $f18, $f16 -/* 01394 809FEFC4 46049183 */ div.s $f6, $f18, $f4 -/* 01398 809FEFC8 46083302 */ mul.s $f12, $f6, $f8 -/* 0139C 809FEFCC 0C034348 */ jal Matrix_RotateY -/* 013A0 809FEFD0 00000000 */ nop -/* 013A4 809FEFD4 87B9001C */ lh $t9, 0x001C($sp) -/* 013A8 809FEFD8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 013AC 809FEFDC 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 013B0 809FEFE0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 013B4 809FEFE4 3C0180A0 */ lui $at, %hi(D_809FF494) ## $at = 80A00000 -/* 013B8 809FEFE8 C426F494 */ lwc1 $f6, %lo(D_809FF494)($at) -/* 013BC 809FEFEC 46805420 */ cvt.s.w $f16, $f10 -/* 013C0 809FEFF0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 013C4 809FEFF4 46128103 */ div.s $f4, $f16, $f18 -/* 013C8 809FEFF8 46062302 */ mul.s $f12, $f4, $f6 -/* 013CC 809FEFFC 0C0342DC */ jal Matrix_RotateX -/* 013D0 809FF000 00000000 */ nop -/* 013D4 809FF004 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FF008: -/* 013D8 809FF008 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013DC 809FF00C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 013E0 809FF010 03E00008 */ jr $ra -/* 013E4 809FF014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s deleted file mode 100644 index e70e7d1efa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FF018 -/* 013E8 809FF018 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013EC 809FF01C 3C0E80A0 */ lui $t6, %hi(D_809FF40C) ## $t6 = 80A00000 -/* 013F0 809FF020 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013F4 809FF024 AFA40028 */ sw $a0, 0x0028($sp) -/* 013F8 809FF028 AFA60030 */ sw $a2, 0x0030($sp) -/* 013FC 809FF02C AFA70034 */ sw $a3, 0x0034($sp) -/* 01400 809FF030 25CEF40C */ addiu $t6, $t6, %lo(D_809FF40C) ## $t6 = 809FF40C -/* 01404 809FF034 8DD80000 */ lw $t8, 0x0000($t6) ## 809FF40C -/* 01408 809FF038 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 0140C 809FF03C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01410 809FF040 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 01414 809FF044 8DCF0004 */ lw $t7, 0x0004($t6) ## 809FF410 -/* 01418 809FF048 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 0141C 809FF04C 8DD80008 */ lw $t8, 0x0008($t6) ## 809FF414 -/* 01420 809FF050 14A10004 */ bne $a1, $at, .L809FF064 -/* 01424 809FF054 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 01428 809FF058 8FA50038 */ lw $a1, 0x0038($sp) -/* 0142C 809FF05C 0C0346BD */ jal Matrix_MultVec3f -/* 01430 809FF060 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L809FF064: -/* 01434 809FF064 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01438 809FF068 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0143C 809FF06C 03E00008 */ jr $ra -/* 01440 809FF070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s deleted file mode 100644 index 1f0b4f21fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel EnFz_Destroy -/* 0017C 80A1FF3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00180 80A1FF40 AFA40018 */ sw $a0, 0x0018($sp) -/* 00184 80A1FF44 AFA5001C */ sw $a1, 0x001C($sp) -/* 00188 80A1FF48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0018C 80A1FF4C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00190 80A1FF50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00194 80A1FF54 0C0170EB */ jal Collider_DestroyCylinder - -/* 00198 80A1FF58 24A50150 */ addiu $a1, $a1, 0x0150 ## $a1 = 00000150 -/* 0019C 80A1FF5C 8FA50018 */ lw $a1, 0x0018($sp) -/* 001A0 80A1FF60 8FA4001C */ lw $a0, 0x001C($sp) -/* 001A4 80A1FF64 0C0170EB */ jal Collider_DestroyCylinder - -/* 001A8 80A1FF68 24A5019C */ addiu $a1, $a1, 0x019C ## $a1 = 0000019C -/* 001AC 80A1FF6C 8FA50018 */ lw $a1, 0x0018($sp) -/* 001B0 80A1FF70 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B4 80A1FF74 0C0170EB */ jal Collider_DestroyCylinder - -/* 001B8 80A1FF78 24A501E8 */ addiu $a1, $a1, 0x01E8 ## $a1 = 000001E8 -/* 001BC 80A1FF7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C0 80A1FF80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C4 80A1FF84 03E00008 */ jr $ra -/* 001C8 80A1FF88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s deleted file mode 100644 index c6f8b0a8ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s +++ /dev/null @@ -1,149 +0,0 @@ -.rdata -glabel D_80A21C60 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21C70 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21C80 - .asciz "../z_en_fz.c" - .balign 4 - -.text -glabel EnFz_Draw -/* 0148C 80A2124C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01490 80A21250 AFBF003C */ sw $ra, 0x003C($sp) -/* 01494 80A21254 AFB10038 */ sw $s1, 0x0038($sp) -/* 01498 80A21258 AFB00034 */ sw $s0, 0x0034($sp) -/* 0149C 80A2125C AFA40080 */ sw $a0, 0x0080($sp) -/* 014A0 80A21260 908F00AF */ lbu $t7, 0x00AF($a0) ## 000000AF -/* 014A4 80A21264 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 014A8 80A21268 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 014AC 80A2126C 030FC823 */ subu $t9, $t8, $t7 -/* 014B0 80A21270 00194843 */ sra $t1, $t9, 1 -/* 014B4 80A21274 AFA90074 */ sw $t1, 0x0074($sp) -/* 014B8 80A21278 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 014BC 80A2127C 3C0680A2 */ lui $a2, %hi(D_80A21C60) ## $a2 = 80A20000 -/* 014C0 80A21280 24C61C60 */ addiu $a2, $a2, %lo(D_80A21C60) ## $a2 = 80A21C60 -/* 014C4 80A21284 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 014C8 80A21288 2407048F */ addiu $a3, $zero, 0x048F ## $a3 = 0000048F -/* 014CC 80A2128C 0C031AB1 */ jal Graph_OpenDisps -/* 014D0 80A21290 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 014D4 80A21294 8FAA0080 */ lw $t2, 0x0080($sp) -/* 014D8 80A21298 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 014DC 80A2129C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014E0 80A212A0 914B00AF */ lbu $t3, 0x00AF($t2) ## 000000AF -/* 014E4 80A212A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 014E8 80A212A8 55600003 */ bnel $t3, $zero, .L80A212B8 -/* 014EC 80A212AC 8FAD0080 */ lw $t5, 0x0080($sp) -/* 014F0 80A212B0 AFAC0074 */ sw $t4, 0x0074($sp) -/* 014F4 80A212B4 8FAD0080 */ lw $t5, 0x0080($sp) -.L80A212B8: -/* 014F8 80A212B8 91AE0261 */ lbu $t6, 0x0261($t5) ## 00000261 -/* 014FC 80A212BC 11C00059 */ beq $t6, $zero, .L80A21424 -/* 01500 80A212C0 00000000 */ nop -/* 01504 80A212C4 0C00BB60 */ jal func_8002ED80 -/* 01508 80A212C8 01A02025 */ or $a0, $t5, $zero ## $a0 = 00000000 -/* 0150C 80A212CC 0C024F61 */ jal func_80093D84 -/* 01510 80A212D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01514 80A212D4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01518 80A212D8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0151C 80A212DC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01520 80A212E0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01524 80A212E4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01528 80A212E8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0152C 80A212EC 8E23009C */ lw $v1, 0x009C($s1) ## 0000009C -/* 01530 80A212F0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01534 80A212F4 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 01538 80A212F8 00035840 */ sll $t3, $v1, 1 -/* 0153C 80A212FC 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 01540 80A21300 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 01544 80A21304 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01548 80A21308 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 0154C 80A2130C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 01550 80A21310 AFAD0028 */ sw $t5, 0x0028($sp) -/* 01554 80A21314 AFAE0024 */ sw $t6, 0x0024($sp) -/* 01558 80A21318 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0155C 80A2131C AFA90014 */ sw $t1, 0x0014($sp) -/* 01560 80A21320 AFAC0020 */ sw $t4, 0x0020($sp) -/* 01564 80A21324 AFB90010 */ sw $t9, 0x0010($sp) -/* 01568 80A21328 AFA0001C */ sw $zero, 0x001C($sp) -/* 0156C 80A2132C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01570 80A21330 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01574 80A21334 AFA2005C */ sw $v0, 0x005C($sp) -/* 01578 80A21338 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0157C 80A2133C 3067007F */ andi $a3, $v1, 0x007F ## $a3 = 00000000 -/* 01580 80A21340 8FA8005C */ lw $t0, 0x005C($sp) -/* 01584 80A21344 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 01588 80A21348 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 0158C 80A2134C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 01590 80A21350 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01594 80A21354 3C0580A2 */ lui $a1, %hi(D_80A21C70) ## $a1 = 80A20000 -/* 01598 80A21358 24A51C70 */ addiu $a1, $a1, %lo(D_80A21C70) ## $a1 = 80A21C70 -/* 0159C 80A2135C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 015A0 80A21360 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 015A4 80A21364 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 015A8 80A21368 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 015AC 80A2136C 2406049F */ addiu $a2, $zero, 0x049F ## $a2 = 0000049F -/* 015B0 80A21370 0C0346A2 */ jal Matrix_NewMtx -/* 015B4 80A21374 AFA20058 */ sw $v0, 0x0058($sp) -/* 015B8 80A21378 8FA30058 */ lw $v1, 0x0058($sp) -/* 015BC 80A2137C 3C09FC27 */ lui $t1, 0xFC27 ## $t1 = FC270000 -/* 015C0 80A21380 3C0A3514 */ lui $t2, 0x3514 ## $t2 = 35140000 -/* 015C4 80A21384 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 015C8 80A21388 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 015CC 80A2138C 354A937F */ ori $t2, $t2, 0x937F ## $t2 = 3514937F -/* 015D0 80A21390 35292660 */ ori $t1, $t1, 0x2660 ## $t1 = FC272660 -/* 015D4 80A21394 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 015D8 80A21398 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 015DC 80A2139C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 015E0 80A213A0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 015E4 80A213A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 015E8 80A213A8 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 015EC 80A213AC 3C0E9BFF */ lui $t6, 0x9BFF ## $t6 = 9BFF0000 -/* 015F0 80A213B0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 015F4 80A213B4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 015F8 80A213B8 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = 9BFFFFFF -/* 015FC 80A213BC 358C0080 */ ori $t4, $t4, 0x0080 ## $t4 = FA000080 -/* 01600 80A213C0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01604 80A213C4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01608 80A213C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0160C 80A213CC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 01610 80A213D0 3C01C8C8 */ lui $at, 0xC8C8 ## $at = C8C80000 -/* 01614 80A213D4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01618 80A213D8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 0161C 80A213DC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01620 80A213E0 8FAF0080 */ lw $t7, 0x0080($sp) -/* 01624 80A213E4 3421C800 */ ori $at, $at, 0xC800 ## $at = C8C8C800 -/* 01628 80A213E8 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0162C 80A213EC 8DF90258 */ lw $t9, 0x0258($t7) ## 00000258 -/* 01630 80A213F0 3C1880A2 */ lui $t8, %hi(D_80A21C50) ## $t8 = 80A20000 -/* 01634 80A213F4 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000008 -/* 01638 80A213F8 01215025 */ or $t2, $t1, $at ## $t2 = C8C8C808 -/* 0163C 80A213FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01640 80A21400 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01644 80A21404 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01648 80A21408 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0164C 80A2140C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01650 80A21410 8FAE0074 */ lw $t6, 0x0074($sp) -/* 01654 80A21414 000E6880 */ sll $t5, $t6, 2 -/* 01658 80A21418 030DC021 */ addu $t8, $t8, $t5 -/* 0165C 80A2141C 8F181C50 */ lw $t8, %lo(D_80A21C50)($t8) -/* 01660 80A21420 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L80A21424: -/* 01664 80A21424 3C0680A2 */ lui $a2, %hi(D_80A21C80) ## $a2 = 80A20000 -/* 01668 80A21428 24C61C80 */ addiu $a2, $a2, %lo(D_80A21C80) ## $a2 = 80A21C80 -/* 0166C 80A2142C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 01670 80A21430 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01674 80A21434 0C031AD5 */ jal Graph_CloseDisps -/* 01678 80A21438 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 -/* 0167C 80A2143C 8FA40080 */ lw $a0, 0x0080($sp) -/* 01680 80A21440 0C28862A */ jal func_80A218A8 -/* 01684 80A21444 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01688 80A21448 8FBF003C */ lw $ra, 0x003C($sp) -/* 0168C 80A2144C 8FB00034 */ lw $s0, 0x0034($sp) -/* 01690 80A21450 8FB10038 */ lw $s1, 0x0038($sp) -/* 01694 80A21454 03E00008 */ jr $ra -/* 01698 80A21458 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s deleted file mode 100644 index 6ee28655c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel EnFz_Init -/* 00000 80A1FDC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 80A1FDC4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00008 80A1FDC8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80A1FDCC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 80A1FDD0 AFB00014 */ sw $s0, 0x0014($sp) -/* 00014 80A1FDD4 3C0580A2 */ lui $a1, %hi(D_80A21C34) ## $a1 = 80A20000 -/* 00018 80A1FDD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80A1FDDC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80A1FDE0 24A51C34 */ addiu $a1, $a1, %lo(D_80A21C34) ## $a1 = 80A21C34 -/* 00024 80A1FDE4 3C0E80A2 */ lui $t6, %hi(D_80A21C14) ## $t6 = 80A20000 -/* 00028 80A1FDE8 25CE1C14 */ addiu $t6, $t6, %lo(D_80A21C14) ## $t6 = 80A21C14 -/* 0002C 80A1FDEC 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00030 80A1FDF0 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 00034 80A1FDF4 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF -/* 00038 80A1FDF8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0003C 80A1FDFC AFA50020 */ sw $a1, 0x0020($sp) -/* 00040 80A1FE00 0C0170D9 */ jal Collider_InitCylinder - -/* 00044 80A1FE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00048 80A1FE08 3C0780A2 */ lui $a3, %hi(D_80A21B90) ## $a3 = 80A20000 -/* 0004C 80A1FE0C 8FA50020 */ lw $a1, 0x0020($sp) -/* 00050 80A1FE10 24E71B90 */ addiu $a3, $a3, %lo(D_80A21B90) ## $a3 = 80A21B90 -/* 00054 80A1FE14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 80A1FE18 0C017114 */ jal Collider_SetCylinderType1 -/* 0005C 80A1FE1C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00060 80A1FE20 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C -/* 00064 80A1FE24 AFA50020 */ sw $a1, 0x0020($sp) -/* 00068 80A1FE28 0C0170D9 */ jal Collider_InitCylinder - -/* 0006C 80A1FE2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00070 80A1FE30 3C0780A2 */ lui $a3, %hi(D_80A21BBC) ## $a3 = 80A20000 -/* 00074 80A1FE34 8FA50020 */ lw $a1, 0x0020($sp) -/* 00078 80A1FE38 24E71BBC */ addiu $a3, $a3, %lo(D_80A21BBC) ## $a3 = 80A21BBC -/* 0007C 80A1FE3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00080 80A1FE40 0C017114 */ jal Collider_SetCylinderType1 -/* 00084 80A1FE44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00088 80A1FE48 260501E8 */ addiu $a1, $s0, 0x01E8 ## $a1 = 000001E8 -/* 0008C 80A1FE4C AFA50020 */ sw $a1, 0x0020($sp) -/* 00090 80A1FE50 0C0170D9 */ jal Collider_InitCylinder - -/* 00094 80A1FE54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00098 80A1FE58 3C0780A2 */ lui $a3, %hi(D_80A21BE8) ## $a3 = 80A20000 -/* 0009C 80A1FE5C 8FA50020 */ lw $a1, 0x0020($sp) -/* 000A0 80A1FE60 24E71BE8 */ addiu $a3, $a3, %lo(D_80A21BE8) ## $a3 = 80A21BE8 -/* 000A4 80A1FE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A8 80A1FE68 0C017114 */ jal Collider_SetCylinderType1 -/* 000AC 80A1FE6C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B0 80A1FE70 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 -/* 000B4 80A1FE74 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F -/* 000B8 80A1FE78 0C00B58B */ jal Actor_SetScale - -/* 000BC 80A1FE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 80A1FE80 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 000C4 80A1FE84 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000C8 80A1FE88 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000CC 80A1FE8C 0301C824 */ and $t9, $t8, $at -/* 000D0 80A1FE90 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 000D4 80A1FE94 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 000D8 80A1FE98 3C014307 */ lui $at, 0x4307 ## $at = 43070000 -/* 000DC 80A1FE9C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 000E0 80A1FEA0 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 000E4 80A1FEA4 44814000 */ mtc1 $at, $f8 ## $f8 = 135.00 -/* 000E8 80A1FEA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000EC 80A1FEAC 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 000F0 80A1FEB0 A20300AE */ sb $v1, 0x00AE($s0) ## 000000AE -/* 000F4 80A1FEB4 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 000F8 80A1FEB8 A6000242 */ sh $zero, 0x0242($s0) ## 00000242 -/* 000FC 80A1FEBC A2000249 */ sb $zero, 0x0249($s0) ## 00000249 -/* 00100 80A1FEC0 A2020246 */ sb $v0, 0x0246($s0) ## 00000246 -/* 00104 80A1FEC4 A2000247 */ sb $zero, 0x0247($s0) ## 00000247 -/* 00108 80A1FEC8 A2000248 */ sb $zero, 0x0248($s0) ## 00000248 -/* 0010C 80A1FECC A2020261 */ sb $v0, 0x0261($s0) ## 00000261 -/* 00110 80A1FED0 A2000262 */ sb $zero, 0x0262($s0) ## 00000262 -/* 00114 80A1FED4 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 00118 80A1FED8 E602006C */ swc1 $f2, 0x006C($s0) ## 0000006C -/* 0011C 80A1FEDC E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 00120 80A1FEE0 E6000238 */ swc1 $f0, 0x0238($s0) ## 00000238 -/* 00124 80A1FEE4 E600024C */ swc1 $f0, 0x024C($s0) ## 0000024C -/* 00128 80A1FEE8 E6040234 */ swc1 $f4, 0x0234($s0) ## 00000234 -/* 0012C 80A1FEEC E606023C */ swc1 $f6, 0x023C($s0) ## 0000023C -/* 00130 80A1FEF0 05010007 */ bgez $t0, .L80A1FF10 -/* 00134 80A1FEF4 E6080250 */ swc1 $f8, 0x0250($s0) ## 00000250 -/* 00138 80A1FEF8 AE000258 */ sw $zero, 0x0258($s0) ## 00000258 -/* 0013C 80A1FEFC E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 -/* 00140 80A1FF00 0C2881FD */ jal func_80A207F4 -/* 00144 80A1FF04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00148 80A1FF08 10000005 */ beq $zero, $zero, .L80A1FF20 -/* 0014C 80A1FF0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A1FF10: -/* 00150 80A1FF10 AE030258 */ sw $v1, 0x0258($s0) ## 00000258 -/* 00154 80A1FF14 0C2883A1 */ jal func_80A20E84 -/* 00158 80A1FF18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80A1FF1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A1FF20: -/* 00160 80A1FF20 0C287FE3 */ jal func_80A1FF8C -/* 00164 80A1FF24 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00168 80A1FF28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0016C 80A1FF2C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00170 80A1FF30 8FB10018 */ lw $s1, 0x0018($sp) -/* 00174 80A1FF34 03E00008 */ jr $ra -/* 00178 80A1FF38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s deleted file mode 100644 index 46ae6fae32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel EnFz_Update -/* 012FC 80A210BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01300 80A210C0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01304 80A210C4 AFB10020 */ sw $s1, 0x0020($sp) -/* 01308 80A210C8 AFB0001C */ sw $s0, 0x001C($sp) -/* 0130C 80A210CC 848E0240 */ lh $t6, 0x0240($a0) ## 00000240 -/* 01310 80A210D0 84820242 */ lh $v0, 0x0242($a0) ## 00000242 -/* 01314 80A210D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01318 80A210D8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0131C 80A210DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01320 80A210E0 10400003 */ beq $v0, $zero, .L80A210F0 -/* 01324 80A210E4 A48F0240 */ sh $t7, 0x0240($a0) ## 00000240 -/* 01328 80A210E8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0132C 80A210EC A4980242 */ sh $t8, 0x0242($a0) ## 00000242 -.L80A210F0: -/* 01330 80A210F0 86020244 */ lh $v0, 0x0244($s0) ## 00000244 -/* 01334 80A210F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01338 80A210F8 10400002 */ beq $v0, $zero, .L80A21104 -/* 0133C 80A210FC 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01340 80A21100 A6190244 */ sh $t9, 0x0244($s0) ## 00000244 -.L80A21104: -/* 01344 80A21104 92020263 */ lbu $v0, 0x0263($s0) ## 00000263 -/* 01348 80A21108 10400002 */ beq $v0, $zero, .L80A21114 -/* 0134C 80A2110C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 01350 80A21110 A2080263 */ sb $t0, 0x0263($s0) ## 00000263 -.L80A21114: -/* 01354 80A21114 0C00B56E */ jal Actor_SetFocus - -/* 01358 80A21118 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 0135C 80A2111C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01360 80A21120 0C288128 */ jal func_80A204A0 -/* 01364 80A21124 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01368 80A21128 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 0136C 80A2112C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01370 80A21130 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01374 80A21134 0320F809 */ jalr $ra, $t9 -/* 01378 80A21138 00000000 */ nop -/* 0137C 80A2113C 92090262 */ lbu $t1, 0x0262($s0) ## 00000262 -/* 01380 80A21140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01384 80A21144 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 01388 80A21148 5520001E */ bnel $t1, $zero, .L80A211C4 -/* 0138C 80A2114C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01390 80A21150 0C0189B7 */ jal Collider_UpdateCylinder - -/* 01394 80A21154 AFA50030 */ sw $a1, 0x0030($sp) -/* 01398 80A21158 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C -/* 0139C 80A2115C AFA5002C */ sw $a1, 0x002C($sp) -/* 013A0 80A21160 0C0189B7 */ jal Collider_UpdateCylinder - -/* 013A4 80A21164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013A8 80A21168 920A0248 */ lbu $t2, 0x0248($s0) ## 00000248 -/* 013AC 80A2116C 51400015 */ beql $t2, $zero, .L80A211C4 -/* 013B0 80A21170 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 013B4 80A21174 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 -/* 013B8 80A21178 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013BC 80A2117C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 013C0 80A21180 15600009 */ bne $t3, $zero, .L80A211A8 -/* 013C4 80A21184 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013C8 80A21188 02212821 */ addu $a1, $s1, $at -/* 013CC 80A2118C AFA50034 */ sw $a1, 0x0034($sp) -/* 013D0 80A21190 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 013D4 80A21194 8FA60030 */ lw $a2, 0x0030($sp) -/* 013D8 80A21198 8FA50034 */ lw $a1, 0x0034($sp) -/* 013DC 80A2119C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013E0 80A211A0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 013E4 80A211A4 8FA6002C */ lw $a2, 0x002C($sp) -.L80A211A8: -/* 013E8 80A211A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013EC 80A211AC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 013F0 80A211B0 02212821 */ addu $a1, $s1, $at -/* 013F4 80A211B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013F8 80A211B8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 013FC 80A211BC 8FA60030 */ lw $a2, 0x0030($sp) -/* 01400 80A211C0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -.L80A211C4: -/* 01404 80A211C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01408 80A211C8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0140C 80A211CC 0C01DE80 */ jal Math_StepToF - -/* 01410 80A211D0 8E050254 */ lw $a1, 0x0254($s0) ## 00000254 -/* 01414 80A211D4 0C00B638 */ jal Actor_MoveForward - -/* 01418 80A211D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0141C 80A211DC 920C0246 */ lbu $t4, 0x0246($s0) ## 00000246 -/* 01420 80A211E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01424 80A211E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01428 80A211E8 11800008 */ beq $t4, $zero, .L80A2120C -/* 0142C 80A211EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01430 80A211F0 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 01434 80A211F4 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 01438 80A211F8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0143C 80A211FC 44060000 */ mfc1 $a2, $f0 -/* 01440 80A21200 44070000 */ mfc1 $a3, $f0 -/* 01444 80A21204 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 01448 80A21208 E7A00010 */ swc1 $f0, 0x0010($sp) -.L80A2120C: -/* 0144C 80A2120C 920E0260 */ lbu $t6, 0x0260($s0) ## 00000260 -/* 01450 80A21210 3C1980A2 */ lui $t9, %hi(jtbl_80A21C40) ## $t9 = 80A20000 -/* 01454 80A21214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01458 80A21218 000E7880 */ sll $t7, $t6, 2 -/* 0145C 80A2121C 032FC821 */ addu $t9, $t9, $t7 -/* 01460 80A21220 8F391C40 */ lw $t9, %lo(jtbl_80A21C40)($t9) -/* 01464 80A21224 0320F809 */ jalr $ra, $t9 -/* 01468 80A21228 00000000 */ nop -/* 0146C 80A2122C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 80A21230 0C28856F */ jal func_80A215BC -/* 01474 80A21234 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01478 80A21238 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0147C 80A2123C 8FB0001C */ lw $s0, 0x001C($sp) -/* 01480 80A21240 8FB10020 */ lw $s1, 0x0020($sp) -/* 01484 80A21244 03E00008 */ jr $ra -/* 01488 80A21248 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s deleted file mode 100644 index 30031bfec5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80A1FF8C -/* 001CC 80A1FF8C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001D0 80A1FF90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 001D4 80A1FF94 AFB00030 */ sw $s0, 0x0030($sp) -/* 001D8 80A1FF98 AFA5006C */ sw $a1, 0x006C($sp) -/* 001DC 80A1FF9C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 001E0 80A1FFA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 001E4 80A1FFA4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 001E8 80A1FFA8 E7A4005C */ swc1 $f4, 0x005C($sp) -/* 001EC 80A1FFAC C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 001F0 80A1FFB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001F4 80A1FFB4 C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 001F8 80A1FFB8 46083280 */ add.s $f10, $f6, $f8 -/* 001FC 80A1FFBC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00200 80A1FFC0 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 00204 80A1FFC4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00208 80A1FFC8 C7AE0060 */ lwc1 $f14, 0x0060($sp) -/* 0020C 80A1FFCC E7B00064 */ swc1 $f16, 0x0064($sp) -/* 00210 80A1FFD0 0C034261 */ jal Matrix_Translate -/* 00214 80A1FFD4 8FA60064 */ lw $a2, 0x0064($sp) -/* 00218 80A1FFD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 0021C 80A1FFDC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 -/* 00220 80A1FFE0 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateRPY -/* 00228 80A1FFE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0022C 80A1FFEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00230 80A1FFF0 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 00234 80A1FFF4 44819000 */ mtc1 $at, $f18 ## $f18 = 220.00 -/* 00238 80A1FFF8 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 0023C 80A1FFFC AFA50038 */ sw $a1, 0x0038($sp) -/* 00240 80A20000 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 00244 80A20004 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00248 80A20008 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0024C 80A2000C 0C0346BD */ jal Matrix_MultVec3f -/* 00250 80A20010 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 00254 80A20014 8FA4006C */ lw $a0, 0x006C($sp) -/* 00258 80A20018 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFD4 -/* 0025C 80A2001C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00260 80A20020 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00264 80A20024 27B90040 */ addiu $t9, $sp, 0x0040 ## $t9 = FFFFFFD8 -/* 00268 80A20028 AFB90024 */ sw $t9, 0x0024($sp) -/* 0026C 80A2002C AFB80020 */ sw $t8, 0x0020($sp) -/* 00270 80A20030 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00274 80A20034 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00278 80A20038 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 0027C 80A2003C 8FA60038 */ lw $a2, 0x0038($sp) -/* 00280 80A20040 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 00284 80A20044 AFA00018 */ sw $zero, 0x0018($sp) -/* 00288 80A20048 AFA0001C */ sw $zero, 0x001C($sp) -/* 0028C 80A2004C 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 00290 80A20050 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00294 80A20054 10400003 */ beq $v0, $zero, .L80A20064 -/* 00298 80A20058 8FA40038 */ lw $a0, 0x0038($sp) -/* 0029C 80A2005C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 002A0 80A20060 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -.L80A20064: -/* 002A4 80A20064 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 002A8 80A20068 C6060264 */ lwc1 $f6, 0x0264($s0) ## 00000264 -/* 002AC 80A2006C 46062201 */ sub.s $f8, $f4, $f6 -/* 002B0 80A20070 E7A8005C */ swc1 $f8, 0x005C($sp) -/* 002B4 80A20074 C610026C */ lwc1 $f16, 0x026C($s0) ## 0000026C -/* 002B8 80A20078 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 002BC 80A2007C C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 002C0 80A20080 46105481 */ sub.s $f18, $f10, $f16 -/* 002C4 80A20084 46042182 */ mul.s $f6, $f4, $f4 -/* 002C8 80A20088 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 002CC 80A2008C C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 002D0 80A20090 46084282 */ mul.s $f10, $f8, $f8 -/* 002D4 80A20094 460A3400 */ add.s $f16, $f6, $f10 -/* 002D8 80A20098 E6100270 */ swc1 $f16, 0x0270($s0) ## 00000270 -/* 002DC 80A2009C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 002E0 80A200A0 8FB00030 */ lw $s0, 0x0030($sp) -/* 002E4 80A200A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 002E8 80A200A8 03E00008 */ jr $ra -/* 002EC 80A200AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s deleted file mode 100644 index 08ea185e92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A200B0 -/* 002F0 80A200B0 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 002F4 80A200B4 C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000000 -/* 002F8 80A200B8 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 002FC 80A200BC C4AA0008 */ lwc1 $f10, 0x0008($a1) ## 00000008 -/* 00300 80A200C0 46062001 */ sub.s $f0, $f4, $f6 -/* 00304 80A200C4 C4860270 */ lwc1 $f6, 0x0270($a0) ## 00000270 -/* 00308 80A200C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0030C 80A200CC 460A4081 */ sub.s $f2, $f8, $f10 -/* 00310 80A200D0 46000402 */ mul.s $f16, $f0, $f0 -/* 00314 80A200D4 00000000 */ nop -/* 00318 80A200D8 46021482 */ mul.s $f18, $f2, $f2 -/* 0031C 80A200DC 46128100 */ add.s $f4, $f16, $f18 -/* 00320 80A200E0 4604303E */ c.le.s $f6, $f4 -/* 00324 80A200E4 00000000 */ nop -/* 00328 80A200E8 45000003 */ bc1f .L80A200F8 -/* 0032C 80A200EC 00000000 */ nop -/* 00330 80A200F0 03E00008 */ jr $ra -/* 00334 80A200F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A200F8: -/* 00338 80A200F8 03E00008 */ jr $ra -/* 0033C 80A200FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s deleted file mode 100644 index a4e1aaf853..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel D_80A21CC0 - .float 0.6 - -glabel D_80A21CC4 - .float 0.3 - -.text -glabel func_80A20100 -/* 00340 80A20100 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 00344 80A20104 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00348 80A20108 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0034C 80A2010C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00350 80A20110 AFB30064 */ sw $s3, 0x0064($sp) -/* 00354 80A20114 AFB20060 */ sw $s2, 0x0060($sp) -/* 00358 80A20118 AFB00058 */ sw $s0, 0x0058($sp) -/* 0035C 80A2011C 240E009B */ addiu $t6, $zero, 0x009B ## $t6 = 0000009B -/* 00360 80A20120 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00364 80A20124 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00368 80A20128 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0036C 80A2012C 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 00370 80A20130 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 -/* 00374 80A20134 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 -/* 00378 80A20138 00C09025 */ or $s2, $a2, $zero ## $s2 = 00000000 -/* 0037C 80A2013C 00E09825 */ or $s3, $a3, $zero ## $s3 = 00000000 -/* 00380 80A20140 AFBF007C */ sw $ra, 0x007C($sp) -/* 00384 80A20144 AFBE0078 */ sw $s8, 0x0078($sp) -/* 00388 80A20148 AFB70074 */ sw $s7, 0x0074($sp) -/* 0038C 80A2014C AFB60070 */ sw $s6, 0x0070($sp) -/* 00390 80A20150 AFB5006C */ sw $s5, 0x006C($sp) -/* 00394 80A20154 AFB40068 */ sw $s4, 0x0068($sp) -/* 00398 80A20158 AFB1005C */ sw $s1, 0x005C($sp) -/* 0039C 80A2015C F7BE0050 */ sdc1 $f30, 0x0050($sp) -/* 003A0 80A20160 F7BC0048 */ sdc1 $f28, 0x0048($sp) -/* 003A4 80A20164 F7BA0040 */ sdc1 $f26, 0x0040($sp) -/* 003A8 80A20168 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 003AC 80A2016C F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 003B0 80A20170 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 003B4 80A20174 AFA400B8 */ sw $a0, 0x00B8($sp) -/* 003B8 80A20178 AFA500BC */ sw $a1, 0x00BC($sp) -/* 003BC 80A2017C A3AE008C */ sb $t6, 0x008C($sp) -/* 003C0 80A20180 A3AF008D */ sb $t7, 0x008D($sp) -/* 003C4 80A20184 A3B8008E */ sb $t8, 0x008E($sp) -/* 003C8 80A20188 A3B9008F */ sb $t9, 0x008F($sp) -/* 003CC 80A2018C A3A80088 */ sb $t0, 0x0088($sp) -/* 003D0 80A20190 A3A90089 */ sb $t1, 0x0089($sp) -/* 003D4 80A20194 A3AA008A */ sb $t2, 0x008A($sp) -/* 003D8 80A20198 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 003DC 80A2019C E7A00098 */ swc1 $f0, 0x0098($sp) -/* 003E0 80A201A0 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 003E4 80A201A4 18E0003E */ blez $a3, .L80A202A0 -/* 003E8 80A201A8 E7A40094 */ swc1 $f4, 0x0094($sp) -/* 003EC 80A201AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 003F0 80A201B0 4481F000 */ mtc1 $at, $f30 ## $f30 = 5.00 -/* 003F4 80A201B4 3C0180A2 */ lui $at, %hi(D_80A21CC0) ## $at = 80A20000 -/* 003F8 80A201B8 C43C1CC0 */ lwc1 $f28, %lo(D_80A21CC0)($at) -/* 003FC 80A201BC 3C0180A2 */ lui $at, %hi(D_80A21CC4) ## $at = 80A20000 -/* 00400 80A201C0 C43A1CC4 */ lwc1 $f26, %lo(D_80A21CC4)($at) -/* 00404 80A201C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00408 80A201C8 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 0040C 80A201CC C7B400C8 */ lwc1 $f20, 0x00C8($sp) -/* 00410 80A201D0 27BE0088 */ addiu $s8, $sp, 0x0088 ## $s8 = FFFFFFD0 -/* 00414 80A201D4 27B7008C */ addiu $s7, $sp, 0x008C ## $s7 = FFFFFFD4 -/* 00418 80A201D8 27B60090 */ addiu $s6, $sp, 0x0090 ## $s6 = FFFFFFD8 -/* 0041C 80A201DC 27B5009C */ addiu $s5, $sp, 0x009C ## $s5 = FFFFFFE4 -/* 00420 80A201E0 27B400A8 */ addiu $s4, $sp, 0x00A8 ## $s4 = FFFFFFF0 -.L80A201E4: -/* 00424 80A201E4 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00428 80A201E8 4600D306 */ mov.s $f12, $f26 -/* 0042C 80A201EC 461C0600 */ add.s $f24, $f0, $f28 -/* 00430 80A201F0 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00434 80A201F4 4600F306 */ mov.s $f12, $f30 -/* 00438 80A201F8 4600018D */ trunc.w.s $f6, $f0 -/* 0043C 80A201FC 4600A306 */ mov.s $f12, $f20 -/* 00440 80A20200 44113000 */ mfc1 $s1, $f6 -/* 00444 80A20204 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00448 80A20208 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 0000000C -/* 0044C 80A2020C C6480000 */ lwc1 $f8, 0x0000($s2) ## 00000000 -/* 00450 80A20210 4600A306 */ mov.s $f12, $f20 -/* 00454 80A20214 46080280 */ add.s $f10, $f0, $f8 -/* 00458 80A20218 0C00CFBE */ jal Rand_ZeroFloat - -/* 0045C 80A2021C E7AA00A8 */ swc1 $f10, 0x00A8($sp) -/* 00460 80A20220 C6500004 */ lwc1 $f16, 0x0004($s2) ## 00000004 -/* 00464 80A20224 4600A306 */ mov.s $f12, $f20 -/* 00468 80A20228 46100480 */ add.s $f18, $f0, $f16 -/* 0046C 80A2022C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00470 80A20230 E7B200AC */ swc1 $f18, 0x00AC($sp) -/* 00474 80A20234 C6440008 */ lwc1 $f4, 0x0008($s2) ## 00000008 -/* 00478 80A20238 4600B306 */ mov.s $f12, $f22 -/* 0047C 80A2023C 46040180 */ add.s $f6, $f0, $f4 -/* 00480 80A20240 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00484 80A20244 E7A600B0 */ swc1 $f6, 0x00B0($sp) -/* 00488 80A20248 E7A0009C */ swc1 $f0, 0x009C($sp) -/* 0048C 80A2024C 0C00CFBE */ jal Rand_ZeroFloat - -/* 00490 80A20250 4600B306 */ mov.s $f12, $f22 -/* 00494 80A20254 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00498 80A20258 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 0049C 80A2025C 4600B306 */ mov.s $f12, $f22 -/* 004A0 80A20260 46080280 */ add.s $f10, $f0, $f8 -/* 004A4 80A20264 0C00CFC8 */ jal Rand_CenteredFloat - -/* 004A8 80A20268 E7AA00A0 */ swc1 $f10, 0x00A0($sp) -/* 004AC 80A2026C 4406C000 */ mfc1 $a2, $f24 -/* 004B0 80A20270 E7A000A4 */ swc1 $f0, 0x00A4($sp) -/* 004B4 80A20274 8FA400BC */ lw $a0, 0x00BC($sp) -/* 004B8 80A20278 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF0 -/* 004BC 80A2027C 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFE4 -/* 004C0 80A20280 AFB60010 */ sw $s6, 0x0010($sp) -/* 004C4 80A20284 AFB70014 */ sw $s7, 0x0014($sp) -/* 004C8 80A20288 AFBE0018 */ sw $s8, 0x0018($sp) -/* 004CC 80A2028C 0C00A8A9 */ jal EffectSsEnIce_Spawn -/* 004D0 80A20290 AFB1001C */ sw $s1, 0x001C($sp) -/* 004D4 80A20294 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 004D8 80A20298 1613FFD2 */ bne $s0, $s3, .L80A201E4 -/* 004DC 80A2029C 00000000 */ nop -.L80A202A0: -/* 004E0 80A202A0 8FA400BC */ lw $a0, 0x00BC($sp) -/* 004E4 80A202A4 0C018B35 */ jal CollisionCheck_SpawnShieldParticles -/* 004E8 80A202A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 004EC 80A202AC 8FBF007C */ lw $ra, 0x007C($sp) -/* 004F0 80A202B0 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 004F4 80A202B4 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 004F8 80A202B8 D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 004FC 80A202BC D7BA0040 */ ldc1 $f26, 0x0040($sp) -/* 00500 80A202C0 D7BC0048 */ ldc1 $f28, 0x0048($sp) -/* 00504 80A202C4 D7BE0050 */ ldc1 $f30, 0x0050($sp) -/* 00508 80A202C8 8FB00058 */ lw $s0, 0x0058($sp) -/* 0050C 80A202CC 8FB1005C */ lw $s1, 0x005C($sp) -/* 00510 80A202D0 8FB20060 */ lw $s2, 0x0060($sp) -/* 00514 80A202D4 8FB30064 */ lw $s3, 0x0064($sp) -/* 00518 80A202D8 8FB40068 */ lw $s4, 0x0068($sp) -/* 0051C 80A202DC 8FB5006C */ lw $s5, 0x006C($sp) -/* 00520 80A202E0 8FB60070 */ lw $s6, 0x0070($sp) -/* 00524 80A202E4 8FB70074 */ lw $s7, 0x0074($sp) -/* 00528 80A202E8 8FBE0078 */ lw $s8, 0x0078($sp) -/* 0052C 80A202EC 03E00008 */ jr $ra -/* 00530 80A202F0 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 -glabel L80A202F4 -/* 00534 80A202F4 03E00008 */ jr $ra -/* 00538 80A202F8 AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s deleted file mode 100644 index 26ff7adf95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s +++ /dev/null @@ -1,67 +0,0 @@ -.late_rodata -glabel D_80A21CC8 - .float 0.1 - -.text -glabel func_80A202FC -/* 0053C 80A202FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00540 80A20300 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00544 80A20304 AFB00020 */ sw $s0, 0x0020($sp) -/* 00548 80A20308 848E0240 */ lh $t6, 0x0240($a0) ## 00000240 -/* 0054C 80A2030C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00550 80A20310 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00554 80A20314 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 -/* 00558 80A20318 55E0002C */ bnel $t7, $zero, .L80A203CC -/* 0055C 80A2031C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00560 80A20320 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00564 80A20324 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00568 80A20328 00000000 */ nop -/* 0056C 80A2032C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00570 80A20330 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00574 80A20334 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00578 80A20338 46040180 */ add.s $f6, $f0, $f4 -/* 0057C 80A2033C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00580 80A20340 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 00584 80A20344 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00588 80A20348 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0058C 80A2034C 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 00590 80A20350 46080280 */ add.s $f10, $f0, $f8 -/* 00594 80A20354 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00598 80A20358 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 0059C 80A2035C 46105480 */ add.s $f18, $f10, $f16 -/* 005A0 80A20360 0C00CFC8 */ jal Rand_CenteredFloat - -/* 005A4 80A20364 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 005A8 80A20368 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 005AC 80A2036C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 005B0 80A20370 3C0180A2 */ lui $at, %hi(D_80A21CC8) ## $at = 80A20000 -/* 005B4 80A20374 46040180 */ add.s $f6, $f0, $f4 -/* 005B8 80A20378 C4281CC8 */ lwc1 $f8, %lo(D_80A21CC8)($at) -/* 005BC 80A2037C 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 005C0 80A20380 44816000 */ mtc1 $at, $f12 ## $f12 = 7.50 -/* 005C4 80A20384 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 005C8 80A20388 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 005CC 80A2038C E7A2002C */ swc1 $f2, 0x002C($sp) -/* 005D0 80A20390 E7A20040 */ swc1 $f2, 0x0040($sp) -/* 005D4 80A20394 E7A2003C */ swc1 $f2, 0x003C($sp) -/* 005D8 80A20398 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 005DC 80A2039C 0C00CFBE */ jal Rand_ZeroFloat - -/* 005E0 80A203A0 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 005E4 80A203A4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 005E8 80A203A8 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 005EC 80A203AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005F0 80A203B0 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 005F4 80A203B4 460A0400 */ add.s $f16, $f0, $f10 -/* 005F8 80A203B8 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 -/* 005FC 80A203BC 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFFDC -/* 00600 80A203C0 0C288517 */ jal func_80A2145C -/* 00604 80A203C4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00608 80A203C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A203CC: -/* 0060C 80A203CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00610 80A203D0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00614 80A203D4 03E00008 */ jr $ra -/* 00618 80A203D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s deleted file mode 100644 index c0c63a5f2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s +++ /dev/null @@ -1,59 +0,0 @@ -.late_rodata -glabel D_80A21CCC - .float 0.1 - -.text -glabel func_80A203DC -/* 0061C 80A203DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00620 80A203E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00624 80A203E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00628 80A203E8 848E0240 */ lh $t6, 0x0240($a0) ## 00000240 -/* 0062C 80A203EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00630 80A203F0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00634 80A203F4 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 00638 80A203F8 55E00025 */ bnel $t7, $zero, .L80A20490 -/* 0063C 80A203FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00640 80A20400 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00644 80A20404 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00648 80A20408 00000000 */ nop -/* 0064C 80A2040C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00650 80A20410 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00654 80A20414 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 00658 80A20418 46040180 */ add.s $f6, $f0, $f4 -/* 0065C 80A2041C E7A60044 */ swc1 $f6, 0x0044($sp) -/* 00660 80A20420 C608024C */ lwc1 $f8, 0x024C($s0) ## 0000024C -/* 00664 80A20424 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00668 80A20428 E7A80048 */ swc1 $f8, 0x0048($sp) -/* 0066C 80A2042C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00670 80A20430 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00674 80A20434 3C0180A2 */ lui $at, %hi(D_80A21CCC) ## $at = 80A20000 -/* 00678 80A20438 460A0400 */ add.s $f16, $f0, $f10 -/* 0067C 80A2043C C4321CCC */ lwc1 $f18, %lo(D_80A21CCC)($at) -/* 00680 80A20440 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 00684 80A20444 44816000 */ mtc1 $at, $f12 ## $f12 = 7.50 -/* 00688 80A20448 E7B0004C */ swc1 $f16, 0x004C($sp) -/* 0068C 80A2044C E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00690 80A20450 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 00694 80A20454 E7A20040 */ swc1 $f2, 0x0040($sp) -/* 00698 80A20458 E7A2003C */ swc1 $f2, 0x003C($sp) -/* 0069C 80A2045C E7A20038 */ swc1 $f2, 0x0038($sp) -/* 006A0 80A20460 0C00CFBE */ jal Rand_ZeroFloat - -/* 006A4 80A20464 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 006A8 80A20468 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 006AC 80A2046C 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 -/* 006B0 80A20470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B4 80A20474 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 006B8 80A20478 46040180 */ add.s $f6, $f0, $f4 -/* 006BC 80A2047C 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 -/* 006C0 80A20480 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFFDC -/* 006C4 80A20484 0C288517 */ jal func_80A2145C -/* 006C8 80A20488 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006CC 80A2048C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A20490: -/* 006D0 80A20490 8FB00020 */ lw $s0, 0x0020($sp) -/* 006D4 80A20494 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 006D8 80A20498 03E00008 */ jr $ra -/* 006DC 80A2049C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s deleted file mode 100644 index aa46d57f4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s +++ /dev/null @@ -1,170 +0,0 @@ -glabel func_80A204A0 -/* 006E0 80A204A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 006E4 80A204A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006E8 80A204A8 AFB00020 */ sw $s0, 0x0020($sp) -/* 006EC 80A204AC AFA50044 */ sw $a1, 0x0044($sp) -/* 006F0 80A204B0 908E0247 */ lbu $t6, 0x0247($a0) ## 00000247 -/* 006F4 80A204B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006F8 80A204B8 51C00012 */ beql $t6, $zero, .L80A20504 -/* 006FC 80A204BC 92190248 */ lbu $t9, 0x0248($s0) ## 00000248 -/* 00700 80A204C0 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 00704 80A204C4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 00708 80A204C8 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 0070C 80A204CC 55E00007 */ bnel $t7, $zero, .L80A204EC -/* 00710 80A204D0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00714 80A204D4 0C00CE6E */ jal func_800339B8 -/* 00718 80A204D8 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 0071C 80A204DC 54400009 */ bnel $v0, $zero, .L80A20504 -/* 00720 80A204E0 92190248 */ lbu $t9, 0x0248($s0) ## 00000248 -/* 00724 80A204E4 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00728 80A204E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A204EC: -/* 0072C 80A204EC 3058FFF7 */ andi $t8, $v0, 0xFFF7 ## $t8 = 00000000 -/* 00730 80A204F0 A6180088 */ sh $t8, 0x0088($s0) ## 00000088 -/* 00734 80A204F4 A2000247 */ sb $zero, 0x0247($s0) ## 00000247 -/* 00738 80A204F8 E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 0073C 80A204FC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00740 80A20500 92190248 */ lbu $t9, 0x0248($s0) ## 00000248 -.L80A20504: -/* 00744 80A20504 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00748 80A20508 5320007A */ beql $t9, $zero, .L80A206F4 -/* 0074C 80A2050C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00750 80A20510 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00754 80A20514 05030012 */ bgezl $t0, .L80A20560 -/* 00758 80A20518 920201AD */ lbu $v0, 0x01AD($s0) ## 000001AD -/* 0075C 80A2051C 92090160 */ lbu $t1, 0x0160($s0) ## 00000160 -/* 00760 80A20520 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00764 80A20524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00768 80A20528 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 0076C 80A2052C 5140000C */ beql $t2, $zero, .L80A20560 -/* 00770 80A20530 920201AD */ lbu $v0, 0x01AD($s0) ## 000001AD -/* 00774 80A20534 920B0161 */ lbu $t3, 0x0161($s0) ## 00000161 -/* 00778 80A20538 A2000247 */ sb $zero, 0x0247($s0) ## 00000247 -/* 0077C 80A2053C E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 00780 80A20540 316CFFFD */ andi $t4, $t3, 0xFFFD ## $t4 = 00000000 -/* 00784 80A20544 A20C0161 */ sb $t4, 0x0161($s0) ## 00000161 -/* 00788 80A20548 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0078C 80A2054C 0C2881D2 */ jal func_80A20748 -/* 00790 80A20550 A60D0244 */ sh $t5, 0x0244($s0) ## 00000244 -/* 00794 80A20554 10000067 */ beq $zero, $zero, .L80A206F4 -/* 00798 80A20558 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0079C 80A2055C 920201AD */ lbu $v0, 0x01AD($s0) ## 000001AD -.L80A20560: -/* 007A0 80A20560 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 007A4 80A20564 51C00008 */ beql $t6, $zero, .L80A20588 -/* 007A8 80A20568 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 -/* 007AC 80A2056C 92180161 */ lbu $t8, 0x0161($s0) ## 00000161 -/* 007B0 80A20570 304FFF7F */ andi $t7, $v0, 0xFF7F ## $t7 = 00000000 -/* 007B4 80A20574 A20F01AD */ sb $t7, 0x01AD($s0) ## 000001AD -/* 007B8 80A20578 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 007BC 80A2057C 1000005C */ beq $zero, $zero, .L80A206F0 -/* 007C0 80A20580 A2190161 */ sb $t9, 0x0161($s0) ## 00000161 -/* 007C4 80A20584 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 -.L80A20588: -/* 007C8 80A20588 30480002 */ andi $t0, $v0, 0x0002 ## $t0 = 00000000 -/* 007CC 80A2058C 51000059 */ beql $t0, $zero, .L80A206F4 -/* 007D0 80A20590 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007D4 80A20594 920300B1 */ lbu $v1, 0x00B1($s0) ## 000000B1 -/* 007D8 80A20598 3049FFFD */ andi $t1, $v0, 0xFFFD ## $t1 = 00000000 -/* 007DC 80A2059C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 007E0 80A205A0 1061003D */ beq $v1, $at, .L80A20698 -/* 007E4 80A205A4 A2090161 */ sb $t1, 0x0161($s0) ## 00000161 -/* 007E8 80A205A8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 007EC 80A205AC 54610051 */ bnel $v1, $at, .L80A206F4 -/* 007F0 80A205B0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007F4 80A205B4 0C00D58A */ jal Actor_ApplyDamage - -/* 007F8 80A205B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007FC 80A205BC 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 -/* 00800 80A205C0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00804 80A205C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00808 80A205C8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 0080C 80A205CC 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00810 80A205D0 0C00D09B */ jal func_8003426C -/* 00814 80A205D4 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 -/* 00818 80A205D8 920B00AF */ lbu $t3, 0x00AF($s0) ## 000000AF -/* 0081C 80A205DC 240539A5 */ addiu $a1, $zero, 0x39A5 ## $a1 = 000039A5 -/* 00820 80A205E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00824 80A205E4 11600014 */ beq $t3, $zero, .L80A20638 -/* 00828 80A205E8 00000000 */ nop -/* 0082C 80A205EC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00830 80A205F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00834 80A205F4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00838 80A205F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0083C 80A205FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00840 80A20600 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 00844 80A20604 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00848 80A20608 8FA50044 */ lw $a1, 0x0044($sp) -/* 0084C 80A2060C 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 00850 80A20610 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 00854 80A20614 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00858 80A20618 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 0085C 80A2061C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00860 80A20620 0C288040 */ jal func_80A20100 -/* 00864 80A20624 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 00868 80A20628 920C0249 */ lbu $t4, 0x0249($s0) ## 00000249 -/* 0086C 80A2062C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00870 80A20630 1000002F */ beq $zero, $zero, .L80A206F0 -/* 00874 80A20634 A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 -.L80A20638: -/* 00878 80A20638 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0087C 80A2063C 240539A6 */ addiu $a1, $zero, 0x39A6 ## $a1 = 000039A6 -/* 00880 80A20640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00884 80A20644 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00888 80A20648 240528CB */ addiu $a1, $zero, 0x28CB ## $a1 = 000028CB -/* 0088C 80A2064C C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00890 80A20650 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00894 80A20654 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00898 80A20658 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 0089C 80A2065C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 008A0 80A20660 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008A4 80A20664 8FA50044 */ lw $a1, 0x0044($sp) -/* 008A8 80A20668 E7B20038 */ swc1 $f18, 0x0038($sp) -/* 008AC 80A2066C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 008B0 80A20670 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 008B4 80A20674 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 008B8 80A20678 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008BC 80A2067C 0C288040 */ jal func_80A20100 -/* 008C0 80A20680 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 008C4 80A20684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008C8 80A20688 0C28832B */ jal func_80A20CAC -/* 008CC 80A2068C 8FA50044 */ lw $a1, 0x0044($sp) -/* 008D0 80A20690 10000018 */ beq $zero, $zero, .L80A206F4 -/* 008D4 80A20694 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A20698: -/* 008D8 80A20698 0C00D58A */ jal Actor_ApplyDamage - -/* 008DC 80A2069C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E0 80A206A0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 008E4 80A206A4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 008E8 80A206A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008EC 80A206AC 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 008F0 80A206B0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 008F4 80A206B4 0C00D09B */ jal func_8003426C -/* 008F8 80A206B8 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 -/* 008FC 80A206BC 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 00900 80A206C0 240539A6 */ addiu $a1, $zero, 0x39A6 ## $a1 = 000039A6 -/* 00904 80A206C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00908 80A206C8 15E00007 */ bne $t7, $zero, .L80A206E8 -/* 0090C 80A206CC 00000000 */ nop -/* 00910 80A206D0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00914 80A206D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00918 80A206D8 0C28835F */ jal func_80A20D7C -/* 0091C 80A206DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00920 80A206E0 10000004 */ beq $zero, $zero, .L80A206F4 -/* 00924 80A206E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A206E8: -/* 00928 80A206E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0092C 80A206EC 240539A5 */ addiu $a1, $zero, 0x39A5 ## $a1 = 000039A5 -.L80A206F0: -/* 00930 80A206F0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A206F4: -/* 00934 80A206F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00938 80A206F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0093C 80A206FC 03E00008 */ jr $ra -/* 00940 80A20700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s deleted file mode 100644 index 107e3989c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A20704 -/* 00944 80A20704 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00948 80A20708 AFBF001C */ sw $ra, 0x001C($sp) -/* 0094C 80A2070C AFA40020 */ sw $a0, 0x0020($sp) -/* 00950 80A20710 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 00954 80A20714 85C5008A */ lh $a1, 0x008A($t6) ## 0000008A -/* 00958 80A20718 AFA00010 */ sw $zero, 0x0010($sp) -/* 0095C 80A2071C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00960 80A20720 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00964 80A20724 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00968 80A20728 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0096C 80A2072C 8FA20020 */ lw $v0, 0x0020($sp) -/* 00970 80A20730 844F00B6 */ lh $t7, 0x00B6($v0) ## 000000B6 -/* 00974 80A20734 A44F0032 */ sh $t7, 0x0032($v0) ## 00000032 -/* 00978 80A20738 8FBF001C */ lw $ra, 0x001C($sp) -/* 0097C 80A2073C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00980 80A20740 03E00008 */ jr $ra -/* 00984 80A20744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s deleted file mode 100644 index 2f9fab6637..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A20748 -/* 00988 80A20748 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 0098C 80A2074C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00990 80A20750 3C1980A2 */ lui $t9, %hi(func_80A20774) ## $t9 = 80A20000 -/* 00994 80A20754 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00998 80A20758 27390774 */ addiu $t9, $t9, %lo(func_80A20774) ## $t9 = 80A20774 -/* 0099C 80A2075C 01E1C024 */ and $t8, $t7, $at -/* 009A0 80A20760 A08E0260 */ sb $t6, 0x0260($a0) ## 00000260 -/* 009A4 80A20764 A0800248 */ sb $zero, 0x0248($a0) ## 00000248 -/* 009A8 80A20768 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 009AC 80A2076C 03E00008 */ jr $ra -/* 009B0 80A20770 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s deleted file mode 100644 index e9b79a9f28..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A20774 -/* 009B4 80A20774 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009B8 80A20778 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009BC 80A2077C AFB00020 */ sw $s0, 0x0020($sp) -/* 009C0 80A20780 AFA5002C */ sw $a1, 0x002C($sp) -/* 009C4 80A20784 8C8E0258 */ lw $t6, 0x0258($a0) ## 00000258 -/* 009C8 80A20788 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009CC 80A2078C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 009D0 80A20790 25CFFFF0 */ addiu $t7, $t6, 0xFFF0 ## $t7 = FFFFFFF0 -/* 009D4 80A20794 2DE10100 */ sltiu $at, $t7, 0x0100 -/* 009D8 80A20798 14200002 */ bne $at, $zero, .L80A207A4 -/* 009DC 80A2079C AC8F0258 */ sw $t7, 0x0258($a0) ## 00000258 -/* 009E0 80A207A0 AC800258 */ sw $zero, 0x0258($a0) ## 00000258 -.L80A207A4: -/* 009E4 80A207A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 009E8 80A207A8 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 -/* 009EC 80A207AC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F -/* 009F0 80A207B0 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 009F4 80A207B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009F8 80A207B8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 009FC 80A207BC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A00 80A207C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00A04 80A207C4 00000000 */ nop -/* 00A08 80A207C8 46060032 */ c.eq.s $f0, $f6 -/* 00A0C 80A207CC 00000000 */ nop -/* 00A10 80A207D0 45020004 */ bc1fl .L80A207E4 -/* 00A14 80A207D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A18 80A207D8 0C2881FD */ jal func_80A207F4 -/* 00A1C 80A207DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A20 80A207E0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A207E4: -/* 00A24 80A207E4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A28 80A207E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A2C 80A207EC 03E00008 */ jr $ra -/* 00A30 80A207F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s deleted file mode 100644 index bb61e83543..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A207F4 -/* 00A34 80A207F4 C4840234 */ lwc1 $f4, 0x0234($a0) ## 00000234 -/* 00A38 80A207F8 C4860238 */ lwc1 $f6, 0x0238($a0) ## 00000238 -/* 00A3C 80A207FC C488023C */ lwc1 $f8, 0x023C($a0) ## 0000023C -/* 00A40 80A20800 3C0F80A2 */ lui $t7, %hi(func_80A20830) ## $t7 = 80A20000 -/* 00A44 80A20804 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00A48 80A20808 25EF0830 */ addiu $t7, $t7, %lo(func_80A20830) ## $t7 = 80A20830 -/* 00A4C 80A2080C A0800260 */ sb $zero, 0x0260($a0) ## 00000260 -/* 00A50 80A20810 A480025E */ sh $zero, 0x025E($a0) ## 0000025E -/* 00A54 80A20814 A480025C */ sh $zero, 0x025C($a0) ## 0000025C -/* 00A58 80A20818 A48E0244 */ sh $t6, 0x0244($a0) ## 00000244 -/* 00A5C 80A2081C AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 00A60 80A20820 E4840024 */ swc1 $f4, 0x0024($a0) ## 00000024 -/* 00A64 80A20824 E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -/* 00A68 80A20828 03E00008 */ jr $ra -/* 00A6C 80A2082C E488002C */ swc1 $f8, 0x002C($a0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s deleted file mode 100644 index 27c1863ffd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A20830 -/* 00A70 80A20830 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A74 80A20834 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A78 80A20838 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A7C 80A2083C 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00A80 80A20840 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00A84 80A20844 55C0000B */ bnel $t6, $zero, .L80A20874 -/* 00A88 80A20848 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A8C 80A2084C C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00A90 80A20850 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 00A94 80A20854 00000000 */ nop -/* 00A98 80A20858 4606203C */ c.lt.s $f4, $f6 -/* 00A9C 80A2085C 00000000 */ nop -/* 00AA0 80A20860 45020004 */ bc1fl .L80A20874 -/* 00AA4 80A20864 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AA8 80A20868 0C288220 */ jal func_80A20880 -/* 00AAC 80A2086C 00000000 */ nop -/* 00AB0 80A20870 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20874: -/* 00AB4 80A20874 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AB8 80A20878 03E00008 */ jr $ra -/* 00ABC 80A2087C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s deleted file mode 100644 index 59c174e217..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80A20880 -/* 00AC0 80A20880 3C1980A2 */ lui $t9, %hi(func_80A208A8) ## $t9 = 80A20000 -/* 00AC4 80A20884 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00AC8 80A20888 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00ACC 80A2088C 24180FA0 */ addiu $t8, $zero, 0x0FA0 ## $t8 = 00000FA0 -/* 00AD0 80A20890 273908A8 */ addiu $t9, $t9, %lo(func_80A208A8) ## $t9 = 80A208A8 -/* 00AD4 80A20894 A08E0260 */ sb $t6, 0x0260($a0) ## 00000260 -/* 00AD8 80A20898 A48F0244 */ sh $t7, 0x0244($a0) ## 00000244 -/* 00ADC 80A2089C A498025E */ sh $t8, 0x025E($a0) ## 0000025E -/* 00AE0 80A208A0 03E00008 */ jr $ra -/* 00AE4 80A208A4 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s deleted file mode 100644 index ca2dc77fc1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A208A8 -/* 00AE8 80A208A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AEC 80A208AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AF0 80A208B0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AF4 80A208B4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00AF8 80A208B8 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00AFC 80A208BC 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 -/* 00B00 80A208C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B04 80A208C4 15C00017 */ bne $t6, $zero, .L80A20924 -/* 00B08 80A208C8 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F -/* 00B0C 80A208CC 8C8F0258 */ lw $t7, 0x0258($a0) ## 00000258 -/* 00B10 80A208D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B14 80A208D4 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 -/* 00B18 80A208D8 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 00000008 -/* 00B1C 80A208DC 2F010100 */ sltiu $at, $t8, 0x0100 -/* 00B20 80A208E0 14200003 */ bne $at, $zero, .L80A208F0 -/* 00B24 80A208E4 AC980258 */ sw $t8, 0x0258($a0) ## 00000258 -/* 00B28 80A208E8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00B2C 80A208EC AC880258 */ sw $t0, 0x0258($a0) ## 00000258 -.L80A208F0: -/* 00B30 80A208F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00B34 80A208F4 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 00B38 80A208F8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F -/* 00B3C 80A208FC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00B40 80A20900 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00B44 80A20904 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00B48 80A20908 00000000 */ nop -/* 00B4C 80A2090C 46060032 */ c.eq.s $f0, $f6 -/* 00B50 80A20910 00000000 */ nop -/* 00B54 80A20914 45020004 */ bc1fl .L80A20928 -/* 00B58 80A20918 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B5C 80A2091C 0C28824E */ jal func_80A20938 -/* 00B60 80A20920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A20924: -/* 00B64 80A20924 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A20928: -/* 00B68 80A20928 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B6C 80A2092C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B70 80A20930 03E00008 */ jr $ra -/* 00B74 80A20934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s deleted file mode 100644 index 16b7d5d3d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A20938 -/* 00B78 80A20938 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 00B7C 80A2093C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00B80 80A20940 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00B84 80A20944 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B88 80A20948 3C1980A2 */ lui $t9, %hi(func_80A20978) ## $t9 = 80A20000 -/* 00B8C 80A2094C 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 00B90 80A20950 27390978 */ addiu $t9, $t9, %lo(func_80A20978) ## $t9 = 80A20978 -/* 00B94 80A20954 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00B98 80A20958 A0820260 */ sb $v0, 0x0260($a0) ## 00000260 -/* 00B9C 80A2095C A48E0244 */ sh $t6, 0x0244($a0) ## 00000244 -/* 00BA0 80A20960 A0820246 */ sb $v0, 0x0246($a0) ## 00000246 -/* 00BA4 80A20964 A0820248 */ sb $v0, 0x0248($a0) ## 00000248 -/* 00BA8 80A20968 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 00BAC 80A2096C AC99014C */ sw $t9, 0x014C($a0) ## 0000014C -/* 00BB0 80A20970 03E00008 */ jr $ra -/* 00BB4 80A20974 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s deleted file mode 100644 index efd786a786..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A20978 -/* 00BB8 80A20978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BBC 80A2097C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BC0 80A20980 AFA5001C */ sw $a1, 0x001C($sp) -/* 00BC4 80A20984 0C2881C1 */ jal func_80A20704 -/* 00BC8 80A20988 AFA40018 */ sw $a0, 0x0018($sp) -/* 00BCC 80A2098C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD0 80A20990 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00BD4 80A20994 55C00004 */ bnel $t6, $zero, .L80A209A8 -/* 00BD8 80A20998 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BDC 80A2099C 0C28826D */ jal func_80A209B4 -/* 00BE0 80A209A0 00000000 */ nop -/* 00BE4 80A209A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A209A8: -/* 00BE8 80A209A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BEC 80A209AC 03E00008 */ jr $ra -/* 00BF0 80A209B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s deleted file mode 100644 index 65c9114e03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A209B4 -/* 00BF4 80A209B4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00BF8 80A209B8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00BFC 80A209BC 3C0F80A2 */ lui $t7, %hi(func_80A209E4) ## $t7 = 80A20000 -/* 00C00 80A209C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00C04 80A209C4 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00C08 80A209C8 25EF09E4 */ addiu $t7, $t7, %lo(func_80A209E4) ## $t7 = 80A209E4 -/* 00C0C 80A209CC A0820260 */ sb $v0, 0x0260($a0) ## 00000260 -/* 00C10 80A209D0 A0820247 */ sb $v0, 0x0247($a0) ## 00000247 -/* 00C14 80A209D4 A48E0244 */ sh $t6, 0x0244($a0) ## 00000244 -/* 00C18 80A209D8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 00C1C 80A209DC 03E00008 */ jr $ra -/* 00C20 80A209E0 E4840254 */ swc1 $f4, 0x0254($a0) ## 00000254 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s deleted file mode 100644 index 70197f28f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A209E4 -/* 00C24 80A209E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C28 80A209E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C2C 80A209EC AFA5001C */ sw $a1, 0x001C($sp) -/* 00C30 80A209F0 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00C34 80A209F4 11C00004 */ beq $t6, $zero, .L80A20A08 -/* 00C38 80A209F8 00000000 */ nop -/* 00C3C 80A209FC 908F0247 */ lbu $t7, 0x0247($a0) ## 00000247 -/* 00C40 80A20A00 55E00004 */ bnel $t7, $zero, .L80A20A14 -/* 00C44 80A20A04 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20A08: -/* 00C48 80A20A08 0C288288 */ jal func_80A20A20 -/* 00C4C 80A20A0C 00000000 */ nop -/* 00C50 80A20A10 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20A14: -/* 00C54 80A20A14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C58 80A20A18 03E00008 */ jr $ra -/* 00C5C 80A20A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s deleted file mode 100644 index 368601023e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A20A20 -/* 00C60 80A20A20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C64 80A20A24 3C1880A2 */ lui $t8, %hi(func_80A20A4C) ## $t8 = 80A20000 -/* 00C68 80A20A28 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00C6C 80A20A2C 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 00C70 80A20A30 27180A4C */ addiu $t8, $t8, %lo(func_80A20A4C) ## $t8 = 80A20A4C -/* 00C74 80A20A34 A08E0260 */ sb $t6, 0x0260($a0) ## 00000260 -/* 00C78 80A20A38 A48F0244 */ sh $t7, 0x0244($a0) ## 00000244 -/* 00C7C 80A20A3C AC98014C */ sw $t8, 0x014C($a0) ## 0000014C -/* 00C80 80A20A40 E4800254 */ swc1 $f0, 0x0254($a0) ## 00000254 -/* 00C84 80A20A44 03E00008 */ jr $ra -/* 00C88 80A20A48 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s deleted file mode 100644 index 6266b380e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A20A4C -/* 00C8C 80A20A4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C90 80A20A50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C94 80A20A54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C98 80A20A58 0C2881C1 */ jal func_80A20704 -/* 00C9C 80A20A5C AFA40018 */ sw $a0, 0x0018($sp) -/* 00CA0 80A20A60 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CA4 80A20A64 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00CA8 80A20A68 55C00004 */ bnel $t6, $zero, .L80A20A7C -/* 00CAC 80A20A6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CB0 80A20A70 0C2882A2 */ jal func_80A20A88 -/* 00CB4 80A20A74 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CB8 80A20A78 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20A7C: -/* 00CBC 80A20A7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CC0 80A20A80 03E00008 */ jr $ra -/* 00CC4 80A20A84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s deleted file mode 100644 index d1096ef179..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A20A88 -/* 00CC8 80A20A88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CCC 80A20A8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CD0 80A20A90 3C1880A2 */ lui $t8, %hi(func_80A20AC0) ## $t8 = 80A20000 -/* 00CD4 80A20A94 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CD8 80A20A98 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 00CDC 80A20A9C 27180AC0 */ addiu $t8, $t8, %lo(func_80A20AC0) ## $t8 = 80A20AC0 -/* 00CE0 80A20AA0 A08E0260 */ sb $t6, 0x0260($a0) ## 00000260 -/* 00CE4 80A20AA4 A48F0244 */ sh $t7, 0x0244($a0) ## 00000244 -/* 00CE8 80A20AA8 0C287FE3 */ jal func_80A1FF8C -/* 00CEC 80A20AAC AC98014C */ sw $t8, 0x014C($a0) ## 0000014C -/* 00CF0 80A20AB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CF4 80A20AB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CF8 80A20AB8 03E00008 */ jr $ra -/* 00CFC 80A20ABC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s deleted file mode 100644 index 7a4a0e7f75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s +++ /dev/null @@ -1,137 +0,0 @@ -.late_rodata -glabel D_80A21CD0 - .float 0.6 - -glabel D_80A21CD4 - .float 3.14159274101 - -.text -glabel func_80A20AC0 -/* 00D00 80A20AC0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00D04 80A20AC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D08 80A20AC8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D0C 80A20ACC AFA5006C */ sw $a1, 0x006C($sp) -/* 00D10 80A20AD0 84820244 */ lh $v0, 0x0244($a0) ## 00000244 -/* 00D14 80A20AD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D18 80A20AD8 14400005 */ bne $v0, $zero, .L80A20AF0 -/* 00D1C 80A20ADC 2841000B */ slti $at, $v0, 0x000B -/* 00D20 80A20AE0 0C2881D2 */ jal func_80A20748 -/* 00D24 80A20AE4 00000000 */ nop -/* 00D28 80A20AE8 1000006C */ beq $zero, $zero, .L80A20C9C -/* 00D2C 80A20AEC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A20AF0: -/* 00D30 80A20AF0 14200069 */ bne $at, $zero, .L80A20C98 -/* 00D34 80A20AF4 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 00D38 80A20AF8 A3A00037 */ sb $zero, 0x0037($sp) -/* 00D3C 80A20AFC A7AE0034 */ sh $t6, 0x0034($sp) -/* 00D40 80A20B00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D44 80A20B04 0C00BE5D */ jal func_8002F974 -/* 00D48 80A20B08 240531A4 */ addiu $a1, $zero, 0x31A4 ## $a1 = 000031A4 -/* 00D4C 80A20B0C 86020244 */ lh $v0, 0x0244($s0) ## 00000244 -/* 00D50 80A20B10 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D54 80A20B14 244FFFF6 */ addiu $t7, $v0, 0xFFF6 ## $t7 = FFFFFFF6 -/* 00D58 80A20B18 29E10010 */ slti $at, $t7, 0x0010 -/* 00D5C 80A20B1C 10200005 */ beq $at, $zero, .L80A20B34 -/* 00D60 80A20B20 0002C080 */ sll $t8, $v0, 2 -/* 00D64 80A20B24 0302C021 */ addu $t8, $t8, $v0 -/* 00D68 80A20B28 0018C040 */ sll $t8, $t8, 1 -/* 00D6C 80A20B2C 2719FF9C */ addiu $t9, $t8, 0xFF9C ## $t9 = FFFFFF9C -/* 00D70 80A20B30 A7B90034 */ sh $t9, 0x0034($sp) -.L80A20B34: -/* 00D74 80A20B34 3C0180A2 */ lui $at, %hi(D_80A21CD0) ## $at = 80A20000 -/* 00D78 80A20B38 C4241CD0 */ lwc1 $f4, %lo(D_80A21CD0)($at) -/* 00D7C 80A20B3C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00D80 80A20B40 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 00D84 80A20B44 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 00D88 80A20B48 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00D8C 80A20B4C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00D90 80A20B50 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00D94 80A20B54 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 00D98 80A20B58 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00D9C 80A20B5C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 00DA0 80A20B60 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DA4 80A20B64 460A4400 */ add.s $f16, $f8, $f10 -/* 00DA8 80A20B68 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 00DAC 80A20B6C 3C0180A2 */ lui $at, %hi(D_80A21CD4) ## $at = 80A20000 -/* 00DB0 80A20B70 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 00DB4 80A20B74 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00DB8 80A20B78 C4301CD4 */ lwc1 $f16, %lo(D_80A21CD4)($at) -/* 00DBC 80A20B7C E7B20058 */ swc1 $f18, 0x0058($sp) -/* 00DC0 80A20B80 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00DC4 80A20B84 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00DC8 80A20B88 00000000 */ nop -/* 00DCC 80A20B8C 468021A0 */ cvt.s.w $f6, $f4 -/* 00DD0 80A20B90 46083283 */ div.s $f10, $f6, $f8 -/* 00DD4 80A20B94 46105302 */ mul.s $f12, $f10, $f16 -/* 00DD8 80A20B98 0C034348 */ jal Matrix_RotateY -/* 00DDC 80A20B9C 00000000 */ nop -/* 00DE0 80A20BA0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 00DE4 80A20BA4 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 00DE8 80A20BA8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00DEC 80A20BAC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00DF0 80A20BB0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00DF4 80A20BB4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFF4 -/* 00DF8 80A20BB8 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFDC -/* 00DFC 80A20BBC E7A40060 */ swc1 $f4, 0x0060($sp) -/* 00E00 80A20BC0 E7B2005C */ swc1 $f18, 0x005C($sp) -/* 00E04 80A20BC4 0C0346BD */ jal Matrix_MultVec3f -/* 00E08 80A20BC8 E7A60064 */ swc1 $f6, 0x0064($sp) -/* 00E0C 80A20BCC 86090244 */ lh $t1, 0x0244($s0) ## 00000244 -/* 00E10 80A20BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E14 80A20BD4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 00E18 80A20BD8 312A0007 */ andi $t2, $t1, 0x0007 ## $t2 = 00000000 -/* 00E1C 80A20BDC 15400003 */ bne $t2, $zero, .L80A20BEC -/* 00E20 80A20BE0 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC -/* 00E24 80A20BE4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00E28 80A20BE8 A3AB0037 */ sb $t3, 0x0037($sp) -.L80A20BEC: -/* 00E2C 80A20BEC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00E30 80A20BF0 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00E34 80A20BF4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00E38 80A20BF8 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 00E3C 80A20BFC 87AC0034 */ lh $t4, 0x0034($sp) -/* 00E40 80A20C00 93AD0037 */ lbu $t5, 0x0037($sp) -/* 00E44 80A20C04 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFD0 -/* 00E48 80A20C08 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00E4C 80A20C0C AFAC0018 */ sw $t4, 0x0018($sp) -/* 00E50 80A20C10 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00E54 80A20C14 0C288540 */ jal func_80A21500 -/* 00E58 80A20C18 AFAD001C */ sw $t5, 0x001C($sp) -/* 00E5C 80A20C1C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 00E60 80A20C20 C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 00E64 80A20C24 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 00E68 80A20C28 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 00E6C 80A20C2C C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 00E70 80A20C30 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 00E74 80A20C34 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E78 80A20C38 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00E7C 80A20C3C 87AE0034 */ lh $t6, 0x0034($sp) -/* 00E80 80A20C40 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00E84 80A20C44 46069482 */ mul.s $f18, $f18, $f6 -/* 00E88 80A20C48 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00E8C 80A20C4C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00E90 80A20C50 46068402 */ mul.s $f16, $f16, $f6 -/* 00E94 80A20C54 44811000 */ mtc1 $at, $f2 ## $f2 = 25.00 -/* 00E98 80A20C58 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E9C 80A20C5C 46067182 */ mul.s $f6, $f14, $f6 -/* 00EA0 80A20C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EA4 80A20C64 46126480 */ add.s $f18, $f12, $f18 -/* 00EA8 80A20C68 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 00EAC 80A20C6C 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC -/* 00EB0 80A20C70 46105400 */ add.s $f16, $f10, $f16 -/* 00EB4 80A20C74 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 00EB8 80A20C78 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFD0 -/* 00EBC 80A20C7C 46064180 */ add.s $f6, $f8, $f6 -/* 00EC0 80A20C80 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 00EC4 80A20C84 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00EC8 80A20C88 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00ECC 80A20C8C E7A60058 */ swc1 $f6, 0x0058($sp) -/* 00ED0 80A20C90 0C288540 */ jal func_80A21500 -/* 00ED4 80A20C94 AFA0001C */ sw $zero, 0x001C($sp) -.L80A20C98: -/* 00ED8 80A20C98 8FBF002C */ lw $ra, 0x002C($sp) -.L80A20C9C: -/* 00EDC 80A20C9C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EE0 80A20CA0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00EE4 80A20CA4 03E00008 */ jr $ra -/* 00EE8 80A20CA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s deleted file mode 100644 index e39040d3fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A20CAC -/* 00EEC 80A20CAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EF0 80A20CB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00EF4 80A20CB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EF8 80A20CB8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EFC 80A20CBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00F00 80A20CC0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00F04 80A20CC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00F08 80A20CC8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00F0C 80A20CCC 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 00F10 80A20CD0 01C17824 */ and $t7, $t6, $at -/* 00F14 80A20CD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F18 80A20CD8 A0800260 */ sb $zero, 0x0260($a0) ## 00000260 -/* 00F1C 80A20CDC A0820246 */ sb $v0, 0x0246($a0) ## 00000246 -/* 00F20 80A20CE0 A0800248 */ sb $zero, 0x0248($a0) ## 00000248 -/* 00F24 80A20CE4 A0820262 */ sb $v0, 0x0262($a0) ## 00000262 -/* 00F28 80A20CE8 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00F2C 80A20CEC A0800261 */ sb $zero, 0x0261($a0) ## 00000261 -/* 00F30 80A20CF0 A4980244 */ sh $t8, 0x0244($a0) ## 00000244 -/* 00F34 80A20CF4 E4800254 */ swc1 $f0, 0x0254($a0) ## 00000254 -/* 00F38 80A20CF8 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 00F3C 80A20CFC E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00F40 80A20D00 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00F44 80A20D04 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F48 80A20D08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00F4C 80A20D0C 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 00F50 80A20D10 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00F54 80A20D14 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00F58 80A20D18 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F5C 80A20D1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F60 80A20D20 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00F64 80A20D24 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00F68 80A20D28 24070060 */ addiu $a3, $zero, 0x0060 ## $a3 = 00000060 -/* 00F6C 80A20D2C 3C0880A2 */ lui $t0, %hi(func_80A20D4C) ## $t0 = 80A20000 -/* 00F70 80A20D30 25080D4C */ addiu $t0, $t0, %lo(func_80A20D4C) ## $t0 = 80A20D4C -/* 00F74 80A20D34 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 00F78 80A20D38 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F7C 80A20D3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F80 80A20D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F84 80A20D44 03E00008 */ jr $ra -/* 00F88 80A20D48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s deleted file mode 100644 index 9626eb2295..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A20D4C -/* 00F8C 80A20D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F90 80A20D50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F94 80A20D54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F98 80A20D58 848E0244 */ lh $t6, 0x0244($a0) ## 00000244 -/* 00F9C 80A20D5C 55C00004 */ bnel $t6, $zero, .L80A20D70 -/* 00FA0 80A20D60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FA4 80A20D64 0C00B55C */ jal Actor_Kill - -/* 00FA8 80A20D68 00000000 */ nop -/* 00FAC 80A20D6C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20D70: -/* 00FB0 80A20D70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FB4 80A20D74 03E00008 */ jr $ra -/* 00FB8 80A20D78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s deleted file mode 100644 index 60b2ec5339..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A20D7C -/* 00FBC 80A20D7C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00FC0 80A20D80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00FC4 80A20D84 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00FC8 80A20D88 3C0880A2 */ lui $t0, %hi(func_80A20DBC) ## $t0 = 80A20000 -/* 00FCC 80A20D8C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00FD0 80A20D90 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00FD4 80A20D94 25080DBC */ addiu $t0, $t0, %lo(func_80A20DBC) ## $t0 = 80A20DBC -/* 00FD8 80A20D98 0301C824 */ and $t9, $t8, $at -/* 00FDC 80A20D9C A08E0260 */ sb $t6, 0x0260($a0) ## 00000260 -/* 00FE0 80A20DA0 A0800248 */ sb $zero, 0x0248($a0) ## 00000248 -/* 00FE4 80A20DA4 A08F0262 */ sb $t7, 0x0262($a0) ## 00000262 -/* 00FE8 80A20DA8 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00FEC 80A20DAC AC88014C */ sw $t0, 0x014C($a0) ## 0000014C -/* 00FF0 80A20DB0 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00FF4 80A20DB4 03E00008 */ jr $ra -/* 00FF8 80A20DB8 E4800254 */ swc1 $f0, 0x0254($a0) ## 00000254 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s deleted file mode 100644 index 741b6431ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s +++ /dev/null @@ -1,65 +0,0 @@ -.late_rodata -glabel D_80A21CD8 - .word 0x3BC49BA6 -glabel D_80A21CDC - .word 0x39D1B717 -glabel D_80A21CE0 - .word 0x3B83126F - -.text -glabel func_80A20DBC -/* 00FFC 80A20DBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01000 80A20DC0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01004 80A20DC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01008 80A20DC8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0100C 80A20DCC 3C053A1D */ lui $a1, 0x3A1D ## $a1 = 3A1D0000 -/* 01010 80A20DD0 3C063951 */ lui $a2, 0x3951 ## $a2 = 39510000 -/* 01014 80A20DD4 34C6B717 */ ori $a2, $a2, 0xB717 ## $a2 = 3951B717 -/* 01018 80A20DD8 34A54952 */ ori $a1, $a1, 0x4952 ## $a1 = 3A1D4952 -/* 0101C 80A20DDC AFA70018 */ sw $a3, 0x0018($sp) -/* 01020 80A20DE0 0C01DE80 */ jal Math_StepToF - -/* 01024 80A20DE4 24840054 */ addiu $a0, $a0, 0x0054 ## $a0 = 00000054 -/* 01028 80A20DE8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0102C 80A20DEC 3C0180A2 */ lui $at, %hi(D_80A21CD8) ## $at = 80A20000 -/* 01030 80A20DF0 C4241CD8 */ lwc1 $f4, %lo(D_80A21CD8)($at) -/* 01034 80A20DF4 C4E00054 */ lwc1 $f0, 0x0054($a3) ## 00000054 -/* 01038 80A20DF8 3C0180A2 */ lui $at, %hi(D_80A21CDC) ## $at = 80A20000 -/* 0103C 80A20DFC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01040 80A20E00 4604003C */ c.lt.s $f0, $f4 -/* 01044 80A20E04 00000000 */ nop -/* 01048 80A20E08 45000009 */ bc1f .L80A20E30 -/* 0104C 80A20E0C 00000000 */ nop -/* 01050 80A20E10 C4221CDC */ lwc1 $f2, %lo(D_80A21CDC)($at) -/* 01054 80A20E14 C4E60050 */ lwc1 $f6, 0x0050($a3) ## 00000050 -/* 01058 80A20E18 C4EA0058 */ lwc1 $f10, 0x0058($a3) ## 00000058 -/* 0105C 80A20E1C C4E00054 */ lwc1 $f0, 0x0054($a3) ## 00000054 -/* 01060 80A20E20 46023200 */ add.s $f8, $f6, $f2 -/* 01064 80A20E24 46025400 */ add.s $f16, $f10, $f2 -/* 01068 80A20E28 E4E80050 */ swc1 $f8, 0x0050($a3) ## 00000050 -/* 0106C 80A20E2C E4F00058 */ swc1 $f16, 0x0058($a3) ## 00000058 -.L80A20E30: -/* 01070 80A20E30 3C0180A2 */ lui $at, %hi(D_80A21CE0) ## $at = 80A20000 -/* 01074 80A20E34 C4321CE0 */ lwc1 $f18, %lo(D_80A21CE0)($at) -/* 01078 80A20E38 4612003C */ c.lt.s $f0, $f18 -/* 0107C 80A20E3C 00000000 */ nop -/* 01080 80A20E40 45020008 */ bc1fl .L80A20E64 -/* 01084 80A20E44 8CF90258 */ lw $t9, 0x0258($a3) ## 00000258 -/* 01088 80A20E48 8CEE0258 */ lw $t6, 0x0258($a3) ## 00000258 -/* 0108C 80A20E4C 25CFFFF8 */ addiu $t7, $t6, 0xFFF8 ## $t7 = FFFFFFF8 -/* 01090 80A20E50 2DE10100 */ sltiu $at, $t7, 0x0100 -/* 01094 80A20E54 14200002 */ bne $at, $zero, .L80A20E60 -/* 01098 80A20E58 ACEF0258 */ sw $t7, 0x0258($a3) ## 00000258 -/* 0109C 80A20E5C ACE00258 */ sw $zero, 0x0258($a3) ## 00000258 -.L80A20E60: -/* 010A0 80A20E60 8CF90258 */ lw $t9, 0x0258($a3) ## 00000258 -.L80A20E64: -/* 010A4 80A20E64 57200004 */ bnel $t9, $zero, .L80A20E78 -/* 010A8 80A20E68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010AC 80A20E6C 0C28832B */ jal func_80A20CAC -/* 010B0 80A20E70 8FA5001C */ lw $a1, 0x001C($sp) -/* 010B4 80A20E74 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A20E78: -/* 010B8 80A20E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010BC 80A20E7C 03E00008 */ jr $ra -/* 010C0 80A20E80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s deleted file mode 100644 index 3d783201ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A20E84 -/* 010C4 80A20E84 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 010C8 80A20E88 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 010CC 80A20E8C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 010D0 80A20E90 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 010D4 80A20E94 3C1980A2 */ lui $t9, %hi(func_80A20EC4) ## $t9 = 80A20000 -/* 010D8 80A20E98 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 010DC 80A20E9C 27390EC4 */ addiu $t9, $t9, %lo(func_80A20EC4) ## $t9 = 80A20EC4 -/* 010E0 80A20EA0 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 010E4 80A20EA4 A0820260 */ sb $v0, 0x0260($a0) ## 00000260 -/* 010E8 80A20EA8 A48E0244 */ sh $t6, 0x0244($a0) ## 00000244 -/* 010EC 80A20EAC A0820246 */ sb $v0, 0x0246($a0) ## 00000246 -/* 010F0 80A20EB0 A0820248 */ sb $v0, 0x0248($a0) ## 00000248 -/* 010F4 80A20EB4 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 010F8 80A20EB8 AC99014C */ sw $t9, 0x014C($a0) ## 0000014C -/* 010FC 80A20EBC 03E00008 */ jr $ra -/* 01100 80A20EC0 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s deleted file mode 100644 index 52c9c5d9df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s +++ /dev/null @@ -1,139 +0,0 @@ -.late_rodata -glabel D_80A21CE4 - .float 0.6 - -glabel D_80A21CE8 - .float 3.14159274101 - -.text -glabel func_80A20EC4 -/* 01104 80A20EC4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01108 80A20EC8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0110C 80A20ECC AFB00028 */ sw $s0, 0x0028($sp) -/* 01110 80A20ED0 AFA5006C */ sw $a1, 0x006C($sp) -/* 01114 80A20ED4 848E0240 */ lh $t6, 0x0240($a0) ## 00000240 -/* 01118 80A20ED8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0111C 80A20EDC 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 01120 80A20EE0 31CF00C0 */ andi $t7, $t6, 0x00C0 ## $t7 = 00000000 -/* 01124 80A20EE4 11E00008 */ beq $t7, $zero, .L80A20F08 -/* 01128 80A20EE8 240531A4 */ addiu $a1, $zero, 0x31A4 ## $a1 = 000031A4 -/* 0112C 80A20EEC 0C2881C1 */ jal func_80A20704 -/* 01130 80A20EF0 00000000 */ nop -/* 01134 80A20EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01138 80A20EF8 0C287FE3 */ jal func_80A1FF8C -/* 0113C 80A20EFC 8FA5006C */ lw $a1, 0x006C($sp) -/* 01140 80A20F00 1000006A */ beq $zero, $zero, .L80A210AC -/* 01144 80A20F04 8FBF002C */ lw $ra, 0x002C($sp) -.L80A20F08: -/* 01148 80A20F08 A3A00037 */ sb $zero, 0x0037($sp) -/* 0114C 80A20F0C A7B80034 */ sh $t8, 0x0034($sp) -/* 01150 80A20F10 0C00BE5D */ jal func_8002F974 -/* 01154 80A20F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01158 80A20F18 86020240 */ lh $v0, 0x0240($s0) ## 00000240 -/* 0115C 80A20F1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01160 80A20F20 24080276 */ addiu $t0, $zero, 0x0276 ## $t0 = 00000276 -/* 01164 80A20F24 3042003F */ andi $v0, $v0, 0x003F ## $v0 = 00000000 -/* 01168 80A20F28 28410030 */ slti $at, $v0, 0x0030 -/* 0116C 80A20F2C 14200005 */ bne $at, $zero, .L80A20F44 -/* 01170 80A20F30 0002C880 */ sll $t9, $v0, 2 -/* 01174 80A20F34 0322C821 */ addu $t9, $t9, $v0 -/* 01178 80A20F38 0019C840 */ sll $t9, $t9, 1 -/* 0117C 80A20F3C 01194823 */ subu $t1, $t0, $t9 -/* 01180 80A20F40 A7A90034 */ sh $t1, 0x0034($sp) -.L80A20F44: -/* 01184 80A20F44 3C0180A2 */ lui $at, %hi(D_80A21CE4) ## $at = 80A20000 -/* 01188 80A20F48 C4241CE4 */ lwc1 $f4, %lo(D_80A21CE4)($at) -/* 0118C 80A20F4C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 01190 80A20F50 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 01194 80A20F54 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 01198 80A20F58 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 0119C 80A20F5C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 011A0 80A20F60 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 011A4 80A20F64 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 011A8 80A20F68 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 011AC 80A20F6C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 011B0 80A20F70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 011B4 80A20F74 460A4400 */ add.s $f16, $f8, $f10 -/* 011B8 80A20F78 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 011BC 80A20F7C 3C0180A2 */ lui $at, %hi(D_80A21CE8) ## $at = 80A20000 -/* 011C0 80A20F80 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 011C4 80A20F84 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 011C8 80A20F88 C4301CE8 */ lwc1 $f16, %lo(D_80A21CE8)($at) -/* 011CC 80A20F8C E7B20058 */ swc1 $f18, 0x0058($sp) -/* 011D0 80A20F90 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 011D4 80A20F94 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 011D8 80A20F98 00000000 */ nop -/* 011DC 80A20F9C 468021A0 */ cvt.s.w $f6, $f4 -/* 011E0 80A20FA0 46083283 */ div.s $f10, $f6, $f8 -/* 011E4 80A20FA4 46105302 */ mul.s $f12, $f10, $f16 -/* 011E8 80A20FA8 0C034348 */ jal Matrix_RotateY -/* 011EC 80A20FAC 00000000 */ nop -/* 011F0 80A20FB0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 011F4 80A20FB4 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 011F8 80A20FB8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 011FC 80A20FBC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01200 80A20FC0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 01204 80A20FC4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFF4 -/* 01208 80A20FC8 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFDC -/* 0120C 80A20FCC E7A40060 */ swc1 $f4, 0x0060($sp) -/* 01210 80A20FD0 E7B2005C */ swc1 $f18, 0x005C($sp) -/* 01214 80A20FD4 0C0346BD */ jal Matrix_MultVec3f -/* 01218 80A20FD8 E7A60064 */ swc1 $f6, 0x0064($sp) -/* 0121C 80A20FDC 860B0240 */ lh $t3, 0x0240($s0) ## 00000240 -/* 01220 80A20FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01224 80A20FE4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 01228 80A20FE8 316C0007 */ andi $t4, $t3, 0x0007 ## $t4 = 00000000 -/* 0122C 80A20FEC 15800003 */ bne $t4, $zero, .L80A20FFC -/* 01230 80A20FF0 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC -/* 01234 80A20FF4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01238 80A20FF8 A3AD0037 */ sb $t5, 0x0037($sp) -.L80A20FFC: -/* 0123C 80A20FFC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01240 80A21000 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 01244 80A21004 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 01248 80A21008 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 0124C 80A2100C 87AE0034 */ lh $t6, 0x0034($sp) -/* 01250 80A21010 93AF0037 */ lbu $t7, 0x0037($sp) -/* 01254 80A21014 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFD0 -/* 01258 80A21018 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0125C 80A2101C AFAE0018 */ sw $t6, 0x0018($sp) -/* 01260 80A21020 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01264 80A21024 0C288540 */ jal func_80A21500 -/* 01268 80A21028 AFAF001C */ sw $t7, 0x001C($sp) -/* 0126C 80A2102C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 01270 80A21030 C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 01274 80A21034 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 01278 80A21038 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 0127C 80A2103C C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 01280 80A21040 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 01284 80A21044 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01288 80A21048 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0128C 80A2104C 87B80034 */ lh $t8, 0x0034($sp) -/* 01290 80A21050 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01294 80A21054 46069482 */ mul.s $f18, $f18, $f6 -/* 01298 80A21058 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0129C 80A2105C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 012A0 80A21060 46068402 */ mul.s $f16, $f16, $f6 -/* 012A4 80A21064 44811000 */ mtc1 $at, $f2 ## $f2 = 25.00 -/* 012A8 80A21068 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 012AC 80A2106C 46067182 */ mul.s $f6, $f14, $f6 -/* 012B0 80A21070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012B4 80A21074 46126480 */ add.s $f18, $f12, $f18 -/* 012B8 80A21078 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 012BC 80A2107C 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC -/* 012C0 80A21080 46105400 */ add.s $f16, $f10, $f16 -/* 012C4 80A21084 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 012C8 80A21088 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFD0 -/* 012CC 80A2108C 46064180 */ add.s $f6, $f8, $f6 -/* 012D0 80A21090 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 012D4 80A21094 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 012D8 80A21098 AFB80018 */ sw $t8, 0x0018($sp) -/* 012DC 80A2109C E7A60058 */ swc1 $f6, 0x0058($sp) -/* 012E0 80A210A0 0C288540 */ jal func_80A21500 -/* 012E4 80A210A4 AFA0001C */ sw $zero, 0x001C($sp) -/* 012E8 80A210A8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A210AC: -/* 012EC 80A210AC 8FB00028 */ lw $s0, 0x0028($sp) -/* 012F0 80A210B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 012F4 80A210B4 03E00008 */ jr $ra -/* 012F8 80A210B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s deleted file mode 100644 index e01fd31ba0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A2145C -/* 0169C 80A2145C 24820274 */ addiu $v0, $a0, 0x0274 ## $v0 = 00000274 -/* 016A0 80A21460 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A21464: -/* 016A4 80A21464 904E0000 */ lbu $t6, 0x0000($v0) ## 00000274 -/* 016A8 80A21468 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 016AC 80A2146C 00031C00 */ sll $v1, $v1, 16 -/* 016B0 80A21470 15C0001E */ bne $t6, $zero, .L80A214EC -/* 016B4 80A21474 00031C03 */ sra $v1, $v1, 16 -/* 016B8 80A21478 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 016BC 80A2147C A04F0000 */ sb $t7, 0x0000($v0) ## 00000274 -/* 016C0 80A21480 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 016C4 80A21484 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 016C8 80A21488 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 016CC 80A2148C AC590004 */ sw $t9, 0x0004($v0) ## 00000278 -/* 016D0 80A21490 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -/* 016D4 80A21494 AC580008 */ sw $t8, 0x0008($v0) ## 0000027C -/* 016D8 80A21498 8CB90008 */ lw $t9, 0x0008($a1) ## 00000008 -/* 016DC 80A2149C AC59000C */ sw $t9, 0x000C($v0) ## 00000280 -/* 016E0 80A214A0 8CC90000 */ lw $t1, 0x0000($a2) ## 00000000 -/* 016E4 80A214A4 AC490010 */ sw $t1, 0x0010($v0) ## 00000284 -/* 016E8 80A214A8 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -/* 016EC 80A214AC AC480014 */ sw $t0, 0x0014($v0) ## 00000288 -/* 016F0 80A214B0 8CC90008 */ lw $t1, 0x0008($a2) ## 00000008 -/* 016F4 80A214B4 AC490018 */ sw $t1, 0x0018($v0) ## 0000028C -/* 016F8 80A214B8 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 016FC 80A214BC AC4B001C */ sw $t3, 0x001C($v0) ## 00000290 -/* 01700 80A214C0 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 01704 80A214C4 AC4A0020 */ sw $t2, 0x0020($v0) ## 00000294 -/* 01708 80A214C8 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 0170C 80A214CC A440002E */ sh $zero, 0x002E($v0) ## 000002A2 -/* 01710 80A214D0 AC4B0024 */ sw $t3, 0x0024($v0) ## 00000298 -/* 01714 80A214D4 C7A40010 */ lwc1 $f4, 0x0010($sp) -/* 01718 80A214D8 A440002C */ sh $zero, 0x002C($v0) ## 000002A0 -/* 0171C 80A214DC A0400001 */ sb $zero, 0x0001($v0) ## 00000275 -/* 01720 80A214E0 46062203 */ div.s $f8, $f4, $f6 -/* 01724 80A214E4 03E00008 */ jr $ra -/* 01728 80A214E8 E4480030 */ swc1 $f8, 0x0030($v0) ## 000002A4 -.L80A214EC: -/* 0172C 80A214EC 28610028 */ slti $at, $v1, 0x0028 -/* 01730 80A214F0 1420FFDC */ bne $at, $zero, .L80A21464 -/* 01734 80A214F4 2442003C */ addiu $v0, $v0, 0x003C ## $v0 = 000002B0 -/* 01738 80A214F8 03E00008 */ jr $ra -/* 0173C 80A214FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s deleted file mode 100644 index 5fcf4f9f23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A21500 -/* 01740 80A21500 24820274 */ addiu $v0, $a0, 0x0274 ## $v0 = 00000274 -/* 01744 80A21504 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A21508: -/* 01748 80A21508 904E0000 */ lbu $t6, 0x0000($v0) ## 00000274 -/* 0174C 80A2150C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 01750 80A21510 00031C00 */ sll $v1, $v1, 16 -/* 01754 80A21514 15C00024 */ bne $t6, $zero, .L80A215A8 -/* 01758 80A21518 00031C03 */ sra $v1, $v1, 16 -/* 0175C 80A2151C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01760 80A21520 A04F0000 */ sb $t7, 0x0000($v0) ## 00000274 -/* 01764 80A21524 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01768 80A21528 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0176C 80A2152C 44810000 */ mtc1 $at, $f0 ## $f0 = 1000.00 -/* 01770 80A21530 AC590004 */ sw $t9, 0x0004($v0) ## 00000278 -/* 01774 80A21534 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -/* 01778 80A21538 AC580008 */ sw $t8, 0x0008($v0) ## 0000027C -/* 0177C 80A2153C 8CB90008 */ lw $t9, 0x0008($a1) ## 00000008 -/* 01780 80A21540 AC59000C */ sw $t9, 0x000C($v0) ## 00000280 -/* 01784 80A21544 8CC90000 */ lw $t1, 0x0000($a2) ## 00000000 -/* 01788 80A21548 AC490010 */ sw $t1, 0x0010($v0) ## 00000284 -/* 0178C 80A2154C 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -/* 01790 80A21550 AC480014 */ sw $t0, 0x0014($v0) ## 00000288 -/* 01794 80A21554 8CC90008 */ lw $t1, 0x0008($a2) ## 00000008 -/* 01798 80A21558 AC490018 */ sw $t1, 0x0018($v0) ## 0000028C -/* 0179C 80A2155C 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 017A0 80A21560 AC4B001C */ sw $t3, 0x001C($v0) ## 00000290 -/* 017A4 80A21564 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 017A8 80A21568 AC4A0020 */ sw $t2, 0x0020($v0) ## 00000294 -/* 017AC 80A2156C 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 017B0 80A21570 A440002E */ sh $zero, 0x002E($v0) ## 000002A2 -/* 017B4 80A21574 AC4B0024 */ sw $t3, 0x0024($v0) ## 00000298 -/* 017B8 80A21578 C7A40010 */ lwc1 $f4, 0x0010($sp) -/* 017BC 80A2157C 46002183 */ div.s $f6, $f4, $f0 -/* 017C0 80A21580 E4460030 */ swc1 $f6, 0x0030($v0) ## 000002A4 -/* 017C4 80A21584 C7A80014 */ lwc1 $f8, 0x0014($sp) -/* 017C8 80A21588 46004283 */ div.s $f10, $f8, $f0 -/* 017CC 80A2158C E44A0034 */ swc1 $f10, 0x0034($v0) ## 000002A8 -/* 017D0 80A21590 87AC001A */ lh $t4, 0x001A($sp) -/* 017D4 80A21594 A0400001 */ sb $zero, 0x0001($v0) ## 00000275 -/* 017D8 80A21598 A44C002C */ sh $t4, 0x002C($v0) ## 000002A0 -/* 017DC 80A2159C 93AD001F */ lbu $t5, 0x001F($sp) -/* 017E0 80A215A0 03E00008 */ jr $ra -/* 017E4 80A215A4 A04D0038 */ sb $t5, 0x0038($v0) ## 000002AC -.L80A215A8: -/* 017E8 80A215A8 28610028 */ slti $at, $v1, 0x0028 -/* 017EC 80A215AC 1420FFD6 */ bne $at, $zero, .L80A21508 -/* 017F0 80A215B0 2442003C */ addiu $v0, $v0, 0x003C ## $v0 = 000002B0 -/* 017F4 80A215B4 03E00008 */ jr $ra -/* 017F8 80A215B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s deleted file mode 100644 index 6fa106d897..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s +++ /dev/null @@ -1,204 +0,0 @@ -.late_rodata -glabel D_80A21CEC - .float 0.1 - -.text -glabel func_80A215BC -/* 017FC 80A215BC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 01800 80A215C0 F7BC0030 */ sdc1 $f28, 0x0030($sp) -/* 01804 80A215C4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01808 80A215C8 4481E000 */ mtc1 $at, $f28 ## $f28 = 2.00 -/* 0180C 80A215CC F7BA0028 */ sdc1 $f26, 0x0028($sp) -/* 01810 80A215D0 3C0180A2 */ lui $at, %hi(D_80A21CEC) ## $at = 80A20000 -/* 01814 80A215D4 C43A1CEC */ lwc1 $f26, %lo(D_80A21CEC)($at) -/* 01818 80A215D8 F7B80020 */ sdc1 $f24, 0x0020($sp) -/* 0181C 80A215DC 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 -/* 01820 80A215E0 4481C000 */ mtc1 $at, $f24 ## $f24 = 0.75 -/* 01824 80A215E4 AFB60054 */ sw $s6, 0x0054($sp) -/* 01828 80A215E8 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 0182C 80A215EC F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 01830 80A215F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01834 80A215F4 AFB70058 */ sw $s7, 0x0058($sp) -/* 01838 80A215F8 AFB50050 */ sw $s5, 0x0050($sp) -/* 0183C 80A215FC AFB4004C */ sw $s4, 0x004C($sp) -/* 01840 80A21600 AFB30048 */ sw $s3, 0x0048($sp) -/* 01844 80A21604 AFB20044 */ sw $s2, 0x0044($sp) -/* 01848 80A21608 AFB10040 */ sw $s1, 0x0040($sp) -/* 0184C 80A2160C AFB0003C */ sw $s0, 0x003C($sp) -/* 01850 80A21610 3C160001 */ lui $s6, 0x0001 ## $s6 = 00010000 -/* 01854 80A21614 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 01858 80A21618 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 0185C 80A2161C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01860 80A21620 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 01864 80A21624 AFBF005C */ sw $ra, 0x005C($sp) -/* 01868 80A21628 24900274 */ addiu $s0, $a0, 0x0274 ## $s0 = 00000274 -/* 0186C 80A2162C 36D61E60 */ ori $s6, $s6, 0x1E60 ## $s6 = 00011E60 -/* 01870 80A21630 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 01874 80A21634 24130002 */ addiu $s3, $zero, 0x0002 ## $s3 = 00000002 -/* 01878 80A21638 24150001 */ addiu $s5, $zero, 0x0001 ## $s5 = 00000001 -/* 0187C 80A2163C 27B70064 */ addiu $s7, $sp, 0x0064 ## $s7 = FFFFFFEC -.L80A21640: -/* 01880 80A21640 920E0000 */ lbu $t6, 0x0000($s0) ## 00000274 -/* 01884 80A21644 51C00083 */ beql $t6, $zero, .L80A21854 -/* 01888 80A21648 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 0188C 80A2164C C6000010 */ lwc1 $f0, 0x0010($s0) ## 00000284 -/* 01890 80A21650 C6040004 */ lwc1 $f4, 0x0004($s0) ## 00000278 -/* 01894 80A21654 C6020014 */ lwc1 $f2, 0x0014($s0) ## 00000288 -/* 01898 80A21658 C6080008 */ lwc1 $f8, 0x0008($s0) ## 0000027C -/* 0189C 80A2165C C60C0018 */ lwc1 $f12, 0x0018($s0) ## 0000028C -/* 018A0 80A21660 C610000C */ lwc1 $f16, 0x000C($s0) ## 00000280 -/* 018A4 80A21664 46002180 */ add.s $f6, $f4, $f0 -/* 018A8 80A21668 C604001C */ lwc1 $f4, 0x001C($s0) ## 00000290 -/* 018AC 80A2166C 920F0001 */ lbu $t7, 0x0001($s0) ## 00000275 -/* 018B0 80A21670 46024280 */ add.s $f10, $f8, $f2 -/* 018B4 80A21674 C6080020 */ lwc1 $f8, 0x0020($s0) ## 00000294 -/* 018B8 80A21678 E6060004 */ swc1 $f6, 0x0004($s0) ## 00000278 -/* 018BC 80A2167C 460C8480 */ add.s $f18, $f16, $f12 -/* 018C0 80A21680 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000298 -/* 018C4 80A21684 E60A0008 */ swc1 $f10, 0x0008($s0) ## 0000027C -/* 018C8 80A21688 46040180 */ add.s $f6, $f0, $f4 -/* 018CC 80A2168C E612000C */ swc1 $f18, 0x000C($s0) ## 00000280 -/* 018D0 80A21690 92020000 */ lbu $v0, 0x0000($s0) ## 00000274 -/* 018D4 80A21694 46081280 */ add.s $f10, $f2, $f8 -/* 018D8 80A21698 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 018DC 80A2169C A2180001 */ sb $t8, 0x0001($s0) ## 00000275 -/* 018E0 80A216A0 46106480 */ add.s $f18, $f12, $f16 -/* 018E4 80A216A4 E6060010 */ swc1 $f6, 0x0010($s0) ## 00000284 -/* 018E8 80A216A8 E60A0014 */ swc1 $f10, 0x0014($s0) ## 00000288 -/* 018EC 80A216AC 16A20018 */ bne $s5, $v0, .L80A21710 -/* 018F0 80A216B0 E6120018 */ swc1 $f18, 0x0018($s0) ## 0000028C -/* 018F4 80A216B4 8619002E */ lh $t9, 0x002E($s0) ## 000002A2 -/* 018F8 80A216B8 5720000D */ bnel $t9, $zero, .L80A216F0 -/* 018FC 80A216BC 860D002C */ lh $t5, 0x002C($s0) ## 000002A0 -/* 01900 80A216C0 8608002C */ lh $t0, 0x002C($s0) ## 000002A0 -/* 01904 80A216C4 2509000A */ addiu $t1, $t0, 0x000A ## $t1 = 0000000A -/* 01908 80A216C8 A609002C */ sh $t1, 0x002C($s0) ## 000002A0 -/* 0190C 80A216CC 860A002C */ lh $t2, 0x002C($s0) ## 000002A0 -/* 01910 80A216D0 29410064 */ slti $at, $t2, 0x0064 -/* 01914 80A216D4 5420005F */ bnel $at, $zero, .L80A21854 -/* 01918 80A216D8 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000002 -/* 0191C 80A216DC 860B002E */ lh $t3, 0x002E($s0) ## 000002A2 -/* 01920 80A216E0 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 01924 80A216E4 1000005A */ beq $zero, $zero, .L80A21850 -/* 01928 80A216E8 A60C002E */ sh $t4, 0x002E($s0) ## 000002A2 -/* 0192C 80A216EC 860D002C */ lh $t5, 0x002C($s0) ## 000002A0 -.L80A216F0: -/* 01930 80A216F0 25AEFFFD */ addiu $t6, $t5, 0xFFFD ## $t6 = FFFFFFFD -/* 01934 80A216F4 A60E002C */ sh $t6, 0x002C($s0) ## 000002A0 -/* 01938 80A216F8 860F002C */ lh $t7, 0x002C($s0) ## 000002A0 -/* 0193C 80A216FC 5DE00055 */ bgtzl $t7, .L80A21854 -/* 01940 80A21700 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000003 -/* 01944 80A21704 A600002C */ sh $zero, 0x002C($s0) ## 000002A0 -/* 01948 80A21708 10000051 */ beq $zero, $zero, .L80A21850 -/* 0194C 80A2170C A2000000 */ sb $zero, 0x0000($s0) ## 00000274 -.L80A21710: -/* 01950 80A21710 56620050 */ bnel $s3, $v0, .L80A21854 -/* 01954 80A21714 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000004 -/* 01958 80A21718 C6000034 */ lwc1 $f0, 0x0034($s0) ## 000002A8 -/* 0195C 80A2171C 4406D000 */ mfc1 $a2, $f26 -/* 01960 80A21720 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 000002A4 -/* 01964 80A21724 46140103 */ div.s $f4, $f0, $f20 -/* 01968 80A21728 44050000 */ mfc1 $a1, $f0 -/* 0196C 80A2172C 44072000 */ mfc1 $a3, $f4 -/* 01970 80A21730 0C01E107 */ jal Math_ApproachF - -/* 01974 80A21734 00000000 */ nop -/* 01978 80A21738 8602002E */ lh $v0, 0x002E($s0) ## 000002A2 -/* 0197C 80A2173C 54400009 */ bnel $v0, $zero, .L80A21764 -/* 01980 80A21740 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000284 -/* 01984 80A21744 92180001 */ lbu $t8, 0x0001($s0) ## 00000275 -/* 01988 80A21748 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 0198C 80A2174C 2B010007 */ slti $at, $t8, 0x0007 -/* 01990 80A21750 54200012 */ bnel $at, $zero, .L80A2179C -/* 01994 80A21754 922B0263 */ lbu $t3, 0x0263($s1) ## 00000263 -/* 01998 80A21758 1000000F */ beq $zero, $zero, .L80A21798 -/* 0199C 80A2175C A619002E */ sh $t9, 0x002E($s0) ## 000002A2 -/* 019A0 80A21760 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000284 -.L80A21764: -/* 019A4 80A21764 C60A0018 */ lwc1 $f10, 0x0018($s0) ## 0000028C -/* 019A8 80A21768 8608002C */ lh $t0, 0x002C($s0) ## 000002A0 -/* 019AC 80A2176C 46183202 */ mul.s $f8, $f6, $f24 -/* 019B0 80A21770 E61C0020 */ swc1 $f28, 0x0020($s0) ## 00000294 -/* 019B4 80A21774 2509FFEF */ addiu $t1, $t0, 0xFFEF ## $t1 = FFFFFFEF -/* 019B8 80A21778 46185402 */ mul.s $f16, $f10, $f24 -/* 019BC 80A2177C A609002C */ sh $t1, 0x002C($s0) ## 000002A0 -/* 019C0 80A21780 860A002C */ lh $t2, 0x002C($s0) ## 000002A0 -/* 019C4 80A21784 E6080010 */ swc1 $f8, 0x0010($s0) ## 00000284 -/* 019C8 80A21788 1D400003 */ bgtz $t2, .L80A21798 -/* 019CC 80A2178C E6100018 */ swc1 $f16, 0x0018($s0) ## 0000028C -/* 019D0 80A21790 A600002C */ sh $zero, 0x002C($s0) ## 000002A0 -/* 019D4 80A21794 A2000000 */ sb $zero, 0x0000($s0) ## 00000274 -.L80A21798: -/* 019D8 80A21798 922B0263 */ lbu $t3, 0x0263($s1) ## 00000263 -.L80A2179C: -/* 019DC 80A2179C 5560001B */ bnel $t3, $zero, .L80A2180C -/* 019E0 80A217A0 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 -/* 019E4 80A217A4 860C002C */ lh $t4, 0x002C($s0) ## 000002A0 -/* 019E8 80A217A8 29810065 */ slti $at, $t4, 0x0065 -/* 019EC 80A217AC 54200017 */ bnel $at, $zero, .L80A2180C -/* 019F0 80A217B0 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 -/* 019F4 80A217B4 920D0038 */ lbu $t5, 0x0038($s0) ## 000002AC -/* 019F8 80A217B8 51A00014 */ beql $t5, $zero, .L80A2180C -/* 019FC 80A217BC C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 -/* 01A00 80A217C0 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 -/* 01A04 80A217C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01A08 80A217C8 02962821 */ addu $a1, $s4, $s6 -/* 01A0C 80A217CC 4600910D */ trunc.w.s $f4, $f18 -/* 01A10 80A217D0 262601E8 */ addiu $a2, $s1, 0x01E8 ## $a2 = 000001E8 -/* 01A14 80A217D4 440F2000 */ mfc1 $t7, $f4 -/* 01A18 80A217D8 00000000 */ nop -/* 01A1C 80A217DC A62F022E */ sh $t7, 0x022E($s1) ## 0000022E -/* 01A20 80A217E0 C6060008 */ lwc1 $f6, 0x0008($s0) ## 0000027C -/* 01A24 80A217E4 4600320D */ trunc.w.s $f8, $f6 -/* 01A28 80A217E8 44194000 */ mfc1 $t9, $f8 -/* 01A2C 80A217EC 00000000 */ nop -/* 01A30 80A217F0 A6390230 */ sh $t9, 0x0230($s1) ## 00000230 -/* 01A34 80A217F4 C60A000C */ lwc1 $f10, 0x000C($s0) ## 00000280 -/* 01A38 80A217F8 4600540D */ trunc.w.s $f16, $f10 -/* 01A3C 80A217FC 44098000 */ mfc1 $t1, $f16 -/* 01A40 80A21800 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 01A44 80A21804 A6290232 */ sh $t1, 0x0232($s1) ## 00000232 -/* 01A48 80A21808 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 -.L80A2180C: -/* 01A4C 80A2180C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A50 80A21810 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 01A54 80A21814 C6040008 */ lwc1 $f4, 0x0008($s0) ## 0000027C -/* 01A58 80A21818 46142180 */ add.s $f6, $f4, $f20 -/* 01A5C 80A2181C E7A60068 */ swc1 $f6, 0x0068($sp) -/* 01A60 80A21820 C608000C */ lwc1 $f8, 0x000C($s0) ## 00000280 -/* 01A64 80A21824 E7A8006C */ swc1 $f8, 0x006C($sp) -/* 01A68 80A21828 860A002E */ lh $t2, 0x002E($s0) ## 000002A2 -/* 01A6C 80A2182C 526A0009 */ beql $s3, $t2, .L80A21854 -/* 01A70 80A21830 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000005 -/* 01A74 80A21834 0C28802C */ jal func_80A200B0 -/* 01A78 80A21838 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFEC -/* 01A7C 80A2183C 50400005 */ beql $v0, $zero, .L80A21854 -/* 01A80 80A21840 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000006 -/* 01A84 80A21844 A613002E */ sh $s3, 0x002E($s0) ## 000002A2 -/* 01A88 80A21848 E6160010 */ swc1 $f22, 0x0010($s0) ## 00000284 -/* 01A8C 80A2184C E6160018 */ swc1 $f22, 0x0018($s0) ## 0000028C -.L80A21850: -/* 01A90 80A21850 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000007 -.L80A21854: -/* 01A94 80A21854 00129400 */ sll $s2, $s2, 16 -/* 01A98 80A21858 00129403 */ sra $s2, $s2, 16 -/* 01A9C 80A2185C 2A410028 */ slti $at, $s2, 0x0028 -/* 01AA0 80A21860 1420FF77 */ bne $at, $zero, .L80A21640 -/* 01AA4 80A21864 2610003C */ addiu $s0, $s0, 0x003C ## $s0 = 000002B0 -/* 01AA8 80A21868 8FBF005C */ lw $ra, 0x005C($sp) -/* 01AAC 80A2186C D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 01AB0 80A21870 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 01AB4 80A21874 D7B80020 */ ldc1 $f24, 0x0020($sp) -/* 01AB8 80A21878 D7BA0028 */ ldc1 $f26, 0x0028($sp) -/* 01ABC 80A2187C D7BC0030 */ ldc1 $f28, 0x0030($sp) -/* 01AC0 80A21880 8FB0003C */ lw $s0, 0x003C($sp) -/* 01AC4 80A21884 8FB10040 */ lw $s1, 0x0040($sp) -/* 01AC8 80A21888 8FB20044 */ lw $s2, 0x0044($sp) -/* 01ACC 80A2188C 8FB30048 */ lw $s3, 0x0048($sp) -/* 01AD0 80A21890 8FB4004C */ lw $s4, 0x004C($sp) -/* 01AD4 80A21894 8FB50050 */ lw $s5, 0x0050($sp) -/* 01AD8 80A21898 8FB60054 */ lw $s6, 0x0054($sp) -/* 01ADC 80A2189C 8FB70058 */ lw $s7, 0x0058($sp) -/* 01AE0 80A218A0 03E00008 */ jr $ra -/* 01AE4 80A218A4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s deleted file mode 100644 index 791c62d1b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ /dev/null @@ -1,196 +0,0 @@ -.rdata -glabel D_80A21C90 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21CA0 - .asciz "../z_en_fz.c" - .balign 4 - -glabel D_80A21CB0 - .asciz "../z_en_fz.c" - .balign 4 - -.text -glabel func_80A218A8 -/* 01AE8 80A218A8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 01AEC 80A218AC AFBF0064 */ sw $ra, 0x0064($sp) -/* 01AF0 80A218B0 AFBE0060 */ sw $s8, 0x0060($sp) -/* 01AF4 80A218B4 AFB7005C */ sw $s7, 0x005C($sp) -/* 01AF8 80A218B8 AFB60058 */ sw $s6, 0x0058($sp) -/* 01AFC 80A218BC AFB50054 */ sw $s5, 0x0054($sp) -/* 01B00 80A218C0 AFB40050 */ sw $s4, 0x0050($sp) -/* 01B04 80A218C4 AFB3004C */ sw $s3, 0x004C($sp) -/* 01B08 80A218C8 AFB20048 */ sw $s2, 0x0048($sp) -/* 01B0C 80A218CC AFB10044 */ sw $s1, 0x0044($sp) -/* 01B10 80A218D0 AFB00040 */ sw $s0, 0x0040($sp) -/* 01B14 80A218D4 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01B18 80A218D8 AFA500C4 */ sw $a1, 0x00C4($sp) -/* 01B1C 80A218DC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 01B20 80A218E0 24920274 */ addiu $s2, $a0, 0x0274 ## $s2 = 00000274 -/* 01B24 80A218E4 3C0680A2 */ lui $a2, %hi(D_80A21C90) ## $a2 = 80A20000 -/* 01B28 80A218E8 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 -/* 01B2C 80A218EC 24C61C90 */ addiu $a2, $a2, %lo(D_80A21C90) ## $a2 = 80A21C90 -/* 01B30 80A218F0 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC -/* 01B34 80A218F4 24070568 */ addiu $a3, $zero, 0x0568 ## $a3 = 00000568 -/* 01B38 80A218F8 0C031AB1 */ jal Graph_OpenDisps -/* 01B3C 80A218FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B40 80A21900 8FAF00C4 */ lw $t7, 0x00C4($sp) -/* 01B44 80A21904 0C024F61 */ jal func_80093D84 -/* 01B48 80A21908 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01B4C 80A2190C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B50 80A21910 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 01B54 80A21914 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 01B58 80A21918 3C1EDE00 */ lui $s8, 0xDE00 ## $s8 = DE000000 -.L80A2191C: -/* 01B5C 80A2191C 92580000 */ lbu $t8, 0x0000($s2) ## 00000274 -/* 01B60 80A21920 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01B64 80A21924 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 01B68 80A21928 1B000078 */ blez $t8, .L80A21B0C -/* 01B6C 80A2192C 8FB400C4 */ lw $s4, 0x00C4($sp) -/* 01B70 80A21930 0281A021 */ addu $s4, $s4, $at -/* 01B74 80A21934 3C020600 */ lui $v0, %hi(D_06003158) ## $v0 = 06000000 -/* 01B78 80A21938 24423158 */ addiu $v0, $v0, %lo(D_06003158) ## $v0 = 06003158 -/* 01B7C 80A2193C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01B80 80A21940 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01B84 80A21944 0041B824 */ and $s7, $v0, $at -/* 01B88 80A21948 0002C900 */ sll $t9, $v0, 4 -/* 01B8C 80A2194C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01B90 80A21950 00194F02 */ srl $t1, $t9, 28 -/* 01B94 80A21954 3C0B8016 */ lui $t3, %hi(gSegments) -/* 01B98 80A21958 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 06003160 -/* 01B9C 80A2195C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 01BA0 80A21960 256B6FA8 */ addiu $t3, %lo(gSegments) -/* 01BA4 80A21964 00095080 */ sll $t2, $t1, 2 -/* 01BA8 80A21968 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 01BAC 80A2196C 014BB021 */ addu $s6, $t2, $t3 -/* 01BB0 80A21970 AC4D0000 */ sw $t5, 0x0000($v0) ## 06003158 -/* 01BB4 80A21974 16A00017 */ bne $s5, $zero, .L80A219D4 -/* 01BB8 80A21978 AC400004 */ sw $zero, 0x0004($v0) ## 0600315C -/* 01BBC 80A2197C 3C020600 */ lui $v0, %hi(D_060030A0) ## $v0 = 06000000 -/* 01BC0 80A21980 244230A0 */ addiu $v0, $v0, %lo(D_060030A0) ## $v0 = 060030A0 -/* 01BC4 80A21984 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01BC8 80A21988 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01BCC 80A2198C 00412824 */ and $a1, $v0, $at -/* 01BD0 80A21990 00027100 */ sll $t6, $v0, 4 -/* 01BD4 80A21994 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01BD8 80A21998 000E7F02 */ srl $t7, $t6, 28 -/* 01BDC 80A2199C 3C198016 */ lui $t9, %hi(gSegments) -/* 01BE0 80A219A0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 060030A8 -/* 01BE4 80A219A4 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 01BE8 80A219A8 27396FA8 */ addiu $t9, %lo(gSegments) -/* 01BEC 80A219AC 000FC080 */ sll $t8, $t7, 2 -/* 01BF0 80A219B0 03192021 */ addu $a0, $t8, $t9 -/* 01BF4 80A219B4 AC5E0000 */ sw $s8, 0x0000($v0) ## 060030A0 -/* 01BF8 80A219B8 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 01BFC 80A219BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01C00 80A219C0 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 -/* 01C04 80A219C4 01455821 */ addu $t3, $t2, $a1 -/* 01C08 80A219C8 01616021 */ addu $t4, $t3, $at -/* 01C0C 80A219CC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000001 -/* 01C10 80A219D0 AC4C0004 */ sw $t4, 0x0004($v0) ## 060030A4 -.L80A219D4: -/* 01C14 80A219D4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01C18 80A219D8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 01C1C 80A219DC 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 -/* 01C20 80A219E0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 060030A8 -/* 01C24 80A219E4 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01C28 80A219E8 AC4E0000 */ sw $t6, 0x0000($v0) ## 060030A0 -/* 01C2C 80A219EC 864F002C */ lh $t7, 0x002C($s2) ## 000002A0 -/* 01C30 80A219F0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 01C34 80A219F4 02680019 */ multu $s3, $t0 -/* 01C38 80A219F8 3421EB00 */ ori $at, $at, 0xEB00 ## $at = C3E1EB00 -/* 01C3C 80A219FC 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 01C40 80A21A00 0301C825 */ or $t9, $t8, $at ## $t9 = C3E1EB00 -/* 01C44 80A21A04 AC590004 */ sw $t9, 0x0004($v0) ## 060030A4 -/* 01C48 80A21A08 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01C4C 80A21A0C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01C50 80A21A10 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 01C54 80A21A14 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 060030A8 -/* 01C58 80A21A18 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 01C5C 80A21A1C AC4A0000 */ sw $t2, 0x0000($v0) ## 060030A0 -/* 01C60 80A21A20 924C0001 */ lbu $t4, 0x0001($s2) ## 00000275 -/* 01C64 80A21A24 00006812 */ mflo $t5 -/* 01C68 80A21A28 8FAB00C4 */ lw $t3, 0x00C4($sp) -/* 01C6C 80A21A2C 018D1821 */ addu $v1, $t4, $t5 -/* 01C70 80A21A30 00680019 */ multu $v1, $t0 -/* 01C74 80A21A34 8D640000 */ lw $a0, 0x0000($t3) ## 80166FA8 -/* 01C78 80A21A38 00033900 */ sll $a3, $v1, 4 -/* 01C7C 80A21A3C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 01C80 80A21A40 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 01C84 80A21A44 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01C88 80A21A48 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 01C8C 80A21A4C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 01C90 80A21A50 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01C94 80A21A54 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01C98 80A21A58 00003012 */ mflo $a2 -/* 01C9C 80A21A5C AFB80018 */ sw $t8, 0x0018($sp) -/* 01CA0 80A21A60 AFB90024 */ sw $t9, 0x0024($sp) -/* 01CA4 80A21A64 AFA90028 */ sw $t1, 0x0028($sp) -/* 01CA8 80A21A68 00E33823 */ subu $a3, $a3, $v1 -/* 01CAC 80A21A6C AFA00020 */ sw $zero, 0x0020($sp) -/* 01CB0 80A21A70 AFA0001C */ sw $zero, 0x001C($sp) -/* 01CB4 80A21A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01CB8 80A21A78 0C0253D0 */ jal Gfx_TwoTexScroll -/* 01CBC 80A21A7C 00408825 */ or $s1, $v0, $zero ## $s1 = 060030A0 -/* 01CC0 80A21A80 AE220004 */ sw $v0, 0x0004($s1) ## 060030A4 -/* 01CC4 80A21A84 8E46000C */ lw $a2, 0x000C($s2) ## 00000280 -/* 01CC8 80A21A88 C64E0008 */ lwc1 $f14, 0x0008($s2) ## 0000027C -/* 01CCC 80A21A8C C64C0004 */ lwc1 $f12, 0x0004($s2) ## 00000278 -/* 01CD0 80A21A90 0C034261 */ jal Matrix_Translate -/* 01CD4 80A21A94 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01CD8 80A21A98 0C0347F5 */ jal func_800D1FD4 -/* 01CDC 80A21A9C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01CE0 80A21AA0 C64C0030 */ lwc1 $f12, 0x0030($s2) ## 000002A4 -/* 01CE4 80A21AA4 4406A000 */ mfc1 $a2, $f20 -/* 01CE8 80A21AA8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01CEC 80A21AAC 0C0342A3 */ jal Matrix_Scale -/* 01CF0 80A21AB0 46006386 */ mov.s $f14, $f12 -/* 01CF4 80A21AB4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01CF8 80A21AB8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 01CFC 80A21ABC 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 01D00 80A21AC0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01D04 80A21AC4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01D08 80A21AC8 3C0580A2 */ lui $a1, %hi(D_80A21CA0) ## $a1 = 80A20000 -/* 01D0C 80A21ACC 24A51CA0 */ addiu $a1, $a1, %lo(D_80A21CA0) ## $a1 = 80A21CA0 -/* 01D10 80A21AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D14 80A21AD4 24060590 */ addiu $a2, $zero, 0x0590 ## $a2 = 00000590 -/* 01D18 80A21AD8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01D1C 80A21ADC 0C0346A2 */ jal Matrix_NewMtx -/* 01D20 80A21AE0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 01D24 80A21AE4 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 01D28 80A21AE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01D2C 80A21AEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01D30 80A21AF0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01D34 80A21AF4 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 01D38 80A21AF8 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 01D3C 80A21AFC 8ECD0000 */ lw $t5, 0x0000($s6) ## 00000000 -/* 01D40 80A21B00 01B77021 */ addu $t6, $t5, $s7 -/* 01D44 80A21B04 01C17821 */ addu $t7, $t6, $at -/* 01D48 80A21B08 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -.L80A21B0C: -/* 01D4C 80A21B0C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 01D50 80A21B10 00139C00 */ sll $s3, $s3, 16 -/* 01D54 80A21B14 00139C03 */ sra $s3, $s3, 16 -/* 01D58 80A21B18 2A610028 */ slti $at, $s3, 0x0028 -/* 01D5C 80A21B1C 1420FF7F */ bne $at, $zero, .L80A2191C -/* 01D60 80A21B20 2652003C */ addiu $s2, $s2, 0x003C ## $s2 = 000002B0 -/* 01D64 80A21B24 3C0680A2 */ lui $a2, %hi(D_80A21CB0) ## $a2 = 80A20000 -/* 01D68 80A21B28 24C61CB0 */ addiu $a2, $a2, %lo(D_80A21CB0) ## $a2 = 80A21CB0 -/* 01D6C 80A21B2C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC -/* 01D70 80A21B30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D74 80A21B34 0C031AD5 */ jal Graph_CloseDisps -/* 01D78 80A21B38 24070596 */ addiu $a3, $zero, 0x0596 ## $a3 = 00000596 -/* 01D7C 80A21B3C 8FBF0064 */ lw $ra, 0x0064($sp) -/* 01D80 80A21B40 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 01D84 80A21B44 8FB00040 */ lw $s0, 0x0040($sp) -/* 01D88 80A21B48 8FB10044 */ lw $s1, 0x0044($sp) -/* 01D8C 80A21B4C 8FB20048 */ lw $s2, 0x0048($sp) -/* 01D90 80A21B50 8FB3004C */ lw $s3, 0x004C($sp) -/* 01D94 80A21B54 8FB40050 */ lw $s4, 0x0050($sp) -/* 01D98 80A21B58 8FB50054 */ lw $s5, 0x0054($sp) -/* 01D9C 80A21B5C 8FB60058 */ lw $s6, 0x0058($sp) -/* 01DA0 80A21B60 8FB7005C */ lw $s7, 0x005C($sp) -/* 01DA4 80A21B64 8FBE0060 */ lw $s8, 0x0060($sp) -/* 01DA8 80A21B68 03E00008 */ jr $ra -/* 01DAC 80A21B6C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s deleted file mode 100644 index 264ec99b1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnGe3_Destroy -/* 001AC 80A347CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001B0 80A347D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001B4 80A347D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001B8 80A347D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001BC 80A347DC 0C0170EB */ jal Collider_DestroyCylinder - -/* 001C0 80A347E0 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 001C4 80A347E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C8 80A347E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001CC 80A347EC 03E00008 */ jr $ra -/* 001D0 80A347F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s deleted file mode 100644 index 03c21ad7e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ /dev/null @@ -1,79 +0,0 @@ -.rdata -glabel D_80A35200 - .asciz "../z_en_ge3.c" - .balign 4 - -glabel D_80A35210 - .asciz "../z_en_ge3.c" - .balign 4 - -.text -glabel EnGe3_Draw -/* 00A40 80A35060 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) -/* 00A48 80A35068 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A4C 80A3506C AFBF002C */ sw $ra, 0x002C($sp) -/* 00A50 80A35070 AFB00024 */ sw $s0, 0x0024($sp) -/* 00A54 80A35074 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00A58 80A35078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A5C 80A3507C 3C0680A3 */ lui $a2, %hi(D_80A35200) ## $a2 = 80A30000 -/* 00A60 80A35080 24C65200 */ addiu $a2, $a2, %lo(D_80A35200) ## $a2 = 80A35200 -/* 00A64 80A35084 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 00A68 80A35088 24070266 */ addiu $a3, $zero, 0x0266 ## $a3 = 00000266 -/* 00A6C 80A3508C 0C031AB1 */ jal Graph_OpenDisps -/* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) -/* 00A74 80A35094 0C0250F2 */ jal func_800943C8 -/* 00A78 80A35098 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00A7C 80A3509C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00A80 80A350A0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00A84 80A350A4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00A88 80A350A8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 00A8C 80A350AC 3C0480A3 */ lui $a0, %hi(D_80A351D4) ## $a0 = 80A30000 -/* 00A90 80A350B0 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00A94 80A350B4 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00A98 80A350B8 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 00A9C 80A350BC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 00AA0 80A350C0 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -/* 00AA4 80A350C4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00AA8 80A350C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AAC 80A350CC 0018C880 */ sll $t9, $t8, 2 -/* 00AB0 80A350D0 00992021 */ addu $a0, $a0, $t9 -/* 00AB4 80A350D4 8C8451D4 */ lw $a0, %lo(D_80A351D4)($a0) -/* 00AB8 80A350D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00ABC 80A350DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00AC0 80A350E0 00044900 */ sll $t1, $a0, 4 -/* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 -/* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 -/* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 -/* 00AD0 80A350F0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at -/* 00AD8 80A350F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 -/* 00AE0 80A35100 01A17021 */ addu $t6, $t5, $at -/* 00AE4 80A35104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE8 80A35108 0C00BAF3 */ jal func_8002EBCC -/* 00AEC 80A3510C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00AF0 80A35110 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C -/* 00AF4 80A35114 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 -/* 00AF8 80A35118 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A -/* 00AFC 80A3511C 3C0F80A3 */ lui $t7, %hi(func_80A34E58) ## $t7 = 80A30000 -/* 00B00 80A35120 3C1880A3 */ lui $t8, %hi(func_80A35004) ## $t8 = 80A30000 -/* 00B04 80A35124 27185004 */ addiu $t8, $t8, %lo(func_80A35004) ## $t8 = 80A35004 -/* 00B08 80A35128 25EF4E58 */ addiu $t7, $t7, %lo(func_80A34E58) ## $t7 = 80A34E58 -/* 00B0C 80A3512C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00B10 80A35130 AFB80014 */ sw $t8, 0x0014($sp) -/* 00B14 80A35134 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B18 80A35138 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 00B1C 80A3513C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B20 80A35140 3C0680A3 */ lui $a2, %hi(D_80A35210) ## $a2 = 80A30000 -/* 00B24 80A35144 24C65210 */ addiu $a2, $a2, %lo(D_80A35210) ## $a2 = 80A35210 -/* 00B28 80A35148 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 00B2C 80A3514C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00B30 80A35150 0C031AD5 */ jal Graph_CloseDisps -/* 00B34 80A35154 24070277 */ addiu $a3, $zero, 0x0277 ## $a3 = 00000277 -/* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00B40 80A35160 8FB10028 */ lw $s1, 0x0028($sp) -/* 00B44 80A35164 03E00008 */ jr $ra -/* 00B48 80A35168 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00B4C 80A3516C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s deleted file mode 100644 index 552b102ed8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel EnGe3_Init -/* 000A4 80A346C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000A8 80A346C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 000AC 80A346CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) -/* 000B8 80A346D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 000BC 80A346DC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 000C0 80A346E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000C4 80A346E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 000C8 80A346E8 0C00AC78 */ jal ActorShape_Init - -/* 000CC 80A346EC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 000D0 80A346F0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 000D4 80A346F4 3C060601 */ lui $a2, %hi(D_0600A458) ## $a2 = 06010000 -/* 000D8 80A346F8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC -/* 000DC 80A346FC 260F026C */ addiu $t7, $s0, 0x026C ## $t7 = 0000026C -/* 000E0 80A34700 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) -/* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) -/* 000F0 80A34710 24C6A458 */ addiu $a2, $a2, %lo(D_0600A458) ## $a2 = 0600A458 -/* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) -/* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) -/* 000FC 80A3471C 0C0291BE */ jal SkelAnime_InitFlex -/* 00100 80A34720 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00104 80A34724 3C050601 */ lui $a1, %hi(D_0600B07C) ## $a1 = 06010000 -/* 00108 80A34728 24A5B07C */ addiu $a1, $a1, %lo(D_0600B07C) ## $a1 = 0600B07C -/* 0010C 80A3472C 0C0294BE */ jal Animation_PlayLoop -/* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) -/* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) -/* 0011C 80A3473C 0C0170D9 */ jal Collider_InitCylinder - -/* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) -/* 00124 80A34744 3C0780A3 */ lui $a3, %hi(D_80A35190) ## $a3 = 80A30000 -/* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) -/* 0012C 80A3474C 24E75190 */ addiu $a3, $a3, %lo(D_80A35190) ## $a3 = 80A35190 -/* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) -/* 00134 80A34754 0C01712B */ jal Collider_SetCylinder - -/* 00138 80A34758 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0013C 80A3475C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00140 80A34760 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00144 80A34764 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 00148 80A34768 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 0014C 80A3476C 0C00B58B */ jal Actor_SetScale - -/* 00150 80A34770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00154 80A34774 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 00158 80A34778 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 0015C 80A3477C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00160 80A34780 0C28D188 */ jal func_80A34620 -/* 00164 80A34784 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00168 80A34788 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 0016C 80A3478C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 00170 80A34790 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00174 80A34794 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00178 80A34798 3C0880A3 */ lui $t0, %hi(func_80A34B90) ## $t0 = 80A30000 -/* 0017C 80A3479C 25084B90 */ addiu $t0, $t0, %lo(func_80A34B90) ## $t0 = 80A34B90 -/* 00180 80A347A0 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00184 80A347A4 AE080310 */ sw $t0, 0x0310($s0) ## 00000310 -/* 00188 80A347A8 A600030C */ sh $zero, 0x030C($s0) ## 0000030C -/* 0018C 80A347AC A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 00190 80A347B0 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 -/* 00194 80A347B4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00198 80A347B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0019C 80A347BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 001A0 80A347C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001A4 80A347C4 03E00008 */ jr $ra -/* 001A8 80A347C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s deleted file mode 100644 index 11ad1cad8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel EnGe3_Update -/* 007F4 80A34E14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007F8 80A34E18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007FC 80A34E1C AFA40018 */ sw $a0, 0x0018($sp) -/* 00800 80A34E20 0C28D310 */ jal func_80A34C40 -/* 00804 80A34E24 AFA5001C */ sw $a1, 0x001C($sp) -/* 00808 80A34E28 8FA40018 */ lw $a0, 0x0018($sp) -/* 0080C 80A34E2C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00810 80A34E30 8C990310 */ lw $t9, 0x0310($a0) ## 00000310 -/* 00814 80A34E34 0320F809 */ jalr $ra, $t9 -/* 00818 80A34E38 00000000 */ nop -/* 0081C 80A34E3C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00820 80A34E40 0C28D339 */ jal func_80A34CE4 -/* 00824 80A34E44 8FA5001C */ lw $a1, 0x001C($sp) -/* 00828 80A34E48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0082C 80A34E4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00830 80A34E50 03E00008 */ jr $ra -/* 00834 80A34E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s deleted file mode 100644 index 1ef02f2cb7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A34620 -/* 00000 80A34620 00051080 */ sll $v0, $a1, 2 -/* 00004 80A34624 3C0E80A3 */ lui $t6, %hi(D_80A351BC) ## $t6 = 80A30000 -/* 00008 80A34628 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80A3462C 01C27021 */ addu $t6, $t6, $v0 -/* 00010 80A34630 8DCE51BC */ lw $t6, %lo(D_80A351BC)($t6) -/* 00014 80A34634 3C1880A3 */ lui $t8, %hi(D_80A351C0) ## $t8 = 80A30000 -/* 00018 80A34638 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0001C 80A3463C AFA40030 */ sw $a0, 0x0030($sp) -/* 00020 80A34640 AFA50034 */ sw $a1, 0x0034($sp) -/* 00024 80A34644 271851C0 */ addiu $t8, $t8, %lo(D_80A351C0) ## $t8 = 80A351C0 -/* 00028 80A34648 00581821 */ addu $v1, $v0, $t8 -/* 0002C 80A3464C AC8E0310 */ sw $t6, 0x0310($a0) ## 00000310 -/* 00030 80A34650 AFA30028 */ sw $v1, 0x0028($sp) -/* 00034 80A34654 0C028800 */ jal Animation_GetLastFrame - -/* 00038 80A34658 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 0003C 80A3465C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00040 80A34660 8FB90034 */ lw $t9, 0x0034($sp) -/* 00044 80A34664 3C0880A3 */ lui $t0, %hi(D_80A351C4) ## $t0 = 80A30000 -/* 00048 80A34668 468021A0 */ cvt.s.w $f6, $f4 -/* 0004C 80A3466C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00050 80A34670 01194021 */ addu $t0, $t0, $t9 -/* 00054 80A34674 910851C4 */ lbu $t0, %lo(D_80A351C4)($t0) -/* 00058 80A34678 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0005C 80A3467C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00060 80A34680 8FA40030 */ lw $a0, 0x0030($sp) -/* 00064 80A34684 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00068 80A34688 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0006C 80A3468C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00070 80A34690 AFA80014 */ sw $t0, 0x0014($sp) -/* 00074 80A34694 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00078 80A34698 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0007C 80A3469C 0C029468 */ jal Animation_Change - -/* 00080 80A346A0 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00084 80A346A4 8FA20030 */ lw $v0, 0x0030($sp) -/* 00088 80A346A8 9449030C */ lhu $t1, 0x030C($v0) ## 0000030C -/* 0008C 80A346AC 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 -/* 00090 80A346B0 A44A030C */ sh $t2, 0x030C($v0) ## 0000030C -/* 00094 80A346B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00098 80A346B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0009C 80A346BC 03E00008 */ jr $ra -/* 000A0 80A346C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s deleted file mode 100644 index 50af4ab9e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80A347F4 -/* 001D4 80A347F4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001D8 80A347F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 001DC 80A347FC AFB00028 */ sw $s0, 0x0028($sp) -/* 001E0 80A34800 AFA50044 */ sw $a1, 0x0044($sp) -/* 001E4 80A34804 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 001E8 80A34808 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001EC 80A3480C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 001F0 80A34810 AFAE0030 */ sw $t6, 0x0030($sp) -/* 001F4 80A34814 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 001F8 80A34818 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 001FC 80A3481C 87A50032 */ lh $a1, 0x0032($sp) -/* 00200 80A34820 01D81023 */ subu $v0, $t6, $t8 -/* 00204 80A34824 00021400 */ sll $v0, $v0, 16 -/* 00208 80A34828 00021403 */ sra $v0, $v0, 16 -/* 0020C 80A3482C 04400003 */ bltz $v0, .L80A3483C -/* 00210 80A34830 00021823 */ subu $v1, $zero, $v0 -/* 00214 80A34834 10000001 */ beq $zero, $zero, .L80A3483C -/* 00218 80A34838 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80A3483C: -/* 0021C 80A3483C 28614001 */ slti $at, $v1, 0x4001 -/* 00220 80A34840 10200013 */ beq $at, $zero, .L80A34890 -/* 00224 80A34844 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 00228 80A34848 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 0022C 80A3484C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00230 80A34850 AFB90010 */ sw $t9, 0x0010($sp) -/* 00234 80A34854 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00238 80A34858 8E0A0038 */ lw $t2, 0x0038($s0) ## 00000038 -/* 0023C 80A3485C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00240 80A34860 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 00244 80A34864 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00248 80A34868 8E09003C */ lw $t1, 0x003C($s0) ## 0000003C -/* 0024C 80A3486C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00250 80A34870 26060300 */ addiu $a2, $s0, 0x0300 ## $a2 = 00000300 -/* 00254 80A34874 AFA90014 */ sw $t1, 0x0014($sp) -/* 00258 80A34878 8E0A0040 */ lw $t2, 0x0040($s0) ## 00000040 -/* 0025C 80A3487C 26070306 */ addiu $a3, $s0, 0x0306 ## $a3 = 00000306 -/* 00260 80A34880 0C00E0A4 */ jal func_80038290 -/* 00264 80A34884 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00268 80A34888 1000001C */ beq $zero, $zero, .L80A348FC -/* 0026C 80A3488C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A34890: -/* 00270 80A34890 0441000A */ bgez $v0, .L80A348BC -/* 00274 80A34894 26040302 */ addiu $a0, $s0, 0x0302 ## $a0 = 00000302 -/* 00278 80A34898 240B0100 */ addiu $t3, $zero, 0x0100 ## $t3 = 00000100 -/* 0027C 80A3489C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00280 80A348A0 26040302 */ addiu $a0, $s0, 0x0302 ## $a0 = 00000302 -/* 00284 80A348A4 2405E000 */ addiu $a1, $zero, 0xE000 ## $a1 = FFFFE000 -/* 00288 80A348A8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0028C 80A348AC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00290 80A348B0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00294 80A348B4 10000008 */ beq $zero, $zero, .L80A348D8 -/* 00298 80A348B8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -.L80A348BC: -/* 0029C 80A348BC 240C0100 */ addiu $t4, $zero, 0x0100 ## $t4 = 00000100 -/* 002A0 80A348C0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 002A4 80A348C4 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 002A8 80A348C8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 002AC 80A348CC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 002B0 80A348D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 002B4 80A348D4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -.L80A348D8: -/* 002B8 80A348D8 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 002BC 80A348DC AFAD0010 */ sw $t5, 0x0010($sp) -/* 002C0 80A348E0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 002C4 80A348E4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 002C8 80A348E8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 002CC 80A348EC 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 002D0 80A348F0 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 002D4 80A348F4 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 002D8 80A348F8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A348FC: -/* 002DC 80A348FC 8FB00028 */ lw $s0, 0x0028($sp) -/* 002E0 80A34900 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002E4 80A34904 03E00008 */ jr $ra -/* 002E8 80A34908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s deleted file mode 100644 index 32a43d7572..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80A3490C -/* 002EC 80A3490C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 002F0 80A34910 AFBF002C */ sw $ra, 0x002C($sp) -/* 002F4 80A34914 AFB00028 */ sw $s0, 0x0028($sp) -/* 002F8 80A34918 AFA50034 */ sw $a1, 0x0034($sp) -/* 002FC 80A3491C 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00300 80A34920 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00304 80A34924 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00308 80A34928 26040300 */ addiu $a0, $s0, 0x0300 ## $a0 = 00000300 -/* 0030C 80A3492C 01CF1023 */ subu $v0, $t6, $t7 -/* 00310 80A34930 00021400 */ sll $v0, $v0, 16 -/* 00314 80A34934 00021403 */ sra $v0, $v0, 16 -/* 00318 80A34938 04400003 */ bltz $v0, .L80A34948 -/* 0031C 80A3493C 00021823 */ subu $v1, $zero, $v0 -/* 00320 80A34940 10000001 */ beq $zero, $zero, .L80A34948 -/* 00324 80A34944 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80A34948: -/* 00328 80A34948 28612301 */ slti $at, $v1, 0x2301 -/* 0032C 80A3494C 10200015 */ beq $at, $zero, .L80A349A4 -/* 00330 80A34950 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00334 80A34954 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00338 80A34958 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0033C 80A3495C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00340 80A34960 4606203C */ c.lt.s $f4, $f6 -/* 00344 80A34964 00000000 */ nop -/* 00348 80A34968 4502000F */ bc1fl .L80A349A8 -/* 0034C 80A3496C 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 00350 80A34970 8E190038 */ lw $t9, 0x0038($s0) ## 00000038 -/* 00354 80A34974 8FA40034 */ lw $a0, 0x0034($sp) -/* 00358 80A34978 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0035C 80A3497C AFB90010 */ sw $t9, 0x0010($sp) -/* 00360 80A34980 8E18003C */ lw $t8, 0x003C($s0) ## 0000003C -/* 00364 80A34984 26060300 */ addiu $a2, $s0, 0x0300 ## $a2 = 00000300 -/* 00368 80A34988 26070306 */ addiu $a3, $s0, 0x0306 ## $a3 = 00000306 -/* 0036C 80A3498C AFB80014 */ sw $t8, 0x0014($sp) -/* 00370 80A34990 8E190040 */ lw $t9, 0x0040($s0) ## 00000040 -/* 00374 80A34994 0C00E0A4 */ jal func_80038290 -/* 00378 80A34998 AFB90018 */ sw $t9, 0x0018($sp) -/* 0037C 80A3499C 1000001C */ beq $zero, $zero, .L80A34A10 -/* 00380 80A349A0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A349A4: -/* 00384 80A349A4 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -.L80A349A8: -/* 00388 80A349A8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0038C 80A349AC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00390 80A349B0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00394 80A349B4 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00398 80A349B8 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 0039C 80A349BC AFA90010 */ sw $t1, 0x0010($sp) -/* 003A0 80A349C0 26040302 */ addiu $a0, $s0, 0x0302 ## $a0 = 00000302 -/* 003A4 80A349C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003A8 80A349C8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003AC 80A349CC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 003B0 80A349D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 003B4 80A349D4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 003B8 80A349D8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 003BC 80A349DC 26040306 */ addiu $a0, $s0, 0x0306 ## $a0 = 00000306 -/* 003C0 80A349E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003C4 80A349E4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003C8 80A349E8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 003CC 80A349EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 003D0 80A349F0 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 003D4 80A349F4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 003D8 80A349F8 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 003DC 80A349FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003E0 80A34A00 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003E4 80A34A04 0C01E1A7 */ jal Math_SmoothStepToS - -/* 003E8 80A34A08 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 003EC 80A34A0C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A34A10: -/* 003F0 80A34A10 8FB00028 */ lw $s0, 0x0028($sp) -/* 003F4 80A34A14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003F8 80A34A18 03E00008 */ jr $ra -/* 003FC 80A34A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s deleted file mode 100644 index f0c3535e05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A34A20 -/* 00400 80A34A20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00404 80A34A24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00408 80A34A28 AFA5001C */ sw $a1, 0x001C($sp) -/* 0040C 80A34A2C 0C00BCCD */ jal func_8002F334 -/* 00410 80A34A30 AFA40018 */ sw $a0, 0x0018($sp) -/* 00414 80A34A34 1040000C */ beq $v0, $zero, .L80A34A68 -/* 00418 80A34A38 8FA40018 */ lw $a0, 0x0018($sp) -/* 0041C 80A34A3C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00420 80A34A40 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00424 80A34A44 3C0E80A3 */ lui $t6, %hi(func_80A34A80) ## $t6 = 80A30000 -/* 00428 80A34A48 3C0F80A3 */ lui $t7, %hi(func_80A34D68) ## $t7 = 80A30000 -/* 0042C 80A34A4C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00430 80A34A50 25CE4A80 */ addiu $t6, $t6, %lo(func_80A34A80) ## $t6 = 80A34A80 -/* 00434 80A34A54 25EF4D68 */ addiu $t7, $t7, %lo(func_80A34D68) ## $t7 = 80A34D68 -/* 00438 80A34A58 0301C824 */ and $t9, $t8, $at -/* 0043C 80A34A5C AC8E0310 */ sw $t6, 0x0310($a0) ## 00000310 -/* 00440 80A34A60 AC8F0130 */ sw $t7, 0x0130($a0) ## 00000130 -/* 00444 80A34A64 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -.L80A34A68: -/* 00448 80A34A68 0C28D1FD */ jal func_80A347F4 -/* 0044C 80A34A6C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00450 80A34A70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00454 80A34A74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00458 80A34A78 03E00008 */ jr $ra -/* 0045C 80A34A7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s deleted file mode 100644 index 964e0cd5a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80A34A80 -/* 00460 80A34A80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00464 80A34A84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00468 80A34A88 0C28D243 */ jal func_80A3490C -/* 0046C 80A34A8C 00000000 */ nop -/* 00470 80A34A90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00474 80A34A94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00478 80A34A98 03E00008 */ jr $ra -/* 0047C 80A34A9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s deleted file mode 100644 index 3f129b841a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A34AA0 -/* 00480 80A34AA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00484 80A34AA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00488 80A34AA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0048C 80A34AAC 0C00BD04 */ jal Actor_HasParent -/* 00490 80A34AB0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00494 80A34AB4 10400006 */ beq $v0, $zero, .L80A34AD0 -/* 00498 80A34AB8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0049C 80A34ABC 3C0E80A3 */ lui $t6, %hi(func_80A34A20) ## $t6 = 80A30000 -/* 004A0 80A34AC0 25CE4A20 */ addiu $t6, $t6, %lo(func_80A34A20) ## $t6 = 80A34A20 -/* 004A4 80A34AC4 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 004A8 80A34AC8 10000009 */ beq $zero, $zero, .L80A34AF0 -/* 004AC 80A34ACC AC8E0310 */ sw $t6, 0x0310($a0) ## 00000310 -.L80A34AD0: -/* 004B0 80A34AD0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 004B4 80A34AD4 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 004B8 80A34AD8 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 004BC 80A34ADC 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 004C0 80A34AE0 8FA50024 */ lw $a1, 0x0024($sp) -/* 004C4 80A34AE4 2406003A */ addiu $a2, $zero, 0x003A ## $a2 = 0000003A -/* 004C8 80A34AE8 0C00BD0D */ jal func_8002F434 -/* 004CC 80A34AEC E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A34AF0: -/* 004D0 80A34AF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 004D4 80A34AF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004D8 80A34AF8 03E00008 */ jr $ra -/* 004DC 80A34AFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s deleted file mode 100644 index bfd38f7d58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A34B00 -/* 004E0 80A34B00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004E4 80A34B04 AFBF001C */ sw $ra, 0x001C($sp) -/* 004E8 80A34B08 AFA40020 */ sw $a0, 0x0020($sp) -/* 004EC 80A34B0C AFA50024 */ sw $a1, 0x0024($sp) -/* 004F0 80A34B10 0C042F6F */ jal func_8010BDBC -/* 004F4 80A34B14 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 004F8 80A34B18 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 004FC 80A34B1C 54410019 */ bnel $v0, $at, .L80A34B84 -/* 00500 80A34B20 8FBF001C */ lw $ra, 0x001C($sp) -/* 00504 80A34B24 0C041AF2 */ jal func_80106BC8 -/* 00508 80A34B28 8FA40024 */ lw $a0, 0x0024($sp) -/* 0050C 80A34B2C 50400015 */ beql $v0, $zero, .L80A34B84 -/* 00510 80A34B30 8FBF001C */ lw $ra, 0x001C($sp) -/* 00514 80A34B34 0C041B33 */ jal func_80106CCC -/* 00518 80A34B38 8FA40024 */ lw $a0, 0x0024($sp) -/* 0051C 80A34B3C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00520 80A34B40 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00524 80A34B44 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00528 80A34B48 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0052C 80A34B4C 3C1880A3 */ lui $t8, %hi(func_80A34AA0) ## $t8 = 80A30000 -/* 00530 80A34B50 27184AA0 */ addiu $t8, $t8, %lo(func_80A34AA0) ## $t8 = 80A34AA0 -/* 00534 80A34B54 01C17824 */ and $t7, $t6, $at -/* 00538 80A34B58 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0053C 80A34B5C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00540 80A34B60 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00544 80A34B64 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00548 80A34B68 AC980310 */ sw $t8, 0x0310($a0) ## 00000310 -/* 0054C 80A34B6C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00550 80A34B70 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 00554 80A34B74 2406003A */ addiu $a2, $zero, 0x003A ## $a2 = 0000003A -/* 00558 80A34B78 0C00BD0D */ jal func_8002F434 -/* 0055C 80A34B7C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00560 80A34B80 8FBF001C */ lw $ra, 0x001C($sp) -.L80A34B84: -/* 00564 80A34B84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00568 80A34B88 03E00008 */ jr $ra -/* 0056C 80A34B8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s deleted file mode 100644 index 708a6bc6d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A34B90 -/* 00570 80A34B90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00574 80A34B94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00578 80A34B98 AFB00020 */ sw $s0, 0x0020($sp) -/* 0057C 80A34B9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00580 80A34BA0 0C00BC65 */ jal func_8002F194 -/* 00584 80A34BA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00588 80A34BA8 10400004 */ beq $v0, $zero, .L80A34BBC -/* 0058C 80A34BAC 3C0E80A3 */ lui $t6, %hi(func_80A34B00) ## $t6 = 80A30000 -/* 00590 80A34BB0 25CE4B00 */ addiu $t6, $t6, %lo(func_80A34B00) ## $t6 = 80A34B00 -/* 00594 80A34BB4 1000001A */ beq $zero, $zero, .L80A34C20 -/* 00598 80A34BB8 AE0E0310 */ sw $t6, 0x0310($s0) ## 00000310 -.L80A34BBC: -/* 0059C 80A34BBC 960F030C */ lhu $t7, 0x030C($s0) ## 0000030C -/* 005A0 80A34BC0 8FA4002C */ lw $a0, 0x002C($sp) -/* 005A4 80A34BC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005A8 80A34BC8 31F80004 */ andi $t8, $t7, 0x0004 ## $t8 = 00000000 -/* 005AC 80A34BCC 57000007 */ bnel $t8, $zero, .L80A34BEC -/* 005B0 80A34BD0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 005B4 80A34BD4 0C00B7D5 */ jal func_8002DF54 -/* 005B8 80A34BD8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 005BC 80A34BDC 9619030C */ lhu $t9, 0x030C($s0) ## 0000030C -/* 005C0 80A34BE0 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 -/* 005C4 80A34BE4 A608030C */ sh $t0, 0x030C($s0) ## 0000030C -/* 005C8 80A34BE8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -.L80A34BEC: -/* 005CC 80A34BEC 44810000 */ mtc1 $at, $f0 ## $f0 = 300.00 -/* 005D0 80A34BF0 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 005D4 80A34BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005D8 80A34BF8 24096004 */ addiu $t1, $zero, 0x6004 ## $t1 = 00006004 -/* 005DC 80A34BFC 01415825 */ or $t3, $t2, $at ## $t3 = 00010000 -/* 005E0 80A34C00 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 005E4 80A34C04 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 005E8 80A34C08 44060000 */ mfc1 $a2, $f0 -/* 005EC 80A34C0C 44070000 */ mfc1 $a3, $f0 -/* 005F0 80A34C10 AFA00010 */ sw $zero, 0x0010($sp) -/* 005F4 80A34C14 8FA5002C */ lw $a1, 0x002C($sp) -/* 005F8 80A34C18 0C00BC71 */ jal func_8002F1C4 -/* 005FC 80A34C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A34C20: -/* 00600 80A34C20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00604 80A34C24 0C28D243 */ jal func_80A3490C -/* 00608 80A34C28 8FA5002C */ lw $a1, 0x002C($sp) -/* 0060C 80A34C2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00610 80A34C30 8FB00020 */ lw $s0, 0x0020($sp) -/* 00614 80A34C34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00618 80A34C38 03E00008 */ jr $ra -/* 0061C 80A34C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s deleted file mode 100644 index 8fc719d967..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A34C40 -/* 00620 80A34C40 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00624 80A34C44 AFB00020 */ sw $s0, 0x0020($sp) -/* 00628 80A34C48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0062C 80A34C4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00630 80A34C50 AFA5003C */ sw $a1, 0x003C($sp) -/* 00634 80A34C54 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 00638 80A34C58 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 0063C 80A34C5C 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00640 80A34C60 AFA6002C */ sw $a2, 0x002C($sp) -/* 00644 80A34C64 8FA4003C */ lw $a0, 0x003C($sp) -/* 00648 80A34C68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0064C 80A34C6C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00650 80A34C70 8FA6002C */ lw $a2, 0x002C($sp) -/* 00654 80A34C74 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00658 80A34C78 00812821 */ addu $a1, $a0, $at -/* 0065C 80A34C7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00660 80A34C80 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 00664 80A34C84 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00668 80A34C88 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0066C 80A34C8C 44060000 */ mfc1 $a2, $f0 -/* 00670 80A34C90 8FA4003C */ lw $a0, 0x003C($sp) -/* 00674 80A34C94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00678 80A34C98 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 0067C 80A34C9C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00680 80A34CA0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00684 80A34CA4 960F030C */ lhu $t7, 0x030C($s0) ## 0000030C -/* 00688 80A34CA8 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0068C 80A34CAC 57000009 */ bnel $t8, $zero, .L80A34CD4 -/* 00690 80A34CB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00694 80A34CB4 0C02927F */ jal SkelAnime_Update - -/* 00698 80A34CB8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 0069C 80A34CBC 50400005 */ beql $v0, $zero, .L80A34CD4 -/* 006A0 80A34CC0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A4 80A34CC4 9619030C */ lhu $t9, 0x030C($s0) ## 0000030C -/* 006A8 80A34CC8 37280002 */ ori $t0, $t9, 0x0002 ## $t0 = 00000002 -/* 006AC 80A34CCC A608030C */ sh $t0, 0x030C($s0) ## 0000030C -/* 006B0 80A34CD0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A34CD4: -/* 006B4 80A34CD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 006B8 80A34CD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 006BC 80A34CDC 03E00008 */ jr $ra -/* 006C0 80A34CE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s deleted file mode 100644 index 16483912a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A34CE4 -/* 006C4 80A34CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006C8 80A34CE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006CC 80A34CEC AFA5001C */ sw $a1, 0x001C($sp) -/* 006D0 80A34CF0 0C00B638 */ jal Actor_MoveForward - -/* 006D4 80A34CF4 AFA40018 */ sw $a0, 0x0018($sp) -/* 006D8 80A34CF8 8FA60018 */ lw $a2, 0x0018($sp) -/* 006DC 80A34CFC 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 006E0 80A34D00 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 006E4 80A34D04 84C302FE */ lh $v1, 0x02FE($a2) ## 000002FE -/* 006E8 80A34D08 14600003 */ bne $v1, $zero, .L80A34D18 -/* 006EC 80A34D0C 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 006F0 80A34D10 10000004 */ beq $zero, $zero, .L80A34D24 -/* 006F4 80A34D14 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A34D18: -/* 006F8 80A34D18 A4CE02FE */ sh $t6, 0x02FE($a2) ## 000002FE -/* 006FC 80A34D1C 84C302FE */ lh $v1, 0x02FE($a2) ## 000002FE -/* 00700 80A34D20 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80A34D24: -/* 00704 80A34D24 54400007 */ bnel $v0, $zero, .L80A34D44 -/* 00708 80A34D28 A4C302FC */ sh $v1, 0x02FC($a2) ## 000002FC -/* 0070C 80A34D2C 0C01DF64 */ jal Rand_S16Offset - -/* 00710 80A34D30 AFA60018 */ sw $a2, 0x0018($sp) -/* 00714 80A34D34 8FA60018 */ lw $a2, 0x0018($sp) -/* 00718 80A34D38 A4C202FE */ sh $v0, 0x02FE($a2) ## 000002FE -/* 0071C 80A34D3C 84C302FE */ lh $v1, 0x02FE($a2) ## 000002FE -/* 00720 80A34D40 A4C302FC */ sh $v1, 0x02FC($a2) ## 000002FC -.L80A34D44: -/* 00724 80A34D44 84CF02FC */ lh $t7, 0x02FC($a2) ## 000002FC -/* 00728 80A34D48 29E10003 */ slti $at, $t7, 0x0003 -/* 0072C 80A34D4C 54200003 */ bnel $at, $zero, .L80A34D5C -/* 00730 80A34D50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00734 80A34D54 A4C002FC */ sh $zero, 0x02FC($a2) ## 000002FC -/* 00738 80A34D58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A34D5C: -/* 0073C 80A34D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00740 80A34D60 03E00008 */ jr $ra -/* 00744 80A34D64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s deleted file mode 100644 index bc63fa7274..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80A34D68 -/* 00748 80A34D68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0074C 80A34D6C AFBF001C */ sw $ra, 0x001C($sp) -/* 00750 80A34D70 AFB10018 */ sw $s1, 0x0018($sp) -/* 00754 80A34D74 AFB00014 */ sw $s0, 0x0014($sp) -/* 00758 80A34D78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0075C 80A34D7C 0C28D310 */ jal func_80A34C40 -/* 00760 80A34D80 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00764 80A34D84 8E190310 */ lw $t9, 0x0310($s0) ## 00000310 -/* 00768 80A34D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0076C 80A34D8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00770 80A34D90 0320F809 */ jalr $ra, $t9 -/* 00774 80A34D94 00000000 */ nop -/* 00778 80A34D98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0077C 80A34D9C 0C00BC65 */ jal func_8002F194 -/* 00780 80A34DA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00784 80A34DA4 10400008 */ beq $v0, $zero, .L80A34DC8 -/* 00788 80A34DA8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0078C 80A34DAC 3C0E80A3 */ lui $t6, %hi(func_80A34A20) ## $t6 = 80A30000 -/* 00790 80A34DB0 3C0F80A3 */ lui $t7, %hi(EnGe3_Update) ## $t7 = 80A30000 -/* 00794 80A34DB4 25CE4A20 */ addiu $t6, $t6, %lo(func_80A34A20) ## $t6 = 80A34A20 -/* 00798 80A34DB8 25EF4E14 */ addiu $t7, $t7, %lo(EnGe3_Update) ## $t7 = 80A34E14 -/* 0079C 80A34DBC AE0E0310 */ sw $t6, 0x0310($s0) ## 00000310 -/* 007A0 80A34DC0 1000000C */ beq $zero, $zero, .L80A34DF4 -/* 007A4 80A34DC4 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 -.L80A34DC8: -/* 007A8 80A34DC8 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 007AC 80A34DCC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 007B0 80A34DD0 24186005 */ addiu $t8, $zero, 0x6005 ## $t8 = 00006005 -/* 007B4 80A34DD4 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 007B8 80A34DD8 4600203C */ c.lt.s $f4, $f0 -/* 007BC 80A34DDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007C0 80A34DE0 45020005 */ bc1fl .L80A34DF8 -/* 007C4 80A34DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007C8 80A34DE8 44060000 */ mfc1 $a2, $f0 -/* 007CC 80A34DEC 0C00BCB3 */ jal func_8002F2CC -/* 007D0 80A34DF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80A34DF4: -/* 007D4 80A34DF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A34DF8: -/* 007D8 80A34DF8 0C28D339 */ jal func_80A34CE4 -/* 007DC 80A34DFC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 007E0 80A34E00 8FBF001C */ lw $ra, 0x001C($sp) -/* 007E4 80A34E04 8FB00014 */ lw $s0, 0x0014($sp) -/* 007E8 80A34E08 8FB10018 */ lw $s1, 0x0018($sp) -/* 007EC 80A34E0C 03E00008 */ jr $ra -/* 007F0 80A34E10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s deleted file mode 100644 index b029ad02ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80A351E0 - .asciz "../z_en_ge3.c" - .balign 4 - -glabel D_80A351F0 - .asciz "../z_en_ge3.c" - .balign 4 - -.text -glabel func_80A34E58 -/* 00838 80A34E58 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0083C 80A34E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00840 80A34E60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00844 80A34E64 AFA40058 */ sw $a0, 0x0058($sp) -/* 00848 80A34E68 AFA5005C */ sw $a1, 0x005C($sp) -/* 0084C 80A34E6C 10A10009 */ beq $a1, $at, .L80A34E94 -/* 00850 80A34E70 AFA70064 */ sw $a3, 0x0064($sp) -/* 00854 80A34E74 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00858 80A34E78 10A10009 */ beq $a1, $at, .L80A34EA0 -/* 0085C 80A34E7C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 00860 80A34E80 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00864 80A34E84 10A10003 */ beq $a1, $at, .L80A34E94 -/* 00868 80A34E88 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0086C 80A34E8C 54A1000B */ bnel $a1, $at, .L80A34EBC -/* 00870 80A34E90 8FAA0058 */ lw $t2, 0x0058($sp) -.L80A34E94: -/* 00874 80A34E94 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 00878 80A34E98 10000056 */ beq $zero, $zero, .L80A34FF4 -/* 0087C 80A34E9C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A34EA0: -/* 00880 80A34EA0 8FA20068 */ lw $v0, 0x0068($sp) -/* 00884 80A34EA4 8FB8006C */ lw $t8, 0x006C($sp) -/* 00888 80A34EA8 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 0088C 80A34EAC 87190302 */ lh $t9, 0x0302($t8) ## 00000302 -/* 00890 80A34EB0 01F94821 */ addu $t1, $t7, $t9 -/* 00894 80A34EB4 A4490000 */ sh $t1, 0x0000($v0) ## 00000000 -/* 00898 80A34EB8 8FAA0058 */ lw $t2, 0x0058($sp) -.L80A34EBC: -/* 0089C 80A34EBC 3C0680A3 */ lui $a2, %hi(D_80A351E0) ## $a2 = 80A30000 -/* 008A0 80A34EC0 24C651E0 */ addiu $a2, $a2, %lo(D_80A351E0) ## $a2 = 80A351E0 -/* 008A4 80A34EC4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 008A8 80A34EC8 24070223 */ addiu $a3, $zero, 0x0223 ## $a3 = 00000223 -/* 008AC 80A34ECC 0C031AB1 */ jal Graph_OpenDisps -/* 008B0 80A34ED0 AFA50050 */ sw $a1, 0x0050($sp) -/* 008B4 80A34ED4 8FA2005C */ lw $v0, 0x005C($sp) -/* 008B8 80A34ED8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 008BC 80A34EDC 8FA80050 */ lw $t0, 0x0050($sp) -/* 008C0 80A34EE0 1041003D */ beq $v0, $at, .L80A34FD8 -/* 008C4 80A34EE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 008C8 80A34EE8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 008CC 80A34EEC 10410007 */ beq $v0, $at, .L80A34F0C -/* 008D0 80A34EF0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 008D4 80A34EF4 10410014 */ beq $v0, $at, .L80A34F48 -/* 008D8 80A34EF8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 008DC 80A34EFC 50410013 */ beql $v0, $at, .L80A34F4C -/* 008E0 80A34F00 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 008E4 80A34F04 10000027 */ beq $zero, $zero, .L80A34FA4 -/* 008E8 80A34F08 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L80A34F0C: -/* 008EC 80A34F0C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 008F0 80A34F10 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 008F4 80A34F14 3C18503C */ lui $t8, 0x503C ## $t8 = 503C0000 -/* 008F8 80A34F18 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 008FC 80A34F1C AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 00900 80A34F20 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00904 80A34F24 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00908 80A34F28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0090C 80A34F2C 37180AFF */ ori $t8, $t8, 0x0AFF ## $t8 = 503C0AFF -/* 00910 80A34F30 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 00914 80A34F34 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00918 80A34F38 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 0091C 80A34F3C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00920 80A34F40 10000025 */ beq $zero, $zero, .L80A34FD8 -/* 00924 80A34F44 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -.L80A34F48: -/* 00928 80A34F48 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L80A34F4C: -/* 0092C 80A34F4C 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00930 80A34F50 3C0B8CAA */ lui $t3, 0x8CAA ## $t3 = 8CAA0000 -/* 00934 80A34F54 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00938 80A34F58 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 0093C 80A34F5C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00940 80A34F60 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00944 80A34F64 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00948 80A34F68 356BE6FF */ ori $t3, $t3, 0xE6FF ## $t3 = 8CAAE6FF -/* 0094C 80A34F6C 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 00950 80A34F70 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00954 80A34F74 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 00958 80A34F78 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0095C 80A34F7C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00960 80A34F80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00964 80A34F84 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 00968 80A34F88 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 0096C 80A34F8C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00970 80A34F90 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 00974 80A34F94 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00978 80A34F98 1000000F */ beq $zero, $zero, .L80A34FD8 -/* 0097C 80A34F9C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00980 80A34FA0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L80A34FA4: -/* 00984 80A34FA4 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 00988 80A34FA8 3C0A8C00 */ lui $t2, 0x8C00 ## $t2 = 8C000000 -/* 0098C 80A34FAC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00990 80A34FB0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00994 80A34FB4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00998 80A34FB8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0099C 80A34FBC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 009A0 80A34FC0 354A00FF */ ori $t2, $t2, 0x00FF ## $t2 = 8C0000FF -/* 009A4 80A34FC4 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 009A8 80A34FC8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 009AC 80A34FCC AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 009B0 80A34FD0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 009B4 80A34FD4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L80A34FD8: -/* 009B8 80A34FD8 8FAB0058 */ lw $t3, 0x0058($sp) -/* 009BC 80A34FDC 3C0680A3 */ lui $a2, %hi(D_80A351F0) ## $a2 = 80A30000 -/* 009C0 80A34FE0 24C651F0 */ addiu $a2, $a2, %lo(D_80A351F0) ## $a2 = 80A351F0 -/* 009C4 80A34FE4 24070236 */ addiu $a3, $zero, 0x0236 ## $a3 = 00000236 -/* 009C8 80A34FE8 0C031AD5 */ jal Graph_CloseDisps -/* 009CC 80A34FEC 8D650000 */ lw $a1, 0x0000($t3) ## 8CAAE6FF -/* 009D0 80A34FF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A34FF4: -/* 009D4 80A34FF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 80A34FF8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 009DC 80A34FFC 03E00008 */ jr $ra -/* 009E0 80A35000 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s deleted file mode 100644 index b5655d1b57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A35004 -/* 009E4 80A35004 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009E8 80A35008 3C0E80A3 */ lui $t6, %hi(D_80A351C8) ## $t6 = 80A30000 -/* 009EC 80A3500C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009F0 80A35010 AFA40028 */ sw $a0, 0x0028($sp) -/* 009F4 80A35014 AFA60030 */ sw $a2, 0x0030($sp) -/* 009F8 80A35018 AFA70034 */ sw $a3, 0x0034($sp) -/* 009FC 80A3501C 25CE51C8 */ addiu $t6, $t6, %lo(D_80A351C8) ## $t6 = 80A351C8 -/* 00A00 80A35020 8DD80000 */ lw $t8, 0x0000($t6) ## 80A351C8 -/* 00A04 80A35024 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 00A08 80A35028 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00A0C 80A3502C AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 00A10 80A35030 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A351CC -/* 00A14 80A35034 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 00A18 80A35038 8DD80008 */ lw $t8, 0x0008($t6) ## 80A351D0 -/* 00A1C 80A3503C 14A10004 */ bne $a1, $at, .L80A35050 -/* 00A20 80A35040 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 00A24 80A35044 8FA50038 */ lw $a1, 0x0038($sp) -/* 00A28 80A35048 0C0346BD */ jal Matrix_MultVec3f -/* 00A2C 80A3504C 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80A35050: -/* 00A30 80A35050 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A34 80A35054 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A38 80A35058 03E00008 */ jr $ra -/* 00A3C 80A3505C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s deleted file mode 100644 index 78bdd349f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnGo_Destroy -/* 0190C 80A3FE7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01910 80A3FE80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01914 80A3FE84 AFA40018 */ sw $a0, 0x0018($sp) -/* 01918 80A3FE88 AFA5001C */ sw $a1, 0x001C($sp) -/* 0191C 80A3FE8C 0C0295BC */ jal SkelAnime_Free -/* 01920 80A3FE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) -/* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0192C 80A3FE9C 0C0170EB */ jal Collider_DestroyCylinder - -/* 01930 80A3FEA0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01938 80A3FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0193C 80A3FEAC 03E00008 */ jr $ra -/* 01940 80A3FEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s deleted file mode 100644 index 93b312939f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ /dev/null @@ -1,121 +0,0 @@ -glabel EnGo_Draw -/* 02EC8 80A41438 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02ECC 80A4143C AFB10028 */ sw $s1, 0x0028($sp) -/* 02ED0 80A41440 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02ED4 80A41444 AFBF002C */ sw $ra, 0x002C($sp) -/* 02ED8 80A41448 AFB00024 */ sw $s0, 0x0024($sp) -/* 02EDC 80A4144C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02EE0 80A41450 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02EE4 80A41454 3C0680A4 */ lui $a2, %hi(D_80A41C60) ## $a2 = 80A40000 -/* 02EE8 80A41458 24C61C60 */ addiu $a2, $a2, %lo(D_80A41C60) ## $a2 = 80A41C60 -/* 02EEC 80A4145C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02EF0 80A41460 240709AF */ addiu $a3, $zero, 0x09AF ## $a3 = 000009AF -/* 02EF4 80A41464 0C031AB1 */ jal Graph_OpenDisps -/* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) -/* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 -/* 02F00 80A41470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F04 80A41474 0C034213 */ jal Matrix_Push -/* 02F08 80A41478 00000000 */ nop -/* 02F0C 80A4147C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F10 80A41480 0C2905ED */ jal func_80A417B4 -/* 02F14 80A41484 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F18 80A41488 0C034221 */ jal Matrix_Pull -/* 02F1C 80A4148C 00000000 */ nop -/* 02F20 80A41490 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02F24 80A41494 3C0E80A4 */ lui $t6, %hi(func_80A40218) ## $t6 = 80A40000 -/* 02F28 80A41498 25CE0218 */ addiu $t6, $t6, %lo(func_80A40218) ## $t6 = 80A40218 -/* 02F2C 80A4149C 15C20006 */ bne $t6, $v0, .L80A414B8 -/* 02F30 80A414A0 3C0F80A4 */ lui $t7, %hi(func_80A4011C) ## $t7 = 80A40000 -/* 02F34 80A414A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F38 80A414A8 0C2903D6 */ jal func_80A40F58 -/* 02F3C 80A414AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F40 80A414B0 10000050 */ beq $zero, $zero, .L80A415F4 -/* 02F44 80A414B4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A414B8: -/* 02F48 80A414B8 25EF011C */ addiu $t7, $t7, %lo(func_80A4011C) ## $t7 = 0000011C -/* 02F4C 80A414BC 11E20008 */ beq $t7, $v0, .L80A414E0 -/* 02F50 80A414C0 3C0380A4 */ lui $v1, %hi(func_80A3FEB4) ## $v1 = 80A40000 -/* 02F54 80A414C4 2463FEB4 */ addiu $v1, $v1, %lo(func_80A3FEB4) ## $v1 = 80A3FEB4 -/* 02F58 80A414C8 10620005 */ beq $v1, $v0, .L80A414E0 -/* 02F5C 80A414CC 3C1880A4 */ lui $t8, %hi(func_80A3FEF8) ## $t8 = 80A40000 -/* 02F60 80A414D0 2718FEF8 */ addiu $t8, $t8, %lo(func_80A3FEF8) ## $t8 = 80A3FEF8 -/* 02F64 80A414D4 53020003 */ beql $t8, $v0, .L80A414E4 -/* 02F68 80A414D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F6C 80A414DC 14620005 */ bne $v1, $v0, .L80A414F4 -.L80A414E0: -/* 02F70 80A414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A414E4: -/* 02F74 80A414E4 0C29041A */ jal func_80A41068 -/* 02F78 80A414E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F7C 80A414EC 10000041 */ beq $zero, $zero, .L80A415F4 -/* 02F80 80A414F0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A414F4: -/* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 -/* 02F88 80A414F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) -/* 02F90 80A41500 3C040601 */ lui $a0, %hi(D_0600CE80) ## $a0 = 06010000 -/* 02F94 80A41504 2484CE80 */ addiu $a0, $a0, %lo(D_0600CE80) ## $a0 = 0600CE80 -/* 02F98 80A41508 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 -/* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 -/* 02FA4 80A41514 3C068016 */ lui $a2, %hi(gSegments) -/* 02FA8 80A41518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 02FAC 80A4151C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 02FB0 80A41520 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 02FB4 80A41524 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 -/* 02FBC 80A4152C ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 -/* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 -/* 02FC4 80A41534 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 02FC8 80A41538 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 02FCC 80A4153C 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 -/* 02FD0 80A41540 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 02FD4 80A41544 00877824 */ and $t7, $a0, $a3 -/* 02FD8 80A41548 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 02FDC 80A4154C 01CFC021 */ addu $t8, $t6, $t7 -/* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 -/* 02FE4 80A41554 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 02FE8 80A41558 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 02FEC 80A4155C 3C040601 */ lui $a0, %hi(D_0600DE80) ## $a0 = 06010000 -/* 02FF0 80A41560 2484DE80 */ addiu $a0, $a0, %lo(D_0600DE80) ## $a0 = 0600DE80 -/* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 -/* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 -/* 02FFC 80A4156C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03000 80A41570 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 03004 80A41574 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 03008 80A41578 000C6880 */ sll $t5, $t4, 2 -/* 0300C 80A4157C ACA902C0 */ sw $t1, 0x02C0($a1) ## 000002C0 -/* 03010 80A41580 00CD7021 */ addu $t6, $a2, $t5 -/* 03014 80A41584 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 03018 80A41588 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 0301C 80A4158C 0087C024 */ and $t8, $a0, $a3 -/* 03020 80A41590 3C0A80A4 */ lui $t2, %hi(func_80A411C8) ## $t2 = 80A40000 -/* 03024 80A41594 01F8C821 */ addu $t9, $t7, $t8 -/* 03028 80A41598 03284821 */ addu $t1, $t9, $t0 -/* 0302C 80A4159C AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -/* 03030 80A415A0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 03034 80A415A4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 03038 80A415A8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0303C 80A415AC 3C0B80A4 */ lui $t3, %hi(func_80A413DC) ## $t3 = 80A40000 -/* 03040 80A415B0 256B13DC */ addiu $t3, $t3, %lo(func_80A413DC) ## $t3 = 80A413DC -/* 03044 80A415B4 254A11C8 */ addiu $t2, $t2, %lo(func_80A411C8) ## $t2 = 80A411C8 -/* 03048 80A415B8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0304C 80A415BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 03050 80A415C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03054 80A415C4 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 03058 80A415C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0305C 80A415CC 3C0680A4 */ lui $a2, %hi(D_80A41C70) ## $a2 = 80A40000 -/* 03060 80A415D0 24C61C70 */ addiu $a2, $a2, %lo(D_80A41C70) ## $a2 = 80A41C70 -/* 03064 80A415D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 03068 80A415D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0306C 80A415DC 0C031AD5 */ jal Graph_CloseDisps -/* 03070 80A415E0 240709DD */ addiu $a3, $zero, 0x09DD ## $a3 = 000009DD -/* 03074 80A415E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03078 80A415E8 0C2905ED */ jal func_80A417B4 -/* 0307C 80A415EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03080 80A415F0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A415F4: -/* 03084 80A415F4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0308C 80A415FC 03E00008 */ jr $ra -/* 03090 80A41600 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s deleted file mode 100644 index 8751a281c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ /dev/null @@ -1,240 +0,0 @@ -glabel EnGo_Init -/* 015BC 80A3FB2C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 015C0 80A3FB30 3C0F80A4 */ lui $t7, %hi(D_80A41B9C) ## $t7 = 80A40000 -/* 015C4 80A3FB34 AFBF002C */ sw $ra, 0x002C($sp) -/* 015C8 80A3FB38 AFB00028 */ sw $s0, 0x0028($sp) -/* 015CC 80A3FB3C AFA5005C */ sw $a1, 0x005C($sp) -/* 015D0 80A3FB40 25EF1B9C */ addiu $t7, $t7, %lo(D_80A41B9C) ## $t7 = 80A41B9C -/* 015D4 80A3FB44 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41B9C -/* 015D8 80A3FB48 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFEC -/* 015DC 80A3FB4C 8DF80004 */ lw $t8, 0x0004($t7) ## 80A41BA0 -/* 015E0 80A3FB50 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 015E4 80A3FB54 8DF90008 */ lw $t9, 0x0008($t7) ## 80A41BA4 -/* 015E8 80A3FB58 3C0980A4 */ lui $t1, %hi(D_80A41BA8) ## $t1 = 80A40000 -/* 015EC 80A3FB5C 25291BA8 */ addiu $t1, $t1, %lo(D_80A41BA8) ## $t1 = 80A41BA8 -/* 015F0 80A3FB60 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 015F4 80A3FB64 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 015F8 80A3FB68 8D2B0000 */ lw $t3, 0x0000($t1) ## 80A41BA8 -/* 015FC 80A3FB6C 27A80038 */ addiu $t0, $sp, 0x0038 ## $t0 = FFFFFFE0 -/* 01600 80A3FB70 8D2A0004 */ lw $t2, 0x0004($t1) ## 80A41BAC -/* 01604 80A3FB74 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE0 -/* 01608 80A3FB78 8D2B0008 */ lw $t3, 0x0008($t1) ## 80A41BB0 -/* 0160C 80A3FB7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01610 80A3FB80 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 01614 80A3FB84 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 01618 80A3FB88 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 0161C 80A3FB8C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01620 80A3FB90 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01624 80A3FB94 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 -/* 01628 80A3FB98 0C00AC78 */ jal ActorShape_Init - -/* 0162C 80A3FB9C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 -/* 01630 80A3FBA0 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 -/* 01634 80A3FBA4 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 -/* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0163C 80A3FBAC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01640 80A3FBB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01644 80A3FBB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01648 80A3FBB8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0164C 80A3FBBC 0C0291BE */ jal SkelAnime_InitFlex -/* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01654 80A3FBC4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0165C 80A3FBCC 0C0170D9 */ jal Collider_InitCylinder - -/* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) -/* 01664 80A3FBD4 3C0780A4 */ lui $a3, %hi(D_80A41B00) ## $a3 = 80A40000 -/* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) -/* 0166C 80A3FBDC 24E71B00 */ addiu $a3, $a3, %lo(D_80A41B00) ## $a3 = 80A41B00 -/* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) -/* 01674 80A3FBE4 0C01712B */ jal Collider_SetCylinder - -/* 01678 80A3FBE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0167C 80A3FBEC 0C016C80 */ jal DamageTable_Get - -/* 01680 80A3FBF0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 -/* 01684 80A3FBF4 3C0680A4 */ lui $a2, %hi(D_80A41B2C) ## $a2 = 80A40000 -/* 01688 80A3FBF8 24C61B2C */ addiu $a2, $a2, %lo(D_80A41B2C) ## $a2 = 80A41B2C -/* 0168C 80A3FBFC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01690 80A3FC00 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 01694 80A3FC04 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 01698 80A3FC08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0169C 80A3FC0C 0C28FBA3 */ jal func_80A3EE8C -/* 016A0 80A3FC10 8FA5005C */ lw $a1, 0x005C($sp) -/* 016A4 80A3FC14 14400005 */ bne $v0, $zero, .L80A3FC2C -/* 016A8 80A3FC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016AC 80A3FC1C 0C00B55C */ jal Actor_Kill - -/* 016B0 80A3FC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B4 80A3FC24 10000091 */ beq $zero, $zero, .L80A3FE6C -/* 016B8 80A3FC28 8FBF002C */ lw $ra, 0x002C($sp) -.L80A3FC2C: -/* 016BC 80A3FC2C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 016C0 80A3FC30 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 016C4 80A3FC34 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 016C8 80A3FC38 1040000A */ beq $v0, $zero, .L80A3FC64 -/* 016CC 80A3FC3C 00000000 */ nop -/* 016D0 80A3FC40 10410008 */ beq $v0, $at, .L80A3FC64 -/* 016D4 80A3FC44 00000000 */ nop -/* 016D8 80A3FC48 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 016DC 80A3FC4C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 016E0 80A3FC50 01816824 */ and $t5, $t4, $at -/* 016E4 80A3FC54 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 016E8 80A3FC58 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 016EC 80A3FC5C 01A17824 */ and $t7, $t5, $at -/* 016F0 80A3FC60 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80A3FC64: -/* 016F4 80A3FC64 0C28FB78 */ jal func_80A3EDE0 -/* 016F8 80A3FC68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 016FC 80A3FC6C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01700 80A3FC70 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01704 80A3FC74 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 01708 80A3FC78 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 0170C 80A3FC7C 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 01710 80A3FC80 28410071 */ slti $at, $v0, 0x0071 -/* 01714 80A3FC84 A218001F */ sb $t8, 0x001F($s0) ## 0000001F -/* 01718 80A3FC88 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0171C 80A3FC8C 14200006 */ bne $at, $zero, .L80A3FCA8 -/* 01720 80A3FC90 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 01724 80A3FC94 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01728 80A3FC98 1041005C */ beq $v0, $at, .L80A3FE0C -/* 0172C 80A3FC9C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 01730 80A3FCA0 1000006F */ beq $zero, $zero, .L80A3FE60 -/* 01734 80A3FCA4 00000000 */ nop -.L80A3FCA8: -/* 01738 80A3FCA8 2C410071 */ sltiu $at, $v0, 0x0071 -/* 0173C 80A3FCAC 1020006C */ beq $at, $zero, .L80A3FE60 -/* 01740 80A3FCB0 0002C880 */ sll $t9, $v0, 2 -/* 01744 80A3FCB4 3C0180A4 */ lui $at, %hi(jtbl_80A420E4) ## $at = 80A40000 -/* 01748 80A3FCB8 00390821 */ addu $at, $at, $t9 -/* 0174C 80A3FCBC 8C3920E4 */ lw $t9, %lo(jtbl_80A420E4)($at) -/* 01750 80A3FCC0 03200008 */ jr $t9 -/* 01754 80A3FCC4 00000000 */ nop -glabel L80A3FCC8 -/* 01758 80A3FCC8 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 -/* 0175C 80A3FCCC 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F -/* 01760 80A3FCD0 0C00B58B */ jal Actor_SetScale - -/* 01764 80A3FCD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80A3FCD8 3C088012 */ lui $t0, %hi(gBitFlags+4) -/* 0176C 80A3FCDC 3C098012 */ lui $t1, %hi(gEquipShifts+2) -/* 01770 80A3FCE0 912971F2 */ lbu $t1, %lo(gEquipShifts+2)($t1) -/* 01774 80A3FCE4 8D087124 */ lw $t0, %lo(gBitFlags+4)($t0) -/* 01778 80A3FCE8 3C0B8016 */ lui $t3, %hi(gSaveContext+0x9c) -/* 0177C 80A3FCEC 956BE6FC */ lhu $t3, %lo(gSaveContext+0x9c)($t3) -/* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 -/* 01784 80A3FCF4 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 -/* 0178C 80A3FCFC 1180000A */ beq $t4, $zero, .L80A3FD28 -/* 01790 80A3FD00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01794 80A3FD04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01798 80A3FD08 0C28FD2F */ jal func_80A3F4BC -/* 0179C 80A3FD0C 8FA5005C */ lw $a1, 0x005C($sp) -/* 017A0 80A3FD10 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 017A4 80A3FD14 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 017A8 80A3FD18 0C28F95C */ jal func_80A3E570 -/* 017AC 80A3FD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B0 80A3FD20 10000052 */ beq $zero, $zero, .L80A3FE6C -/* 017B4 80A3FD24 8FBF002C */ lw $ra, 0x002C($sp) -.L80A3FD28: -/* 017B8 80A3FD28 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 017BC 80A3FD2C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 017C0 80A3FD30 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 017C4 80A3FD34 3C0580A4 */ lui $a1, %hi(func_80A4011C) ## $a1 = 80A40000 -/* 017C8 80A3FD38 24A5011C */ addiu $a1, $a1, %lo(func_80A4011C) ## $a1 = 80A4011C -/* 017CC 80A3FD3C E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 017D0 80A3FD40 0C28F95C */ jal func_80A3E570 -/* 017D4 80A3FD44 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C -/* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A3FD50 -/* 017E0 80A3FD50 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 -/* 017E4 80A3FD54 0C028800 */ jal Animation_GetLastFrame - -/* 017E8 80A3FD58 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 -/* 017EC 80A3FD5C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 017F0 80A3FD60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 017F4 80A3FD64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 017F8 80A3FD68 46805420 */ cvt.s.w $f16, $f10 -/* 017FC 80A3FD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01800 80A3FD70 0C00B58B */ jal Actor_SetScale - -/* 01804 80A3FD74 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 -/* 01808 80A3FD78 3C0580A4 */ lui $a1, %hi(func_80A4020C) ## $a1 = 80A40000 -/* 0180C 80A3FD7C 24A5020C */ addiu $a1, $a1, %lo(func_80A4020C) ## $a1 = 80A4020C -/* 01810 80A3FD80 0C28F95C */ jal func_80A3E570 -/* 01814 80A3FD84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C -/* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A3FD90 -/* 01820 80A3FD90 3C0D8016 */ lui $t5, %hi(gSaveContext+0xf14) -/* 01824 80A3FD94 95ADF574 */ lhu $t5, %lo(gSaveContext+0xf14)($t5) -/* 01828 80A3FD98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80A3FD9C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 -/* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 -/* 01834 80A3FDA4 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 01838 80A3FDA8 0C28FD2F */ jal func_80A3F4BC -/* 0183C 80A3FDAC 8FA5005C */ lw $a1, 0x005C($sp) -/* 01840 80A3FDB0 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -.L80A3FDB4: -/* 01844 80A3FDB4 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F -/* 01848 80A3FDB8 0C00B58B */ jal Actor_SetScale - -/* 0184C 80A3FDBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01850 80A3FDC0 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 01854 80A3FDC4 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 01858 80A3FDC8 0C28F95C */ jal func_80A3E570 -/* 0185C 80A3FDCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01860 80A3FDD0 10000026 */ beq $zero, $zero, .L80A3FE6C -/* 01864 80A3FDD4 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A3FDD8 -/* 01868 80A3FDD8 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 0186C 80A3FDDC 44819000 */ mtc1 $at, $f18 ## $f18 = 1400.00 -/* 01870 80A3FDE0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 01874 80A3FDE4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 01878 80A3FDE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0187C 80A3FDEC 0C00B58B */ jal Actor_SetScale - -/* 01880 80A3FDF0 E61200BC */ swc1 $f18, 0x00BC($s0) ## 000000BC -/* 01884 80A3FDF4 3C0580A4 */ lui $a1, %hi(func_80A3FEB4) ## $a1 = 80A40000 -/* 01888 80A3FDF8 24A5FEB4 */ addiu $a1, $a1, %lo(func_80A3FEB4) ## $a1 = 80A3FEB4 -/* 0188C 80A3FDFC 0C28F95C */ jal func_80A3E570 -/* 01890 80A3FE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01894 80A3FE04 10000019 */ beq $zero, $zero, .L80A3FE6C -/* 01898 80A3FE08 8FBF002C */ lw $ra, 0x002C($sp) -.L80A3FE0C: -/* 0189C 80A3FE0C 3C053E23 */ lui $a1, 0x3E23 ## $a1 = 3E230000 -/* 018A0 80A3FE10 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F -/* 018A4 80A3FE14 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3E23D70A -/* 018A8 80A3FE18 0C00B58B */ jal Actor_SetScale - -/* 018AC 80A3FE1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018B0 80A3FE20 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 018B4 80A3FE24 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018B8 80A3FE28 0C28F95C */ jal func_80A3E570 -/* 018BC 80A3FE2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C0 80A3FE30 1000000E */ beq $zero, $zero, .L80A3FE6C -/* 018C4 80A3FE34 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A3FE38 -/* 018C8 80A3FE38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 018CC 80A3FE3C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 018D0 80A3FE40 0C00B58B */ jal Actor_SetScale - -/* 018D4 80A3FE44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018D8 80A3FE48 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 018DC 80A3FE4C 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018E0 80A3FE50 0C28F95C */ jal func_80A3E570 -/* 018E4 80A3FE54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 80A3FE58 10000004 */ beq $zero, $zero, .L80A3FE6C -/* 018EC 80A3FE5C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A3FE60 -.L80A3FE60: -/* 018F0 80A3FE60 0C00B55C */ jal Actor_Kill - -/* 018F4 80A3FE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 80A3FE68 8FBF002C */ lw $ra, 0x002C($sp) -.L80A3FE6C: -/* 018FC 80A3FE6C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01900 80A3FE70 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01904 80A3FE74 03E00008 */ jr $ra -/* 01908 80A3FE78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s deleted file mode 100644 index 64edf29025..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel EnGo_Update -/* 028DC 80A40E4C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 028E0 80A40E50 AFB0001C */ sw $s0, 0x001C($sp) -/* 028E4 80A40E54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 028E8 80A40E58 AFB10020 */ sw $s1, 0x0020($sp) -/* 028EC 80A40E5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 028F0 80A40E60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 028F4 80A40E64 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 028F8 80A40E68 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 028FC 80A40E6C 0C0189B7 */ jal Collider_UpdateCylinder - -/* 02900 80A40E70 AFA6002C */ sw $a2, 0x002C($sp) -/* 02904 80A40E74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02908 80A40E78 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0290C 80A40E7C 8FA6002C */ lw $a2, 0x002C($sp) -/* 02910 80A40E80 02212821 */ addu $a1, $s1, $at -/* 02914 80A40E84 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 02918 80A40E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0291C 80A40E8C 0C02927F */ jal SkelAnime_Update - -/* 02920 80A40E90 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02924 80A40E94 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02928 80A40E98 3C0E80A4 */ lui $t6, %hi(func_80A406E0) ## $t6 = 80A40000 -/* 0292C 80A40E9C 25CE06E0 */ addiu $t6, $t6, %lo(func_80A406E0) ## $t6 = 80A406E0 -/* 02930 80A40EA0 11C20006 */ beq $t6, $v0, .L80A40EBC -/* 02934 80A40EA4 3C0F80A4 */ lui $t7, %hi(func_80A4020C) ## $t7 = 80A40000 -/* 02938 80A40EA8 25EF020C */ addiu $t7, $t7, %lo(func_80A4020C) ## $t7 = 80A4020C -/* 0293C 80A40EAC 11E20003 */ beq $t7, $v0, .L80A40EBC -/* 02940 80A40EB0 3C1880A4 */ lui $t8, %hi(func_80A40B1C) ## $t8 = 80A40000 -/* 02944 80A40EB4 27180B1C */ addiu $t8, $t8, %lo(func_80A40B1C) ## $t8 = 80A40B1C -/* 02948 80A40EB8 17020005 */ bne $t8, $v0, .L80A40ED0 -.L80A40EBC: -/* 0294C 80A40EBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02950 80A40EC0 26050220 */ addiu $a1, $s0, 0x0220 ## $a1 = 00000220 -/* 02954 80A40EC4 26060244 */ addiu $a2, $s0, 0x0244 ## $a2 = 00000244 -/* 02958 80A40EC8 0C00D3D5 */ jal func_80034F54 -/* 0295C 80A40ECC 24070012 */ addiu $a3, $zero, 0x0012 ## $a3 = 00000012 -.L80A40ED0: -/* 02960 80A40ED0 0C28FC9D */ jal func_80A3F274 -/* 02964 80A40ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02968 80A40ED8 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 -/* 0296C 80A40EDC 57200004 */ bnel $t9, $zero, .L80A40EF0 -/* 02970 80A40EE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02974 80A40EE4 0C00B638 */ jal Actor_MoveForward - -/* 02978 80A40EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0297C 80A40EEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A40EF0: -/* 02980 80A40EF0 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 02984 80A40EF4 AFA80014 */ sw $t0, 0x0014($sp) -/* 02988 80A40EF8 44060000 */ mfc1 $a2, $f0 -/* 0298C 80A40EFC 44070000 */ mfc1 $a3, $f0 -/* 02990 80A40F00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02994 80A40F04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02998 80A40F08 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 0299C 80A40F0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 029A0 80A40F10 0C28FC39 */ jal func_80A3F0E4 -/* 029A4 80A40F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029A8 80A40F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029AC 80A40F1C 0C28FE42 */ jal func_80A3F908 -/* 029B0 80A40F20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029B4 80A40F24 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 029B8 80A40F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029BC 80A40F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029C0 80A40F30 0320F809 */ jalr $ra, $t9 -/* 029C4 80A40F34 00000000 */ nop -/* 029C8 80A40F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 80A40F3C 0C28FC18 */ jal func_80A3F060 -/* 029D0 80A40F40 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029D4 80A40F44 8FBF0024 */ lw $ra, 0x0024($sp) -/* 029D8 80A40F48 8FB0001C */ lw $s0, 0x001C($sp) -/* 029DC 80A40F4C 8FB10020 */ lw $s1, 0x0020($sp) -/* 029E0 80A40F50 03E00008 */ jr $ra -/* 029E4 80A40F54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s deleted file mode 100644 index bf8952251b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A3E570 -/* 00000 80A3E570 03E00008 */ jr $ra -/* 00004 80A3E574 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s deleted file mode 100644 index afe49d9607..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s +++ /dev/null @@ -1,269 +0,0 @@ -glabel func_80A3E578 -/* 00008 80A3E578 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0000C 80A3E57C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00010 80A3E580 84A3001C */ lh $v1, 0x001C($a1) ## 0000001C -/* 00014 80A3E584 8C861C44 */ lw $a2, 0x1C44($a0) ## 00001C44 -/* 00018 80A3E588 306200F0 */ andi $v0, $v1, 0x00F0 ## $v0 = 00000000 -/* 0001C 80A3E58C 28410071 */ slti $at, $v0, 0x0071 -/* 00020 80A3E590 14200005 */ bne $at, $zero, .L80A3E5A8 -/* 00024 80A3E594 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 00028 80A3E598 1041000B */ beq $v0, $at, .L80A3E5C8 -/* 0002C 80A3E59C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00030 80A3E5A0 100000D5 */ beq $zero, $zero, .L80A3E8F8 -/* 00034 80A3E5A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3E5A8: -/* 00038 80A3E5A8 2C410071 */ sltiu $at, $v0, 0x0071 -/* 0003C 80A3E5AC 102000D1 */ beq $at, $zero, .L80A3E8F4 -/* 00040 80A3E5B0 00027080 */ sll $t6, $v0, 2 -/* 00044 80A3E5B4 3C0180A4 */ lui $at, %hi(jtbl_80A41CB0) ## $at = 80A40000 -/* 00048 80A3E5B8 002E0821 */ addu $at, $at, $t6 -/* 0004C 80A3E5BC 8C2E1CB0 */ lw $t6, %lo(jtbl_80A41CB0)($at) -/* 00050 80A3E5C0 01C00008 */ jr $t6 -/* 00054 80A3E5C4 00000000 */ nop -.L80A3E5C8: -/* 00058 80A3E5C8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0005C 80A3E5CC 906F003E */ lbu $t7, 0x003E($v1) ## 8015E69E -/* 00060 80A3E5D0 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) -/* 00064 80A3E5D4 11E00003 */ beq $t7, $zero, .L80A3E5E4 -/* 00068 80A3E5D8 00000000 */ nop -/* 0006C 80A3E5DC 100000C6 */ beq $zero, $zero, .L80A3E8F8 -/* 00070 80A3E5E0 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E -.L80A3E5E4: -/* 00074 80A3E5E4 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) -/* 00078 80A3E5E8 0078C821 */ addu $t9, $v1, $t8 -/* 0007C 80A3E5EC 93220074 */ lbu $v0, 0x0074($t9) ## 00000074 -/* 00080 80A3E5F0 28410037 */ slti $at, $v0, 0x0037 -/* 00084 80A3E5F4 5420000B */ bnel $at, $zero, .L80A3E624 -/* 00088 80A3E5F8 28410036 */ slti $at, $v0, 0x0036 -/* 0008C 80A3E5FC 0C01DD73 */ jal func_800775CC -/* 00090 80A3E600 00000000 */ nop -/* 00094 80A3E604 28410003 */ slti $at, $v0, 0x0003 -/* 00098 80A3E608 14200003 */ bne $at, $zero, .L80A3E618 -/* 0009C 80A3E60C 00000000 */ nop -/* 000A0 80A3E610 100000B9 */ beq $zero, $zero, .L80A3E8F8 -/* 000A4 80A3E614 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E -.L80A3E618: -/* 000A8 80A3E618 100000B7 */ beq $zero, $zero, .L80A3E8F8 -/* 000AC 80A3E61C 2402305D */ addiu $v0, $zero, 0x305D ## $v0 = 0000305D -/* 000B0 80A3E620 28410036 */ slti $at, $v0, 0x0036 -.L80A3E624: -/* 000B4 80A3E624 14200004 */ bne $at, $zero, .L80A3E638 -/* 000B8 80A3E628 2408000E */ addiu $t0, $zero, 0x000E ## $t0 = 0000000E -/* 000BC 80A3E62C A0C80693 */ sb $t0, 0x0693($a2) ## 00000693 -/* 000C0 80A3E630 100000B1 */ beq $zero, $zero, .L80A3E8F8 -/* 000C4 80A3E634 24023059 */ addiu $v0, $zero, 0x3059 ## $v0 = 00003059 -.L80A3E638: -/* 000C8 80A3E638 28410034 */ slti $at, $v0, 0x0034 -/* 000CC 80A3E63C 14200003 */ bne $at, $zero, .L80A3E64C -/* 000D0 80A3E640 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B -/* 000D4 80A3E644 100000AC */ beq $zero, $zero, .L80A3E8F8 -/* 000D8 80A3E648 24023058 */ addiu $v0, $zero, 0x3058 ## $v0 = 00003058 -.L80A3E64C: -/* 000DC 80A3E64C A0C90693 */ sb $t1, 0x0693($a2) ## 00000693 -/* 000E0 80A3E650 100000A9 */ beq $zero, $zero, .L80A3E8F8 -/* 000E4 80A3E654 24023053 */ addiu $v0, $zero, 0x3053 ## $v0 = 00003053 -glabel L80A3E658 -/* 000E8 80A3E658 3C038016 */ lui $v1, %hi(gSaveContext) -/* 000EC 80A3E65C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 000F0 80A3E660 3C028012 */ lui $v0, %hi(gBitFlags+4) -/* 000F4 80A3E664 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) -/* 000F8 80A3E668 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 000FC 80A3E66C 3C0E8012 */ lui $t6, %hi(gEquipShifts+2) -/* 00100 80A3E670 004A5824 */ and $t3, $v0, $t2 -/* 00104 80A3E674 11600009 */ beq $t3, $zero, .L80A3E69C -/* 00108 80A3E678 00000000 */ nop -/* 0010C 80A3E67C 946C0F18 */ lhu $t4, 0x0F18($v1) ## 8015F578 -/* 00110 80A3E680 318D8000 */ andi $t5, $t4, 0x8000 ## $t5 = 00000000 -/* 00114 80A3E684 11A00003 */ beq $t5, $zero, .L80A3E694 -/* 00118 80A3E688 00000000 */ nop -/* 0011C 80A3E68C 1000009A */ beq $zero, $zero, .L80A3E8F8 -/* 00120 80A3E690 24023042 */ addiu $v0, $zero, 0x3042 ## $v0 = 00003042 -.L80A3E694: -/* 00124 80A3E694 10000098 */ beq $zero, $zero, .L80A3E8F8 -/* 00128 80A3E698 24023041 */ addiu $v0, $zero, 0x3041 ## $v0 = 00003041 -.L80A3E69C: -/* 0012C 80A3E69C 91CE71F2 */ lbu $t6, %lo(gEquipShifts+2)($t6) -/* 00130 80A3E6A0 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC -/* 00134 80A3E6A4 01C27804 */ sllv $t7, $v0, $t6 -/* 00138 80A3E6A8 01F8C824 */ and $t9, $t7, $t8 -/* 0013C 80A3E6AC 57200006 */ bnel $t9, $zero, .L80A3E6C8 -/* 00140 80A3E6B0 94690F18 */ lhu $t1, 0x0F18($v1) ## 8015F578 -/* 00144 80A3E6B4 94620F18 */ lhu $v0, 0x0F18($v1) ## 8015F578 -/* 00148 80A3E6B8 30482000 */ andi $t0, $v0, 0x2000 ## $t0 = 00002000 -/* 0014C 80A3E6BC 11000009 */ beq $t0, $zero, .L80A3E6E4 -/* 00150 80A3E6C0 304B0200 */ andi $t3, $v0, 0x0200 ## $t3 = 00000000 -/* 00154 80A3E6C4 94690F18 */ lhu $t1, 0x0F18($v1) ## 8015F578 -.L80A3E6C8: -/* 00158 80A3E6C8 312A4000 */ andi $t2, $t1, 0x4000 ## $t2 = 00000000 -/* 0015C 80A3E6CC 11400003 */ beq $t2, $zero, .L80A3E6DC -/* 00160 80A3E6D0 00000000 */ nop -/* 00164 80A3E6D4 10000088 */ beq $zero, $zero, .L80A3E8F8 -/* 00168 80A3E6D8 24023038 */ addiu $v0, $zero, 0x3038 ## $v0 = 00003038 -.L80A3E6DC: -/* 0016C 80A3E6DC 10000086 */ beq $zero, $zero, .L80A3E8F8 -/* 00170 80A3E6E0 24023037 */ addiu $v0, $zero, 0x3037 ## $v0 = 00003037 -.L80A3E6E4: -/* 00174 80A3E6E4 11600007 */ beq $t3, $zero, .L80A3E704 -/* 00178 80A3E6E8 304C0400 */ andi $t4, $v0, 0x0400 ## $t4 = 00000000 -/* 0017C 80A3E6EC 11800003 */ beq $t4, $zero, .L80A3E6FC -/* 00180 80A3E6F0 00000000 */ nop -/* 00184 80A3E6F4 10000080 */ beq $zero, $zero, .L80A3E8F8 -/* 00188 80A3E6F8 24023033 */ addiu $v0, $zero, 0x3033 ## $v0 = 00003033 -.L80A3E6FC: -/* 0018C 80A3E6FC 1000007E */ beq $zero, $zero, .L80A3E8F8 -/* 00190 80A3E700 24023032 */ addiu $v0, $zero, 0x3032 ## $v0 = 00003032 -.L80A3E704: -/* 00194 80A3E704 1000007C */ beq $zero, $zero, .L80A3E8F8 -/* 00198 80A3E708 24023030 */ addiu $v0, $zero, 0x3030 ## $v0 = 00003030 -glabel L80A3E70C -/* 0019C 80A3E70C 0C00B2D0 */ jal Flags_GetSwitch - -/* 001A0 80A3E710 00032A03 */ sra $a1, $v1, 8 -/* 001A4 80A3E714 10400003 */ beq $v0, $zero, .L80A3E724 -/* 001A8 80A3E718 00000000 */ nop -/* 001AC 80A3E71C 10000076 */ beq $zero, $zero, .L80A3E8F8 -/* 001B0 80A3E720 24023052 */ addiu $v0, $zero, 0x3052 ## $v0 = 00003052 -.L80A3E724: -/* 001B4 80A3E724 10000074 */ beq $zero, $zero, .L80A3E8F8 -/* 001B8 80A3E728 24023051 */ addiu $v0, $zero, 0x3051 ## $v0 = 00003051 -glabel L80A3E72C -/* 001BC 80A3E72C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 001C0 80A3E730 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 001C4 80A3E734 3C0D8012 */ lui $t5, %hi(gBitFlags+0x4c) -/* 001C8 80A3E738 8DAD716C */ lw $t5, %lo(gBitFlags+0x4c)($t5) -/* 001CC 80A3E73C 8C6E00A4 */ lw $t6, 0x00A4($v1) ## 8015E704 -/* 001D0 80A3E740 01AE7824 */ and $t7, $t5, $t6 -/* 001D4 80A3E744 51E00004 */ beql $t7, $zero, .L80A3E758 -/* 001D8 80A3E748 94780ED8 */ lhu $t8, 0x0ED8($v1) ## 8015F538 -/* 001DC 80A3E74C 1000006A */ beq $zero, $zero, .L80A3E8F8 -/* 001E0 80A3E750 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 001E4 80A3E754 94780ED8 */ lhu $t8, 0x0ED8($v1) ## 8015F538 -.L80A3E758: -/* 001E8 80A3E758 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 001EC 80A3E75C 53200004 */ beql $t9, $zero, .L80A3E770 -/* 001F0 80A3E760 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 -/* 001F4 80A3E764 10000064 */ beq $zero, $zero, .L80A3E8F8 -/* 001F8 80A3E768 24023021 */ addiu $v0, $zero, 0x3021 ## $v0 = 00003021 -/* 001FC 80A3E76C 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 -.L80A3E770: -/* 00200 80A3E770 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00204 80A3E774 11200003 */ beq $t1, $zero, .L80A3E784 -/* 00208 80A3E778 00000000 */ nop -/* 0020C 80A3E77C 1000005E */ beq $zero, $zero, .L80A3E8F8 -/* 00210 80A3E780 2402302A */ addiu $v0, $zero, 0x302A ## $v0 = 0000302A -.L80A3E784: -/* 00214 80A3E784 1000005C */ beq $zero, $zero, .L80A3E8F8 -/* 00218 80A3E788 24023008 */ addiu $v0, $zero, 0x3008 ## $v0 = 00003008 -glabel L80A3E78C -/* 0021C 80A3E78C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00220 80A3E790 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00224 80A3E794 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) -/* 00228 80A3E798 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) -/* 0022C 80A3E79C 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 -/* 00230 80A3E7A0 014B6024 */ and $t4, $t2, $t3 -/* 00234 80A3E7A4 51800004 */ beql $t4, $zero, .L80A3E7B8 -/* 00238 80A3E7A8 946D0ED8 */ lhu $t5, 0x0ED8($v1) ## 8015F538 -/* 0023C 80A3E7AC 10000052 */ beq $zero, $zero, .L80A3E8F8 -/* 00240 80A3E7B0 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 00244 80A3E7B4 946D0ED8 */ lhu $t5, 0x0ED8($v1) ## 8015F538 -.L80A3E7B8: -/* 00248 80A3E7B8 31AE0008 */ andi $t6, $t5, 0x0008 ## $t6 = 00000000 -/* 0024C 80A3E7BC 11C00003 */ beq $t6, $zero, .L80A3E7CC -/* 00250 80A3E7C0 00000000 */ nop -/* 00254 80A3E7C4 1000004C */ beq $zero, $zero, .L80A3E8F8 -/* 00258 80A3E7C8 24023026 */ addiu $v0, $zero, 0x3026 ## $v0 = 00003026 -.L80A3E7CC: -/* 0025C 80A3E7CC 1000004A */ beq $zero, $zero, .L80A3E8F8 -/* 00260 80A3E7D0 24023009 */ addiu $v0, $zero, 0x3009 ## $v0 = 00003009 -glabel L80A3E7D4 -/* 00264 80A3E7D4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00268 80A3E7D8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0026C 80A3E7DC 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) -/* 00270 80A3E7E0 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) -/* 00274 80A3E7E4 8C7800A4 */ lw $t8, 0x00A4($v1) ## 8015E704 -/* 00278 80A3E7E8 01F8C824 */ and $t9, $t7, $t8 -/* 0027C 80A3E7EC 53200004 */ beql $t9, $zero, .L80A3E800 -/* 00280 80A3E7F0 94680ED8 */ lhu $t0, 0x0ED8($v1) ## 8015F538 -/* 00284 80A3E7F4 10000040 */ beq $zero, $zero, .L80A3E8F8 -/* 00288 80A3E7F8 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 0028C 80A3E7FC 94680ED8 */ lhu $t0, 0x0ED8($v1) ## 8015F538 -.L80A3E800: -/* 00290 80A3E800 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 00294 80A3E804 11200003 */ beq $t1, $zero, .L80A3E814 -/* 00298 80A3E808 00000000 */ nop -/* 0029C 80A3E80C 1000003A */ beq $zero, $zero, .L80A3E8F8 -/* 002A0 80A3E810 24023026 */ addiu $v0, $zero, 0x3026 ## $v0 = 00003026 -.L80A3E814: -/* 002A4 80A3E814 10000038 */ beq $zero, $zero, .L80A3E8F8 -/* 002A8 80A3E818 2402300A */ addiu $v0, $zero, 0x300A ## $v0 = 0000300A -glabel L80A3E81C -/* 002AC 80A3E81C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 002B0 80A3E820 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 002B4 80A3E824 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) -/* 002B8 80A3E828 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) -/* 002BC 80A3E82C 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 -/* 002C0 80A3E830 014B6024 */ and $t4, $t2, $t3 -/* 002C4 80A3E834 51800004 */ beql $t4, $zero, .L80A3E848 -/* 002C8 80A3E838 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 -/* 002CC 80A3E83C 1000002E */ beq $zero, $zero, .L80A3E8F8 -/* 002D0 80A3E840 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 002D4 80A3E844 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 -.L80A3E848: -/* 002D8 80A3E848 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 002DC 80A3E84C 11C00003 */ beq $t6, $zero, .L80A3E85C -/* 002E0 80A3E850 00000000 */ nop -/* 002E4 80A3E854 10000028 */ beq $zero, $zero, .L80A3E8F8 -/* 002E8 80A3E858 24023015 */ addiu $v0, $zero, 0x3015 ## $v0 = 00003015 -.L80A3E85C: -/* 002EC 80A3E85C 10000026 */ beq $zero, $zero, .L80A3E8F8 -/* 002F0 80A3E860 24023014 */ addiu $v0, $zero, 0x3014 ## $v0 = 00003014 -glabel L80A3E864 -/* 002F4 80A3E864 3C038016 */ lui $v1, %hi(gSaveContext) -/* 002F8 80A3E868 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 002FC 80A3E86C 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) -/* 00300 80A3E870 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) -/* 00304 80A3E874 8C7800A4 */ lw $t8, 0x00A4($v1) ## 8015E704 -/* 00308 80A3E878 01F8C824 */ and $t9, $t7, $t8 -/* 0030C 80A3E87C 53200004 */ beql $t9, $zero, .L80A3E890 -/* 00310 80A3E880 94680F16 */ lhu $t0, 0x0F16($v1) ## 8015F576 -/* 00314 80A3E884 1000001C */ beq $zero, $zero, .L80A3E8F8 -/* 00318 80A3E888 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 0031C 80A3E88C 94680F16 */ lhu $t0, 0x0F16($v1) ## 8015F576 -.L80A3E890: -/* 00320 80A3E890 31090010 */ andi $t1, $t0, 0x0010 ## $t1 = 00000000 -/* 00324 80A3E894 11200003 */ beq $t1, $zero, .L80A3E8A4 -/* 00328 80A3E898 00000000 */ nop -/* 0032C 80A3E89C 10000016 */ beq $zero, $zero, .L80A3E8F8 -/* 00330 80A3E8A0 24023017 */ addiu $v0, $zero, 0x3017 ## $v0 = 00003017 -.L80A3E8A4: -/* 00334 80A3E8A4 10000014 */ beq $zero, $zero, .L80A3E8F8 -/* 00338 80A3E8A8 24023016 */ addiu $v0, $zero, 0x3016 ## $v0 = 00003016 -glabel L80A3E8AC -/* 0033C 80A3E8AC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00340 80A3E8B0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00344 80A3E8B4 3C0A8012 */ lui $t2, %hi(gBitFlags+0x4c) -/* 00348 80A3E8B8 8D4A716C */ lw $t2, %lo(gBitFlags+0x4c)($t2) -/* 0034C 80A3E8BC 8C6B00A4 */ lw $t3, 0x00A4($v1) ## 8015E704 -/* 00350 80A3E8C0 014B6024 */ and $t4, $t2, $t3 -/* 00354 80A3E8C4 51800004 */ beql $t4, $zero, .L80A3E8D8 -/* 00358 80A3E8C8 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 -/* 0035C 80A3E8CC 1000000A */ beq $zero, $zero, .L80A3E8F8 -/* 00360 80A3E8D0 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 00364 80A3E8D4 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 -.L80A3E8D8: -/* 00368 80A3E8D8 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 0036C 80A3E8DC 11C00003 */ beq $t6, $zero, .L80A3E8EC -/* 00370 80A3E8E0 00000000 */ nop -/* 00374 80A3E8E4 10000004 */ beq $zero, $zero, .L80A3E8F8 -/* 00378 80A3E8E8 24023019 */ addiu $v0, $zero, 0x3019 ## $v0 = 00003019 -.L80A3E8EC: -/* 0037C 80A3E8EC 10000002 */ beq $zero, $zero, .L80A3E8F8 -/* 00380 80A3E8F0 24023018 */ addiu $v0, $zero, 0x3018 ## $v0 = 00003018 -glabel L80A3E8F4 -.L80A3E8F4: -/* 00384 80A3E8F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3E8F8: -/* 00388 80A3E8F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0038C 80A3E8FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00390 80A3E900 03E00008 */ jr $ra -/* 00394 80A3E904 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s deleted file mode 100644 index 7b27c30177..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s +++ /dev/null @@ -1,300 +0,0 @@ -glabel func_80A3E908 -/* 00398 80A3E908 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0039C 80A3E90C AFBF001C */ sw $ra, 0x001C($sp) -/* 003A0 80A3E910 AFA40030 */ sw $a0, 0x0030($sp) -/* 003A4 80A3E914 C4A00094 */ lwc1 $f0, 0x0094($a1) ## 00000094 -/* 003A8 80A3E918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003AC 80A3E91C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 003B0 80A3E920 46000005 */ abs.s $f0, $f0 -/* 003B4 80A3E924 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 003B8 80A3E928 46020100 */ add.s $f4, $f0, $f2 -/* 003BC 80A3E92C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 003C0 80A3E930 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 003C4 80A3E934 C4A60090 */ lwc1 $f6, 0x0090($a1) ## 00000090 -/* 003C8 80A3E938 A7A7002E */ sh $a3, 0x002E($sp) -/* 003CC 80A3E93C AFA50034 */ sw $a1, 0x0034($sp) -/* 003D0 80A3E940 46023200 */ add.s $f8, $f6, $f2 -/* 003D4 80A3E944 0C042F6F */ jal func_8010BDBC -/* 003D8 80A3E948 E7A80028 */ swc1 $f8, 0x0028($sp) -/* 003DC 80A3E94C 2C41000A */ sltiu $at, $v0, 0x000A -/* 003E0 80A3E950 102000EF */ beq $at, $zero, .L80A3ED10 -/* 003E4 80A3E954 87A7002E */ lh $a3, 0x002E($sp) -/* 003E8 80A3E958 00027080 */ sll $t6, $v0, 2 -/* 003EC 80A3E95C 3C0180A4 */ lui $at, %hi(jtbl_80A41E74) ## $at = 80A40000 -/* 003F0 80A3E960 002E0821 */ addu $at, $at, $t6 -/* 003F4 80A3E964 8C2E1E74 */ lw $t6, %lo(jtbl_80A41E74)($at) -/* 003F8 80A3E968 01C00008 */ jr $t6 -/* 003FC 80A3E96C 00000000 */ nop -glabel L80A3E970 -/* 00400 80A3E970 8FA40034 */ lw $a0, 0x0034($sp) -/* 00404 80A3E974 9482010E */ lhu $v0, 0x010E($a0) ## 0000010E -/* 00408 80A3E978 28413019 */ slti $at, $v0, 0x3019 -/* 0040C 80A3E97C 1420000A */ bne $at, $zero, .L80A3E9A8 -/* 00410 80A3E980 2458CFF8 */ addiu $t8, $v0, 0xCFF8 ## $t8 = FFFFCFF8 -/* 00414 80A3E984 244FCFCA */ addiu $t7, $v0, 0xCFCA ## $t7 = FFFFCFCA -/* 00418 80A3E988 2DE10029 */ sltiu $at, $t7, 0x0029 -/* 0041C 80A3E98C 10200052 */ beq $at, $zero, .L80A3EAD8 -/* 00420 80A3E990 000F7880 */ sll $t7, $t7, 2 -/* 00424 80A3E994 3C0180A4 */ lui $at, %hi(jtbl_80A41E9C) ## $at = 80A40000 -/* 00428 80A3E998 002F0821 */ addu $at, $at, $t7 -/* 0042C 80A3E99C 8C2F1E9C */ lw $t7, %lo(jtbl_80A41E9C)($at) -/* 00430 80A3E9A0 01E00008 */ jr $t7 -/* 00434 80A3E9A4 00000000 */ nop -.L80A3E9A8: -/* 00438 80A3E9A8 2F010011 */ sltiu $at, $t8, 0x0011 -/* 0043C 80A3E9AC 1020004A */ beq $at, $zero, .L80A3EAD8 -/* 00440 80A3E9B0 0018C080 */ sll $t8, $t8, 2 -/* 00444 80A3E9B4 3C0180A4 */ lui $at, %hi(jtbl_80A41F40) ## $at = 80A40000 -/* 00448 80A3E9B8 00380821 */ addu $at, $at, $t8 -/* 0044C 80A3E9BC 8C381F40 */ lw $t8, %lo(jtbl_80A41F40)($at) -/* 00450 80A3E9C0 03000008 */ jr $t8 -/* 00454 80A3E9C4 00000000 */ nop -glabel L80A3E9C8 -/* 00458 80A3E9C8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0045C 80A3E9CC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00460 80A3E9D0 94790F14 */ lhu $t9, 0x0F14($v1) ## 8015F574 -/* 00464 80A3E9D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00468 80A3E9D8 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 0046C 80A3E9DC 100000CC */ beq $zero, $zero, .L80A3ED10 -/* 00470 80A3E9E0 A4680F14 */ sh $t0, 0x0F14($v1) ## 8015F574 -glabel L80A3E9E4 -/* 00474 80A3E9E4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00478 80A3E9E8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0047C 80A3E9EC 94690F14 */ lhu $t1, 0x0F14($v1) ## 8015F574 -/* 00480 80A3E9F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00484 80A3E9F4 352A0800 */ ori $t2, $t1, 0x0800 ## $t2 = 00000800 -/* 00488 80A3E9F8 100000C5 */ beq $zero, $zero, .L80A3ED10 -/* 0048C 80A3E9FC A46A0F14 */ sh $t2, 0x0F14($v1) ## 8015F574 -glabel L80A3EA00 -/* 00490 80A3EA00 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00494 80A3EA04 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00498 80A3EA08 946B0F16 */ lhu $t3, 0x0F16($v1) ## 8015F576 -/* 0049C 80A3EA0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004A0 80A3EA10 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 004A4 80A3EA14 100000BE */ beq $zero, $zero, .L80A3ED10 -/* 004A8 80A3EA18 A46C0F16 */ sh $t4, 0x0F16($v1) ## 8015F576 -glabel L80A3EA1C -/* 004AC 80A3EA1C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 004B0 80A3EA20 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 004B4 80A3EA24 946D0F16 */ lhu $t5, 0x0F16($v1) ## 8015F576 -/* 004B8 80A3EA28 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004BC 80A3EA2C 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 -/* 004C0 80A3EA30 100000B7 */ beq $zero, $zero, .L80A3ED10 -/* 004C4 80A3EA34 A46E0F16 */ sh $t6, 0x0F16($v1) ## 8015F576 -glabel L80A3EA38 -/* 004C8 80A3EA38 3C038016 */ lui $v1, %hi(gSaveContext) -/* 004CC 80A3EA3C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 004D0 80A3EA40 946F0F16 */ lhu $t7, 0x0F16($v1) ## 8015F576 -/* 004D4 80A3EA44 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004D8 80A3EA48 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = FFFFCFCA -/* 004DC 80A3EA4C 100000B0 */ beq $zero, $zero, .L80A3ED10 -/* 004E0 80A3EA50 A4780F16 */ sh $t8, 0x0F16($v1) ## 8015F576 -glabel L80A3EA54 -/* 004E4 80A3EA54 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 004E8 80A3EA58 8FA50030 */ lw $a1, 0x0030($sp) -/* 004EC 80A3EA5C 2406002C */ addiu $a2, $zero, 0x002C ## $a2 = 0000002C -/* 004F0 80A3EA60 8FA70028 */ lw $a3, 0x0028($sp) -/* 004F4 80A3EA64 0C00BD0D */ jal func_8002F434 -/* 004F8 80A3EA68 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 004FC 80A3EA6C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00500 80A3EA70 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00504 80A3EA74 94790F18 */ lhu $t9, 0x0F18($v1) ## 8015F578 -/* 00508 80A3EA78 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 0050C 80A3EA7C 37282000 */ ori $t0, $t9, 0x2000 ## $t0 = 00002000 -/* 00510 80A3EA80 100000A3 */ beq $zero, $zero, .L80A3ED10 -/* 00514 80A3EA84 A4680F18 */ sh $t0, 0x0F18($v1) ## 8015F578 -glabel L80A3EA88 -/* 00518 80A3EA88 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0051C 80A3EA8C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00520 80A3EA90 94690F18 */ lhu $t1, 0x0F18($v1) ## 8015F578 -/* 00524 80A3EA94 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00528 80A3EA98 352A4000 */ ori $t2, $t1, 0x4000 ## $t2 = 00004000 -/* 0052C 80A3EA9C 1000009C */ beq $zero, $zero, .L80A3ED10 -/* 00530 80A3EAA0 A46A0F18 */ sh $t2, 0x0F18($v1) ## 8015F578 -glabel L80A3EAA4 -/* 00534 80A3EAA4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00538 80A3EAA8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0053C 80A3EAAC 946B0F18 */ lhu $t3, 0x0F18($v1) ## 8015F578 -/* 00540 80A3EAB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00544 80A3EAB4 356C8000 */ ori $t4, $t3, 0x8000 ## $t4 = 00008000 -/* 00548 80A3EAB8 10000095 */ beq $zero, $zero, .L80A3ED10 -/* 0054C 80A3EABC A46C0F18 */ sh $t4, 0x0F18($v1) ## 8015F578 -glabel L80A3EAC0 -/* 00550 80A3EAC0 10000093 */ beq $zero, $zero, .L80A3ED10 -/* 00554 80A3EAC4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -glabel L80A3EAC8 -/* 00558 80A3EAC8 10000091 */ beq $zero, $zero, .L80A3ED10 -/* 0055C 80A3EACC 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -glabel L80A3EAD0 -/* 00560 80A3EAD0 1000008F */ beq $zero, $zero, .L80A3ED10 -/* 00564 80A3EAD4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -glabel L80A3EAD8 -.L80A3EAD8: -/* 00568 80A3EAD8 1000008D */ beq $zero, $zero, .L80A3ED10 -/* 0056C 80A3EADC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -glabel L80A3EAE0 -/* 00570 80A3EAE0 8FA40030 */ lw $a0, 0x0030($sp) -/* 00574 80A3EAE4 0C041AF2 */ jal func_80106BC8 -/* 00578 80A3EAE8 A7A7002E */ sh $a3, 0x002E($sp) -/* 0057C 80A3EAEC 10400088 */ beq $v0, $zero, .L80A3ED10 -/* 00580 80A3EAF0 87A7002E */ lh $a3, 0x002E($sp) -/* 00584 80A3EAF4 8FA60034 */ lw $a2, 0x0034($sp) -/* 00588 80A3EAF8 8FAD0030 */ lw $t5, 0x0030($sp) -/* 0058C 80A3EAFC 2401300A */ addiu $at, $zero, 0x300A ## $at = 0000300A -/* 00590 80A3EB00 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 00594 80A3EB04 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00598 80A3EB08 01CD7021 */ addu $t6, $t6, $t5 -/* 0059C 80A3EB0C 1041000B */ beq $v0, $at, .L80A3EB3C -/* 005A0 80A3EB10 24013034 */ addiu $at, $zero, 0x3034 ## $at = 00003034 -/* 005A4 80A3EB14 10410028 */ beq $v0, $at, .L80A3EBB8 -/* 005A8 80A3EB18 8FA40030 */ lw $a0, 0x0030($sp) -/* 005AC 80A3EB1C 24013054 */ addiu $at, $zero, 0x3054 ## $at = 00003054 -/* 005B0 80A3EB20 10410046 */ beq $v0, $at, .L80A3EC3C -/* 005B4 80A3EB24 8FA40030 */ lw $a0, 0x0030($sp) -/* 005B8 80A3EB28 24013055 */ addiu $at, $zero, 0x3055 ## $at = 00003055 -/* 005BC 80A3EB2C 50410044 */ beql $v0, $at, .L80A3EC40 -/* 005C0 80A3EB30 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 005C4 80A3EB34 10000077 */ beq $zero, $zero, .L80A3ED14 -/* 005C8 80A3EB38 8FBF001C */ lw $ra, 0x001C($sp) -.L80A3EB3C: -/* 005CC 80A3EB3C 91CE04BD */ lbu $t6, 0x04BD($t6) ## 000104BD -/* 005D0 80A3EB40 3C038016 */ lui $v1, %hi(gSaveContext) -/* 005D4 80A3EB44 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 005D8 80A3EB48 15C00013 */ bne $t6, $zero, .L80A3EB98 -/* 005DC 80A3EB4C 3C188012 */ lui $t8, %hi(gUpgradeMasks+8) -/* 005E0 80A3EB50 8C6F00A0 */ lw $t7, 0x00A0($v1) ## 8015E700 -/* 005E4 80A3EB54 8F1871B8 */ lw $t8, %lo(gUpgradeMasks+8)($t8) -/* 005E8 80A3EB58 3C088012 */ lui $t0, %hi(gUpgradeShifts+2) -/* 005EC 80A3EB5C 910871F6 */ lbu $t0, %lo(gUpgradeShifts+2)($t0) -/* 005F0 80A3EB60 01F8C824 */ and $t9, $t7, $t8 -/* 005F4 80A3EB64 240C300B */ addiu $t4, $zero, 0x300B ## $t4 = 0000300B -/* 005F8 80A3EB68 01194807 */ srav $t1, $t9, $t0 -/* 005FC 80A3EB6C 15200006 */ bne $t1, $zero, .L80A3EB88 -/* 00600 80A3EB70 00000000 */ nop -/* 00604 80A3EB74 946A0F14 */ lhu $t2, 0x0F14($v1) ## 8015F574 -/* 00608 80A3EB78 240D300C */ addiu $t5, $zero, 0x300C ## $t5 = 0000300C -/* 0060C 80A3EB7C 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 -/* 00610 80A3EB80 11600003 */ beq $t3, $zero, .L80A3EB90 -/* 00614 80A3EB84 00000000 */ nop -.L80A3EB88: -/* 00618 80A3EB88 10000005 */ beq $zero, $zero, .L80A3EBA0 -/* 0061C 80A3EB8C A4CC010E */ sh $t4, 0x010E($a2) ## 0000010E -.L80A3EB90: -/* 00620 80A3EB90 10000003 */ beq $zero, $zero, .L80A3EBA0 -/* 00624 80A3EB94 A4CD010E */ sh $t5, 0x010E($a2) ## 0000010E -.L80A3EB98: -/* 00628 80A3EB98 240E300D */ addiu $t6, $zero, 0x300D ## $t6 = 0000300D -/* 0062C 80A3EB9C A4CE010E */ sh $t6, 0x010E($a2) ## 0000010E -.L80A3EBA0: -/* 00630 80A3EBA0 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 00634 80A3EBA4 A7A7002E */ sh $a3, 0x002E($sp) -/* 00638 80A3EBA8 0C042DC8 */ jal func_8010B720 -/* 0063C 80A3EBAC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00640 80A3EBB0 10000057 */ beq $zero, $zero, .L80A3ED10 -/* 00644 80A3EBB4 87A7002E */ lh $a3, 0x002E($sp) -.L80A3EBB8: -/* 00648 80A3EBB8 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0064C 80A3EBBC 01E47821 */ addu $t7, $t7, $a0 -/* 00650 80A3EBC0 91EF04BD */ lbu $t7, 0x04BD($t7) ## 000104BD -/* 00654 80A3EBC4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00658 80A3EBC8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0065C 80A3EBCC 55E0000E */ bnel $t7, $zero, .L80A3EC08 -/* 00660 80A3EBD0 946A0F18 */ lhu $t2, 0x0F18($v1) ## 8015F578 -/* 00664 80A3EBD4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00668 80A3EBD8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0066C 80A3EBDC 94780F18 */ lhu $t8, 0x0F18($v1) ## 8015F578 -/* 00670 80A3EBE0 24083033 */ addiu $t0, $zero, 0x3033 ## $t0 = 00003033 -/* 00674 80A3EBE4 24093035 */ addiu $t1, $zero, 0x3035 ## $t1 = 00003035 -/* 00678 80A3EBE8 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 0067C 80A3EBEC 13200003 */ beq $t9, $zero, .L80A3EBFC -/* 00680 80A3EBF0 00000000 */ nop -/* 00684 80A3EBF4 1000000C */ beq $zero, $zero, .L80A3EC28 -/* 00688 80A3EBF8 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E -.L80A3EBFC: -/* 0068C 80A3EBFC 1000000A */ beq $zero, $zero, .L80A3EC28 -/* 00690 80A3EC00 A4C9010E */ sh $t1, 0x010E($a2) ## 0000010E -/* 00694 80A3EC04 946A0F18 */ lhu $t2, 0x0F18($v1) ## 8015F578 -.L80A3EC08: -/* 00698 80A3EC08 240C3036 */ addiu $t4, $zero, 0x3036 ## $t4 = 00003036 -/* 0069C 80A3EC0C 240D3033 */ addiu $t5, $zero, 0x3033 ## $t5 = 00003033 -/* 006A0 80A3EC10 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 -/* 006A4 80A3EC14 51600004 */ beql $t3, $zero, .L80A3EC28 -/* 006A8 80A3EC18 A4CD010E */ sh $t5, 0x010E($a2) ## 0000010E -/* 006AC 80A3EC1C 10000002 */ beq $zero, $zero, .L80A3EC28 -/* 006B0 80A3EC20 A4CC010E */ sh $t4, 0x010E($a2) ## 0000010E -/* 006B4 80A3EC24 A4CD010E */ sh $t5, 0x010E($a2) ## 0000010E -.L80A3EC28: -/* 006B8 80A3EC28 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 006BC 80A3EC2C 0C042DC8 */ jal func_8010B720 -/* 006C0 80A3EC30 A7A7002E */ sh $a3, 0x002E($sp) -/* 006C4 80A3EC34 10000036 */ beq $zero, $zero, .L80A3ED10 -/* 006C8 80A3EC38 87A7002E */ lh $a3, 0x002E($sp) -.L80A3EC3C: -/* 006CC 80A3EC3C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -.L80A3EC40: -/* 006D0 80A3EC40 01C47021 */ addu $t6, $t6, $a0 -/* 006D4 80A3EC44 91CE04BD */ lbu $t6, 0x04BD($t6) ## 000104BD -/* 006D8 80A3EC48 240F3056 */ addiu $t7, $zero, 0x3056 ## $t7 = 00003056 -/* 006DC 80A3EC4C 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 00003056 -/* 006E0 80A3EC50 55C00004 */ bnel $t6, $zero, .L80A3EC64 -/* 006E4 80A3EC54 A4CF010E */ sh $t7, 0x010E($a2) ## 0000010E -/* 006E8 80A3EC58 10000005 */ beq $zero, $zero, .L80A3EC70 -/* 006EC 80A3EC5C 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 006F0 80A3EC60 A4CF010E */ sh $t7, 0x010E($a2) ## 0000010E -.L80A3EC64: -/* 006F4 80A3EC64 0C042DC8 */ jal func_8010B720 -/* 006F8 80A3EC68 A7A7002E */ sh $a3, 0x002E($sp) -/* 006FC 80A3EC6C 87A7002E */ lh $a3, 0x002E($sp) -.L80A3EC70: -/* 00700 80A3EC70 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00704 80A3EC74 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00708 80A3EC78 94780F0E */ lhu $t8, 0x0F0E($v1) ## 8015F56E -/* 0070C 80A3EC7C 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 00710 80A3EC80 10000023 */ beq $zero, $zero, .L80A3ED10 -/* 00714 80A3EC84 A4790F0E */ sh $t9, 0x0F0E($v1) ## 8015F56E -glabel L80A3EC88 -/* 00718 80A3EC88 8FA40030 */ lw $a0, 0x0030($sp) -/* 0071C 80A3EC8C 0C041AF2 */ jal func_80106BC8 -/* 00720 80A3EC90 A7A7002E */ sh $a3, 0x002E($sp) -/* 00724 80A3EC94 1040001E */ beq $v0, $zero, .L80A3ED10 -/* 00728 80A3EC98 87A7002E */ lh $a3, 0x002E($sp) -/* 0072C 80A3EC9C 8FA60034 */ lw $a2, 0x0034($sp) -/* 00730 80A3ECA0 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -/* 00734 80A3ECA4 240A3034 */ addiu $t2, $zero, 0x3034 ## $t2 = 00003034 -/* 00738 80A3ECA8 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 0073C 80A3ECAC 3145FFFF */ andi $a1, $t2, 0xFFFF ## $a1 = 00003034 -/* 00740 80A3ECB0 1041000B */ beq $v0, $at, .L80A3ECE0 -/* 00744 80A3ECB4 24013033 */ addiu $at, $zero, 0x3033 ## $at = 00003033 -/* 00748 80A3ECB8 10410009 */ beq $v0, $at, .L80A3ECE0 -/* 0074C 80A3ECBC 24013035 */ addiu $at, $zero, 0x3035 ## $at = 00003035 -/* 00750 80A3ECC0 10410003 */ beq $v0, $at, .L80A3ECD0 -/* 00754 80A3ECC4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00758 80A3ECC8 10000011 */ beq $zero, $zero, .L80A3ED10 -/* 0075C 80A3ECCC 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -.L80A3ECD0: -/* 00760 80A3ECD0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00764 80A3ECD4 94680F18 */ lhu $t0, 0x0F18($v1) ## 8015F578 -/* 00768 80A3ECD8 35090800 */ ori $t1, $t0, 0x0800 ## $t1 = 00000800 -/* 0076C 80A3ECDC A4690F18 */ sh $t1, 0x0F18($v1) ## 8015F578 -.L80A3ECE0: -/* 00770 80A3ECE0 A4CA010E */ sh $t2, 0x010E($a2) ## 0000010E -/* 00774 80A3ECE4 A7A7002E */ sh $a3, 0x002E($sp) -/* 00778 80A3ECE8 0C042DC8 */ jal func_8010B720 -/* 0077C 80A3ECEC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00780 80A3ECF0 10000007 */ beq $zero, $zero, .L80A3ED10 -/* 00784 80A3ECF4 87A7002E */ lh $a3, 0x002E($sp) -glabel L80A3ECF8 -/* 00788 80A3ECF8 8FA40030 */ lw $a0, 0x0030($sp) -/* 0078C 80A3ECFC 0C041AF2 */ jal func_80106BC8 -/* 00790 80A3ED00 A7A7002E */ sh $a3, 0x002E($sp) -/* 00794 80A3ED04 10400002 */ beq $v0, $zero, .L80A3ED10 -/* 00798 80A3ED08 87A7002E */ lh $a3, 0x002E($sp) -/* 0079C 80A3ED0C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -glabel L80A3ED10 -.L80A3ED10: -/* 007A0 80A3ED10 8FBF001C */ lw $ra, 0x001C($sp) -.L80A3ED14: -/* 007A4 80A3ED14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 007A8 80A3ED18 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000003 -/* 007AC 80A3ED1C 03E00008 */ jr $ra -/* 007B0 80A3ED20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s deleted file mode 100644 index a18e8b6d72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80A3ED24 -/* 007B4 80A3ED24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007B8 80A3ED28 AFBF001C */ sw $ra, 0x001C($sp) -/* 007BC 80A3ED2C AFB00018 */ sw $s0, 0x0018($sp) -/* 007C0 80A3ED30 AFA40020 */ sw $a0, 0x0020($sp) -/* 007C4 80A3ED34 AFA7002C */ sw $a3, 0x002C($sp) -/* 007C8 80A3ED38 84CE0000 */ lh $t6, 0x0000($a2) ## 00000000 -/* 007CC 80A3ED3C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007D0 80A3ED40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007D4 80A3ED44 51C0000A */ beql $t6, $zero, .L80A3ED70 -/* 007D8 80A3ED48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007DC 80A3ED4C 8FB90034 */ lw $t9, 0x0034($sp) -/* 007E0 80A3ED50 AFA60028 */ sw $a2, 0x0028($sp) -/* 007E4 80A3ED54 0320F809 */ jalr $ra, $t9 -/* 007E8 80A3ED58 00000000 */ nop -/* 007EC 80A3ED5C 8FA60028 */ lw $a2, 0x0028($sp) -/* 007F0 80A3ED60 A4C20000 */ sh $v0, 0x0000($a2) ## 00000000 -/* 007F4 80A3ED64 10000019 */ beq $zero, $zero, .L80A3EDCC -/* 007F8 80A3ED68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 007FC 80A3ED6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A3ED70: -/* 00800 80A3ED70 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00804 80A3ED74 AFA60028 */ sw $a2, 0x0028($sp) -/* 00808 80A3ED78 0C00BC65 */ jal func_8002F194 -/* 0080C 80A3ED7C AFA70020 */ sw $a3, 0x0020($sp) -/* 00810 80A3ED80 10400005 */ beq $v0, $zero, .L80A3ED98 -/* 00814 80A3ED84 8FA60028 */ lw $a2, 0x0028($sp) -/* 00818 80A3ED88 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0081C 80A3ED8C A4CF0000 */ sh $t7, 0x0000($a2) ## 00000000 -/* 00820 80A3ED90 1000000E */ beq $zero, $zero, .L80A3EDCC -/* 00824 80A3ED94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3ED98: -/* 00828 80A3ED98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0082C 80A3ED9C 8FA50020 */ lw $a1, 0x0020($sp) -/* 00830 80A3EDA0 0C00BCB3 */ jal func_8002F2CC -/* 00834 80A3EDA4 8FA6002C */ lw $a2, 0x002C($sp) -/* 00838 80A3EDA8 14400003 */ bne $v0, $zero, .L80A3EDB8 -/* 0083C 80A3EDAC 8FB90030 */ lw $t9, 0x0030($sp) -/* 00840 80A3EDB0 10000006 */ beq $zero, $zero, .L80A3EDCC -/* 00844 80A3EDB4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3EDB8: -/* 00848 80A3EDB8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0084C 80A3EDBC 0320F809 */ jalr $ra, $t9 -/* 00850 80A3EDC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00854 80A3EDC4 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 00858 80A3EDC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3EDCC: -/* 0085C 80A3EDCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00860 80A3EDD0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00864 80A3EDD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00868 80A3EDD8 03E00008 */ jr $ra -/* 0086C 80A3EDDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s deleted file mode 100644 index 333a756588..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A3EDE0 -/* 00870 80A3EDE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00874 80A3EDE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00878 80A3EDE8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0087C 80A3EDEC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00880 80A3EDF0 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 00884 80A3EDF4 0005C900 */ sll $t9, $a1, 4 -/* 00888 80A3EDF8 31F800F0 */ andi $t8, $t7, 0x00F0 ## $t8 = 00000000 -/* 0088C 80A3EDFC 17010005 */ bne $t8, $at, .L80A3EE14 -/* 00890 80A3EE00 3C0880A4 */ lui $t0, %hi(D_80A41B38) ## $t0 = 80A40000 -/* 00894 80A3EE04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00898 80A3EE08 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 0089C 80A3EE0C 10000004 */ beq $zero, $zero, .L80A3EE20 -/* 008A0 80A3EE10 00000000 */ nop -.L80A3EE14: -/* 008A4 80A3EE14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008A8 80A3EE18 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 008AC 80A3EE1C 00000000 */ nop -.L80A3EE20: -/* 008B0 80A3EE20 25081B38 */ addiu $t0, $t0, %lo(D_80A41B38) ## $t0 = 80A41B38 -/* 008B4 80A3EE24 03281821 */ addu $v1, $t9, $t0 -/* 008B8 80A3EE28 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 008BC 80A3EE2C AFA3002C */ sw $v1, 0x002C($sp) -/* 008C0 80A3EE30 0C028800 */ jal Animation_GetLastFrame - -/* 008C4 80A3EE34 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 008C8 80A3EE38 8FA3002C */ lw $v1, 0x002C($sp) -/* 008CC 80A3EE3C C7A00030 */ lwc1 $f0, 0x0030($sp) -/* 008D0 80A3EE40 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 008D4 80A3EE44 C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 008D8 80A3EE48 8FA40038 */ lw $a0, 0x0038($sp) -/* 008DC 80A3EE4C 468042A0 */ cvt.s.w $f10, $f8 -/* 008E0 80A3EE50 46040182 */ mul.s $f6, $f0, $f4 -/* 008E4 80A3EE54 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 -/* 008E8 80A3EE58 C470000C */ lwc1 $f16, 0x000C($v1) ## 0000000C -/* 008EC 80A3EE5C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008F0 80A3EE60 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 008F4 80A3EE64 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 008F8 80A3EE68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008FC 80A3EE6C 44063000 */ mfc1 $a2, $f6 -/* 00900 80A3EE70 AFA90014 */ sw $t1, 0x0014($sp) -/* 00904 80A3EE74 0C029468 */ jal Animation_Change - -/* 00908 80A3EE78 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0090C 80A3EE7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00910 80A3EE80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00914 80A3EE84 03E00008 */ jr $ra -/* 00918 80A3EE88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s deleted file mode 100644 index 81149295f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80A3EE8C -/* 0091C 80A3EE8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00920 80A3EE90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00924 80A3EE94 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00928 80A3EE98 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 0092C 80A3EE9C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00930 80A3EEA0 304E00F0 */ andi $t6, $v0, 0x00F0 ## $t6 = 00000000 -/* 00934 80A3EEA4 15C10003 */ bne $t6, $at, .L80A3EEB4 -/* 00938 80A3EEA8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0093C 80A3EEAC 1000004A */ beq $zero, $zero, .L80A3EFD8 -/* 00940 80A3EEB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3EEB4: -/* 00944 80A3EEB4 84EF00A4 */ lh $t7, 0x00A4($a3) ## 000000A4 -/* 00948 80A3EEB8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0094C 80A3EEBC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00950 80A3EEC0 15E10013 */ bne $t7, $at, .L80A3EF10 -/* 00954 80A3EEC4 00022A03 */ sra $a1, $v0, 8 -/* 00958 80A3EEC8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0095C 80A3EECC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00960 80A3EED0 AFA7001C */ sw $a3, 0x001C($sp) -/* 00964 80A3EED4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00968 80A3EED8 1440000D */ bne $v0, $zero, .L80A3EF10 -/* 0096C 80A3EEDC 8FA7001C */ lw $a3, 0x001C($sp) -/* 00970 80A3EEE0 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00974 80A3EEE4 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00978 80A3EEE8 8C980004 */ lw $t8, 0x0004($a0) ## 8015E664 -/* 0097C 80A3EEEC 57000009 */ bnel $t8, $zero, .L80A3EF14 -/* 00980 80A3EEF0 84E300A4 */ lh $v1, 0x00A4($a3) ## 000000A4 -/* 00984 80A3EEF4 84D9001C */ lh $t9, 0x001C($a2) ## 0000001C -/* 00988 80A3EEF8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0098C 80A3EEFC 332800F0 */ andi $t0, $t9, 0x00F0 ## $t0 = 00000000 -/* 00990 80A3EF00 55010004 */ bnel $t0, $at, .L80A3EF14 -/* 00994 80A3EF04 84E300A4 */ lh $v1, 0x00A4($a3) ## 000000A4 -/* 00998 80A3EF08 10000033 */ beq $zero, $zero, .L80A3EFD8 -/* 0099C 80A3EF0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3EF10: -/* 009A0 80A3EF10 84E300A4 */ lh $v1, 0x00A4($a3) ## 000000A4 -.L80A3EF14: -/* 009A4 80A3EF14 3C048016 */ lui $a0, %hi(gSaveContext) -/* 009A8 80A3EF18 24050062 */ addiu $a1, $zero, 0x0062 ## $a1 = 00000062 -/* 009AC 80A3EF1C 14A3000A */ bne $a1, $v1, .L80A3EF48 -/* 009B0 80A3EF20 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 009B4 80A3EF24 8C890004 */ lw $t1, 0x0004($a0) ## 8015E664 -/* 009B8 80A3EF28 55200008 */ bnel $t1, $zero, .L80A3EF4C -/* 009BC 80A3EF2C 24070060 */ addiu $a3, $zero, 0x0060 ## $a3 = 00000060 -/* 009C0 80A3EF30 84CA001C */ lh $t2, 0x001C($a2) ## 0000001C -/* 009C4 80A3EF34 314B00F0 */ andi $t3, $t2, 0x00F0 ## $t3 = 00000000 -/* 009C8 80A3EF38 55600004 */ bnel $t3, $zero, .L80A3EF4C -/* 009CC 80A3EF3C 24070060 */ addiu $a3, $zero, 0x0060 ## $a3 = 00000060 -/* 009D0 80A3EF40 10000025 */ beq $zero, $zero, .L80A3EFD8 -/* 009D4 80A3EF44 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3EF48: -/* 009D8 80A3EF48 24070060 */ addiu $a3, $zero, 0x0060 ## $a3 = 00000060 -.L80A3EF4C: -/* 009DC 80A3EF4C 14E30010 */ bne $a3, $v1, .L80A3EF90 -/* 009E0 80A3EF50 00000000 */ nop -/* 009E4 80A3EF54 8C8C0004 */ lw $t4, 0x0004($a0) ## 8015E664 -/* 009E8 80A3EF58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009EC 80A3EF5C 1581000C */ bne $t4, $at, .L80A3EF90 -/* 009F0 80A3EF60 00000000 */ nop -/* 009F4 80A3EF64 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 009F8 80A3EF68 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 009FC 80A3EF6C 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 00A00 80A3EF70 10410005 */ beq $v0, $at, .L80A3EF88 -/* 00A04 80A3EF74 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00A08 80A3EF78 10410003 */ beq $v0, $at, .L80A3EF88 -/* 00A0C 80A3EF7C 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 00A10 80A3EF80 14410003 */ bne $v0, $at, .L80A3EF90 -/* 00A14 80A3EF84 00000000 */ nop -.L80A3EF88: -/* 00A18 80A3EF88 10000013 */ beq $zero, $zero, .L80A3EFD8 -/* 00A1C 80A3EF8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3EF90: -/* 00A20 80A3EF90 54A30011 */ bnel $a1, $v1, .L80A3EFD8 -/* 00A24 80A3EF94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A28 80A3EF98 8C8D0004 */ lw $t5, 0x0004($a0) ## 8015E664 -/* 00A2C 80A3EF9C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A30 80A3EFA0 55A1000D */ bnel $t5, $at, .L80A3EFD8 -/* 00A34 80A3EFA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A38 80A3EFA8 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00A3C 80A3EFAC 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 00A40 80A3EFB0 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 00A44 80A3EFB4 10410005 */ beq $v0, $at, .L80A3EFCC -/* 00A48 80A3EFB8 00000000 */ nop -/* 00A4C 80A3EFBC 10E20003 */ beq $a3, $v0, .L80A3EFCC -/* 00A50 80A3EFC0 24010070 */ addiu $at, $zero, 0x0070 ## $at = 00000070 -/* 00A54 80A3EFC4 54410004 */ bnel $v0, $at, .L80A3EFD8 -/* 00A58 80A3EFC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3EFCC: -/* 00A5C 80A3EFCC 10000002 */ beq $zero, $zero, .L80A3EFD8 -/* 00A60 80A3EFD0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A64 80A3EFD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3EFD8: -/* 00A68 80A3EFD8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A6C 80A3EFDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A70 80A3EFE0 03E00008 */ jr $ra -/* 00A74 80A3EFE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s deleted file mode 100644 index 59b2f76089..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A3EFE8 -/* 00A78 80A3EFE8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00A7C 80A3EFEC 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 00A80 80A3EFF0 18400009 */ blez $v0, .L80A3F018 -/* 00A84 80A3EFF4 244EFFE0 */ addiu $t6, $v0, 0xFFE0 ## $t6 = FFFFFFE0 -/* 00A88 80A3EFF8 2DC10051 */ sltiu $at, $t6, 0x0051 -/* 00A8C 80A3EFFC 10200013 */ beq $at, $zero, .L80A3F04C -/* 00A90 80A3F000 000E7080 */ sll $t6, $t6, 2 -/* 00A94 80A3F004 3C0180A4 */ lui $at, %hi(jtbl_80A41F84) ## $at = 80A40000 -/* 00A98 80A3F008 002E0821 */ addu $at, $at, $t6 -/* 00A9C 80A3F00C 8C2E1F84 */ lw $t6, %lo(jtbl_80A41F84)($at) -/* 00AA0 80A3F010 01C00008 */ jr $t6 -/* 00AA4 80A3F014 00000000 */ nop -.L80A3F018: -/* 00AA8 80A3F018 1440000C */ bne $v0, $zero, .L80A3F04C -/* 00AAC 80A3F01C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AB0 80A3F020 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00AB4 80A3F024 03E00008 */ jr $ra -/* 00AB8 80A3F028 00000000 */ nop -glabel L80A3F02C -/* 00ABC 80A3F02C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00AC0 80A3F030 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 00AC4 80A3F034 03E00008 */ jr $ra -/* 00AC8 80A3F038 00000000 */ nop -glabel L80A3F03C -/* 00ACC 80A3F03C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00AD0 80A3F040 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 00AD4 80A3F044 03E00008 */ jr $ra -/* 00AD8 80A3F048 00000000 */ nop -glabel L80A3F04C -.L80A3F04C: -/* 00ADC 80A3F04C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00AE0 80A3F050 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 00AE4 80A3F054 00000000 */ nop -/* 00AE8 80A3F058 03E00008 */ jr $ra -/* 00AEC 80A3F05C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s deleted file mode 100644 index 5f06bd0eca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A3F060 -/* 00AF0 80A3F060 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00AF4 80A3F064 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AF8 80A3F068 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 00AFC 80A3F06C 3C0E80A4 */ lui $t6, %hi(func_80A406E0) ## $t6 = 80A40000 -/* 00B00 80A3F070 25CE06E0 */ addiu $t6, $t6, %lo(func_80A406E0) ## $t6 = 80A406E0 -/* 00B04 80A3F074 11C20009 */ beq $t6, $v0, .L80A3F09C -/* 00B08 80A3F078 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00B0C 80A3F07C 3C0F80A4 */ lui $t7, %hi(func_80A4020C) ## $t7 = 80A40000 -/* 00B10 80A3F080 25EF020C */ addiu $t7, $t7, %lo(func_80A4020C) ## $t7 = 80A4020C -/* 00B14 80A3F084 11E20005 */ beq $t7, $v0, .L80A3F09C -/* 00B18 80A3F088 3C1880A4 */ lui $t8, %hi(func_80A40B1C) ## $t8 = 80A40000 -/* 00B1C 80A3F08C 27180B1C */ addiu $t8, $t8, %lo(func_80A40B1C) ## $t8 = 80A40B1C -/* 00B20 80A3F090 13020002 */ beq $t8, $v0, .L80A3F09C -/* 00B24 80A3F094 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00B28 80A3F098 A7B9001A */ sh $t9, 0x001A($sp) -.L80A3F09C: -/* 00B2C 80A3F09C 8C690024 */ lw $t1, 0x0024($v1) ## 00000024 -/* 00B30 80A3F0A0 AC8901F8 */ sw $t1, 0x01F8($a0) ## 000001F8 -/* 00B34 80A3F0A4 8C680028 */ lw $t0, 0x0028($v1) ## 00000028 -/* 00B38 80A3F0A8 AC8801FC */ sw $t0, 0x01FC($a0) ## 000001FC -/* 00B3C 80A3F0AC 8C69002C */ lw $t1, 0x002C($v1) ## 0000002C -/* 00B40 80A3F0B0 AC890200 */ sw $t1, 0x0200($a0) ## 00000200 -/* 00B44 80A3F0B4 0C28FBFA */ jal func_80A3EFE8 -/* 00B48 80A3F0B8 AFA40020 */ sw $a0, 0x0020($sp) -/* 00B4C 80A3F0BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00B50 80A3F0C0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00B54 80A3F0C4 E48001F4 */ swc1 $f0, 0x01F4($a0) ## 000001F4 -/* 00B58 80A3F0C8 87A7001A */ lh $a3, 0x001A($sp) -/* 00B5C 80A3F0CC 0C00D285 */ jal func_80034A14 -/* 00B60 80A3F0D0 248501E0 */ addiu $a1, $a0, 0x01E0 ## $a1 = 000001E0 -/* 00B64 80A3F0D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B68 80A3F0D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B6C 80A3F0DC 03E00008 */ jr $ra -/* 00B70 80A3F0E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s deleted file mode 100644 index 70d4741192..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A3F0E4 -/* 00B74 80A3F0E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B78 80A3F0E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B7C 80A3F0EC 84820214 */ lh $v0, 0x0214($a0) ## 00000214 -/* 00B80 80A3F0F0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00B84 80A3F0F4 14400003 */ bne $v0, $zero, .L80A3F104 -/* 00B88 80A3F0F8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00B8C 80A3F0FC 10000003 */ beq $zero, $zero, .L80A3F10C -/* 00B90 80A3F100 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A3F104: -/* 00B94 80A3F104 A4CE0214 */ sh $t6, 0x0214($a2) ## 00000214 -/* 00B98 80A3F108 84C30214 */ lh $v1, 0x0214($a2) ## 00000214 -.L80A3F10C: -/* 00B9C 80A3F10C 54600010 */ bnel $v1, $zero, .L80A3F150 -/* 00BA0 80A3F110 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BA4 80A3F114 84CF0216 */ lh $t7, 0x0216($a2) ## 00000216 -/* 00BA8 80A3F118 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00BAC 80A3F11C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00BB0 80A3F120 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00BB4 80A3F124 A4D80216 */ sh $t8, 0x0216($a2) ## 00000216 -/* 00BB8 80A3F128 84D90216 */ lh $t9, 0x0216($a2) ## 00000216 -/* 00BBC 80A3F12C 2B210003 */ slti $at, $t9, 0x0003 -/* 00BC0 80A3F130 54200007 */ bnel $at, $zero, .L80A3F150 -/* 00BC4 80A3F134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BC8 80A3F138 0C01DF64 */ jal Rand_S16Offset - -/* 00BCC 80A3F13C AFA60018 */ sw $a2, 0x0018($sp) -/* 00BD0 80A3F140 8FA60018 */ lw $a2, 0x0018($sp) -/* 00BD4 80A3F144 A4C20214 */ sh $v0, 0x0214($a2) ## 00000214 -/* 00BD8 80A3F148 A4C00216 */ sh $zero, 0x0216($a2) ## 00000216 -/* 00BDC 80A3F14C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A3F150: -/* 00BE0 80A3F150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BE4 80A3F154 03E00008 */ jr $ra -/* 00BE8 80A3F158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s deleted file mode 100644 index 089036b73f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80A3F15C -/* 00BEC 80A3F15C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BF0 80A3F160 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BF4 80A3F164 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00BF8 80A3F168 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00BFC 80A3F16C 3C0180A4 */ lui $at, %hi(D_80A420C8) ## $at = 80A40000 -/* 00C00 80A3F170 C42620C8 */ lwc1 $f6, %lo(D_80A420C8)($at) -/* 00C04 80A3F174 01CF1023 */ subu $v0, $t6, $t7 -/* 00C08 80A3F178 00021400 */ sll $v0, $v0, 16 -/* 00C0C 80A3F17C 00021403 */ sra $v0, $v0, 16 -/* 00C10 80A3F180 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C14 80A3F184 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00C18 80A3F188 8CA70790 */ lw $a3, 0x0790($a1) ## 00000790 -/* 00C1C 80A3F18C 46802020 */ cvt.s.w $f0, $f4 -/* 00C20 80A3F190 3C0180A4 */ lui $at, %hi(D_80A420CC) ## $at = 80A40000 -/* 00C24 80A3F194 46000005 */ abs.s $f0, $f0 -/* 00C28 80A3F198 4600303C */ c.lt.s $f6, $f0 -/* 00C2C 80A3F19C 00000000 */ nop -/* 00C30 80A3F1A0 45020004 */ bc1fl .L80A3F1B4 -/* 00C34 80A3F1A4 C4C80050 */ lwc1 $f8, 0x0050($a2) ## 00000050 -/* 00C38 80A3F1A8 10000029 */ beq $zero, $zero, .L80A3F250 -/* 00C3C 80A3F1AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00C40 80A3F1B0 C4C80050 */ lwc1 $f8, 0x0050($a2) ## 00000050 -.L80A3F1B4: -/* 00C44 80A3F1B4 C42A20CC */ lwc1 $f10, %lo(D_80A420CC)($at) -/* 00C48 80A3F1B8 3C0180A4 */ lui $at, %hi(D_80A420D0) ## $at = 80A40000 -/* 00C4C 80A3F1BC C43220D0 */ lwc1 $f18, %lo(D_80A420D0)($at) -/* 00C50 80A3F1C0 460A4403 */ div.s $f16, $f8, $f10 -/* 00C54 80A3F1C4 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 00C58 80A3F1C8 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 00C5C 80A3F1CC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00C60 80A3F1D0 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 -/* 00C64 80A3F1D4 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -/* 00C68 80A3F1D8 46128082 */ mul.s $f2, $f16, $f18 -/* 00C6C 80A3F1DC 5721000D */ bnel $t9, $at, .L80A3F214 -/* 00C70 80A3F1E0 C4C0008C */ lwc1 $f0, 0x008C($a2) ## 0000008C -/* 00C74 80A3F1E4 AFA60028 */ sw $a2, 0x0028($sp) -/* 00C78 80A3F1E8 AFA7001C */ sw $a3, 0x001C($sp) -/* 00C7C 80A3F1EC 0C0169DF */ jal Camera_ChangeSetting -/* 00C80 80A3F1F0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 00C84 80A3F1F4 3C0180A4 */ lui $at, %hi(D_80A420D4) ## $at = 80A40000 -/* 00C88 80A3F1F8 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00C8C 80A3F1FC C42420D4 */ lwc1 $f4, %lo(D_80A420D4)($at) -/* 00C90 80A3F200 8FA60028 */ lw $a2, 0x0028($sp) -/* 00C94 80A3F204 8FA7001C */ lw $a3, 0x001C($sp) -/* 00C98 80A3F208 46041082 */ mul.s $f2, $f2, $f4 -/* 00C9C 80A3F20C 00000000 */ nop -/* 00CA0 80A3F210 C4C0008C */ lwc1 $f0, 0x008C($a2) ## 0000008C -.L80A3F214: -/* 00CA4 80A3F214 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00CA8 80A3F218 46000005 */ abs.s $f0, $f0 -/* 00CAC 80A3F21C 4600103C */ c.lt.s $f2, $f0 -/* 00CB0 80A3F220 00000000 */ nop -/* 00CB4 80A3F224 4500000A */ bc1f .L80A3F250 -/* 00CB8 80A3F228 00000000 */ nop -/* 00CBC 80A3F22C 84E80142 */ lh $t0, 0x0142($a3) ## 00000142 -/* 00CC0 80A3F230 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F -/* 00CC4 80A3F234 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00CC8 80A3F238 15010003 */ bne $t0, $at, .L80A3F248 -/* 00CCC 80A3F23C 00000000 */ nop -/* 00CD0 80A3F240 0C0169DF */ jal Camera_ChangeSetting -/* 00CD4 80A3F244 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L80A3F248: -/* 00CD8 80A3F248 10000001 */ beq $zero, $zero, .L80A3F250 -/* 00CDC 80A3F24C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3F250: -/* 00CE0 80A3F250 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CE4 80A3F254 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CE8 80A3F258 03E00008 */ jr $ra -/* 00CEC 80A3F25C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s deleted file mode 100644 index 27c20941ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80A3F260 -/* 00CF0 80A3F260 C4800158 */ lwc1 $f0, 0x0158($a0) ## 00000158 -/* 00CF4 80A3F264 C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 00CF8 80A3F268 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C -/* 00CFC 80A3F26C 03E00008 */ jr $ra -/* 00D00 80A3F270 E4840158 */ swc1 $f4, 0x0158($a0) ## 00000158 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s deleted file mode 100644 index d9ae9304b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A3F274 -/* 00D04 80A3F274 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D08 80A3F278 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D0C 80A3F27C AFA40030 */ sw $a0, 0x0030($sp) -/* 00D10 80A3F280 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00D14 80A3F284 3C030600 */ lui $v1, %hi(D_06004930) ## $v1 = 06000000 -/* 00D18 80A3F288 24634930 */ addiu $v1, $v1, %lo(D_06004930) ## $v1 = 06004930 -/* 00D1C 80A3F28C 14620008 */ bne $v1, $v0, .L80A3F2B0 -/* 00D20 80A3F290 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00D24 80A3F294 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 00D28 80A3F298 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 00D2C 80A3F29C 00000000 */ nop -/* 00D30 80A3F2A0 4600203C */ c.lt.s $f4, $f0 -/* 00D34 80A3F2A4 00000000 */ nop -/* 00D38 80A3F2A8 45010003 */ bc1t .L80A3F2B8 -/* 00D3C 80A3F2AC 00000000 */ nop -.L80A3F2B0: -/* 00D40 80A3F2B0 10620003 */ beq $v1, $v0, .L80A3F2C0 -/* 00D44 80A3F2B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80A3F2B8: -/* 00D48 80A3F2B8 10000001 */ beq $zero, $zero, .L80A3F2C0 -/* 00D4C 80A3F2BC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -.L80A3F2C0: -/* 00D50 80A3F2C0 8FAF0030 */ lw $t7, 0x0030($sp) -/* 00D54 80A3F2C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00D58 80A3F2C8 27A4002E */ addiu $a0, $sp, 0x002E ## $a0 = FFFFFFFE -/* 00D5C 80A3F2CC 91F800C8 */ lbu $t8, 0x00C8($t7) ## 000000C8 -/* 00D60 80A3F2D0 AFB90010 */ sw $t9, 0x0010($sp) -/* 00D64 80A3F2D4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00D68 80A3F2D8 2407003C */ addiu $a3, $zero, 0x003C ## $a3 = 0000003C -/* 00D6C 80A3F2DC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00D70 80A3F2E0 A7B8002E */ sh $t8, 0x002E($sp) -/* 00D74 80A3F2E4 87A8002E */ lh $t0, 0x002E($sp) -/* 00D78 80A3F2E8 8FA90030 */ lw $t1, 0x0030($sp) -/* 00D7C 80A3F2EC A12800C8 */ sb $t0, 0x00C8($t1) ## 000000C8 -/* 00D80 80A3F2F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D84 80A3F2F4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D88 80A3F2F8 03E00008 */ jr $ra -/* 00D8C 80A3F2FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s deleted file mode 100644 index 60a73e33df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s +++ /dev/null @@ -1,120 +0,0 @@ -glabel func_80A3F300 -/* 00D90 80A3F300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00D94 80A3F304 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D98 80A3F308 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D9C 80A3F30C AFA5003C */ sw $a1, 0x003C($sp) -/* 00DA0 80A3F310 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 00DA4 80A3F314 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00DA8 80A3F318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DAC 80A3F31C 30C6000F */ andi $a2, $a2, 0x000F ## $a2 = 00000000 -/* 00DB0 80A3F320 14C10003 */ bne $a2, $at, .L80A3F330 -/* 00DB4 80A3F324 8FAE003C */ lw $t6, 0x003C($sp) -/* 00DB8 80A3F328 1000005F */ beq $zero, $zero, .L80A3F4A8 -/* 00DBC 80A3F32C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3F330: -/* 00DC0 80A3F330 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00DC4 80A3F334 01EE7821 */ addu $t7, $t7, $t6 -/* 00DC8 80A3F338 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 00DCC 80A3F33C 0006C0C0 */ sll $t8, $a2, 3 -/* 00DD0 80A3F340 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00DD4 80A3F344 01F82021 */ addu $a0, $t7, $t8 -/* 00DD8 80A3F348 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 -/* 00DDC 80A3F34C 860C0218 */ lh $t4, 0x0218($s0) ## 00000218 -/* 00DE0 80A3F350 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00DE4 80A3F354 0003C900 */ sll $t9, $v1, 4 -/* 00DE8 80A3F358 00194702 */ srl $t0, $t9, 28 -/* 00DEC 80A3F35C 00084880 */ sll $t1, $t0, 2 -/* 00DF0 80A3F360 01495021 */ addu $t2, $t2, $t1 -/* 00DF4 80A3F364 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00DF8 80A3F368 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DFC 80A3F36C 00615824 */ and $t3, $v1, $at -/* 00E00 80A3F370 000C6880 */ sll $t5, $t4, 2 -/* 00E04 80A3F374 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00E08 80A3F378 01AC6823 */ subu $t5, $t5, $t4 -/* 00E0C 80A3F37C 014B1021 */ addu $v0, $t2, $t3 -/* 00E10 80A3F380 00411021 */ addu $v0, $v0, $at -/* 00E14 80A3F384 000D6840 */ sll $t5, $t5, 1 -/* 00E18 80A3F388 004D1021 */ addu $v0, $v0, $t5 -/* 00E1C 80A3F38C 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 00E20 80A3F390 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 00E24 80A3F394 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00E28 80A3F398 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00E2C 80A3F39C 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00E30 80A3F3A0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00E34 80A3F3A4 468021A0 */ cvt.s.w $f6, $f4 -/* 00E38 80A3F3A8 AFA40034 */ sw $a0, 0x0034($sp) -/* 00E3C 80A3F3AC 46805420 */ cvt.s.w $f16, $f10 -/* 00E40 80A3F3B0 46083301 */ sub.s $f12, $f6, $f8 -/* 00E44 80A3F3B4 46128381 */ sub.s $f14, $f16, $f18 -/* 00E48 80A3F3B8 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00E4C 80A3F3BC 0C03F494 */ jal Math_FAtan2F -/* 00E50 80A3F3C0 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 00E54 80A3F3C4 3C0180A4 */ lui $at, %hi(D_80A420D8) ## $at = 80A40000 -/* 00E58 80A3F3C8 C42420D8 */ lwc1 $f4, %lo(D_80A420D8)($at) -/* 00E5C 80A3F3CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00E60 80A3F3D0 AFB90010 */ sw $t9, 0x0010($sp) -/* 00E64 80A3F3D4 46040182 */ mul.s $f6, $f0, $f4 -/* 00E68 80A3F3D8 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00E6C 80A3F3DC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00E70 80A3F3E0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00E74 80A3F3E4 4600320D */ trunc.w.s $f8, $f6 -/* 00E78 80A3F3E8 44054000 */ mfc1 $a1, $f8 -/* 00E7C 80A3F3EC 00000000 */ nop -/* 00E80 80A3F3F0 00052C00 */ sll $a1, $a1, 16 -/* 00E84 80A3F3F4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00E88 80A3F3F8 00052C03 */ sra $a1, $a1, 16 -/* 00E8C 80A3F3FC C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 00E90 80A3F400 C7AE0028 */ lwc1 $f14, 0x0028($sp) -/* 00E94 80A3F404 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00E98 80A3F408 460C6282 */ mul.s $f10, $f12, $f12 -/* 00E9C 80A3F40C 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 -/* 00EA0 80A3F410 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00EA4 80A3F414 460E7402 */ mul.s $f16, $f14, $f14 -/* 00EA8 80A3F418 46105480 */ add.s $f18, $f10, $f16 -/* 00EAC 80A3F41C 4604903C */ c.lt.s $f18, $f4 -/* 00EB0 80A3F420 00000000 */ nop -/* 00EB4 80A3F424 45000020 */ bc1f .L80A3F4A8 -/* 00EB8 80A3F428 00000000 */ nop -/* 00EBC 80A3F42C 86080218 */ lh $t0, 0x0218($s0) ## 00000218 -/* 00EC0 80A3F430 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00EC4 80A3F434 A6090218 */ sh $t1, 0x0218($s0) ## 00000218 -/* 00EC8 80A3F438 8FAB0034 */ lw $t3, 0x0034($sp) -/* 00ECC 80A3F43C 860A0218 */ lh $t2, 0x0218($s0) ## 00000218 -/* 00ED0 80A3F440 916C0000 */ lbu $t4, 0x0000($t3) ## 00000000 -/* 00ED4 80A3F444 014C082A */ slt $at, $t2, $t4 -/* 00ED8 80A3F448 54200003 */ bnel $at, $zero, .L80A3F458 -/* 00EDC 80A3F44C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00EE0 80A3F450 A6000218 */ sh $zero, 0x0218($s0) ## 00000218 -/* 00EE4 80A3F454 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A3F458: -/* 00EE8 80A3F458 8FA4003C */ lw $a0, 0x003C($sp) -/* 00EEC 80A3F45C 304D00F0 */ andi $t5, $v0, 0x00F0 ## $t5 = 00000000 -/* 00EF0 80A3F460 11A00003 */ beq $t5, $zero, .L80A3F470 -/* 00EF4 80A3F464 00000000 */ nop -/* 00EF8 80A3F468 1000000F */ beq $zero, $zero, .L80A3F4A8 -/* 00EFC 80A3F46C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3F470: -/* 00F00 80A3F470 0C00B2D0 */ jal Flags_GetSwitch - -/* 00F04 80A3F474 00022A03 */ sra $a1, $v0, 8 -/* 00F08 80A3F478 50400004 */ beql $v0, $zero, .L80A3F48C -/* 00F0C 80A3F47C 860E0218 */ lh $t6, 0x0218($s0) ## 00000218 -/* 00F10 80A3F480 10000009 */ beq $zero, $zero, .L80A3F4A8 -/* 00F14 80A3F484 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00F18 80A3F488 860E0218 */ lh $t6, 0x0218($s0) ## 00000218 -.L80A3F48C: -/* 00F1C 80A3F48C 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 -/* 00F20 80A3F490 01CF082A */ slt $at, $t6, $t7 -/* 00F24 80A3F494 14200002 */ bne $at, $zero, .L80A3F4A0 -/* 00F28 80A3F498 00000000 */ nop -/* 00F2C 80A3F49C A6000218 */ sh $zero, 0x0218($s0) ## 00000218 -.L80A3F4A0: -/* 00F30 80A3F4A0 10000001 */ beq $zero, $zero, .L80A3F4A8 -/* 00F34 80A3F4A4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3F4A8: -/* 00F38 80A3F4A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F3C 80A3F4AC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00F40 80A3F4B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F44 80A3F4B4 03E00008 */ jr $ra -/* 00F48 80A3F4B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s deleted file mode 100644 index d4c4618968..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80A3F4BC -/* 00F4C 80A3F4BC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00F50 80A3F4C0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00F54 80A3F4C4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00F58 80A3F4C8 3063000F */ andi $v1, $v1, 0x000F ## $v1 = 00000000 -/* 00F5C 80A3F4CC 14610003 */ bne $v1, $at, .L80A3F4DC -/* 00F60 80A3F4D0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00F64 80A3F4D4 03E00008 */ jr $ra -/* 00F68 80A3F4D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3F4DC: -/* 00F6C 80A3F4DC 01C67021 */ addu $t6, $t6, $a2 -/* 00F70 80A3F4E0 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 00F74 80A3F4E4 000378C0 */ sll $t7, $v1, 3 -/* 00F78 80A3F4E8 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00F7C 80A3F4EC 01CF2821 */ addu $a1, $t6, $t7 -/* 00F80 80A3F4F0 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 00F84 80A3F4F4 90AC0000 */ lbu $t4, 0x0000($a1) ## 00000000 -/* 00F88 80A3F4F8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00F8C 80A3F4FC 0008C100 */ sll $t8, $t0, 4 -/* 00F90 80A3F500 0018CF02 */ srl $t9, $t8, 28 -/* 00F94 80A3F504 00194880 */ sll $t1, $t9, 2 -/* 00F98 80A3F508 01495021 */ addu $t2, $t2, $t1 -/* 00F9C 80A3F50C 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00FA0 80A3F510 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00FA4 80A3F514 01015824 */ and $t3, $t0, $at -/* 00FA8 80A3F518 000C6880 */ sll $t5, $t4, 2 -/* 00FAC 80A3F51C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00FB0 80A3F520 01AC6823 */ subu $t5, $t5, $t4 -/* 00FB4 80A3F524 014B3821 */ addu $a3, $t2, $t3 -/* 00FB8 80A3F528 00E13821 */ addu $a3, $a3, $at -/* 00FBC 80A3F52C 000D6840 */ sll $t5, $t5, 1 -/* 00FC0 80A3F530 00ED3821 */ addu $a3, $a3, $t5 -/* 00FC4 80A3F534 84EEFFFA */ lh $t6, -0x0006($a3) ## FFFFFFFA -/* 00FC8 80A3F538 24E7FFFA */ addiu $a3, $a3, 0xFFFA ## $a3 = FFFFFFFA -/* 00FCC 80A3F53C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00FD0 80A3F540 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00FD4 80A3F544 00000000 */ nop -/* 00FD8 80A3F548 468021A0 */ cvt.s.w $f6, $f4 -/* 00FDC 80A3F54C E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 00FE0 80A3F550 84EF0002 */ lh $t7, 0x0002($a3) ## FFFFFFFC -/* 00FE4 80A3F554 8C890024 */ lw $t1, 0x0024($a0) ## 00000024 -/* 00FE8 80A3F558 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00FEC 80A3F55C 00000000 */ nop -/* 00FF0 80A3F560 468042A0 */ cvt.s.w $f10, $f8 -/* 00FF4 80A3F564 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 00FF8 80A3F568 84F80004 */ lh $t8, 0x0004($a3) ## FFFFFFFE -/* 00FFC 80A3F56C AC890008 */ sw $t1, 0x0008($a0) ## 00000008 -/* 01000 80A3F570 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 01004 80A3F574 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 01008 80A3F578 AC99000C */ sw $t9, 0x000C($a0) ## 0000000C -/* 0100C 80A3F57C 468084A0 */ cvt.s.w $f18, $f16 -/* 01010 80A3F580 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 01014 80A3F584 8C89002C */ lw $t1, 0x002C($a0) ## 0000002C -/* 01018 80A3F588 AC890010 */ sw $t1, 0x0010($a0) ## 00000010 -/* 0101C 80A3F58C 03E00008 */ jr $ra -/* 01020 80A3F590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s deleted file mode 100644 index 183ac07c97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80A3F594 -/* 01024 80A3F594 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 01028 80A3F598 3C0E80A4 */ lui $t6, %hi(D_80A41B78) ## $t6 = 80A40000 -/* 0102C 80A3F59C AFBF006C */ sw $ra, 0x006C($sp) -/* 01030 80A3F5A0 AFB70068 */ sw $s7, 0x0068($sp) -/* 01034 80A3F5A4 AFB60064 */ sw $s6, 0x0064($sp) -/* 01038 80A3F5A8 AFB50060 */ sw $s5, 0x0060($sp) -/* 0103C 80A3F5AC AFB4005C */ sw $s4, 0x005C($sp) -/* 01040 80A3F5B0 AFB30058 */ sw $s3, 0x0058($sp) -/* 01044 80A3F5B4 AFB20054 */ sw $s2, 0x0054($sp) -/* 01048 80A3F5B8 AFB10050 */ sw $s1, 0x0050($sp) -/* 0104C 80A3F5BC AFB0004C */ sw $s0, 0x004C($sp) -/* 01050 80A3F5C0 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 01054 80A3F5C4 F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 01058 80A3F5C8 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 0105C 80A3F5CC F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 01060 80A3F5D0 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 01064 80A3F5D4 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 01068 80A3F5D8 25CE1B78 */ addiu $t6, $t6, %lo(D_80A41B78) ## $t6 = 80A41B78 -/* 0106C 80A3F5DC 8DD80000 */ lw $t8, 0x0000($t6) ## 80A41B78 -/* 01070 80A3F5E0 27B40094 */ addiu $s4, $sp, 0x0094 ## $s4 = FFFFFFF4 -/* 01074 80A3F5E4 3C1980A4 */ lui $t9, %hi(D_80A41B84) ## $t9 = 80A40000 -/* 01078 80A3F5E8 AE980000 */ sw $t8, 0x0000($s4) ## FFFFFFF4 -/* 0107C 80A3F5EC 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A41B7C -/* 01080 80A3F5F0 27391B84 */ addiu $t9, $t9, %lo(D_80A41B84) ## $t9 = 80A41B84 -/* 01084 80A3F5F4 27B60088 */ addiu $s6, $sp, 0x0088 ## $s6 = FFFFFFE8 -/* 01088 80A3F5F8 AE8F0004 */ sw $t7, 0x0004($s4) ## FFFFFFF8 -/* 0108C 80A3F5FC 8DD80008 */ lw $t8, 0x0008($t6) ## 80A41B80 -/* 01090 80A3F600 3C0A80A4 */ lui $t2, %hi(D_80A41B90) ## $t2 = 80A40000 -/* 01094 80A3F604 254A1B90 */ addiu $t2, $t2, %lo(D_80A41B90) ## $t2 = 80A41B90 -/* 01098 80A3F608 AE980008 */ sw $t8, 0x0008($s4) ## FFFFFFFC -/* 0109C 80A3F60C 8F290000 */ lw $t1, 0x0000($t9) ## 80A41B84 -/* 010A0 80A3F610 27B7007C */ addiu $s7, $sp, 0x007C ## $s7 = FFFFFFDC -/* 010A4 80A3F614 4486D000 */ mtc1 $a2, $f26 ## $f26 = 0.00 -/* 010A8 80A3F618 AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFE8 -/* 010AC 80A3F61C 8F280004 */ lw $t0, 0x0004($t9) ## 80A41B88 -/* 010B0 80A3F620 4487E000 */ mtc1 $a3, $f28 ## $f28 = 0.00 -/* 010B4 80A3F624 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 010B8 80A3F628 AEC80004 */ sw $t0, 0x0004($s6) ## FFFFFFEC -/* 010BC 80A3F62C 8F290008 */ lw $t1, 0x0008($t9) ## 80A41B8C -/* 010C0 80A3F630 30B500FF */ andi $s5, $a1, 0x00FF ## $s5 = 00000000 -/* 010C4 80A3F634 AEC90008 */ sw $t1, 0x0008($s6) ## FFFFFFF0 -/* 010C8 80A3F638 8D4C0000 */ lw $t4, 0x0000($t2) ## 80A41B90 -/* 010CC 80A3F63C AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFDC -/* 010D0 80A3F640 8D4B0004 */ lw $t3, 0x0004($t2) ## 80A41B94 -/* 010D4 80A3F644 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFE0 -/* 010D8 80A3F648 8D4C0008 */ lw $t4, 0x0008($t2) ## 80A41B98 -/* 010DC 80A3F64C AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFE4 -/* 010E0 80A3F650 8C8E0024 */ lw $t6, 0x0024($a0) ## 00000024 -/* 010E4 80A3F654 AE8E0000 */ sw $t6, 0x0000($s4) ## FFFFFFF4 -/* 010E8 80A3F658 8C8D0028 */ lw $t5, 0x0028($a0) ## 00000028 -/* 010EC 80A3F65C AE8D0004 */ sw $t5, 0x0004($s4) ## FFFFFFF8 -/* 010F0 80A3F660 8C8E002C */ lw $t6, 0x002C($a0) ## 0000002C -/* 010F4 80A3F664 AE8E0008 */ sw $t6, 0x0008($s4) ## FFFFFFFC -/* 010F8 80A3F668 C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 010FC 80A3F66C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01100 80A3F670 E7A40098 */ swc1 $f4, 0x0098($sp) -/* 01104 80A3F674 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01108 80A3F678 4481C000 */ mtc1 $at, $f24 ## $f24 = 0.50 -/* 0110C 80A3F67C 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 01110 80A3F680 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 01114 80A3F684 46180181 */ sub.s $f6, $f0, $f24 -/* 01118 80A3F688 8FA200B0 */ lw $v0, 0x00B0($sp) -/* 0111C 80A3F68C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01120 80A3F690 C7B600B4 */ lwc1 $f22, 0x00B4($sp) -/* 01124 80A3F694 46083282 */ mul.s $f10, $f6, $f8 -/* 01128 80A3F698 C7B400B8 */ lwc1 $f20, 0x00B8($sp) -/* 0112C 80A3F69C 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 01130 80A3F6A0 4600540D */ trunc.w.s $f16, $f10 -/* 01134 80A3F6A4 44108000 */ mfc1 $s0, $f16 -/* 01138 80A3F6A8 00000000 */ nop -/* 0113C 80A3F6AC 00108400 */ sll $s0, $s0, 16 -/* 01140 80A3F6B0 04400032 */ bltz $v0, .L80A3F77C -/* 01144 80A3F6B4 00108403 */ sra $s0, $s0, 16 -/* 01148 80A3F6B8 0302001A */ div $zero, $t8, $v0 -/* 0114C 80A3F6BC 00009812 */ mflo $s3 -/* 01150 80A3F6C0 00139C00 */ sll $s3, $s3, 16 -/* 01154 80A3F6C4 00139C03 */ sra $s3, $s3, 16 -/* 01158 80A3F6C8 14400002 */ bne $v0, $zero, .L80A3F6D4 -/* 0115C 80A3F6CC 00000000 */ nop -/* 01160 80A3F6D0 0007000D */ break 7 -.L80A3F6D4: -/* 01164 80A3F6D4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 01168 80A3F6D8 14410004 */ bne $v0, $at, .L80A3F6EC -/* 0116C 80A3F6DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01170 80A3F6E0 17010002 */ bne $t8, $at, .L80A3F6EC -/* 01174 80A3F6E4 00000000 */ nop -/* 01178 80A3F6E8 0006000D */ break 6 -.L80A3F6EC: -/* 0117C 80A3F6EC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01180 80A3F6F0 00000000 */ nop -/* 01184 80A3F6F4 46180481 */ sub.s $f18, $f0, $f24 -/* 01188 80A3F6F8 46149102 */ mul.s $f4, $f18, $f20 -/* 0118C 80A3F6FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01190 80A3F700 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 01194 80A3F704 46180181 */ sub.s $f6, $f0, $f24 -/* 01198 80A3F708 00102400 */ sll $a0, $s0, 16 -/* 0119C 80A3F70C 00042403 */ sra $a0, $a0, 16 -/* 011A0 80A3F710 46143202 */ mul.s $f8, $f6, $f20 -/* 011A4 80A3F714 0C01DE1C */ jal Math_SinS - ## sins? -/* 011A8 80A3F718 E7A80084 */ swc1 $f8, 0x0084($sp) -/* 011AC 80A3F71C 46160282 */ mul.s $f10, $f0, $f22 -/* 011B0 80A3F720 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 011B4 80A3F724 00102400 */ sll $a0, $s0, 16 -/* 011B8 80A3F728 00042403 */ sra $a0, $a0, 16 -/* 011BC 80A3F72C 46105480 */ add.s $f18, $f10, $f16 -/* 011C0 80A3F730 0C01DE0D */ jal Math_CosS - ## coss? -/* 011C4 80A3F734 E7B20094 */ swc1 $f18, 0x0094($sp) -/* 011C8 80A3F738 46160102 */ mul.s $f4, $f0, $f22 -/* 011CC 80A3F73C C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 011D0 80A3F740 E7BC0018 */ swc1 $f28, 0x0018($sp) -/* 011D4 80A3F744 E7BA0014 */ swc1 $f26, 0x0014($sp) -/* 011D8 80A3F748 AFB50010 */ sw $s5, 0x0010($sp) -/* 011DC 80A3F74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 011E0 80A3F750 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4 -/* 011E4 80A3F754 46062200 */ add.s $f8, $f4, $f6 -/* 011E8 80A3F758 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFE8 -/* 011EC 80A3F75C 02E03825 */ or $a3, $s7, $zero ## $a3 = FFFFFFDC -/* 011F0 80A3F760 0C290581 */ jal func_80A41604 -/* 011F4 80A3F764 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 011F8 80A3F768 02138021 */ addu $s0, $s0, $s3 -/* 011FC 80A3F76C 00108400 */ sll $s0, $s0, 16 -/* 01200 80A3F770 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = FFFFFFFF -/* 01204 80A3F774 0641FFDD */ bgez $s2, .L80A3F6EC -/* 01208 80A3F778 00108403 */ sra $s0, $s0, 16 -.L80A3F77C: -/* 0120C 80A3F77C 8FBF006C */ lw $ra, 0x006C($sp) -/* 01210 80A3F780 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 01214 80A3F784 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 01218 80A3F788 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 0121C 80A3F78C D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 01220 80A3F790 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 01224 80A3F794 8FB0004C */ lw $s0, 0x004C($sp) -/* 01228 80A3F798 8FB10050 */ lw $s1, 0x0050($sp) -/* 0122C 80A3F79C 8FB20054 */ lw $s2, 0x0054($sp) -/* 01230 80A3F7A0 8FB30058 */ lw $s3, 0x0058($sp) -/* 01234 80A3F7A4 8FB4005C */ lw $s4, 0x005C($sp) -/* 01238 80A3F7A8 8FB50060 */ lw $s5, 0x0060($sp) -/* 0123C 80A3F7AC 8FB60064 */ lw $s6, 0x0064($sp) -/* 01240 80A3F7B0 8FB70068 */ lw $s7, 0x0068($sp) -/* 01244 80A3F7B4 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 01248 80A3F7B8 03E00008 */ jr $ra -/* 0124C 80A3F7BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s deleted file mode 100644 index b3bb93108d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80A3F7C0 -/* 01250 80A3F7C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01254 80A3F7C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01258 80A3F7C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0125C 80A3F7CC AFA5001C */ sw $a1, 0x001C($sp) -/* 01260 80A3F7D0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 01264 80A3F7D4 00052C00 */ sll $a1, $a1, 16 -/* 01268 80A3F7D8 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 0126C 80A3F7DC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01270 80A3F7E0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01274 80A3F7E4 11E00007 */ beq $t7, $zero, .L80A3F804 -/* 01278 80A3F7E8 00052C03 */ sra $a1, $a1, 16 -/* 0127C 80A3F7EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01280 80A3F7F0 C4860060 */ lwc1 $f6, 0x0060($a0) ## 00000060 -/* 01284 80A3F7F4 4606203C */ c.lt.s $f4, $f6 -/* 01288 80A3F7F8 00000000 */ nop -/* 0128C 80A3F7FC 45020004 */ bc1fl .L80A3F810 -/* 01290 80A3F800 84D801E0 */ lh $t8, 0x01E0($a2) ## 000001E0 -.L80A3F804: -/* 01294 80A3F804 1000003C */ beq $zero, $zero, .L80A3F8F8 -/* 01298 80A3F808 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0129C 80A3F80C 84D801E0 */ lh $t8, 0x01E0($a2) ## 000001E0 -.L80A3F810: -/* 012A0 80A3F810 53000004 */ beql $t8, $zero, .L80A3F824 -/* 012A4 80A3F814 84C2021C */ lh $v0, 0x021C($a2) ## 0000021C -/* 012A8 80A3F818 10000037 */ beq $zero, $zero, .L80A3F8F8 -/* 012AC 80A3F81C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 012B0 80A3F820 84C2021C */ lh $v0, 0x021C($a2) ## 0000021C -.L80A3F824: -/* 012B4 80A3F824 14400003 */ bne $v0, $zero, .L80A3F834 -/* 012B8 80A3F828 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = 00000000 -/* 012BC 80A3F82C 10000004 */ beq $zero, $zero, .L80A3F840 -/* 012C0 80A3F830 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A3F834: -/* 012C4 80A3F834 A4D9021C */ sh $t9, 0x021C($a2) ## 0000021C -/* 012C8 80A3F838 84C2021C */ lh $v0, 0x021C($a2) ## 0000021C -/* 012CC 80A3F83C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000001 -.L80A3F840: -/* 012D0 80A3F840 10600011 */ beq $v1, $zero, .L80A3F888 -/* 012D4 80A3F844 30480001 */ andi $t0, $v0, 0x0001 ## $t0 = 00000001 -/* 012D8 80A3F848 11000008 */ beq $t0, $zero, .L80A3F86C -/* 012DC 80A3F84C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 012E0 80A3F850 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 012E4 80A3F854 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 012E8 80A3F858 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 012EC 80A3F85C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 012F0 80A3F860 460A4400 */ add.s $f16, $f8, $f10 -/* 012F4 80A3F864 10000024 */ beq $zero, $zero, .L80A3F8F8 -/* 012F8 80A3F868 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -.L80A3F86C: -/* 012FC 80A3F86C C4D20028 */ lwc1 $f18, 0x0028($a2) ## 00000028 -/* 01300 80A3F870 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 01304 80A3F874 00000000 */ nop -/* 01308 80A3F878 46049181 */ sub.s $f6, $f18, $f4 -/* 0130C 80A3F87C E4C60028 */ swc1 $f6, 0x0028($a2) ## 00000028 -/* 01310 80A3F880 1000001D */ beq $zero, $zero, .L80A3F8F8 -/* 01314 80A3F884 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3F888: -/* 01318 80A3F888 84C9021A */ lh $t1, 0x021A($a2) ## 0000021A -/* 0131C 80A3F88C 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 01320 80A3F890 A4CA021A */ sh $t2, 0x021A($a2) ## 0000021A -/* 01324 80A3F894 84C3021A */ lh $v1, 0x021A($a2) ## 0000021A -/* 01328 80A3F898 5C600010 */ bgtzl $v1, .L80A3F8DC -/* 0132C 80A3F89C 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -/* 01330 80A3F8A0 1460000B */ bne $v1, $zero, .L80A3F8D0 -/* 01334 80A3F8A4 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 01338 80A3F8A8 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 0133C 80A3F8AC 0C01DF64 */ jal Rand_S16Offset - -/* 01340 80A3F8B0 AFA60018 */ sw $a2, 0x0018($sp) -/* 01344 80A3F8B4 8FA60018 */ lw $a2, 0x0018($sp) -/* 01348 80A3F8B8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0134C 80A3F8BC A4C2021C */ sh $v0, 0x021C($a2) ## 0000021C -/* 01350 80A3F8C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01354 80A3F8C4 A4C0021A */ sh $zero, 0x021A($a2) ## 0000021A -/* 01358 80A3F8C8 1000000B */ beq $zero, $zero, .L80A3F8F8 -/* 0135C 80A3F8CC E4C80060 */ swc1 $f8, 0x0060($a2) ## 00000060 -.L80A3F8D0: -/* 01360 80A3F8D0 A4C5021A */ sh $a1, 0x021A($a2) ## 0000021A -/* 01364 80A3F8D4 84C3021A */ lh $v1, 0x021A($a2) ## 0000021A -/* 01368 80A3F8D8 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -.L80A3F8DC: -/* 0136C 80A3F8DC 44859000 */ mtc1 $a1, $f18 ## $f18 = 0.00 -/* 01370 80A3F8E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01374 80A3F8E4 46805420 */ cvt.s.w $f16, $f10 -/* 01378 80A3F8E8 46809120 */ cvt.s.w $f4, $f18 -/* 0137C 80A3F8EC 46048183 */ div.s $f6, $f16, $f4 -/* 01380 80A3F8F0 460C3202 */ mul.s $f8, $f6, $f12 -/* 01384 80A3F8F4 E4C80060 */ swc1 $f8, 0x0060($a2) ## 00000060 -.L80A3F8F8: -/* 01388 80A3F8F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0138C 80A3F8FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01390 80A3F900 03E00008 */ jr $ra -/* 01394 80A3F904 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s deleted file mode 100644 index 0d6c4d2efd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s +++ /dev/null @@ -1,150 +0,0 @@ -glabel func_80A3F908 -/* 01398 80A3F908 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0139C 80A3F90C AFBF0024 */ sw $ra, 0x0024($sp) -/* 013A0 80A3F910 AFB00020 */ sw $s0, 0x0020($sp) -/* 013A4 80A3F914 AFA50034 */ sw $a1, 0x0034($sp) -/* 013A8 80A3F918 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 013AC 80A3F91C 3C1880A4 */ lui $t8, %hi(func_80A406E0) ## $t8 = 80A40000 -/* 013B0 80A3F920 271806E0 */ addiu $t8, $t8, %lo(func_80A406E0) ## $t8 = 80A406E0 -/* 013B4 80A3F924 AFAF002C */ sw $t7, 0x002C($sp) -/* 013B8 80A3F928 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 013BC 80A3F92C 3C1980A4 */ lui $t9, %hi(func_80A4011C) ## $t9 = 80A40000 -/* 013C0 80A3F930 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013C4 80A3F934 13020014 */ beq $t8, $v0, .L80A3F988 -/* 013C8 80A3F938 2739011C */ addiu $t9, $t9, %lo(func_80A4011C) ## $t9 = 80A4011C -/* 013CC 80A3F93C 13220012 */ beq $t9, $v0, .L80A3F988 -/* 013D0 80A3F940 3C0880A4 */ lui $t0, %hi(func_80A4020C) ## $t0 = 80A40000 -/* 013D4 80A3F944 2508020C */ addiu $t0, $t0, %lo(func_80A4020C) ## $t0 = 80A4020C -/* 013D8 80A3F948 1102000F */ beq $t0, $v0, .L80A3F988 -/* 013DC 80A3F94C 3C0980A4 */ lui $t1, %hi(func_80A40D5C) ## $t1 = 80A40000 -/* 013E0 80A3F950 25290D5C */ addiu $t1, $t1, %lo(func_80A40D5C) ## $t1 = 80A40D5C -/* 013E4 80A3F954 1122000C */ beq $t1, $v0, .L80A3F988 -/* 013E8 80A3F958 3C0A80A4 */ lui $t2, %hi(func_80A40DCC) ## $t2 = 80A40000 -/* 013EC 80A3F95C 254A0DCC */ addiu $t2, $t2, %lo(func_80A40DCC) ## $t2 = 80A40DCC -/* 013F0 80A3F960 11420009 */ beq $t2, $v0, .L80A3F988 -/* 013F4 80A3F964 3C0B80A4 */ lui $t3, %hi(func_80A40B74) ## $t3 = 80A40000 -/* 013F8 80A3F968 256B0B74 */ addiu $t3, $t3, %lo(func_80A40B74) ## $t3 = 80A40B74 -/* 013FC 80A3F96C 11620006 */ beq $t3, $v0, .L80A3F988 -/* 01400 80A3F970 3C0C80A4 */ lui $t4, %hi(func_80A40C78) ## $t4 = 80A40000 -/* 01404 80A3F974 258C0C78 */ addiu $t4, $t4, %lo(func_80A40C78) ## $t4 = 80A40C78 -/* 01408 80A3F978 11820003 */ beq $t4, $v0, .L80A3F988 -/* 0140C 80A3F97C 3C0D80A4 */ lui $t5, %hi(func_80A40B1C) ## $t5 = 80A40000 -/* 01410 80A3F980 25AD0B1C */ addiu $t5, $t5, %lo(func_80A40B1C) ## $t5 = 80A40B1C -/* 01414 80A3F984 15A20064 */ bne $t5, $v0, .L80A3FB18 -.L80A3F988: -/* 01418 80A3F988 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0141C 80A3F98C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01420 80A3F990 3C0180A4 */ lui $at, %hi(D_80A420DC) ## $at = 80A40000 -/* 01424 80A3F994 C43020DC */ lwc1 $f16, %lo(D_80A420DC)($at) -/* 01428 80A3F998 C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 0142C 80A3F99C 860E01D4 */ lh $t6, 0x01D4($s0) ## 000001D4 -/* 01430 80A3F9A0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01434 80A3F9A4 46105483 */ div.s $f18, $f10, $f16 -/* 01438 80A3F9A8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0143C 80A3F9AC 24030090 */ addiu $v1, $zero, 0x0090 ## $v1 = 00000090 -/* 01440 80A3F9B0 3C0F80A4 */ lui $t7, %hi(func_80A3E578) ## $t7 = 80A40000 -/* 01444 80A3F9B4 468021A0 */ cvt.s.w $f6, $f4 -/* 01448 80A3F9B8 3C1880A4 */ lui $t8, %hi(func_80A3E908) ## $t8 = 80A40000 -/* 0144C 80A3F9BC 3C1980A4 */ lui $t9, %hi(func_80A3E578) ## $t9 = 80A40000 -/* 01450 80A3F9C0 3C0880A4 */ lui $t0, %hi(func_80A3E908) ## $t0 = 80A40000 -/* 01454 80A3F9C4 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 01458 80A3F9C8 3C0180A4 */ lui $at, %hi(D_80A420E0) ## $at = 80A40000 -/* 0145C 80A3F9CC 2718E908 */ addiu $t8, $t8, %lo(func_80A3E908) ## $t8 = 80A3E908 -/* 01460 80A3F9D0 25EFE578 */ addiu $t7, $t7, %lo(func_80A3E578) ## $t7 = 80A3E578 -/* 01464 80A3F9D4 2508E908 */ addiu $t0, $t0, %lo(func_80A3E908) ## $t0 = 80A3E908 -/* 01468 80A3F9D8 2739E578 */ addiu $t9, $t9, %lo(func_80A3E578) ## $t9 = 80A3E578 -/* 0146C 80A3F9DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01470 80A3F9E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01474 80A3F9E4 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 01478 80A3F9E8 46083000 */ add.s $f0, $f6, $f8 -/* 0147C 80A3F9EC 46120002 */ mul.s $f0, $f0, $f18 -/* 01480 80A3F9F0 14620004 */ bne $v1, $v0, .L80A3FA04 -/* 01484 80A3F9F4 00000000 */ nop -/* 01488 80A3F9F8 C42420E0 */ lwc1 $f4, %lo(D_80A420E0)($at) -/* 0148C 80A3F9FC 46040002 */ mul.s $f0, $f0, $f4 -/* 01490 80A3FA00 00000000 */ nop -.L80A3FA04: -/* 01494 80A3FA04 5462000B */ bnel $v1, $v0, .L80A3FA34 -/* 01498 80A3FA08 44070000 */ mfc1 $a3, $f0 -/* 0149C 80A3FA0C 44070000 */ mfc1 $a3, $f0 -/* 014A0 80A3FA10 8FA40034 */ lw $a0, 0x0034($sp) -/* 014A4 80A3FA14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014A8 80A3FA18 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 014AC 80A3FA1C AFAF0010 */ sw $t7, 0x0010($sp) -/* 014B0 80A3FA20 0C28FB49 */ jal func_80A3ED24 -/* 014B4 80A3FA24 AFB80014 */ sw $t8, 0x0014($sp) -/* 014B8 80A3FA28 10000006 */ beq $zero, $zero, .L80A3FA44 -/* 014BC 80A3FA2C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 014C0 80A3FA30 44070000 */ mfc1 $a3, $f0 -.L80A3FA34: -/* 014C4 80A3FA34 AFB90010 */ sw $t9, 0x0010($sp) -/* 014C8 80A3FA38 0C00D0F3 */ jal func_800343CC -/* 014CC 80A3FA3C AFA80014 */ sw $t0, 0x0014($sp) -/* 014D0 80A3FA40 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A3FA44: -/* 014D4 80A3FA44 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 014D8 80A3FA48 312A00F0 */ andi $t2, $t1, 0x00F0 ## $t2 = 00000000 -/* 014DC 80A3FA4C 15410032 */ bne $t2, $at, .L80A3FB18 -/* 014E0 80A3FA50 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E4 80A3FA54 14410030 */ bne $v0, $at, .L80A3FB18 -/* 014E8 80A3FA58 3C0B8012 */ lui $t3, %hi(gItemSlots+0x2d) -/* 014EC 80A3FA5C 916B7491 */ lbu $t3, %lo(gItemSlots+0x2d)($t3) -/* 014F0 80A3FA60 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 014F4 80A3FA64 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 014F8 80A3FA68 004B1021 */ addu $v0, $v0, $t3 -/* 014FC 80A3FA6C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 01500 80A3FA70 5441001B */ bnel $v0, $at, .L80A3FAE0 -/* 01504 80A3FA74 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 01508 80A3FA78 0C00BCDA */ jal func_8002F368 -/* 0150C 80A3FA7C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01510 80A3FA80 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01514 80A3FA84 1441000C */ bne $v0, $at, .L80A3FAB8 -/* 01518 80A3FA88 24183053 */ addiu $t8, $zero, 0x3053 ## $t8 = 00003053 -/* 0151C 80A3FA8C 3C0C8016 */ lui $t4, %hi(gSaveContext+0xf0e) -/* 01520 80A3FA90 958CF56E */ lhu $t4, %lo(gSaveContext+0xf0e)($t4) -/* 01524 80A3FA94 240E3055 */ addiu $t6, $zero, 0x3055 ## $t6 = 00003055 -/* 01528 80A3FA98 240F3054 */ addiu $t7, $zero, 0x3054 ## $t7 = 00003054 -/* 0152C 80A3FA9C 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 01530 80A3FAA0 11A00003 */ beq $t5, $zero, .L80A3FAB0 -/* 01534 80A3FAA4 00000000 */ nop -/* 01538 80A3FAA8 10000004 */ beq $zero, $zero, .L80A3FABC -/* 0153C 80A3FAAC A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -.L80A3FAB0: -/* 01540 80A3FAB0 10000002 */ beq $zero, $zero, .L80A3FABC -/* 01544 80A3FAB4 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -.L80A3FAB8: -/* 01548 80A3FAB8 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -.L80A3FABC: -/* 0154C 80A3FABC 9619010E */ lhu $t9, 0x010E($s0) ## 0000010E -/* 01550 80A3FAC0 8FA8002C */ lw $t0, 0x002C($sp) -/* 01554 80A3FAC4 3C098012 */ lui $t1, %hi(gItemSlots+0x2d) -/* 01558 80A3FAC8 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 0155C 80A3FACC A519010E */ sh $t9, 0x010E($t0) ## 0000010E -/* 01560 80A3FAD0 91297491 */ lbu $t1, %lo(gItemSlots+0x2d)($t1) -/* 01564 80A3FAD4 00491021 */ addu $v0, $v0, $t1 -/* 01568 80A3FAD8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 0156C 80A3FADC 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -.L80A3FAE0: -/* 01570 80A3FAE0 5441000E */ bnel $v0, $at, .L80A3FB1C -/* 01574 80A3FAE4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01578 80A3FAE8 0C00BCDA */ jal func_8002F368 -/* 0157C 80A3FAEC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01580 80A3FAF0 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01584 80A3FAF4 14410004 */ bne $v0, $at, .L80A3FB08 -/* 01588 80A3FAF8 240B3058 */ addiu $t3, $zero, 0x3058 ## $t3 = 00003058 -/* 0158C 80A3FAFC 240A3059 */ addiu $t2, $zero, 0x3059 ## $t2 = 00003059 -/* 01590 80A3FB00 10000002 */ beq $zero, $zero, .L80A3FB0C -/* 01594 80A3FB04 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -.L80A3FB08: -/* 01598 80A3FB08 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -.L80A3FB0C: -/* 0159C 80A3FB0C 960C010E */ lhu $t4, 0x010E($s0) ## 0000010E -/* 015A0 80A3FB10 8FAD002C */ lw $t5, 0x002C($sp) -/* 015A4 80A3FB14 A5AC010E */ sh $t4, 0x010E($t5) ## 0000010E -.L80A3FB18: -/* 015A8 80A3FB18 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A3FB1C: -/* 015AC 80A3FB1C 8FB00020 */ lw $s0, 0x0020($sp) -/* 015B0 80A3FB20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 015B4 80A3FB24 03E00008 */ jr $ra -/* 015B8 80A3FB28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s deleted file mode 100644 index 1e15d9f29d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A3FEB4 -/* 01944 80A3FEB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01948 80A3FEB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0194C 80A3FEBC AFA5001C */ sw $a1, 0x001C($sp) -/* 01950 80A3FEC0 3C0180A4 */ lui $at, %hi(D_80A422A8) ## $at = 80A40000 -/* 01954 80A3FEC4 C42422A8 */ lwc1 $f4, %lo(D_80A422A8)($at) -/* 01958 80A3FEC8 C486008C */ lwc1 $f6, 0x008C($a0) ## 0000008C -/* 0195C 80A3FECC 3C0580A4 */ lui $a1, %hi(func_80A3FEF8) ## $a1 = 80A40000 -/* 01960 80A3FED0 4606203C */ c.lt.s $f4, $f6 -/* 01964 80A3FED4 00000000 */ nop -/* 01968 80A3FED8 45030004 */ bc1tl .L80A3FEEC -/* 0196C 80A3FEDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01970 80A3FEE0 0C28F95C */ jal func_80A3E570 -/* 01974 80A3FEE4 24A5FEF8 */ addiu $a1, $a1, %lo(func_80A3FEF8) ## $a1 = 80A3FEF8 -/* 01978 80A3FEE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A3FEEC: -/* 0197C 80A3FEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01980 80A3FEF0 03E00008 */ jr $ra -/* 01984 80A3FEF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s deleted file mode 100644 index 8bf184f87c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_80A3FEF8 -/* 01988 80A3FEF8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0198C 80A3FEFC AFBF0034 */ sw $ra, 0x0034($sp) -/* 01990 80A3FF00 AFB10030 */ sw $s1, 0x0030($sp) -/* 01994 80A3FF04 AFB0002C */ sw $s0, 0x002C($sp) -/* 01998 80A3FF08 8482020E */ lh $v0, 0x020E($a0) ## 0000020E -/* 0199C 80A3FF0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 019A0 80A3FF10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 019A4 80A3FF14 14400003 */ bne $v0, $zero, .L80A3FF24 -/* 019A8 80A3FF18 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 019AC 80A3FF1C 10000003 */ beq $zero, $zero, .L80A3FF2C -/* 019B0 80A3FF20 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A3FF24: -/* 019B4 80A3FF24 A60E020E */ sh $t6, 0x020E($s0) ## 0000020E -/* 019B8 80A3FF28 8603020E */ lh $v1, 0x020E($s0) ## 0000020E -.L80A3FF2C: -/* 019BC 80A3FF2C 54600018 */ bnel $v1, $zero, .L80A3FF90 -/* 019C0 80A3FF30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 019C4 80A3FF34 920201A7 */ lbu $v0, 0x01A7($s0) ## 000001A7 -/* 019C8 80A3FF38 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 019CC 80A3FF3C 0331C821 */ addu $t9, $t9, $s1 -/* 019D0 80A3FF40 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 019D4 80A3FF44 11E00011 */ beq $t7, $zero, .L80A3FF8C -/* 019D8 80A3FF48 3058FFFE */ andi $t8, $v0, 0xFFFE ## $t8 = 00000000 -/* 019DC 80A3FF4C A21801A7 */ sb $t8, 0x01A7($s0) ## 000001A7 -/* 019E0 80A3FF50 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 019E4 80A3FF54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 019E8 80A3FF58 2405FFFC */ addiu $a1, $zero, 0xFFFC ## $a1 = FFFFFFFC -/* 019EC 80A3FF5C 0320F809 */ jalr $ra, $t9 -/* 019F0 80A3FF60 00000000 */ nop -/* 019F4 80A3FF64 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 019F8 80A3FF68 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 019FC 80A3FF6C 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 01A00 80A3FF70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A04 80A3FF74 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A08 80A3FF78 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01A0C 80A3FF7C 0C00BDC7 */ jal func_8002F71C -/* 01A10 80A3FF80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01A14 80A3FF84 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 01A18 80A3FF88 A608020E */ sh $t0, 0x020E($s0) ## 0000020E -.L80A3FF8C: -/* 01A1C 80A3FF8C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A3FF90: -/* 01A20 80A3FF90 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 01A24 80A3FF94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A28 80A3FF98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01A2C 80A3FF9C 0C28FCC0 */ jal func_80A3F300 -/* 01A30 80A3FFA0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01A34 80A3FFA4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A38 80A3FFA8 5441001A */ bnel $v0, $at, .L80A40014 -/* 01A3C 80A3FFAC 8A0B0030 */ lwl $t3, 0x0030($s0) ## 00000030 -/* 01A40 80A3FFB0 86090218 */ lh $t1, 0x0218($s0) ## 00000218 -/* 01A44 80A3FFB4 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01A48 80A3FFB8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01A4C 80A3FFBC 55200015 */ bnel $t1, $zero, .L80A40014 -/* 01A50 80A3FFC0 8A0B0030 */ lwl $t3, 0x0030($s0) ## 00000030 -/* 01A54 80A3FFC4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01A58 80A3FFC8 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01A5C 80A3FFCC 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01A60 80A3FFD0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01A64 80A3FFD4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01A68 80A3FFD8 AFA00024 */ sw $zero, 0x0024($sp) -/* 01A6C 80A3FFDC AFA00020 */ sw $zero, 0x0020($sp) -/* 01A70 80A3FFE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 01A74 80A3FFE4 AFA00018 */ sw $zero, 0x0018($sp) -/* 01A78 80A3FFE8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01A7C 80A3FFEC E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01A80 80A3FFF0 10400002 */ beq $v0, $zero, .L80A3FFFC -/* 01A84 80A3FFF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A88 80A3FFF8 A44001F8 */ sh $zero, 0x01F8($v0) ## 000001F8 -.L80A3FFFC: -/* 01A8C 80A3FFFC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01A90 80A40000 3C0580A4 */ lui $a1, %hi(func_80A4008C) ## $a1 = 80A40000 -/* 01A94 80A40004 24A5008C */ addiu $a1, $a1, %lo(func_80A4008C) ## $a1 = 80A4008C -/* 01A98 80A40008 0C28F95C */ jal func_80A3E570 -/* 01A9C 80A4000C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01AA0 80A40010 8A0B0030 */ lwl $t3, 0x0030($s0) ## 00000030 -.L80A40014: -/* 01AA4 80A40014 9A0B0033 */ lwr $t3, 0x0033($s0) ## 00000033 -/* 01AA8 80A40018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AAC 80A4001C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01AB0 80A40020 AA0B00B4 */ swl $t3, 0x00B4($s0) ## 000000B4 -/* 01AB4 80A40024 BA0B00B7 */ swr $t3, 0x00B7($s0) ## 000000B7 -/* 01AB8 80A40028 960B0034 */ lhu $t3, 0x0034($s0) ## 00000034 -/* 01ABC 80A4002C 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 01AC0 80A40030 0C28FDF0 */ jal func_80A3F7C0 -/* 01AC4 80A40034 A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 -/* 01AC8 80A40038 1040000F */ beq $v0, $zero, .L80A40078 -/* 01ACC 80A4003C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AD0 80A40040 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01AD4 80A40044 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01AD8 80A40048 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01ADC 80A4004C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 01AE0 80A40050 3C063E23 */ lui $a2, 0x3E23 ## $a2 = 3E230000 -/* 01AE4 80A40054 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 01AE8 80A40058 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01AEC 80A4005C AFAC0010 */ sw $t4, 0x0010($sp) -/* 01AF0 80A40060 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 01AF4 80A40064 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3E23D70A -/* 01AF8 80A40068 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 01AFC 80A4006C E7B20014 */ swc1 $f18, 0x0014($sp) -/* 01B00 80A40070 0C28FD65 */ jal func_80A3F594 -/* 01B04 80A40074 E7A40018 */ swc1 $f4, 0x0018($sp) -.L80A40078: -/* 01B08 80A40078 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01B0C 80A4007C 8FB0002C */ lw $s0, 0x002C($sp) -/* 01B10 80A40080 8FB10030 */ lw $s1, 0x0030($sp) -/* 01B14 80A40084 03E00008 */ jr $ra -/* 01B18 80A40088 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s deleted file mode 100644 index 23c0f5bb80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A4008C -/* 01B1C 80A4008C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B20 80A40090 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B24 80A40094 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B28 80A40098 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01B2C 80A4009C AFA40028 */ sw $a0, 0x0028($sp) -/* 01B30 80A400A0 0C28FDF0 */ jal func_80A3F7C0 -/* 01B34 80A400A4 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 01B38 80A400A8 10400018 */ beq $v0, $zero, .L80A4010C -/* 01B3C 80A400AC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B40 80A400B0 848E021A */ lh $t6, 0x021A($a0) ## 0000021A -/* 01B44 80A400B4 3C063E23 */ lui $a2, 0x3E23 ## $a2 = 3E230000 -/* 01B48 80A400B8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3E23D70A -/* 01B4C 80A400BC 15C00008 */ bne $t6, $zero, .L80A400E0 -/* 01B50 80A400C0 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 01B54 80A400C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01B58 80A400C8 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 01B5C 80A400CC 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 01B60 80A400D0 0C28F95C */ jal func_80A3E570 -/* 01B64 80A400D4 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 01B68 80A400D8 1000000D */ beq $zero, $zero, .L80A40110 -/* 01B6C 80A400DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A400E0: -/* 01B70 80A400E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01B74 80A400E4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01B78 80A400E8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01B7C 80A400EC 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 01B80 80A400F0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 01B84 80A400F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B88 80A400F8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01B8C 80A400FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 01B90 80A40100 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01B94 80A40104 0C28FD65 */ jal func_80A3F594 -/* 01B98 80A40108 E7A80018 */ swc1 $f8, 0x0018($sp) -.L80A4010C: -/* 01B9C 80A4010C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A40110: -/* 01BA0 80A40110 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BA4 80A40114 03E00008 */ jr $ra -/* 01BA8 80A40118 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s deleted file mode 100644 index 56ed5768d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80A4011C -/* 01BAC 80A4011C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01BB0 80A40120 AFBF002C */ sw $ra, 0x002C($sp) -/* 01BB4 80A40124 AFB00028 */ sw $s0, 0x0028($sp) -/* 01BB8 80A40128 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BBC 80A4012C 0C28FCC0 */ jal func_80A3F300 -/* 01BC0 80A40130 AFA50034 */ sw $a1, 0x0034($sp) -/* 01BC4 80A40134 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01BC8 80A40138 54410016 */ bnel $v0, $at, .L80A40194 -/* 01BCC 80A4013C 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 01BD0 80A40140 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01BD4 80A40144 8FA40034 */ lw $a0, 0x0034($sp) -/* 01BD8 80A40148 0C00B2D0 */ jal Flags_GetSwitch - -/* 01BDC 80A4014C 00052A03 */ sra $a1, $a1, 8 -/* 01BE0 80A40150 50400010 */ beql $v0, $zero, .L80A40194 -/* 01BE4 80A40154 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 01BE8 80A40158 860E0218 */ lh $t6, 0x0218($s0) ## 00000218 -/* 01BEC 80A4015C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BF0 80A40160 3C0580A4 */ lui $a1, %hi(func_80A4008C) ## $a1 = 80A40000 -/* 01BF4 80A40164 55C0000B */ bnel $t6, $zero, .L80A40194 -/* 01BF8 80A40168 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 01BFC 80A4016C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01C00 80A40170 24A5008C */ addiu $a1, $a1, %lo(func_80A4008C) ## $a1 = 80A4008C -/* 01C04 80A40174 0C28F95C */ jal func_80A3E570 -/* 01C08 80A40178 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01C0C 80A4017C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01C10 80A40180 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01C14 80A40184 944F0F18 */ lhu $t7, 0x0F18($v0) ## 8015F578 -/* 01C18 80A40188 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 -/* 01C1C 80A4018C A4580F18 */ sh $t8, 0x0F18($v0) ## 8015F578 -/* 01C20 80A40190 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -.L80A40194: -/* 01C24 80A40194 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 -/* 01C28 80A40198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C2C 80A4019C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01C30 80A401A0 AA0800B4 */ swl $t0, 0x00B4($s0) ## 000000B4 -/* 01C34 80A401A4 BA0800B7 */ swr $t0, 0x00B7($s0) ## 000000B7 -/* 01C38 80A401A8 96080034 */ lhu $t0, 0x0034($s0) ## 00000034 -/* 01C3C 80A401AC 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 01C40 80A401B0 0C28FDF0 */ jal func_80A3F7C0 -/* 01C44 80A401B4 A60800B8 */ sh $t0, 0x00B8($s0) ## 000000B8 -/* 01C48 80A401B8 1040000F */ beq $v0, $zero, .L80A401F8 -/* 01C4C 80A401BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C50 80A401C0 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 01C54 80A401C4 44813000 */ mtc1 $at, $f6 ## $f6 = 13.00 -/* 01C58 80A401C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01C5C 80A401CC 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 01C60 80A401D0 3C063E38 */ lui $a2, 0x3E38 ## $a2 = 3E380000 -/* 01C64 80A401D4 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 01C68 80A401D8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01C6C 80A401DC AFA90010 */ sw $t1, 0x0010($sp) -/* 01C70 80A401E0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 01C74 80A401E4 34C651EC */ ori $a2, $a2, 0x51EC ## $a2 = 3E3851EC -/* 01C78 80A401E8 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 01C7C 80A401EC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01C80 80A401F0 0C28FD65 */ jal func_80A3F594 -/* 01C84 80A401F4 E7A80018 */ swc1 $f8, 0x0018($sp) -.L80A401F8: -/* 01C88 80A401F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 01C8C 80A401FC 8FB00028 */ lw $s0, 0x0028($sp) -/* 01C90 80A40200 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C94 80A40204 03E00008 */ jr $ra -/* 01C98 80A40208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s deleted file mode 100644 index c76a270685..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A4020C -/* 01C9C 80A4020C AFA40000 */ sw $a0, 0x0000($sp) -/* 01CA0 80A40210 03E00008 */ jr $ra -/* 01CA4 80A40214 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s deleted file mode 100644 index a2224ad091..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80A40218 -/* 01CA8 80A40218 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CAC 80A4021C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01CB0 80A40220 AFB00020 */ sw $s0, 0x0020($sp) -/* 01CB4 80A40224 AFA5002C */ sw $a1, 0x002C($sp) -/* 01CB8 80A40228 84820210 */ lh $v0, 0x0210($a0) ## 00000210 -/* 01CBC 80A4022C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CC0 80A40230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CC4 80A40234 14400003 */ bne $v0, $zero, .L80A40244 -/* 01CC8 80A40238 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01CCC 80A4023C 10000003 */ beq $zero, $zero, .L80A4024C -/* 01CD0 80A40240 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A40244: -/* 01CD4 80A40244 A60E0210 */ sh $t6, 0x0210($s0) ## 00000210 -/* 01CD8 80A40248 86030210 */ lh $v1, 0x0210($s0) ## 00000210 -.L80A4024C: -/* 01CDC 80A4024C 5460002E */ bnel $v1, $zero, .L80A40308 -/* 01CE0 80A40250 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01CE4 80A40254 0C28FC57 */ jal func_80A3F15C -/* 01CE8 80A40258 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CEC 80A4025C 10400029 */ beq $v0, $zero, .L80A40304 -/* 01CF0 80A40260 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01CF4 80A40264 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 01CF8 80A40268 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01CFC 80A4026C 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 01D00 80A40270 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01D04 80A40274 AFA70010 */ sw $a3, 0x0010($sp) -/* 01D08 80A40278 240438FC */ addiu $a0, $zero, 0x38FC ## $a0 = 000038FC -/* 01D0C 80A4027C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 01D10 80A40280 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01D14 80A40284 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01D18 80A40288 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 01D1C 80A4028C 3C0180A4 */ lui $at, %hi(D_80A422AC) ## $at = 80A40000 -/* 01D20 80A40290 C42422AC */ lwc1 $f4, %lo(D_80A422AC)($at) -/* 01D24 80A40294 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01D28 80A40298 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 -/* 01D2C 80A4029C 17210005 */ bne $t9, $at, .L80A402B4 -/* 01D30 80A402A0 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 01D34 80A402A4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01D38 80A402A8 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 01D3C 80A402AC 10000005 */ beq $zero, $zero, .L80A402C4 -/* 01D40 80A402B0 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -.L80A402B4: -/* 01D44 80A402B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01D48 80A402B8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01D4C 80A402BC 00000000 */ nop -/* 01D50 80A402C0 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -.L80A402C4: -/* 01D54 80A402C4 3C0580A4 */ lui $a1, %hi(func_80A40318) ## $a1 = 80A40000 -/* 01D58 80A402C8 24A50318 */ addiu $a1, $a1, %lo(func_80A40318) ## $a1 = 80A40318 -/* 01D5C 80A402CC 46003202 */ mul.s $f8, $f6, $f0 -/* 01D60 80A402D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D64 80A402D4 0C28F95C */ jal func_80A3E570 -/* 01D68 80A402D8 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -/* 01D6C 80A402DC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 01D70 80A402E0 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01D74 80A402E4 8FA4002C */ lw $a0, 0x002C($sp) -/* 01D78 80A402E8 310900F0 */ andi $t1, $t0, 0x00F0 ## $t1 = 00000000 -/* 01D7C 80A402EC 15210005 */ bne $t1, $at, .L80A40304 -/* 01D80 80A402F0 24051068 */ addiu $a1, $zero, 0x1068 ## $a1 = 00001068 -/* 01D84 80A402F4 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 01D88 80A402F8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01D8C 80A402FC 0C02003E */ jal func_800800F8 -/* 01D90 80A40300 AFA00010 */ sw $zero, 0x0010($sp) -.L80A40304: -/* 01D94 80A40304 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A40308: -/* 01D98 80A40308 8FB00020 */ lw $s0, 0x0020($sp) -/* 01D9C 80A4030C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01DA0 80A40310 03E00008 */ jr $ra -/* 01DA4 80A40314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s deleted file mode 100644 index a760ea4c05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80A40318 -/* 01DA8 80A40318 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01DAC 80A4031C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01DB0 80A40320 AFB00020 */ sw $s0, 0x0020($sp) -/* 01DB4 80A40324 AFA5002C */ sw $a1, 0x002C($sp) -/* 01DB8 80A40328 C4860168 */ lwc1 $f6, 0x0168($a0) ## 00000168 -/* 01DBC 80A4032C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01DC0 80A40330 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DC4 80A40334 46062032 */ c.eq.s $f4, $f6 -/* 01DC8 80A40338 00000000 */ nop -/* 01DCC 80A4033C 4503002C */ bc1tl .L80A403F0 -/* 01DD0 80A40340 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -/* 01DD4 80A40344 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 01DD8 80A40348 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01DDC 80A4034C 31CF00F0 */ andi $t7, $t6, 0x00F0 ## $t7 = 00000000 -/* 01DE0 80A40350 15E10004 */ bne $t7, $at, .L80A40364 -/* 01DE4 80A40354 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01DE8 80A40358 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 01DEC 80A4035C 10000004 */ beq $zero, $zero, .L80A40370 -/* 01DF0 80A40360 00000000 */ nop -.L80A40364: -/* 01DF4 80A40364 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DF8 80A40368 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01DFC 80A4036C 00000000 */ nop -.L80A40370: -/* 01E00 80A40370 3C0180A4 */ lui $at, %hi(D_80A422B0) ## $at = 80A40000 -/* 01E04 80A40374 C42222B0 */ lwc1 $f2, %lo(D_80A422B0)($at) -/* 01E08 80A40378 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01E0C 80A4037C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01E10 80A40380 44061000 */ mfc1 $a2, $f2 -/* 01E14 80A40384 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 01E18 80A40388 46080282 */ mul.s $f10, $f0, $f8 -/* 01E1C 80A4038C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 01E20 80A40390 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01E24 80A40394 44055000 */ mfc1 $a1, $f10 -/* 01E28 80A40398 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01E2C 80A4039C 00000000 */ nop -/* 01E30 80A403A0 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 01E34 80A403A4 C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 01E38 80A403A8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 01E3C 80A403AC 44811000 */ mtc1 $at, $f2 ## $f2 = 12.00 -/* 01E40 80A403B0 46100000 */ add.s $f0, $f0, $f16 -/* 01E44 80A403B4 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01E48 80A403B8 4602003E */ c.le.s $f0, $f2 -/* 01E4C 80A403BC 00000000 */ nop -/* 01E50 80A403C0 45030030 */ bc1tl .L80A40484 -/* 01E54 80A403C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01E58 80A403C8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 01E5C 80A403CC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01E60 80A403D0 E6020164 */ swc1 $f2, 0x0164($s0) ## 00000164 -/* 01E64 80A403D4 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 -/* 01E68 80A403D8 13210004 */ beq $t9, $at, .L80A403EC -/* 01E6C 80A403DC E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 01E70 80A403E0 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 01E74 80A403E4 10000026 */ beq $zero, $zero, .L80A40480 -/* 01E78 80A403E8 A6080212 */ sh $t0, 0x0212($s0) ## 00000212 -.L80A403EC: -/* 01E7C 80A403EC 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -.L80A403F0: -/* 01E80 80A403F0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01E84 80A403F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E88 80A403F8 14400003 */ bne $v0, $zero, .L80A40408 -/* 01E8C 80A403FC 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 01E90 80A40400 10000003 */ beq $zero, $zero, .L80A40410 -/* 01E94 80A40404 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A40408: -/* 01E98 80A40408 A6090212 */ sh $t1, 0x0212($s0) ## 00000212 -/* 01E9C 80A4040C 86030212 */ lh $v1, 0x0212($s0) ## 00000212 -.L80A40410: -/* 01EA0 80A40410 1460000F */ bne $v1, $zero, .L80A40450 -/* 01EA4 80A40414 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01EA8 80A40418 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 01EAC 80A4041C 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 01EB0 80A40420 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01EB4 80A40424 240438FD */ addiu $a0, $zero, 0x38FD ## $a0 = 000038FD -/* 01EB8 80A40428 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 01EBC 80A4042C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01EC0 80A40430 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01EC4 80A40434 AFA70010 */ sw $a3, 0x0010($sp) -/* 01EC8 80A40438 3C0580A4 */ lui $a1, %hi(func_80A405CC) ## $a1 = 80A40000 -/* 01ECC 80A4043C 24A505CC */ addiu $a1, $a1, %lo(func_80A405CC) ## $a1 = 80A405CC -/* 01ED0 80A40440 0C28F95C */ jal func_80A3E570 -/* 01ED4 80A40444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01ED8 80A40448 1000000E */ beq $zero, $zero, .L80A40484 -/* 01EDC 80A4044C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A40450: -/* 01EE0 80A40450 0C28FC57 */ jal func_80A3F15C -/* 01EE4 80A40454 8FA5002C */ lw $a1, 0x002C($sp) -/* 01EE8 80A40458 5440000A */ bnel $v0, $zero, .L80A40484 -/* 01EEC 80A4045C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01EF0 80A40460 0C28FC98 */ jal func_80A3F260 -/* 01EF4 80A40464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EF8 80A40468 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01EFC 80A4046C 3C0580A4 */ lui $a1, %hi(func_80A40494) ## $a1 = 80A40000 -/* 01F00 80A40470 24A50494 */ addiu $a1, $a1, %lo(func_80A40494) ## $a1 = 80A40494 -/* 01F04 80A40474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F08 80A40478 0C28F95C */ jal func_80A3E570 -/* 01F0C 80A4047C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -.L80A40480: -/* 01F10 80A40480 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A40484: -/* 01F14 80A40484 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F18 80A40488 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F1C 80A4048C 03E00008 */ jr $ra -/* 01F20 80A40490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s deleted file mode 100644 index 825cc1b5a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80A40494 -/* 01F24 80A40494 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01F28 80A40498 AFBF002C */ sw $ra, 0x002C($sp) -/* 01F2C 80A4049C AFB00028 */ sw $s0, 0x0028($sp) -/* 01F30 80A404A0 AFA50034 */ sw $a1, 0x0034($sp) -/* 01F34 80A404A4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 01F38 80A404A8 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01F3C 80A404AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F40 80A404B0 31CF00F0 */ andi $t7, $t6, 0x00F0 ## $t7 = 00000000 -/* 01F44 80A404B4 15E10004 */ bne $t7, $at, .L80A404C8 -/* 01F48 80A404B8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01F4C 80A404BC 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 01F50 80A404C0 10000004 */ beq $zero, $zero, .L80A404D4 -/* 01F54 80A404C4 00000000 */ nop -.L80A404C8: -/* 01F58 80A404C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01F5C 80A404CC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01F60 80A404D0 00000000 */ nop -.L80A404D4: -/* 01F64 80A404D4 3C0180A4 */ lui $at, %hi(D_80A422B4) ## $at = 80A40000 -/* 01F68 80A404D8 C42222B4 */ lwc1 $f2, %lo(D_80A422B4)($at) -/* 01F6C 80A404DC 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 01F70 80A404E0 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 01F74 80A404E4 44061000 */ mfc1 $a2, $f2 -/* 01F78 80A404E8 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 01F7C 80A404EC 46040182 */ mul.s $f6, $f0, $f4 -/* 01F80 80A404F0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 01F84 80A404F4 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01F88 80A404F8 44053000 */ mfc1 $a1, $f6 -/* 01F8C 80A404FC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01F90 80A40500 00000000 */ nop -/* 01F94 80A40504 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 01F98 80A40508 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 -/* 01F9C 80A4050C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01FA0 80A40510 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01FA4 80A40514 46080000 */ add.s $f0, $f0, $f8 -/* 01FA8 80A40518 3C188013 */ lui $t8, %hi(D_801333E8) -/* 01FAC 80A4051C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01FB0 80A40520 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 01FB4 80A40524 4600503E */ c.le.s $f10, $f0 -/* 01FB8 80A40528 2404387B */ addiu $a0, $zero, 0x387B ## $a0 = 0000387B -/* 01FBC 80A4052C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 01FC0 80A40530 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FC4 80A40534 45030021 */ bc1tl .L80A405BC -/* 01FC8 80A40538 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FCC 80A4053C AFA70010 */ sw $a3, 0x0010($sp) -/* 01FD0 80A40540 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01FD4 80A40544 AFB80014 */ sw $t8, 0x0014($sp) -/* 01FD8 80A40548 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 01FDC 80A4054C 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 -/* 01FE0 80A40550 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01FE4 80A40554 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 01FE8 80A40558 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 01FEC 80A4055C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 01FF0 80A40560 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 01FF4 80A40564 AFB90010 */ sw $t9, 0x0010($sp) -/* 01FF8 80A40568 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 01FFC 80A4056C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 02000 80A40570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02004 80A40574 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 02008 80A40578 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 0200C 80A4057C 0C28FD65 */ jal func_80A3F594 -/* 02010 80A40580 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 02014 80A40584 0C28FC98 */ jal func_80A3F260 -/* 02018 80A40588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0201C 80A4058C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02020 80A40590 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 02024 80A40594 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 02028 80A40598 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0202C 80A4059C 0C01DF64 */ jal Rand_S16Offset - -/* 02030 80A405A0 E6000164 */ swc1 $f0, 0x0164($s0) ## 00000164 -/* 02034 80A405A4 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 -/* 02038 80A405A8 A6020210 */ sh $v0, 0x0210($s0) ## 00000210 -/* 0203C 80A405AC 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 02040 80A405B0 0C28F95C */ jal func_80A3E570 -/* 02044 80A405B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02048 80A405B8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A405BC: -/* 0204C 80A405BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02050 80A405C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02054 80A405C4 03E00008 */ jr $ra -/* 02058 80A405C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s deleted file mode 100644 index 0fd21ab91b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80A405CC -/* 0205C 80A405CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02060 80A405D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 02064 80A405D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02068 80A405D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0206C 80A405DC 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 -/* 02070 80A405E0 AFA50034 */ sw $a1, 0x0034($sp) -/* 02074 80A405E4 0C028800 */ jal Animation_GetLastFrame - -/* 02078 80A405E8 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 -/* 0207C 80A405EC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 02080 80A405F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02084 80A405F4 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02088 80A405F8 31CF00F0 */ andi $t7, $t6, 0x00F0 ## $t7 = 00000000 -/* 0208C 80A405FC 15E10005 */ bne $t7, $at, .L80A40614 -/* 02090 80A40600 468020A0 */ cvt.s.w $f2, $f4 -/* 02094 80A40604 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02098 80A40608 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 0209C 80A4060C 10000004 */ beq $zero, $zero, .L80A40620 -/* 020A0 80A40610 00000000 */ nop -.L80A40614: -/* 020A4 80A40614 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 020A8 80A40618 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 020AC 80A4061C 00000000 */ nop -.L80A40620: -/* 020B0 80A40620 3C0180A4 */ lui $at, %hi(D_80A422B8) ## $at = 80A40000 -/* 020B4 80A40624 C42C22B8 */ lwc1 $f12, %lo(D_80A422B8)($at) -/* 020B8 80A40628 44050000 */ mfc1 $a1, $f0 -/* 020BC 80A4062C 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 020C0 80A40630 44066000 */ mfc1 $a2, $f12 -/* 020C4 80A40634 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 020C8 80A40638 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 020CC 80A4063C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 020D0 80A40640 E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 020D4 80A40644 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 020D8 80A40648 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 020DC 80A4064C C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 020E0 80A40650 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 020E4 80A40654 46060000 */ add.s $f0, $f0, $f6 -/* 020E8 80A40658 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 020EC 80A4065C 4602003C */ c.lt.s $f0, $f2 -/* 020F0 80A40660 00000000 */ nop -/* 020F4 80A40664 4503001A */ bc1tl .L80A406D0 -/* 020F8 80A40668 8FBF0024 */ lw $ra, 0x0024($sp) -/* 020FC 80A4066C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02100 80A40670 E6020164 */ swc1 $f2, 0x0164($s0) ## 00000164 -/* 02104 80A40674 0C01DF64 */ jal Rand_S16Offset - -/* 02108 80A40678 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -/* 0210C 80A4067C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 02110 80A40680 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 02114 80A40684 A6020212 */ sh $v0, 0x0212($s0) ## 00000212 -/* 02118 80A40688 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 -/* 0211C 80A4068C 1721000B */ bne $t9, $at, .L80A406BC -/* 02120 80A40690 3C088016 */ lui $t0, %hi(gSaveContext+0xf14) -/* 02124 80A40694 9508F574 */ lhu $t0, %lo(gSaveContext+0xf14)($t0) -/* 02128 80A40698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0212C 80A4069C 3C0580A4 */ lui $a1, %hi(func_80A40B1C) ## $a1 = 80A40000 -/* 02130 80A406A0 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 02134 80A406A4 15200005 */ bne $t1, $zero, .L80A406BC -/* 02138 80A406A8 00000000 */ nop -/* 0213C 80A406AC 0C28F95C */ jal func_80A3E570 -/* 02140 80A406B0 24A50B1C */ addiu $a1, $a1, %lo(func_80A40B1C) ## $a1 = 80A40B1C -/* 02144 80A406B4 10000006 */ beq $zero, $zero, .L80A406D0 -/* 02148 80A406B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A406BC: -/* 0214C 80A406BC 3C0580A4 */ lui $a1, %hi(func_80A406E0) ## $a1 = 80A40000 -/* 02150 80A406C0 24A506E0 */ addiu $a1, $a1, %lo(func_80A406E0) ## $a1 = 80A406E0 -/* 02154 80A406C4 0C28F95C */ jal func_80A3E570 -/* 02158 80A406C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0215C 80A406CC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A406D0: -/* 02160 80A406D0 8FB00020 */ lw $s0, 0x0020($sp) -/* 02164 80A406D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02168 80A406D8 03E00008 */ jr $ra -/* 0216C 80A406DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s deleted file mode 100644 index 85ea72985c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s +++ /dev/null @@ -1,138 +0,0 @@ -glabel func_80A406E0 -/* 02170 80A406E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02174 80A406E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02178 80A406E8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0217C 80A406EC AFA5002C */ sw $a1, 0x002C($sp) -/* 02180 80A406F0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 02184 80A406F4 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02188 80A406F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0218C 80A406FC 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 02190 80A40700 14410037 */ bne $v0, $at, .L80A407E0 -/* 02194 80A40704 00000000 */ nop -/* 02198 80A40708 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 0219C 80A4070C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 021A0 80A40710 15C10033 */ bne $t6, $at, .L80A407E0 -/* 021A4 80A40714 00000000 */ nop -/* 021A8 80A40718 3C028016 */ lui $v0, %hi(gSaveContext) -/* 021AC 80A4071C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 021B0 80A40720 904F003E */ lbu $t7, 0x003E($v0) ## 8015E69E -/* 021B4 80A40724 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) -/* 021B8 80A40728 11E00003 */ beq $t7, $zero, .L80A40738 -/* 021BC 80A4072C 00000000 */ nop -/* 021C0 80A40730 10000064 */ beq $zero, $zero, .L80A408C4 -/* 021C4 80A40734 A48001E0 */ sh $zero, 0x01E0($a0) ## 000001E0 -.L80A40738: -/* 021C8 80A40738 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) -/* 021CC 80A4073C 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 021D0 80A40740 3C0580A4 */ lui $a1, %hi(func_80A40B74) ## $a1 = 80A40000 -/* 021D4 80A40744 0058C821 */ addu $t9, $v0, $t8 -/* 021D8 80A40748 93280074 */ lbu $t0, 0x0074($t9) ## 00000074 -/* 021DC 80A4074C 24A50B74 */ addiu $a1, $a1, %lo(func_80A40B74) ## $a1 = 80A40B74 -/* 021E0 80A40750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E4 80A40754 15010019 */ bne $t0, $at, .L80A407BC -/* 021E8 80A40758 00000000 */ nop -/* 021EC 80A4075C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F0 80A40760 0C28FB78 */ jal func_80A3EDE0 -/* 021F4 80A40764 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 021F8 80A40768 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 021FC 80A4076C 3C0580A4 */ lui $a1, %hi(func_80A40D5C) ## $a1 = 80A40000 -/* 02200 80A40770 A609021E */ sh $t1, 0x021E($s0) ## 0000021E -/* 02204 80A40774 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 02208 80A40778 24A50D5C */ addiu $a1, $a1, %lo(func_80A40D5C) ## $a1 = 80A40D5C -/* 0220C 80A4077C 0C28F95C */ jal func_80A3E570 -/* 02210 80A40780 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02214 80A40784 8FA4002C */ lw $a0, 0x002C($sp) -/* 02218 80A40788 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0221C 80A4078C 240A0037 */ addiu $t2, $zero, 0x0037 ## $t2 = 00000037 -/* 02220 80A40790 00240821 */ addu $at, $at, $a0 -/* 02224 80A40794 A02A03DC */ sb $t2, 0x03DC($at) ## 000103DC -/* 02228 80A40798 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) -/* 0222C 80A4079C A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) -/* 02230 80A407A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02234 80A407A4 2405105E */ addiu $a1, $zero, 0x105E ## $a1 = 0000105E -/* 02238 80A407A8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 0223C 80A407AC 0C02003E */ jal func_800800F8 -/* 02240 80A407B0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 02244 80A407B4 10000044 */ beq $zero, $zero, .L80A408C8 -/* 02248 80A407B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A407BC: -/* 0224C 80A407BC 0C28F95C */ jal func_80A3E570 -/* 02250 80A407C0 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 02254 80A407C4 0C041B33 */ jal func_80106CCC -/* 02258 80A407C8 8FA4002C */ lw $a0, 0x002C($sp) -/* 0225C 80A407CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02260 80A407D0 0C2902DD */ jal func_80A40B74 -/* 02264 80A407D4 8FA5002C */ lw $a1, 0x002C($sp) -/* 02268 80A407D8 1000003B */ beq $zero, $zero, .L80A408C8 -/* 0226C 80A407DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A407E0: -/* 02270 80A407E0 54400014 */ bnel $v0, $zero, .L80A40834 -/* 02274 80A407E4 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -/* 02278 80A407E8 860B01E0 */ lh $t3, 0x01E0($s0) ## 000001E0 -/* 0227C 80A407EC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02280 80A407F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02284 80A407F4 1561000E */ bne $t3, $at, .L80A40830 -/* 02288 80A407F8 3C0580A4 */ lui $a1, %hi(func_80A40B74) ## $a1 = 80A40000 -/* 0228C 80A407FC 0C28F95C */ jal func_80A3E570 -/* 02290 80A40800 24A50B74 */ addiu $a1, $a1, %lo(func_80A40B74) ## $a1 = 80A40B74 -/* 02294 80A40804 8FAD002C */ lw $t5, 0x002C($sp) -/* 02298 80A40808 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0229C 80A4080C 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 022A0 80A40810 002D0821 */ addu $at, $at, $t5 -/* 022A4 80A40814 A02C04BF */ sb $t4, 0x04BF($at) ## 000104BF -/* 022A8 80A40818 8FAF002C */ lw $t7, 0x002C($sp) -/* 022AC 80A4081C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 022B0 80A40820 240E0036 */ addiu $t6, $zero, 0x0036 ## $t6 = 00000036 -/* 022B4 80A40824 002F0821 */ addu $at, $at, $t7 -/* 022B8 80A40828 10000026 */ beq $zero, $zero, .L80A408C4 -/* 022BC 80A4082C A02E03DC */ sb $t6, 0x03DC($at) ## 000103DC -.L80A40830: -/* 022C0 80A40830 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -.L80A40834: -/* 022C4 80A40834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022C8 80A40838 14400003 */ bne $v0, $zero, .L80A40848 -/* 022CC 80A4083C 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 022D0 80A40840 10000003 */ beq $zero, $zero, .L80A40850 -/* 022D4 80A40844 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A40848: -/* 022D8 80A40848 A6180212 */ sh $t8, 0x0212($s0) ## 00000212 -/* 022DC 80A4084C 86030212 */ lh $v1, 0x0212($s0) ## 00000212 -.L80A40850: -/* 022E0 80A40850 5460001D */ bnel $v1, $zero, .L80A408C8 -/* 022E4 80A40854 8FBF0024 */ lw $ra, 0x0024($sp) -/* 022E8 80A40858 0C28FC57 */ jal func_80A3F15C -/* 022EC 80A4085C 8FA5002C */ lw $a1, 0x002C($sp) -/* 022F0 80A40860 54400019 */ bnel $v0, $zero, .L80A408C8 -/* 022F4 80A40864 8FBF0024 */ lw $ra, 0x0024($sp) -/* 022F8 80A40868 0C28FC98 */ jal func_80A3F260 -/* 022FC 80A4086C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02300 80A40870 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 02304 80A40874 3C0180A4 */ lui $at, %hi(D_80A422BC) ## $at = 80A40000 -/* 02308 80A40878 C42422BC */ lwc1 $f4, %lo(D_80A422BC)($at) -/* 0230C 80A4087C 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02310 80A40880 332800F0 */ andi $t0, $t9, 0x00F0 ## $t0 = 00000000 -/* 02314 80A40884 15010005 */ bne $t0, $at, .L80A4089C -/* 02318 80A40888 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 0231C 80A4088C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02320 80A40890 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 02324 80A40894 10000005 */ beq $zero, $zero, .L80A408AC -/* 02328 80A40898 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -.L80A4089C: -/* 0232C 80A4089C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02330 80A408A0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 02334 80A408A4 00000000 */ nop -/* 02338 80A408A8 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -.L80A408AC: -/* 0233C 80A408AC 3C0580A4 */ lui $a1, %hi(func_80A408D8) ## $a1 = 80A40000 -/* 02340 80A408B0 24A508D8 */ addiu $a1, $a1, %lo(func_80A408D8) ## $a1 = 80A408D8 -/* 02344 80A408B4 46003202 */ mul.s $f8, $f6, $f0 -/* 02348 80A408B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0234C 80A408BC 0C28F95C */ jal func_80A3E570 -/* 02350 80A408C0 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80A408C4: -/* 02354 80A408C4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A408C8: -/* 02358 80A408C8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0235C 80A408CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02360 80A408D0 03E00008 */ jr $ra -/* 02364 80A408D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s deleted file mode 100644 index aa5a9560fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80A408D8 -/* 02368 80A408D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0236C 80A408DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02370 80A408E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 02374 80A408E4 AFA5002C */ sw $a1, 0x002C($sp) -/* 02378 80A408E8 C4860168 */ lwc1 $f6, 0x0168($a0) ## 00000168 -/* 0237C 80A408EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02380 80A408F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02384 80A408F4 46062032 */ c.eq.s $f4, $f6 -/* 02388 80A408F8 00000000 */ nop -/* 0238C 80A408FC 4503002C */ bc1tl .L80A409B0 -/* 02390 80A40900 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -/* 02394 80A40904 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02398 80A40908 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 0239C 80A4090C 31CF00F0 */ andi $t7, $t6, 0x00F0 ## $t7 = 00000000 -/* 023A0 80A40910 15E10004 */ bne $t7, $at, .L80A40924 -/* 023A4 80A40914 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 023A8 80A40918 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 023AC 80A4091C 10000004 */ beq $zero, $zero, .L80A40930 -/* 023B0 80A40920 00000000 */ nop -.L80A40924: -/* 023B4 80A40924 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 023B8 80A40928 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 023BC 80A4092C 00000000 */ nop -.L80A40930: -/* 023C0 80A40930 3C0180A4 */ lui $at, %hi(D_80A422C0) ## $at = 80A40000 -/* 023C4 80A40934 C42222C0 */ lwc1 $f2, %lo(D_80A422C0)($at) -/* 023C8 80A40938 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 023CC 80A4093C 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 023D0 80A40940 44061000 */ mfc1 $a2, $f2 -/* 023D4 80A40944 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 023D8 80A40948 46080282 */ mul.s $f10, $f0, $f8 -/* 023DC 80A4094C 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 023E0 80A40950 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 023E4 80A40954 44055000 */ mfc1 $a1, $f10 -/* 023E8 80A40958 0C01E0C4 */ jal Math_SmoothStepToF - -/* 023EC 80A4095C 00000000 */ nop -/* 023F0 80A40960 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 023F4 80A40964 C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 023F8 80A40968 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 023FC 80A4096C 44811000 */ mtc1 $at, $f2 ## $f2 = 12.00 -/* 02400 80A40970 46100000 */ add.s $f0, $f0, $f16 -/* 02404 80A40974 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02408 80A40978 4600103E */ c.le.s $f2, $f0 -/* 0240C 80A4097C 00000000 */ nop -/* 02410 80A40980 45030030 */ bc1tl .L80A40A44 -/* 02414 80A40984 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02418 80A40988 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 0241C 80A4098C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 02420 80A40990 E6020164 */ swc1 $f2, 0x0164($s0) ## 00000164 -/* 02424 80A40994 331900F0 */ andi $t9, $t8, 0x00F0 ## $t9 = 00000000 -/* 02428 80A40998 13210004 */ beq $t9, $at, .L80A409AC -/* 0242C 80A4099C E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 02430 80A409A0 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 02434 80A409A4 10000026 */ beq $zero, $zero, .L80A40A40 -/* 02438 80A409A8 A6080212 */ sh $t0, 0x0212($s0) ## 00000212 -.L80A409AC: -/* 0243C 80A409AC 86020212 */ lh $v0, 0x0212($s0) ## 00000212 -.L80A409B0: -/* 02440 80A409B0 3C0580A4 */ lui $a1, %hi(func_80A40494) ## $a1 = 80A40000 -/* 02444 80A409B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02448 80A409B8 14400003 */ bne $v0, $zero, .L80A409C8 -/* 0244C 80A409BC 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 02450 80A409C0 10000003 */ beq $zero, $zero, .L80A409D0 -/* 02454 80A409C4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A409C8: -/* 02458 80A409C8 A6090212 */ sh $t1, 0x0212($s0) ## 00000212 -/* 0245C 80A409CC 86030212 */ lh $v1, 0x0212($s0) ## 00000212 -.L80A409D0: -/* 02460 80A409D0 14600005 */ bne $v1, $zero, .L80A409E8 -/* 02464 80A409D4 24A50494 */ addiu $a1, $a1, %lo(func_80A40494) ## $a1 = 80A40494 -/* 02468 80A409D8 0C28F95C */ jal func_80A3E570 -/* 0246C 80A409DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02470 80A409E0 10000018 */ beq $zero, $zero, .L80A40A44 -/* 02474 80A409E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A409E8: -/* 02478 80A409E8 0C28FC57 */ jal func_80A3F15C -/* 0247C 80A409EC 8FA5002C */ lw $a1, 0x002C($sp) -/* 02480 80A409F0 50400014 */ beql $v0, $zero, .L80A40A44 -/* 02484 80A409F4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02488 80A409F8 0C28FC98 */ jal func_80A3F260 -/* 0248C 80A409FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02490 80A40A00 3C078013 */ lui $a3, %hi(D_801333E0) -/* 02494 80A40A04 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 02498 80A40A08 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0249C 80A40A0C 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 024A0 80A40A10 AFAA0014 */ sw $t2, 0x0014($sp) -/* 024A4 80A40A14 AFA70010 */ sw $a3, 0x0010($sp) -/* 024A8 80A40A18 240438FD */ addiu $a0, $zero, 0x38FD ## $a0 = 000038FD -/* 024AC 80A40A1C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 024B0 80A40A20 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 024B4 80A40A24 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 024B8 80A40A28 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 024BC 80A40A2C 3C0580A4 */ lui $a1, %hi(func_80A405CC) ## $a1 = 80A40000 -/* 024C0 80A40A30 24A505CC */ addiu $a1, $a1, %lo(func_80A405CC) ## $a1 = 80A405CC -/* 024C4 80A40A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C8 80A40A38 0C28F95C */ jal func_80A3E570 -/* 024CC 80A40A3C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -.L80A40A40: -/* 024D0 80A40A40 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A40A44: -/* 024D4 80A40A44 8FB00020 */ lw $s0, 0x0020($sp) -/* 024D8 80A40A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 024DC 80A40A4C 03E00008 */ jr $ra -/* 024E0 80A40A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s deleted file mode 100644 index c05a9027c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A40A54 -/* 024E4 80A40A54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024E8 80A40A58 AFB00018 */ sw $s0, 0x0018($sp) -/* 024EC 80A40A5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 024F0 80A40A60 AFBF001C */ sw $ra, 0x001C($sp) -/* 024F4 80A40A64 3C040601 */ lui $a0, %hi(D_06010590) ## $a0 = 06010000 -/* 024F8 80A40A68 AFA50024 */ sw $a1, 0x0024($sp) -/* 024FC 80A40A6C 0C028800 */ jal Animation_GetLastFrame - -/* 02500 80A40A70 24840590 */ addiu $a0, $a0, %lo(D_06010590) ## $a0 = 06010590 -/* 02504 80A40A74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 02508 80A40A78 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 0250C 80A40A7C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 02510 80A40A80 46803220 */ cvt.s.w $f8, $f6 -/* 02514 80A40A84 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 02518 80A40A88 46082283 */ div.s $f10, $f4, $f8 -/* 0251C 80A40A8C 460A8002 */ mul.s $f0, $f16, $f10 -/* 02520 80A40A90 4600048D */ trunc.w.s $f18, $f0 -/* 02524 80A40A94 44049000 */ mfc1 $a0, $f18 -/* 02528 80A40A98 00000000 */ nop -/* 0252C 80A40A9C 00042400 */ sll $a0, $a0, 16 -/* 02530 80A40AA0 0C01DE1C */ jal Math_SinS - ## sins? -/* 02534 80A40AA4 00042403 */ sra $a0, $a0, 16 -/* 02538 80A40AA8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0253C 80A40AAC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02540 80A40AB0 0C28FCC0 */ jal func_80A3F300 -/* 02544 80A40AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02548 80A40AB8 50400014 */ beql $v0, $zero, .L80A40B0C -/* 0254C 80A40ABC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02550 80A40AC0 860F0218 */ lh $t7, 0x0218($s0) ## 00000218 -/* 02554 80A40AC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02558 80A40AC8 55E00010 */ bnel $t7, $zero, .L80A40B0C -/* 0255C 80A40ACC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02560 80A40AD0 0C28FB78 */ jal func_80A3EDE0 -/* 02564 80A40AD4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02568 80A40AD8 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 -/* 0256C 80A40ADC 0C028800 */ jal Animation_GetLastFrame - -/* 02570 80A40AE0 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 -/* 02574 80A40AE4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 02578 80A40AE8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0257C 80A40AEC 3C0580A4 */ lui $a1, %hi(func_80A406E0) ## $a1 = 80A40000 -/* 02580 80A40AF0 46803120 */ cvt.s.w $f4, $f6 -/* 02584 80A40AF4 24A506E0 */ addiu $a1, $a1, %lo(func_80A406E0) ## $a1 = 80A406E0 -/* 02588 80A40AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0258C 80A40AFC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 02590 80A40B00 0C28F95C */ jal func_80A3E570 -/* 02594 80A40B04 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 02598 80A40B08 8FBF001C */ lw $ra, 0x001C($sp) -.L80A40B0C: -/* 0259C 80A40B0C 8FB00018 */ lw $s0, 0x0018($sp) -/* 025A0 80A40B10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025A4 80A40B14 03E00008 */ jr $ra -/* 025A8 80A40B18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s deleted file mode 100644 index 668351f5a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A40B1C -/* 025AC 80A40B1C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf14) -/* 025B0 80A40B20 95CEF574 */ lhu $t6, %lo(gSaveContext+0xf14)($t6) -/* 025B4 80A40B24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 025B8 80A40B28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 025BC 80A40B2C 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 025C0 80A40B30 11E0000A */ beq $t7, $zero, .L80A40B5C -/* 025C4 80A40B34 00000000 */ nop -/* 025C8 80A40B38 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 025CC 80A40B3C 0C28FB78 */ jal func_80A3EDE0 -/* 025D0 80A40B40 AFA40018 */ sw $a0, 0x0018($sp) -/* 025D4 80A40B44 3C0580A4 */ lui $a1, %hi(func_80A40A54) ## $a1 = 80A40000 -/* 025D8 80A40B48 8FA40018 */ lw $a0, 0x0018($sp) -/* 025DC 80A40B4C 0C28F95C */ jal func_80A3E570 -/* 025E0 80A40B50 24A50A54 */ addiu $a1, $a1, %lo(func_80A40A54) ## $a1 = 80A40A54 -/* 025E4 80A40B54 10000004 */ beq $zero, $zero, .L80A40B68 -/* 025E8 80A40B58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A40B5C: -/* 025EC 80A40B5C 0C2901B8 */ jal func_80A406E0 -/* 025F0 80A40B60 00000000 */ nop -/* 025F4 80A40B64 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A40B68: -/* 025F8 80A40B68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 025FC 80A40B6C 03E00008 */ jr $ra -/* 02600 80A40B70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s deleted file mode 100644 index a44f37a0f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80A40B74 -/* 02604 80A40B74 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02608 80A40B78 AFBF001C */ sw $ra, 0x001C($sp) -/* 0260C 80A40B7C AFA50034 */ sw $a1, 0x0034($sp) -/* 02610 80A40B80 0C00BD04 */ jal Actor_HasParent -/* 02614 80A40B84 AFA40030 */ sw $a0, 0x0030($sp) -/* 02618 80A40B88 10400009 */ beq $v0, $zero, .L80A40BB0 -/* 0261C 80A40B8C 8FA40030 */ lw $a0, 0x0030($sp) -/* 02620 80A40B90 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02624 80A40B94 3C0580A4 */ lui $a1, %hi(func_80A40C78) ## $a1 = 80A40000 -/* 02628 80A40B98 A48E01E0 */ sh $t6, 0x01E0($a0) ## 000001E0 -/* 0262C 80A40B9C AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 02630 80A40BA0 0C28F95C */ jal func_80A3E570 -/* 02634 80A40BA4 24A50C78 */ addiu $a1, $a1, %lo(func_80A40C78) ## $a1 = 80A40C78 -/* 02638 80A40BA8 10000030 */ beq $zero, $zero, .L80A40C6C -/* 0263C 80A40BAC 8FBF001C */ lw $ra, 0x001C($sp) -.L80A40BB0: -/* 02640 80A40BB0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 02644 80A40BB4 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02648 80A40BB8 A480020C */ sh $zero, 0x020C($a0) ## 0000020C -/* 0264C 80A40BBC 306300F0 */ andi $v1, $v1, 0x00F0 ## $v1 = 00000000 -/* 02650 80A40BC0 1461001A */ bne $v1, $at, .L80A40C2C -/* 02654 80A40BC4 3C0F8012 */ lui $t7, %hi(gItemSlots+0x2d) -/* 02658 80A40BC8 91EF7491 */ lbu $t7, %lo(gItemSlots+0x2d)($t7) -/* 0265C 80A40BCC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 02660 80A40BD0 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 02664 80A40BD4 004F1021 */ addu $v0, $v0, $t7 -/* 02668 80A40BD8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 0266C 80A40BDC 24180057 */ addiu $t8, $zero, 0x0057 ## $t8 = 00000057 -/* 02670 80A40BE0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02674 80A40BE4 14410009 */ bne $v0, $at, .L80A40C0C -/* 02678 80A40BE8 3C088012 */ lui $t0, %hi(gItemSlots+0x2d) -/* 0267C 80A40BEC AFB80024 */ sw $t8, 0x0024($sp) -/* 02680 80A40BF0 A499020C */ sh $t9, 0x020C($a0) ## 0000020C -/* 02684 80A40BF4 91087491 */ lbu $t0, %lo(gItemSlots+0x2d)($t0) -/* 02688 80A40BF8 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 0268C 80A40BFC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 02690 80A40C00 00481021 */ addu $v0, $v0, $t0 -/* 02694 80A40C04 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 02698 80A40C08 306300F0 */ andi $v1, $v1, 0x00F0 ## $v1 = 00000000 -.L80A40C0C: -/* 0269C 80A40C0C 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 026A0 80A40C10 14410002 */ bne $v0, $at, .L80A40C1C -/* 026A4 80A40C14 24090026 */ addiu $t1, $zero, 0x0026 ## $t1 = 00000026 -/* 026A8 80A40C18 AFA90024 */ sw $t1, 0x0024($sp) -.L80A40C1C: -/* 026AC 80A40C1C 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 026B0 80A40C20 14410002 */ bne $v0, $at, .L80A40C2C -/* 026B4 80A40C24 240A0023 */ addiu $t2, $zero, 0x0023 ## $t2 = 00000023 -/* 026B8 80A40C28 AFAA0024 */ sw $t2, 0x0024($sp) -.L80A40C2C: -/* 026BC 80A40C2C 14600003 */ bne $v1, $zero, .L80A40C3C -/* 026C0 80A40C30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 026C4 80A40C34 240B002C */ addiu $t3, $zero, 0x002C ## $t3 = 0000002C -/* 026C8 80A40C38 AFAB0024 */ sw $t3, 0x0024($sp) -.L80A40C3C: -/* 026CC 80A40C3C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 026D0 80A40C40 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 026D4 80A40C44 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 026D8 80A40C48 8FA50034 */ lw $a1, 0x0034($sp) -/* 026DC 80A40C4C 46000005 */ abs.s $f0, $f0 -/* 026E0 80A40C50 460C2080 */ add.s $f2, $f4, $f12 -/* 026E4 80A40C54 8FA60024 */ lw $a2, 0x0024($sp) -/* 026E8 80A40C58 460C0180 */ add.s $f6, $f0, $f12 -/* 026EC 80A40C5C 44071000 */ mfc1 $a3, $f2 -/* 026F0 80A40C60 0C00BD0D */ jal func_8002F434 -/* 026F4 80A40C64 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 026F8 80A40C68 8FBF001C */ lw $ra, 0x001C($sp) -.L80A40C6C: -/* 026FC 80A40C6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02700 80A40C70 03E00008 */ jr $ra -/* 02704 80A40C74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s deleted file mode 100644 index b47e7f3611..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80A40C78 -/* 02708 80A40C78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0270C 80A40C7C AFBF001C */ sw $ra, 0x001C($sp) -/* 02710 80A40C80 AFB00018 */ sw $s0, 0x0018($sp) -/* 02714 80A40C84 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 02718 80A40C88 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0271C 80A40C8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02720 80A40C90 15C1002D */ bne $t6, $at, .L80A40D48 -/* 02724 80A40C94 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02728 80A40C98 3C0580A4 */ lui $a1, %hi(func_80A406E0) ## $a1 = 80A40000 -/* 0272C 80A40C9C 24A506E0 */ addiu $a1, $a1, %lo(func_80A406E0) ## $a1 = 80A406E0 -/* 02730 80A40CA0 0C28F95C */ jal func_80A3E570 -/* 02734 80A40CA4 AFA60024 */ sw $a2, 0x0024($sp) -/* 02738 80A40CA8 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 0273C 80A40CAC 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 02740 80A40CB0 8FA60024 */ lw $a2, 0x0024($sp) -/* 02744 80A40CB4 31F800F0 */ andi $t8, $t7, 0x00F0 ## $t8 = 00000000 -/* 02748 80A40CB8 53010004 */ beql $t8, $at, .L80A40CCC -/* 0274C 80A40CBC 8619020C */ lh $t9, 0x020C($s0) ## 0000020C -/* 02750 80A40CC0 10000021 */ beq $zero, $zero, .L80A40D48 -/* 02754 80A40CC4 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 02758 80A40CC8 8619020C */ lh $t9, 0x020C($s0) ## 0000020C -.L80A40CCC: -/* 0275C 80A40CCC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02760 80A40CD0 3C018016 */ lui $at, %hi(gSaveContext+0x3e) -/* 02764 80A40CD4 13200004 */ beq $t9, $zero, .L80A40CE8 -/* 02768 80A40CD8 3C098012 */ lui $t1, %hi(gItemSlots+0x2d) -/* 0276C 80A40CDC A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 02770 80A40CE0 10000019 */ beq $zero, $zero, .L80A40D48 -/* 02774 80A40CE4 A028E69E */ sb $t0, %lo(gSaveContext+0x3e)($at) -.L80A40CE8: -/* 02778 80A40CE8 91297491 */ lbu $t1, %lo(gItemSlots+0x2d)($t1) -/* 0277C 80A40CEC 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 02780 80A40CF0 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 -/* 02784 80A40CF4 00491021 */ addu $v0, $v0, $t1 -/* 02788 80A40CF8 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 0278C 80A40CFC 240A3058 */ addiu $t2, $zero, 0x3058 ## $t2 = 00003058 -/* 02790 80A40D00 3145FFFF */ andi $a1, $t2, 0xFFFF ## $a1 = 00003058 -/* 02794 80A40D04 14410006 */ bne $v0, $at, .L80A40D20 -/* 02798 80A40D08 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0279C 80A40D0C 0C042DC8 */ jal func_8010B720 -/* 027A0 80A40D10 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -/* 027A4 80A40D14 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 027A8 80A40D18 1000000B */ beq $zero, $zero, .L80A40D48 -/* 027AC 80A40D1C A60B01E0 */ sh $t3, 0x01E0($s0) ## 000001E0 -.L80A40D20: -/* 027B0 80A40D20 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 027B4 80A40D24 14410008 */ bne $v0, $at, .L80A40D48 -/* 027B8 80A40D28 240C305C */ addiu $t4, $zero, 0x305C ## $t4 = 0000305C -/* 027BC 80A40D2C A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 027C0 80A40D30 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 027C4 80A40D34 0C042DC8 */ jal func_8010B720 -/* 027C8 80A40D38 3185FFFF */ andi $a1, $t4, 0xFFFF ## $a1 = 0000305C -/* 027CC 80A40D3C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 027D0 80A40D40 0C01DD76 */ jal func_800775D8 -/* 027D4 80A40D44 A60D01E0 */ sh $t5, 0x01E0($s0) ## 000001E0 -.L80A40D48: -/* 027D8 80A40D48 8FBF001C */ lw $ra, 0x001C($sp) -/* 027DC 80A40D4C 8FB00018 */ lw $s0, 0x0018($sp) -/* 027E0 80A40D50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 027E4 80A40D54 03E00008 */ jr $ra -/* 027E8 80A40D58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s deleted file mode 100644 index e1894f3347..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A40D5C -/* 027EC 80A40D5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027F0 80A40D60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027F4 80A40D64 8482021E */ lh $v0, 0x021E($a0) ## 0000021E -/* 027F8 80A40D68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 027FC 80A40D6C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 02800 80A40D70 14400003 */ bne $v0, $zero, .L80A40D80 -/* 02804 80A40D74 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02808 80A40D78 10000003 */ beq $zero, $zero, .L80A40D88 -/* 0280C 80A40D7C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A40D80: -/* 02810 80A40D80 A4CE021E */ sh $t6, 0x021E($a2) ## 0000021E -/* 02814 80A40D84 84C3021E */ lh $v1, 0x021E($a2) ## 0000021E -.L80A40D88: -/* 02818 80A40D88 1460000C */ bne $v1, $zero, .L80A40DBC -/* 0281C 80A40D8C 240F305A */ addiu $t7, $zero, 0x305A ## $t7 = 0000305A -/* 02820 80A40D90 A4CF010E */ sh $t7, 0x010E($a2) ## 0000010E -/* 02824 80A40D94 AFA60018 */ sw $a2, 0x0018($sp) -/* 02828 80A40D98 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0282C 80A40D9C 0C042DC8 */ jal func_8010B720 -/* 02830 80A40DA0 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 0000305A -/* 02834 80A40DA4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02838 80A40DA8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0283C 80A40DAC 3C0580A4 */ lui $a1, %hi(func_80A40DCC) ## $a1 = 80A40000 -/* 02840 80A40DB0 24A50DCC */ addiu $a1, $a1, %lo(func_80A40DCC) ## $a1 = 80A40DCC -/* 02844 80A40DB4 0C28F95C */ jal func_80A3E570 -/* 02848 80A40DB8 A49801E0 */ sh $t8, 0x01E0($a0) ## 000001E0 -.L80A40DBC: -/* 0284C 80A40DBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02850 80A40DC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02854 80A40DC4 03E00008 */ jr $ra -/* 02858 80A40DC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s deleted file mode 100644 index 0baac01a32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A40DCC -/* 0285C 80A40DCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02860 80A40DD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02864 80A40DD4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02868 80A40DD8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0286C 80A40DDC 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 02870 80A40DE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02874 80A40DE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02878 80A40DE8 55C10014 */ bnel $t6, $at, .L80A40E3C -/* 0287C 80A40DEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02880 80A40DF0 0C28FB78 */ jal func_80A3EDE0 -/* 02884 80A40DF4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02888 80A40DF8 3C040600 */ lui $a0, %hi(D_06004930) ## $a0 = 06000000 -/* 0288C 80A40DFC 0C028800 */ jal Animation_GetLastFrame - -/* 02890 80A40E00 24844930 */ addiu $a0, $a0, %lo(D_06004930) ## $a0 = 06004930 -/* 02894 80A40E04 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02898 80A40E08 00000000 */ nop -/* 0289C 80A40E0C 468021A0 */ cvt.s.w $f6, $f4 -/* 028A0 80A40E10 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 028A4 80A40E14 0C041B33 */ jal func_80106CCC -/* 028A8 80A40E18 8FA40024 */ lw $a0, 0x0024($sp) -/* 028AC 80A40E1C 3C0580A4 */ lui $a1, %hi(func_80A40B74) ## $a1 = 80A40000 -/* 028B0 80A40E20 24A50B74 */ addiu $a1, $a1, %lo(func_80A40B74) ## $a1 = 80A40B74 -/* 028B4 80A40E24 0C28F95C */ jal func_80A3E570 -/* 028B8 80A40E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028BC 80A40E2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028C0 80A40E30 0C2902DD */ jal func_80A40B74 -/* 028C4 80A40E34 8FA50024 */ lw $a1, 0x0024($sp) -/* 028C8 80A40E38 8FBF001C */ lw $ra, 0x001C($sp) -.L80A40E3C: -/* 028CC 80A40E3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 028D0 80A40E40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 028D4 80A40E44 03E00008 */ jr $ra -/* 028D8 80A40E48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s deleted file mode 100644 index 32508e7614..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80A40F58 -/* 029E8 80A40F58 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 029EC 80A40F5C 3C0F80A4 */ lui $t7, %hi(D_80A41BB4) ## $t7 = 80A40000 -/* 029F0 80A40F60 AFBF001C */ sw $ra, 0x001C($sp) -/* 029F4 80A40F64 AFB00018 */ sw $s0, 0x0018($sp) -/* 029F8 80A40F68 AFA40050 */ sw $a0, 0x0050($sp) -/* 029FC 80A40F6C AFA50054 */ sw $a1, 0x0054($sp) -/* 02A00 80A40F70 25EF1BB4 */ addiu $t7, $t7, %lo(D_80A41BB4) ## $t7 = 80A41BB4 -/* 02A04 80A40F74 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41BB4 -/* 02A08 80A40F78 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 02A0C 80A40F7C 8DF80004 */ lw $t8, 0x0004($t7) ## 80A41BB8 -/* 02A10 80A40F80 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 02A14 80A40F84 8DF90008 */ lw $t9, 0x0008($t7) ## 80A41BBC -/* 02A18 80A40F88 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 02A1C 80A40F8C 3C0680A4 */ lui $a2, %hi(D_80A41C00) ## $a2 = 80A40000 -/* 02A20 80A40F90 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 02A24 80A40F94 8FA80054 */ lw $t0, 0x0054($sp) -/* 02A28 80A40F98 24C61C00 */ addiu $a2, $a2, %lo(D_80A41C00) ## $a2 = 80A41C00 -/* 02A2C 80A40F9C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 02A30 80A40FA0 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 02A34 80A40FA4 24070910 */ addiu $a3, $zero, 0x0910 ## $a3 = 00000910 -/* 02A38 80A40FA8 0C031AB1 */ jal Graph_OpenDisps -/* 02A3C 80A40FAC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02A40 80A40FB0 0C034213 */ jal Matrix_Push -/* 02A44 80A40FB4 00000000 */ nop -/* 02A48 80A40FB8 8FA90054 */ lw $t1, 0x0054($sp) -/* 02A4C 80A40FBC 0C024F46 */ jal func_80093D18 -/* 02A50 80A40FC0 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 02A54 80A40FC4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02A58 80A40FC8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 02A5C 80A40FCC 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 02A60 80A40FD0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02A64 80A40FD4 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 02A68 80A40FD8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02A6C 80A40FDC 8FAC0054 */ lw $t4, 0x0054($sp) -/* 02A70 80A40FE0 3C0580A4 */ lui $a1, %hi(D_80A41C10) ## $a1 = 80A40000 -/* 02A74 80A40FE4 24A51C10 */ addiu $a1, $a1, %lo(D_80A41C10) ## $a1 = 80A41C10 -/* 02A78 80A40FE8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02A7C 80A40FEC 24060916 */ addiu $a2, $zero, 0x0916 ## $a2 = 00000916 -/* 02A80 80A40FF0 0C0346A2 */ jal Matrix_NewMtx -/* 02A84 80A40FF4 AFA2002C */ sw $v0, 0x002C($sp) -/* 02A88 80A40FF8 8FA3002C */ lw $v1, 0x002C($sp) -/* 02A8C 80A40FFC 3C0F0601 */ lui $t7, %hi(D_0600BD80) ## $t7 = 06010000 -/* 02A90 80A41000 25EFBD80 */ addiu $t7, $t7, %lo(D_0600BD80) ## $t7 = 0600BD80 -/* 02A94 80A41004 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02A98 80A41008 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02A9C 80A4100C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 02AA0 80A41010 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFF4 -/* 02AA4 80A41014 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02AA8 80A41018 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 02AAC 80A4101C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02AB0 80A41020 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02AB4 80A41024 8FA50050 */ lw $a1, 0x0050($sp) -/* 02AB8 80A41028 0C0346BD */ jal Matrix_MultVec3f -/* 02ABC 80A4102C 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 02AC0 80A41030 0C034221 */ jal Matrix_Pull -/* 02AC4 80A41034 00000000 */ nop -/* 02AC8 80A41038 8FB80054 */ lw $t8, 0x0054($sp) -/* 02ACC 80A4103C 3C0680A4 */ lui $a2, %hi(D_80A41C20) ## $a2 = 80A40000 -/* 02AD0 80A41040 24C61C20 */ addiu $a2, $a2, %lo(D_80A41C20) ## $a2 = 80A41C20 -/* 02AD4 80A41044 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 02AD8 80A41048 24070925 */ addiu $a3, $zero, 0x0925 ## $a3 = 00000925 -/* 02ADC 80A4104C 0C031AD5 */ jal Graph_CloseDisps -/* 02AE0 80A41050 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 02AE4 80A41054 8FBF001C */ lw $ra, 0x001C($sp) -/* 02AE8 80A41058 8FB00018 */ lw $s0, 0x0018($sp) -/* 02AEC 80A4105C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02AF0 80A41060 03E00008 */ jr $ra -/* 02AF4 80A41064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s deleted file mode 100644 index e133d4523b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80A41068 -/* 02AF8 80A41068 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02AFC 80A4106C 3C0F80A4 */ lui $t7, %hi(D_80A41BC0) ## $t7 = 80A40000 -/* 02B00 80A41070 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B04 80A41074 AFB10018 */ sw $s1, 0x0018($sp) -/* 02B08 80A41078 AFB00014 */ sw $s0, 0x0014($sp) -/* 02B0C 80A4107C AFA40050 */ sw $a0, 0x0050($sp) -/* 02B10 80A41080 25EF1BC0 */ addiu $t7, $t7, %lo(D_80A41BC0) ## $t7 = 80A41BC0 -/* 02B14 80A41084 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41BC0 -/* 02B18 80A41088 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 02B1C 80A4108C 8DF80004 */ lw $t8, 0x0004($t7) ## 80A41BC4 -/* 02B20 80A41090 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 02B24 80A41094 8DF90008 */ lw $t9, 0x0008($t7) ## 80A41BC8 -/* 02B28 80A41098 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02B2C 80A4109C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 02B30 80A410A0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 02B34 80A410A4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02B38 80A410A8 3C0680A4 */ lui $a2, %hi(D_80A41C30) ## $a2 = 80A40000 -/* 02B3C 80A410AC 24C61C30 */ addiu $a2, $a2, %lo(D_80A41C30) ## $a2 = 80A41C30 -/* 02B40 80A410B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 02B44 80A410B4 24070933 */ addiu $a3, $zero, 0x0933 ## $a3 = 00000933 -/* 02B48 80A410B8 0C031AB1 */ jal Graph_OpenDisps -/* 02B4C 80A410BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02B50 80A410C0 0C034213 */ jal Matrix_Push -/* 02B54 80A410C4 00000000 */ nop -/* 02B58 80A410C8 0C024F46 */ jal func_80093D18 -/* 02B5C 80A410CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02B60 80A410D0 8FA20050 */ lw $v0, 0x0050($sp) -/* 02B64 80A410D4 8E28009C */ lw $t0, 0x009C($s1) ## 0000009C -/* 02B68 80A410D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02B6C 80A410DC C4440068 */ lwc1 $f4, 0x0068($v0) ## 00000068 -/* 02B70 80A410E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02B74 80A410E4 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 02B78 80A410E8 4600218D */ trunc.w.s $f6, $f4 -/* 02B7C 80A410EC 440A3000 */ mfc1 $t2, $f6 -/* 02B80 80A410F0 00000000 */ nop -/* 02B84 80A410F4 000A5C00 */ sll $t3, $t2, 16 -/* 02B88 80A410F8 000B6403 */ sra $t4, $t3, 16 -/* 02B8C 80A410FC 000C6880 */ sll $t5, $t4, 2 -/* 02B90 80A41100 01AC6823 */ subu $t5, $t5, $t4 -/* 02B94 80A41104 000D6880 */ sll $t5, $t5, 2 -/* 02B98 80A41108 01AC6823 */ subu $t5, $t5, $t4 -/* 02B9C 80A4110C 000D6900 */ sll $t5, $t5, 4 -/* 02BA0 80A41110 01AC6823 */ subu $t5, $t5, $t4 -/* 02BA4 80A41114 000D68C0 */ sll $t5, $t5, 3 -/* 02BA8 80A41118 010D0019 */ multu $t0, $t5 -/* 02BAC 80A4111C 00002012 */ mflo $a0 -/* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 -/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateRPY -/* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 -/* 02BBC 80A4112C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02BC0 80A41130 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 02BC4 80A41134 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 02BC8 80A41138 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02BCC 80A4113C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 02BD0 80A41140 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02BD4 80A41144 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02BD8 80A41148 3C0580A4 */ lui $a1, %hi(D_80A41C40) ## $a1 = 80A40000 -/* 02BDC 80A4114C 24A51C40 */ addiu $a1, $a1, %lo(D_80A41C40) ## $a1 = 80A41C40 -/* 02BE0 80A41150 24060940 */ addiu $a2, $zero, 0x0940 ## $a2 = 00000940 -/* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx -/* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) -/* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) -/* 02BF0 80A41160 3C090601 */ lui $t1, %hi(D_0600C140) ## $t1 = 06010000 -/* 02BF4 80A41164 2529C140 */ addiu $t1, $t1, %lo(D_0600C140) ## $t1 = 0600C140 -/* 02BF8 80A41168 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02BFC 80A4116C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02C00 80A41170 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 02C04 80A41174 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFF4 -/* 02C08 80A41178 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02C0C 80A4117C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 02C10 80A41180 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02C14 80A41184 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02C18 80A41188 8FA50050 */ lw $a1, 0x0050($sp) -/* 02C1C 80A4118C 0C0346BD */ jal Matrix_MultVec3f -/* 02C20 80A41190 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 02C24 80A41194 0C034221 */ jal Matrix_Pull -/* 02C28 80A41198 00000000 */ nop -/* 02C2C 80A4119C 3C0680A4 */ lui $a2, %hi(D_80A41C50) ## $a2 = 80A40000 -/* 02C30 80A411A0 24C61C50 */ addiu $a2, $a2, %lo(D_80A41C50) ## $a2 = 80A41C50 -/* 02C34 80A411A4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 02C38 80A411A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C3C 80A411AC 0C031AD5 */ jal Graph_CloseDisps -/* 02C40 80A411B0 2407094F */ addiu $a3, $zero, 0x094F ## $a3 = 0000094F -/* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) -/* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02C50 80A411C0 03E00008 */ jr $ra -/* 02C54 80A411C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s deleted file mode 100644 index b16222030c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel func_80A411C8 -/* 02C58 80A411C8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02C5C 80A411CC AFB00018 */ sw $s0, 0x0018($sp) -/* 02C60 80A411D0 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02C64 80A411D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02C68 80A411D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C6C 80A411DC AFA40038 */ sw $a0, 0x0038($sp) -/* 02C70 80A411E0 AFA60040 */ sw $a2, 0x0040($sp) -/* 02C74 80A411E4 14A1002D */ bne $a1, $at, .L80A4129C -/* 02C78 80A411E8 AFA70044 */ sw $a3, 0x0044($sp) -/* 02C7C 80A411EC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 02C80 80A411F0 3C01452F */ lui $at, 0x452F ## $at = 452F0000 -/* 02C84 80A411F4 44816000 */ mtc1 $at, $f12 ## $f12 = 2800.00 -/* 02C88 80A411F8 44067000 */ mfc1 $a2, $f14 -/* 02C8C 80A411FC 0C034261 */ jal Matrix_Translate -/* 02C90 80A41200 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02C94 80A41204 8FAF004C */ lw $t7, 0x004C($sp) -/* 02C98 80A41208 27AE002C */ addiu $t6, $sp, 0x002C ## $t6 = FFFFFFF4 -/* 02C9C 80A4120C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 02CA0 80A41210 89F901E8 */ lwl $t9, 0x01E8($t7) ## 000001E8 -/* 02CA4 80A41214 99F901EB */ lwr $t9, 0x01EB($t7) ## 000001EB -/* 02CA8 80A41218 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 02CAC 80A4121C 3C0180A4 */ lui $at, %hi(D_80A422C4) ## $at = 80A40000 -/* 02CB0 80A41220 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 02CB4 80A41224 95F901EC */ lhu $t9, 0x01EC($t7) ## 000001EC -/* 02CB8 80A41228 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02CBC 80A4122C A5D90004 */ sh $t9, 0x0004($t6) ## FFFFFFF8 -/* 02CC0 80A41230 87A8002E */ lh $t0, 0x002E($sp) -/* 02CC4 80A41234 C43022C4 */ lwc1 $f16, %lo(D_80A422C4)($at) -/* 02CC8 80A41238 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 02CCC 80A4123C 00000000 */ nop -/* 02CD0 80A41240 468021A0 */ cvt.s.w $f6, $f4 -/* 02CD4 80A41244 46083283 */ div.s $f10, $f6, $f8 -/* 02CD8 80A41248 46105302 */ mul.s $f12, $f10, $f16 -/* 02CDC 80A4124C 0C0342DC */ jal Matrix_RotateX -/* 02CE0 80A41250 00000000 */ nop -/* 02CE4 80A41254 87A9002C */ lh $t1, 0x002C($sp) -/* 02CE8 80A41258 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 02CEC 80A4125C 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 02CF0 80A41260 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 02CF4 80A41264 3C0180A4 */ lui $at, %hi(D_80A422C8) ## $at = 80A40000 -/* 02CF8 80A41268 C42A22C8 */ lwc1 $f10, %lo(D_80A422C8)($at) -/* 02CFC 80A4126C 46809120 */ cvt.s.w $f4, $f18 -/* 02D00 80A41270 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02D04 80A41274 46062203 */ div.s $f8, $f4, $f6 -/* 02D08 80A41278 460A4302 */ mul.s $f12, $f8, $f10 -/* 02D0C 80A4127C 0C0343B5 */ jal Matrix_RotateZ -/* 02D10 80A41280 00000000 */ nop -/* 02D14 80A41284 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 02D18 80A41288 3C01C52F */ lui $at, 0xC52F ## $at = C52F0000 -/* 02D1C 80A4128C 44816000 */ mtc1 $at, $f12 ## $f12 = -2800.00 -/* 02D20 80A41290 44067000 */ mfc1 $a2, $f14 -/* 02D24 80A41294 0C034261 */ jal Matrix_Translate -/* 02D28 80A41298 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A4129C: -/* 02D2C 80A4129C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02D30 80A412A0 16010020 */ bne $s0, $at, .L80A41324 -/* 02D34 80A412A4 8FAB004C */ lw $t3, 0x004C($sp) -/* 02D38 80A412A8 896D01EE */ lwl $t5, 0x01EE($t3) ## 000001EE -/* 02D3C 80A412AC 996D01F1 */ lwr $t5, 0x01F1($t3) ## 000001F1 -/* 02D40 80A412B0 27AA002C */ addiu $t2, $sp, 0x002C ## $t2 = FFFFFFF4 -/* 02D44 80A412B4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 02D48 80A412B8 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFF4 -/* 02D4C 80A412BC 956D01F2 */ lhu $t5, 0x01F2($t3) ## 000001F2 -/* 02D50 80A412C0 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 02D54 80A412C4 3C0180A4 */ lui $at, %hi(D_80A422CC) ## $at = 80A40000 -/* 02D58 80A412C8 A54D0004 */ sh $t5, 0x0004($t2) ## FFFFFFF8 -/* 02D5C 80A412CC 87AE002E */ lh $t6, 0x002E($sp) -/* 02D60 80A412D0 C42822CC */ lwc1 $f8, %lo(D_80A422CC)($at) -/* 02D64 80A412D4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02D68 80A412D8 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 02D6C 80A412DC 00000000 */ nop -/* 02D70 80A412E0 468084A0 */ cvt.s.w $f18, $f16 -/* 02D74 80A412E4 46049183 */ div.s $f6, $f18, $f4 -/* 02D78 80A412E8 46083302 */ mul.s $f12, $f6, $f8 -/* 02D7C 80A412EC 0C034348 */ jal Matrix_RotateY -/* 02D80 80A412F0 00000000 */ nop -/* 02D84 80A412F4 87AF002C */ lh $t7, 0x002C($sp) -/* 02D88 80A412F8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 02D8C 80A412FC 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 02D90 80A41300 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 02D94 80A41304 3C0180A4 */ lui $at, %hi(D_80A422D0) ## $at = 80A40000 -/* 02D98 80A41308 C42622D0 */ lwc1 $f6, %lo(D_80A422D0)($at) -/* 02D9C 80A4130C 46805420 */ cvt.s.w $f16, $f10 -/* 02DA0 80A41310 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02DA4 80A41314 46128103 */ div.s $f4, $f16, $f18 -/* 02DA8 80A41318 46062302 */ mul.s $f12, $f4, $f6 -/* 02DAC 80A4131C 0C0342DC */ jal Matrix_RotateX -/* 02DB0 80A41320 00000000 */ nop -.L80A41324: -/* 02DB4 80A41324 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02DB8 80A41328 12010005 */ beq $s0, $at, .L80A41340 -/* 02DBC 80A4132C 8FB8004C */ lw $t8, 0x004C($sp) -/* 02DC0 80A41330 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 02DC4 80A41334 12010002 */ beq $s0, $at, .L80A41340 -/* 02DC8 80A41338 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02DCC 80A4133C 16010022 */ bne $s0, $at, .L80A413C8 -.L80A41340: -/* 02DD0 80A41340 0010C840 */ sll $t9, $s0, 1 -/* 02DD4 80A41344 03191821 */ addu $v1, $t8, $t9 -/* 02DD8 80A41348 84640220 */ lh $a0, 0x0220($v1) ## 00000220 -/* 02DDC 80A4134C 0C01DE1C */ jal Math_SinS - ## sins? -/* 02DE0 80A41350 AFA30024 */ sw $v1, 0x0024($sp) -/* 02DE4 80A41354 8FA20048 */ lw $v0, 0x0048($sp) -/* 02DE8 80A41358 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 02DEC 80A4135C 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 02DF0 80A41360 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 02DF4 80A41364 8FA30024 */ lw $v1, 0x0024($sp) -/* 02DF8 80A41368 46100482 */ mul.s $f18, $f0, $f16 -/* 02DFC 80A4136C 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 02E00 80A41370 00000000 */ nop -/* 02E04 80A41374 468042A0 */ cvt.s.w $f10, $f8 -/* 02E08 80A41378 46125100 */ add.s $f4, $f10, $f18 -/* 02E0C 80A4137C 4600218D */ trunc.w.s $f6, $f4 -/* 02E10 80A41380 440A3000 */ mfc1 $t2, $f6 -/* 02E14 80A41384 00000000 */ nop -/* 02E18 80A41388 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 02E1C 80A4138C 0C01DE0D */ jal Math_CosS - ## coss? -/* 02E20 80A41390 84640244 */ lh $a0, 0x0244($v1) ## 00000244 -/* 02E24 80A41394 8FA20048 */ lw $v0, 0x0048($sp) -/* 02E28 80A41398 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 02E2C 80A4139C 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 02E30 80A413A0 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 02E34 80A413A4 460A0482 */ mul.s $f18, $f0, $f10 -/* 02E38 80A413A8 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 02E3C 80A413AC 00000000 */ nop -/* 02E40 80A413B0 46804420 */ cvt.s.w $f16, $f8 -/* 02E44 80A413B4 46128100 */ add.s $f4, $f16, $f18 -/* 02E48 80A413B8 4600218D */ trunc.w.s $f6, $f4 -/* 02E4C 80A413BC 440D3000 */ mfc1 $t5, $f6 -/* 02E50 80A413C0 00000000 */ nop -/* 02E54 80A413C4 A44D0004 */ sh $t5, 0x0004($v0) ## 00000004 -.L80A413C8: -/* 02E58 80A413C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E5C 80A413CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02E60 80A413D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02E64 80A413D4 03E00008 */ jr $ra -/* 02E68 80A413D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s deleted file mode 100644 index 437c877cf5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A413DC -/* 02E6C 80A413DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02E70 80A413E0 3C0E80A4 */ lui $t6, %hi(D_80A41BCC) ## $t6 = 80A40000 -/* 02E74 80A413E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E78 80A413E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 02E7C 80A413EC AFA60030 */ sw $a2, 0x0030($sp) -/* 02E80 80A413F0 AFA70034 */ sw $a3, 0x0034($sp) -/* 02E84 80A413F4 25CE1BCC */ addiu $t6, $t6, %lo(D_80A41BCC) ## $t6 = 80A41BCC -/* 02E88 80A413F8 8DD80000 */ lw $t8, 0x0000($t6) ## 80A41BCC -/* 02E8C 80A413FC 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 02E90 80A41400 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02E94 80A41404 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 02E98 80A41408 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A41BD0 -/* 02E9C 80A4140C AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 02EA0 80A41410 8DD80008 */ lw $t8, 0x0008($t6) ## 80A41BD4 -/* 02EA4 80A41414 14A10004 */ bne $a1, $at, .L80A41428 -/* 02EA8 80A41418 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 02EAC 80A4141C 8FA50038 */ lw $a1, 0x0038($sp) -/* 02EB0 80A41420 0C0346BD */ jal Matrix_MultVec3f -/* 02EB4 80A41424 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80A41428: -/* 02EB8 80A41428 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02EBC 80A4142C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02EC0 80A41430 03E00008 */ jr $ra -/* 02EC4 80A41434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s deleted file mode 100644 index 8a0502b6db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A41604 -/* 03094 80A41604 24820268 */ addiu $v0, $a0, 0x0268 ## $v0 = 00000268 -/* 03098 80A41608 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 0309C 80A4160C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A41610: -/* 030A0 80A41610 904E0000 */ lbu $t6, 0x0000($v0) ## 00000268 -/* 030A4 80A41614 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 030A8 80A41618 00031C00 */ sll $v1, $v1, 16 -/* 030AC 80A4161C 108E001D */ beq $a0, $t6, .L80A41694 -/* 030B0 80A41620 00031C03 */ sra $v1, $v1, 16 -/* 030B4 80A41624 C7A40014 */ lwc1 $f4, 0x0014($sp) -/* 030B8 80A41628 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 030BC 80A4162C E4440004 */ swc1 $f4, 0x0004($v0) ## 0000026C -/* 030C0 80A41630 C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 030C4 80A41634 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000270 -/* 030C8 80A41638 93B80013 */ lbu $t8, 0x0013($sp) -/* 030CC 80A4163C A0590000 */ sb $t9, 0x0000($v0) ## 00000268 -/* 030D0 80A41640 A0580001 */ sb $t8, 0x0001($v0) ## 00000269 -/* 030D4 80A41644 A0580002 */ sb $t8, 0x0002($v0) ## 0000026A -/* 030D8 80A41648 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 030DC 80A4164C AC490014 */ sw $t1, 0x0014($v0) ## 0000027C -/* 030E0 80A41650 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 030E4 80A41654 AC480018 */ sw $t0, 0x0018($v0) ## 00000280 -/* 030E8 80A41658 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 -/* 030EC 80A4165C AC49001C */ sw $t1, 0x001C($v0) ## 00000284 -/* 030F0 80A41660 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 030F4 80A41664 AC4B002C */ sw $t3, 0x002C($v0) ## 00000294 -/* 030F8 80A41668 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 030FC 80A4166C AC4A0030 */ sw $t2, 0x0030($v0) ## 00000298 -/* 03100 80A41670 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 03104 80A41674 AC4B0034 */ sw $t3, 0x0034($v0) ## 0000029C -/* 03108 80A41678 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 -/* 0310C 80A4167C AC4D0020 */ sw $t5, 0x0020($v0) ## 00000288 -/* 03110 80A41680 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -/* 03114 80A41684 AC4C0024 */ sw $t4, 0x0024($v0) ## 0000028C -/* 03118 80A41688 8CCD0008 */ lw $t5, 0x0008($a2) ## 00000008 -/* 0311C 80A4168C 03E00008 */ jr $ra -/* 03120 80A41690 AC4D0028 */ sw $t5, 0x0028($v0) ## 00000290 -.L80A41694: -/* 03124 80A41694 28610014 */ slti $at, $v1, 0x0014 -/* 03128 80A41698 1420FFDD */ bne $at, $zero, .L80A41610 -/* 0312C 80A4169C 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 000002A0 -/* 03130 80A416A0 03E00008 */ jr $ra -/* 03134 80A416A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s deleted file mode 100644 index 9eabe5b3a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80A416A8 -/* 03138 80A416A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0313C 80A416AC F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 03140 80A416B0 3C0180A4 */ lui $at, %hi(D_80A422D4) ## $at = 80A40000 -/* 03144 80A416B4 C43622D4 */ lwc1 $f22, %lo(D_80A422D4)($at) -/* 03148 80A416B8 AFB10028 */ sw $s1, 0x0028($sp) -/* 0314C 80A416BC AFB00024 */ sw $s0, 0x0024($sp) -/* 03150 80A416C0 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 03154 80A416C4 3C0180A4 */ lui $at, %hi(D_80A422D8) ## $at = 80A40000 -/* 03158 80A416C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0315C 80A416CC 24900268 */ addiu $s0, $a0, 0x0268 ## $s0 = 00000268 -/* 03160 80A416D0 C43422D8 */ lwc1 $f20, %lo(D_80A422D8)($at) -/* 03164 80A416D4 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -.L80A416D8: -/* 03168 80A416D8 920E0000 */ lbu $t6, 0x0000($s0) ## 00000268 -/* 0316C 80A416DC 51C00029 */ beql $t6, $zero, .L80A41784 -/* 03170 80A416E0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 03174 80A416E4 920F0001 */ lbu $t7, 0x0001($s0) ## 00000269 -/* 03178 80A416E8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0317C 80A416EC 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 000000FF -/* 03180 80A416F0 17200002 */ bne $t9, $zero, .L80A416FC -/* 03184 80A416F4 A2180001 */ sb $t8, 0x0001($s0) ## 00000269 -/* 03188 80A416F8 A2000000 */ sb $zero, 0x0000($s0) ## 00000268 -.L80A416FC: -/* 0318C 80A416FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03190 80A41700 00000000 */ nop -/* 03194 80A41704 46140102 */ mul.s $f4, $f0, $f20 -/* 03198 80A41708 46162181 */ sub.s $f6, $f4, $f22 -/* 0319C 80A4170C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 031A0 80A41710 E606002C */ swc1 $f6, 0x002C($s0) ## 00000294 -/* 031A4 80A41714 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000288 -/* 031A8 80A41718 C60A0014 */ lwc1 $f10, 0x0014($s0) ## 0000027C -/* 031AC 80A4171C 46140202 */ mul.s $f8, $f0, $f20 -/* 031B0 80A41720 C60E0024 */ lwc1 $f14, 0x0024($s0) ## 0000028C -/* 031B4 80A41724 460C5480 */ add.s $f18, $f10, $f12 -/* 031B8 80A41728 C6040018 */ lwc1 $f4, 0x0018($s0) ## 00000280 -/* 031BC 80A4172C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000290 -/* 031C0 80A41730 E6120014 */ swc1 $f18, 0x0014($s0) ## 0000027C -/* 031C4 80A41734 C612002C */ lwc1 $f18, 0x002C($s0) ## 00000294 -/* 031C8 80A41738 460E2180 */ add.s $f6, $f4, $f14 -/* 031CC 80A4173C 46164081 */ sub.s $f2, $f8, $f22 -/* 031D0 80A41740 C608001C */ lwc1 $f8, 0x001C($s0) ## 00000284 -/* 031D4 80A41744 E6060018 */ swc1 $f6, 0x0018($s0) ## 00000280 -/* 031D8 80A41748 46126100 */ add.s $f4, $f12, $f18 -/* 031DC 80A4174C C6060030 */ lwc1 $f6, 0x0030($s0) ## 00000298 -/* 031E0 80A41750 C6120004 */ lwc1 $f18, 0x0004($s0) ## 0000026C -/* 031E4 80A41754 46104280 */ add.s $f10, $f8, $f16 -/* 031E8 80A41758 E6040020 */ swc1 $f4, 0x0020($s0) ## 00000288 -/* 031EC 80A4175C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000270 -/* 031F0 80A41760 46067200 */ add.s $f8, $f14, $f6 -/* 031F4 80A41764 E60A001C */ swc1 $f10, 0x001C($s0) ## 00000284 -/* 031F8 80A41768 E6020034 */ swc1 $f2, 0x0034($s0) ## 0000029C -/* 031FC 80A4176C 46028280 */ add.s $f10, $f16, $f2 -/* 03200 80A41770 E6080024 */ swc1 $f8, 0x0024($s0) ## 0000028C -/* 03204 80A41774 46049180 */ add.s $f6, $f18, $f4 -/* 03208 80A41778 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000290 -/* 0320C 80A4177C E6060004 */ swc1 $f6, 0x0004($s0) ## 0000026C -/* 03210 80A41780 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -.L80A41784: -/* 03214 80A41784 00118C00 */ sll $s1, $s1, 16 -/* 03218 80A41788 00118C03 */ sra $s1, $s1, 16 -/* 0321C 80A4178C 2A210014 */ slti $at, $s1, 0x0014 -/* 03220 80A41790 1420FFD1 */ bne $at, $zero, .L80A416D8 -/* 03224 80A41794 26100038 */ addiu $s0, $s0, 0x0038 ## $s0 = 000002A0 -/* 03228 80A41798 8FBF002C */ lw $ra, 0x002C($sp) -/* 0322C 80A4179C D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 03230 80A417A0 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 03234 80A417A4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03238 80A417A8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0323C 80A417AC 03E00008 */ jr $ra -/* 03240 80A417B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s deleted file mode 100644 index f27c77009a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ /dev/null @@ -1,211 +0,0 @@ -glabel func_80A417B4 -/* 03244 80A417B4 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 03248 80A417B8 AFBE0050 */ sw $s8, 0x0050($sp) -/* 0324C 80A417BC 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 03250 80A417C0 AFBF0054 */ sw $ra, 0x0054($sp) -/* 03254 80A417C4 AFB7004C */ sw $s7, 0x004C($sp) -/* 03258 80A417C8 AFB60048 */ sw $s6, 0x0048($sp) -/* 0325C 80A417CC AFB50044 */ sw $s5, 0x0044($sp) -/* 03260 80A417D0 AFB40040 */ sw $s4, 0x0040($sp) -/* 03264 80A417D4 AFB3003C */ sw $s3, 0x003C($sp) -/* 03268 80A417D8 AFB20038 */ sw $s2, 0x0038($sp) -/* 0326C 80A417DC AFB10034 */ sw $s1, 0x0034($sp) -/* 03270 80A417E0 AFB00030 */ sw $s0, 0x0030($sp) -/* 03274 80A417E4 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 03278 80A417E8 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 0327C 80A417EC F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 03280 80A417F0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03284 80A417F4 24920268 */ addiu $s2, $a0, 0x0268 ## $s2 = 00000268 -/* 03288 80A417F8 3C0680A4 */ lui $a2, %hi(D_80A41C80) ## $a2 = 80A40000 -/* 0328C 80A417FC 24C61C80 */ addiu $a2, $a2, %lo(D_80A41C80) ## $a2 = 80A41C80 -/* 03290 80A41800 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 03294 80A41804 24070A42 */ addiu $a3, $zero, 0x0A42 ## $a3 = 00000A42 -/* 03298 80A41808 0C031AB1 */ jal Graph_OpenDisps -/* 0329C 80A4180C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 032A0 80A41810 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 032A4 80A41814 0C024F61 */ jal func_80093D84 -/* 032A8 80A41818 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 032AC 80A4181C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 032B0 80A41820 4481C000 */ mtc1 $at, $f24 ## $f24 = 8.00 -/* 032B4 80A41824 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 032B8 80A41828 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 032BC 80A4182C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 032C0 80A41830 4481A000 */ mtc1 $at, $f20 ## $f20 = 255.00 -/* 032C4 80A41834 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 032C8 80A41838 3C16DE00 */ lui $s6, 0xDE00 ## $s6 = DE000000 -.L80A4183C: -/* 032CC 80A4183C 924E0000 */ lbu $t6, 0x0000($s2) ## 00000268 -/* 032D0 80A41840 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 032D4 80A41844 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 032D8 80A41848 11C0008A */ beq $t6, $zero, .L80A41A74 -/* 032DC 80A4184C 03C19821 */ addu $s3, $s8, $at -/* 032E0 80A41850 3C150601 */ lui $s5, %hi(D_0600FD50) ## $s5 = 06010000 -/* 032E4 80A41854 16E00014 */ bne $s7, $zero, .L80A418A8 -/* 032E8 80A41858 26B5FD50 */ addiu $s5, $s5, %lo(D_0600FD50) ## $s5 = 0600FD50 -/* 032EC 80A4185C 3C110601 */ lui $s1, %hi(D_0600FD40) ## $s1 = 06010000 -/* 032F0 80A41860 2631FD40 */ addiu $s1, $s1, %lo(D_0600FD40) ## $s1 = 0600FD40 -/* 032F4 80A41864 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 032F8 80A41868 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 032FC 80A4186C 0C024DDD */ jal Gfx_CallSetupDL -/* 03300 80A41870 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 -/* 03304 80A41874 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 03308 80A41878 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0330C 80A4187C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 03310 80A41880 AC510004 */ sw $s1, 0x0004($v0) ## 00000004 -/* 03314 80A41884 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -/* 03318 80A41888 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0331C 80A4188C 3C08643C */ lui $t0, 0x643C ## $t0 = 643C0000 -/* 03320 80A41890 35081400 */ ori $t0, $t0, 0x1400 ## $t0 = 643C1400 -/* 03324 80A41894 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03328 80A41898 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0332C 80A4189C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 03330 80A418A0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03334 80A418A4 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L80A418A8: -/* 03338 80A418A8 92490001 */ lbu $t1, 0x0001($s2) ## 00000269 -/* 0333C 80A418AC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03340 80A418B0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 03344 80A418B4 05210004 */ bgez $t1, .L80A418C8 -/* 03348 80A418B8 468021A0 */ cvt.s.w $f6, $f4 -/* 0334C 80A418BC 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 03350 80A418C0 00000000 */ nop -/* 03354 80A418C4 46083180 */ add.s $f6, $f6, $f8 -.L80A418C8: -/* 03358 80A418C8 924A0002 */ lbu $t2, 0x0002($s2) ## 0000026A -/* 0335C 80A418CC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03360 80A418D0 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 03364 80A418D4 05410004 */ bgez $t2, .L80A418E8 -/* 03368 80A418D8 46805420 */ cvt.s.w $f16, $f10 -/* 0336C 80A418DC 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 03370 80A418E0 00000000 */ nop -/* 03374 80A418E4 46128400 */ add.s $f16, $f16, $f18 -.L80A418E8: -/* 03378 80A418E8 4610A103 */ div.s $f4, $f20, $f16 -/* 0337C 80A418EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03380 80A418F0 3C01AA82 */ lui $at, 0xAA82 ## $at = AA820000 -/* 03384 80A418F4 34215A00 */ ori $at, $at, 0x5A00 ## $at = AA825A00 -/* 03388 80A418F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0338C 80A418FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03390 80A41900 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 03394 80A41904 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03398 80A41908 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 0339C 80A4190C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 033A0 80A41910 46043202 */ mul.s $f8, $f6, $f4 -/* 033A4 80A41914 4600428D */ trunc.w.s $f10, $f8 -/* 033A8 80A41918 44045000 */ mfc1 $a0, $f10 -/* 033AC 80A4191C 00000000 */ nop -/* 033B0 80A41920 00042400 */ sll $a0, $a0, 16 -/* 033B4 80A41924 00042403 */ sra $a0, $a0, 16 -/* 033B8 80A41928 308E00FF */ andi $t6, $a0, 0x00FF ## $t6 = 00000000 -/* 033BC 80A4192C 01C17825 */ or $t7, $t6, $at ## $t7 = AA825A00 -/* 033C0 80A41930 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 033C4 80A41934 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 033C8 80A41938 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 033CC 80A4193C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 033D0 80A41940 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 033D4 80A41944 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 033D8 80A41948 8E46001C */ lw $a2, 0x001C($s2) ## 00000284 -/* 033DC 80A4194C C64E0018 */ lwc1 $f14, 0x0018($s2) ## 00000280 -/* 033E0 80A41950 0C034261 */ jal Matrix_Translate -/* 033E4 80A41954 C64C0014 */ lwc1 $f12, 0x0014($s2) ## 0000027C -/* 033E8 80A41958 0C0347F5 */ jal func_800D1FD4 -/* 033EC 80A4195C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 033F0 80A41960 C64C0004 */ lwc1 $f12, 0x0004($s2) ## 0000026C -/* 033F4 80A41964 4406B000 */ mfc1 $a2, $f22 -/* 033F8 80A41968 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 033FC 80A4196C 0C0342A3 */ jal Matrix_Scale -/* 03400 80A41970 46006386 */ mov.s $f14, $f12 -/* 03404 80A41974 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03408 80A41978 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 0340C 80A4197C 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 03410 80A41980 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03414 80A41984 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 03418 80A41988 3C0580A4 */ lui $a1, %hi(D_80A41C90) ## $a1 = 80A40000 -/* 0341C 80A4198C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 03420 80A41990 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 03424 80A41994 24A51C90 */ addiu $a1, $a1, %lo(D_80A41C90) ## $a1 = 80A41C90 -/* 03428 80A41998 24060A68 */ addiu $a2, $zero, 0x0A68 ## $a2 = 00000A68 -/* 0342C 80A4199C 0C0346A2 */ jal Matrix_NewMtx -/* 03430 80A419A0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 03434 80A419A4 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 03438 80A419A8 924A0001 */ lbu $t2, 0x0001($s2) ## 00000269 -/* 0343C 80A419AC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03440 80A419B0 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 03444 80A419B4 05410004 */ bgez $t2, .L80A419C8 -/* 03448 80A419B8 46809420 */ cvt.s.w $f16, $f18 -/* 0344C 80A419BC 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 03450 80A419C0 00000000 */ nop -/* 03454 80A419C4 46068400 */ add.s $f16, $f16, $f6 -.L80A419C8: -/* 03458 80A419C8 924B0002 */ lbu $t3, 0x0002($s2) ## 0000026A -/* 0345C 80A419CC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03460 80A419D0 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 03464 80A419D4 05610004 */ bgez $t3, .L80A419E8 -/* 03468 80A419D8 46802220 */ cvt.s.w $f8, $f4 -/* 0346C 80A419DC 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 03470 80A419E0 00000000 */ nop -/* 03474 80A419E4 460A4200 */ add.s $f8, $f8, $f10 -.L80A419E8: -/* 03478 80A419E8 4608C483 */ div.s $f18, $f24, $f8 -/* 0347C 80A419EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03480 80A419F0 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 03484 80A419F4 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 03488 80A419F8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0348C 80A419FC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 03490 80A41A00 3C0480A4 */ lui $a0, %hi(D_80A41BD8) ## $a0 = 80A40000 -/* 03494 80A41A04 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03498 80A41A08 3C0A8016 */ lui $t2, %hi(gSegments) -/* 0349C 80A41A0C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 034A0 80A41A10 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 034A4 80A41A14 46128182 */ mul.s $f6, $f16, $f18 -/* 034A8 80A41A18 4600310D */ trunc.w.s $f4, $f6 -/* 034AC 80A41A1C 44052000 */ mfc1 $a1, $f4 -/* 034B0 80A41A20 00000000 */ nop -/* 034B4 80A41A24 00052C00 */ sll $a1, $a1, 16 -/* 034B8 80A41A28 00052C03 */ sra $a1, $a1, 16 -/* 034BC 80A41A2C 00057880 */ sll $t7, $a1, 2 -/* 034C0 80A41A30 008F2021 */ addu $a0, $a0, $t7 -/* 034C4 80A41A34 8C841BD8 */ lw $a0, %lo(D_80A41BD8)($a0) -/* 034C8 80A41A38 0004C900 */ sll $t9, $a0, 4 -/* 034CC 80A41A3C 00194702 */ srl $t0, $t9, 28 -/* 034D0 80A41A40 00084880 */ sll $t1, $t0, 2 -/* 034D4 80A41A44 01495021 */ addu $t2, $t2, $t1 -/* 034D8 80A41A48 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 034DC 80A41A4C 0081C024 */ and $t8, $a0, $at -/* 034E0 80A41A50 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 034E4 80A41A54 030A5821 */ addu $t3, $t8, $t2 -/* 034E8 80A41A58 01616021 */ addu $t4, $t3, $at -/* 034EC 80A41A5C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 034F0 80A41A60 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 034F4 80A41A64 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 034F8 80A41A68 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 034FC 80A41A6C AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 03500 80A41A70 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80A41A74: -/* 03504 80A41A74 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 03508 80A41A78 0014A400 */ sll $s4, $s4, 16 -/* 0350C 80A41A7C 0014A403 */ sra $s4, $s4, 16 -/* 03510 80A41A80 2A810014 */ slti $at, $s4, 0x0014 -/* 03514 80A41A84 1420FF6D */ bne $at, $zero, .L80A4183C -/* 03518 80A41A88 26520038 */ addiu $s2, $s2, 0x0038 ## $s2 = 000002A0 -/* 0351C 80A41A8C 3C0680A4 */ lui $a2, %hi(D_80A41CA0) ## $a2 = 80A40000 -/* 03520 80A41A90 24C61CA0 */ addiu $a2, $a2, %lo(D_80A41CA0) ## $a2 = 80A41CA0 -/* 03524 80A41A94 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 03528 80A41A98 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0352C 80A41A9C 0C031AD5 */ jal Graph_CloseDisps -/* 03530 80A41AA0 24070A76 */ addiu $a3, $zero, 0x0A76 ## $a3 = 00000A76 -/* 03534 80A41AA4 8FBF0054 */ lw $ra, 0x0054($sp) -/* 03538 80A41AA8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0353C 80A41AAC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 03540 80A41AB0 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 03544 80A41AB4 8FB00030 */ lw $s0, 0x0030($sp) -/* 03548 80A41AB8 8FB10034 */ lw $s1, 0x0034($sp) -/* 0354C 80A41ABC 8FB20038 */ lw $s2, 0x0038($sp) -/* 03550 80A41AC0 8FB3003C */ lw $s3, 0x003C($sp) -/* 03554 80A41AC4 8FB40040 */ lw $s4, 0x0040($sp) -/* 03558 80A41AC8 8FB50044 */ lw $s5, 0x0044($sp) -/* 0355C 80A41ACC 8FB60048 */ lw $s6, 0x0048($sp) -/* 03560 80A41AD0 8FB7004C */ lw $s7, 0x004C($sp) -/* 03564 80A41AD4 8FBE0050 */ lw $s8, 0x0050($sp) -/* 03568 80A41AD8 03E00008 */ jr $ra -/* 0356C 80A41ADC 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s deleted file mode 100644 index f7563d3ab3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnGo2_Destroy -/* 03C30 80A46960 AFA40000 */ sw $a0, 0x0000($sp) -/* 03C34 80A46964 03E00008 */ jr $ra -/* 03C38 80A46968 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s deleted file mode 100644 index 9a5b865c40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ /dev/null @@ -1,159 +0,0 @@ -.rdata -glabel D_80A4862C - .asciz "../z_en_go2.c" - .balign 4 - -glabel D_80A4863C - .asciz "../z_en_go2.c" - .balign 4 - -.text -glabel EnGo2_Draw -/* 05160 80A47E90 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 05164 80A47E94 3C0F80A5 */ lui $t7, %hi(D_80A48578) ## $t7 = 80A50000 -/* 05168 80A47E98 AFBF002C */ sw $ra, 0x002C($sp) -/* 0516C 80A47E9C AFB00028 */ sw $s0, 0x0028($sp) -/* 05170 80A47EA0 AFA50074 */ sw $a1, 0x0074($sp) -/* 05174 80A47EA4 25EF8578 */ addiu $t7, $t7, %lo(D_80A48578) ## $t7 = 80A48578 -/* 05178 80A47EA8 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48578 -/* 0517C 80A47EAC 8DF80004 */ lw $t8, 0x0004($t7) ## 80A4857C -/* 05180 80A47EB0 27AE005C */ addiu $t6, $sp, 0x005C ## $t6 = FFFFFFEC -/* 05184 80A47EB4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 05188 80A47EB8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 0518C 80A47EBC 8DF8000C */ lw $t8, 0x000C($t7) ## 80A48584 -/* 05190 80A47EC0 8DF90008 */ lw $t9, 0x0008($t7) ## 80A48580 -/* 05194 80A47EC4 3C0A80A5 */ lui $t2, %hi(D_80A48588) ## $t2 = 80A50000 -/* 05198 80A47EC8 254A8588 */ addiu $t2, $t2, %lo(D_80A48588) ## $t2 = 80A48588 -/* 0519C 80A47ECC ADD8000C */ sw $t8, 0x000C($t6) ## FFFFFFF8 -/* 051A0 80A47ED0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 051A4 80A47ED4 8D4B0004 */ lw $t3, 0x0004($t2) ## 80A4858C -/* 051A8 80A47ED8 8D4C0000 */ lw $t4, 0x0000($t2) ## 80A48588 -/* 051AC 80A47EDC 27A90054 */ addiu $t1, $sp, 0x0054 ## $t1 = FFFFFFE4 -/* 051B0 80A47EE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051B4 80A47EE4 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFE8 -/* 051B8 80A47EE8 0C290B75 */ jal func_80A42DD4 -/* 051BC 80A47EEC AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFE4 -/* 051C0 80A47EF0 0C034213 */ jal Matrix_Push -/* 051C4 80A47EF4 00000000 */ nop -/* 051C8 80A47EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051CC 80A47EFC 0C290BB8 */ jal func_80A42EE0 -/* 051D0 80A47F00 8FA50074 */ lw $a1, 0x0074($sp) -/* 051D4 80A47F04 0C034221 */ jal Matrix_Pull -/* 051D8 80A47F08 00000000 */ nop -/* 051DC 80A47F0C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 051E0 80A47F10 3C0D80A4 */ lui $t5, %hi(func_80A4696C) ## $t5 = 80A40000 -/* 051E4 80A47F14 25AD696C */ addiu $t5, $t5, %lo(func_80A4696C) ## $t5 = 80A4696C -/* 051E8 80A47F18 15A20011 */ bne $t5, $v0, .L80A47F60 -/* 051EC 80A47F1C 3C0E80A4 */ lui $t6, %hi(func_80A46E54) ## $t6 = 80A40000 -/* 051F0 80A47F20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 051F4 80A47F24 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 051F8 80A47F28 46040032 */ c.eq.s $f0, $f4 -/* 051FC 80A47F2C 00000000 */ nop -/* 05200 80A47F30 4500000B */ bc1f .L80A47F60 -/* 05204 80A47F34 00000000 */ nop -/* 05208 80A47F38 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 0520C 80A47F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05210 80A47F40 46060032 */ c.eq.s $f0, $f6 -/* 05214 80A47F44 00000000 */ nop -/* 05218 80A47F48 45000005 */ bc1f .L80A47F60 -/* 0521C 80A47F4C 00000000 */ nop -/* 05220 80A47F50 0C291E6C */ jal func_80A479B0 -/* 05224 80A47F54 8FA50074 */ lw $a1, 0x0074($sp) -/* 05228 80A47F58 10000059 */ beq $zero, $zero, .L80A480C0 -/* 0522C 80A47F5C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A47F60: -/* 05230 80A47F60 25CE6E54 */ addiu $t6, $t6, %lo(func_80A46E54) ## $t6 = 00006E54 -/* 05234 80A47F64 11C20007 */ beq $t6, $v0, .L80A47F84 -/* 05238 80A47F68 3C0F80A4 */ lui $t7, %hi(func_80A47024) ## $t7 = 80A40000 -/* 0523C 80A47F6C 25EF7024 */ addiu $t7, $t7, %lo(func_80A47024) ## $t7 = 80A47024 -/* 05240 80A47F70 11E20004 */ beq $t7, $v0, .L80A47F84 -/* 05244 80A47F74 3C1880A4 */ lui $t8, %hi(func_80A46DBC) ## $t8 = 80A40000 -/* 05248 80A47F78 27186DBC */ addiu $t8, $t8, %lo(func_80A46DBC) ## $t8 = 80A46DBC -/* 0524C 80A47F7C 17020006 */ bne $t8, $v0, .L80A47F98 -/* 05250 80A47F80 8FB90074 */ lw $t9, 0x0074($sp) -.L80A47F84: -/* 05254 80A47F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05258 80A47F88 0C291EAC */ jal func_80A47AB0 -/* 0525C 80A47F8C 8FA50074 */ lw $a1, 0x0074($sp) -/* 05260 80A47F90 1000004B */ beq $zero, $zero, .L80A480C0 -/* 05264 80A47F94 8FBF002C */ lw $ra, 0x002C($sp) -.L80A47F98: -/* 05268 80A47F98 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 0526C 80A47F9C 3C0680A5 */ lui $a2, %hi(D_80A4862C) ## $a2 = 80A50000 -/* 05270 80A47FA0 24C6862C */ addiu $a2, $a2, %lo(D_80A4862C) ## $a2 = 80A4862C -/* 05274 80A47FA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 -/* 05278 80A47FA8 24070BF7 */ addiu $a3, $zero, 0x0BF7 ## $a3 = 00000BF7 -/* 0527C 80A47FAC 0C031AB1 */ jal Graph_OpenDisps -/* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) -/* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) -/* 05288 80A47FB8 0C024F46 */ jal func_80093D18 -/* 0528C 80A47FBC 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 05290 80A47FC0 8FA80050 */ lw $t0, 0x0050($sp) -/* 05294 80A47FC4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 05298 80A47FC8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 0529C 80A47FCC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 052A0 80A47FD0 3C068016 */ lui $a2, %hi(gSegments) -/* 052A4 80A47FD4 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 052A8 80A47FD8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 052AC 80A47FDC AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 052B0 80A47FE0 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 052B4 80A47FE4 920C0214 */ lbu $t4, 0x0214($s0) ## 00000214 -/* 052B8 80A47FE8 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 052BC 80A47FEC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 052C0 80A47FF0 000C6880 */ sll $t5, $t4, 2 -/* 052C4 80A47FF4 03AD2021 */ addu $a0, $sp, $t5 -/* 052C8 80A47FF8 8C84005C */ lw $a0, 0x005C($a0) ## 0000005C -/* 052CC 80A47FFC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 052D0 80A48000 00047900 */ sll $t7, $a0, 4 -/* 052D4 80A48004 000FC702 */ srl $t8, $t7, 28 -/* 052D8 80A48008 0018C880 */ sll $t9, $t8, 2 -/* 052DC 80A4800C 00D94821 */ addu $t1, $a2, $t9 -/* 052E0 80A48010 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 052E4 80A48014 00857024 */ and $t6, $a0, $a1 -/* 052E8 80A48018 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 052EC 80A4801C 01CA5821 */ addu $t3, $t6, $t2 -/* 052F0 80A48020 01676021 */ addu $t4, $t3, $a3 -/* 052F4 80A48024 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 052F8 80A48028 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 052FC 80A4802C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 05300 80A48030 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 05304 80A48034 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 05308 80A48038 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 0530C 80A4803C 92180215 */ lbu $t8, 0x0215($s0) ## 00000215 -/* 05310 80A48040 0018C880 */ sll $t9, $t8, 2 -/* 05314 80A48044 03B92021 */ addu $a0, $sp, $t9 -/* 05318 80A48048 8C840054 */ lw $a0, 0x0054($a0) ## 00000054 -/* 0531C 80A4804C 3C1980A4 */ lui $t9, %hi(func_80A47C20) ## $t9 = 80A40000 -/* 05320 80A48050 27397C20 */ addiu $t9, $t9, %lo(func_80A47C20) ## $t9 = 80A47C20 -/* 05324 80A48054 00047100 */ sll $t6, $a0, 4 -/* 05328 80A48058 000E5702 */ srl $t2, $t6, 28 -/* 0532C 80A4805C 000A5880 */ sll $t3, $t2, 2 -/* 05330 80A48060 00CB6021 */ addu $t4, $a2, $t3 -/* 05334 80A48064 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 05338 80A48068 00854824 */ and $t1, $a0, $a1 -/* 0533C 80A4806C 3C0E80A4 */ lui $t6, %hi(func_80A47E34) ## $t6 = 80A40000 -/* 05340 80A48070 012D7821 */ addu $t7, $t1, $t5 -/* 05344 80A48074 01E7C021 */ addu $t8, $t7, $a3 -/* 05348 80A48078 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 0534C 80A4807C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05350 80A48080 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05354 80A48084 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05358 80A48088 25CE7E34 */ addiu $t6, $t6, %lo(func_80A47E34) ## $t6 = 80A47E34 -/* 0535C 80A4808C AFAE0014 */ sw $t6, 0x0014($sp) -/* 05360 80A48090 AFB00018 */ sw $s0, 0x0018($sp) -/* 05364 80A48094 AFB90010 */ sw $t9, 0x0010($sp) -/* 05368 80A48098 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 0536C 80A4809C 8FA40074 */ lw $a0, 0x0074($sp) -/* 05370 80A480A0 8FAA0074 */ lw $t2, 0x0074($sp) -/* 05374 80A480A4 3C0680A5 */ lui $a2, %hi(D_80A4863C) ## $a2 = 80A50000 -/* 05378 80A480A8 24C6863C */ addiu $a2, $a2, %lo(D_80A4863C) ## $a2 = 80A4863C -/* 0537C 80A480AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 -/* 05380 80A480B0 24070C09 */ addiu $a3, $zero, 0x0C09 ## $a3 = 00000C09 -/* 05384 80A480B4 0C031AD5 */ jal Graph_CloseDisps -/* 05388 80A480B8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A480C0: -/* 05390 80A480C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 05394 80A480C4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 05398 80A480C8 03E00008 */ jr $ra -/* 0539C 80A480CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s deleted file mode 100644 index 19d6a85ac7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ /dev/null @@ -1,359 +0,0 @@ -.late_rodata -glabel jtbl_80A4872C - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - .word L80A46594 - -glabel jtbl_80A48758 - .word L80A46810 - .word L80A46704 - .word L80A4689C - .word L80A46860 - .word L80A468FC - .word L80A46810 - .word L80A46940 - .word L80A46678 - .word L80A46678 - .word L80A46678 - .word L80A46678 - .word L80A46678 - .word L80A46940 - .word L80A466BC - -glabel D_80A48790 - .float 0.6 - -glabel D_80A48794 - .float 0.6 - -.text -glabel EnGo2_Init -/* 0379C 80A464CC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 037A0 80A464D0 AFB00028 */ sw $s0, 0x0028($sp) -/* 037A4 80A464D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) -/* 037B0 80A464E0 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 037B4 80A464E4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 037B8 80A464E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 037BC 80A464EC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 037C0 80A464F0 0C00AC78 */ jal ActorShape_Init - -/* 037C4 80A464F4 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 -/* 037C8 80A464F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 037CC 80A464FC 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 -/* 037D0 80A46500 260E04B8 */ addiu $t6, $s0, 0x04B8 ## $t6 = 000004B8 -/* 037D4 80A46504 260F0524 */ addiu $t7, $s0, 0x0524 ## $t7 = 00000524 -/* 037D8 80A46508 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) -/* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) -/* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) -/* 037E8 80A46518 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 -/* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) -/* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) -/* 037F4 80A46524 0C0291BE */ jal SkelAnime_InitFlex -/* 037F8 80A46528 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 037FC 80A4652C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) -/* 03804 80A46534 0C0170D9 */ jal Collider_InitCylinder - -/* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) -/* 0380C 80A4653C 3C0780A5 */ lui $a3, %hi(D_80A48114) ## $a3 = 80A50000 -/* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) -/* 03814 80A46544 24E78114 */ addiu $a3, $a3, %lo(D_80A48114) ## $a3 = 80A48114 -/* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) -/* 0381C 80A4654C 0C01712B */ jal Collider_SetCylinder - -/* 03820 80A46550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 03824 80A46554 3C0680A5 */ lui $a2, %hi(D_80A48140) ## $a2 = 80A50000 -/* 03828 80A46558 24C68140 */ addiu $a2, $a2, %lo(D_80A48140) ## $a2 = 80A48140 -/* 0382C 80A4655C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 03830 80A46560 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 03834 80A46564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03838 80A46568 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0383C 80A4656C 3328001F */ andi $t0, $t9, 0x001F ## $t0 = 00000000 -/* 03840 80A46570 2509FFFD */ addiu $t1, $t0, 0xFFFD ## $t1 = FFFFFFFD -/* 03844 80A46574 2D21000B */ sltiu $at, $t1, 0x000B -/* 03848 80A46578 1020000D */ beq $at, $zero, .L80A465B0 -/* 0384C 80A4657C 00094880 */ sll $t1, $t1, 2 -/* 03850 80A46580 3C0180A5 */ lui $at, %hi(jtbl_80A4872C) ## $at = 80A50000 -/* 03854 80A46584 00290821 */ addu $at, $at, $t1 -/* 03858 80A46588 8C29872C */ lw $t1, %lo(jtbl_80A4872C)($at) -/* 0385C 80A4658C 01200008 */ jr $t1 -/* 03860 80A46590 00000000 */ nop -glabel L80A46594 -/* 03864 80A46594 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 03868 80A46598 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0386C 80A4659C 01415824 */ and $t3, $t2, $at -/* 03870 80A465A0 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 03874 80A465A4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 03878 80A465A8 01616824 */ and $t5, $t3, $at -/* 0387C 80A465AC AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L80A465B0: -/* 03880 80A465B0 0C291223 */ jal func_80A4488C -/* 03884 80A465B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03888 80A465B8 0C291231 */ jal func_80A448C4 -/* 0388C 80A465BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03890 80A465C0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 03894 80A465C4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 03898 80A465C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0389C 80A465CC 0C00D3B0 */ jal func_80034EC0 -/* 038A0 80A465D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 038A4 80A465D4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 038A8 80A465D8 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 -/* 038AC 80A465DC 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 038B0 80A465E0 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 038B4 80A465E4 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 038B8 80A465E8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 038BC 80A465EC 05C10005 */ bgez $t6, .L80A46604 -/* 038C0 80A465F0 46803220 */ cvt.s.w $f8, $f6 -/* 038C4 80A465F4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 038C8 80A465F8 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 038CC 80A465FC 00000000 */ nop -/* 038D0 80A46600 460A4200 */ add.s $f8, $f8, $f10 -.L80A46604: -/* 038D4 80A46604 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 038D8 80A46608 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 -/* 038DC 80A4660C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 038E0 80A46610 30A503E0 */ andi $a1, $a1, 0x03E0 ## $a1 = 00000000 -/* 038E4 80A46614 00052943 */ sra $a1, $a1, 5 -/* 038E8 80A46618 E6080220 */ swc1 $f8, 0x0220($s0) ## 00000220 -/* 038EC 80A4661C A200020E */ sb $zero, 0x020E($s0) ## 0000020E -/* 038F0 80A46620 A200020F */ sb $zero, 0x020F($s0) ## 0000020F -/* 038F4 80A46624 A2000211 */ sb $zero, 0x0211($s0) ## 00000211 -/* 038F8 80A46628 A2000212 */ sb $zero, 0x0212($s0) ## 00000212 -/* 038FC 80A4662C A2000210 */ sb $zero, 0x0210($s0) ## 00000210 -/* 03900 80A46630 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 03904 80A46634 00052C00 */ sll $a1, $a1, 16 -/* 03908 80A46638 A20F0216 */ sb $t7, 0x0216($s0) ## 00000216 -/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 -/* 03914 80A46644 0C023938 */ jal Path_GetByIndex -/* 03918 80A46648 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F -/* 0391C 80A4664C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 03920 80A46650 AE020208 */ sw $v0, 0x0208($s0) ## 00000208 -/* 03924 80A46654 3066001F */ andi $a2, $v1, 0x001F ## $a2 = 00000000 -/* 03928 80A46658 2CC1000E */ sltiu $at, $a2, 0x000E -/* 0392C 80A4665C 102000B8 */ beq $at, $zero, .L80A46940 -/* 03930 80A46660 0006C880 */ sll $t9, $a2, 2 -/* 03934 80A46664 3C0180A5 */ lui $at, %hi(jtbl_80A48758) ## $at = 80A50000 -/* 03938 80A46668 00390821 */ addu $at, $at, $t9 -/* 0393C 80A4666C 8C398758 */ lw $t9, %lo(jtbl_80A48758)($at) -/* 03940 80A46670 03200008 */ jr $t9 -/* 03944 80A46674 00000000 */ nop -glabel L80A46678 -/* 03948 80A46678 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0394C 80A4667C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03950 80A46680 3C088012 */ lui $t0, %hi(gBitFlags+4) -/* 03954 80A46684 8D087124 */ lw $t0, %lo(gBitFlags+4)($t0) -/* 03958 80A46688 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 -/* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 -/* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC -/* 03964 80A46694 00000000 */ nop -/* 03968 80A46698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0396C 80A4669C 15600003 */ bne $t3, $zero, .L80A466AC -/* 03970 80A466A0 00000000 */ nop -/* 03974 80A466A4 0C00B55C */ jal Actor_Kill - -/* 03978 80A466A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A466AC: -/* 0397C 80A466AC 3C0C80A4 */ lui $t4, %hi(func_80A4696C) ## $t4 = 80A40000 -/* 03980 80A466B0 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C -/* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C -/* 03988 80A466B8 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -glabel L80A466BC -/* 0398C 80A466BC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03990 80A466C0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03994 80A466C4 8C6D0004 */ lw $t5, 0x0004($v1) ## 8015E664 -/* 03998 80A466C8 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) -/* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 -/* 039A0 80A466D0 00000000 */ nop -/* 039A4 80A466D4 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) -/* 039A8 80A466D8 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 -/* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 -/* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 -/* 039B4 80A466E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A466E8: -/* 039B8 80A466E8 0C00B55C */ jal Actor_Kill - -/* 039BC 80A466EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C0 80A466F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A466F4: -/* 039C4 80A466F4 0C291750 */ jal func_80A45D40 -/* 039C8 80A466F8 8FA50044 */ lw $a1, 0x0044($sp) -/* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 -/* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A46704 -/* 039D4 80A46704 3C038016 */ lui $v1, %hi(gSaveContext) -/* 039D8 80A46708 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 039DC 80A4670C 94620F18 */ lhu $v0, 0x0F18($v1) ## 8015F578 -/* 039E0 80A46710 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 039E4 80A46714 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 -/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC -/* 039EC 80A4671C 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 -/* 039F0 80A46720 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 039F4 80A46724 0C023983 */ jal Path_CopyLastPoint -/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) -/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) -/* 03A00 80A46730 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03A04 80A46734 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03A08 80A46738 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 03A0C 80A4673C 3C028012 */ lui $v0, %hi(gBitFlags+4) -/* 03A10 80A46740 3C1880A4 */ lui $t8, %hi(func_80A4696C) ## $t8 = 80A40000 -/* 03A14 80A46744 AE090008 */ sw $t1, 0x0008($s0) ## 00000008 -/* 03A18 80A46748 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 03A1C 80A4674C 3C0C8012 */ lui $t4, %hi(gEquipShifts+2) -/* 03A20 80A46750 2718696C */ addiu $t8, $t8, %lo(func_80A4696C) ## $t8 = 80A4696C -/* 03A24 80A46754 AE08000C */ sw $t0, 0x000C($s0) ## 0000000C -/* 03A28 80A46758 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 -/* 03A2C 80A4675C AE090010 */ sw $t1, 0x0010($s0) ## 00000010 -/* 03A30 80A46760 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 03A34 80A46764 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) -/* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 -/* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 -/* 03A40 80A46770 00000000 */ nop -/* 03A44 80A46774 918C71F2 */ lbu $t4, %lo(gEquipShifts+2)($t4) -/* 03A48 80A46778 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC -/* 03A4C 80A4677C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 -/* 03A54 80A46784 01AE7824 */ and $t7, $t5, $t6 -/* 03A58 80A46788 11E00005 */ beq $t7, $zero, .L80A467A0 -/* 03A5C 80A4678C 00000000 */ nop -/* 03A60 80A46790 0C291750 */ jal func_80A45D40 -/* 03A64 80A46794 8FA50044 */ lw $a1, 0x0044($sp) -/* 03A68 80A46798 1000006D */ beq $zero, $zero, .L80A46950 -/* 03A6C 80A4679C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A467A0: -/* 03A70 80A467A0 1000006A */ beq $zero, $zero, .L80A4694C -/* 03A74 80A467A4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 03A78 80A467A8 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 -.L80A467AC: -/* 03A7C 80A467AC A4790F18 */ sh $t9, 0x0F18($v1) ## 00000F18 -/* 03A80 80A467B0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 03A84 80A467B4 3C0B80A5 */ lui $t3, %hi(D_80A48174) ## $t3 = 80A50000 -/* 03A88 80A467B8 3C0180A5 */ lui $at, %hi(D_80A48790) ## $at = 80A50000 -/* 03A8C 80A467BC 3109001F */ andi $t1, $t0, 0x001F ## $t1 = 00000000 -/* 03A90 80A467C0 00095080 */ sll $t2, $t1, 2 -/* 03A94 80A467C4 01495021 */ addu $t2, $t2, $t1 -/* 03A98 80A467C8 000A5040 */ sll $t2, $t2, 1 -/* 03A9C 80A467CC 016A5821 */ addu $t3, $t3, $t2 -/* 03AA0 80A467D0 856B8174 */ lh $t3, %lo(D_80A48174)($t3) -/* 03AA4 80A467D4 C4248790 */ lwc1 $f4, %lo(D_80A48790)($at) -/* 03AA8 80A467D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03AAC 80A467DC 448B8000 */ mtc1 $t3, $f16 ## $f16 = -0.00 -/* 03AB0 80A467E0 00000000 */ nop -/* 03AB4 80A467E4 468084A0 */ cvt.s.w $f18, $f16 -/* 03AB8 80A467E8 46049182 */ mul.s $f6, $f18, $f4 -/* 03ABC 80A467EC 4600328D */ trunc.w.s $f10, $f6 -/* 03AC0 80A467F0 440D5000 */ mfc1 $t5, $f10 -/* 03AC4 80A467F4 00000000 */ nop -/* 03AC8 80A467F8 A60D01FE */ sh $t5, 0x01FE($s0) ## 000001FE -/* 03ACC 80A467FC 0C291769 */ jal func_80A45DA4 -/* 03AD0 80A46800 8FA50044 */ lw $a1, 0x0044($sp) -/* 03AD4 80A46804 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03AD8 80A46808 10000050 */ beq $zero, $zero, .L80A4694C -/* 03ADC 80A4680C A20E020F */ sb $t6, 0x020F($s0) ## 0000020F -glabel L80A46810 -/* 03AE0 80A46810 00067880 */ sll $t7, $a2, 2 -/* 03AE4 80A46814 01E67821 */ addu $t7, $t7, $a2 -/* 03AE8 80A46818 000F7840 */ sll $t7, $t7, 1 -/* 03AEC 80A4681C 3C1880A5 */ lui $t8, %hi(D_80A48174) ## $t8 = 80A50000 -/* 03AF0 80A46820 030FC021 */ addu $t8, $t8, $t7 -/* 03AF4 80A46824 87188174 */ lh $t8, %lo(D_80A48174)($t8) -/* 03AF8 80A46828 3C0180A5 */ lui $at, %hi(D_80A48794) ## $at = 80A50000 -/* 03AFC 80A4682C C4328794 */ lwc1 $f18, %lo(D_80A48794)($at) -/* 03B00 80A46830 44984000 */ mtc1 $t8, $f8 ## $f8 = -0.00 -/* 03B04 80A46834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B08 80A46838 46804420 */ cvt.s.w $f16, $f8 -/* 03B0C 80A4683C 46128102 */ mul.s $f4, $f16, $f18 -/* 03B10 80A46840 4600218D */ trunc.w.s $f6, $f4 -/* 03B14 80A46844 44083000 */ mfc1 $t0, $f6 -/* 03B18 80A46848 00000000 */ nop -/* 03B1C 80A4684C A60801FE */ sh $t0, 0x01FE($s0) ## 000001FE -/* 03B20 80A46850 0C291769 */ jal func_80A45DA4 -/* 03B24 80A46854 8FA50044 */ lw $a1, 0x0044($sp) -/* 03B28 80A46858 1000003D */ beq $zero, $zero, .L80A46950 -/* 03B2C 80A4685C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80A46860 -/* 03B30 80A46860 3065FC00 */ andi $a1, $v1, 0xFC00 ## $a1 = 00000000 -/* 03B34 80A46864 00052A83 */ sra $a1, $a1, 10 -/* 03B38 80A46868 0C00B2D0 */ jal Flags_GetSwitch - -/* 03B3C 80A4686C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03B40 80A46870 10400005 */ beq $v0, $zero, .L80A46888 -/* 03B44 80A46874 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 03B48 80A46878 0C00B55C */ jal Actor_Kill - -/* 03B4C 80A4687C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B50 80A46880 10000033 */ beq $zero, $zero, .L80A46950 -/* 03B54 80A46884 8FBF002C */ lw $ra, 0x002C($sp) -.L80A46888: -/* 03B58 80A46888 3C0A80A4 */ lui $t2, %hi(func_80A4696C) ## $t2 = 80A40000 -/* 03B5C 80A4688C 254A696C */ addiu $t2, $t2, %lo(func_80A4696C) ## $t2 = 80A4696C -/* 03B60 80A46890 A209020F */ sb $t1, 0x020F($s0) ## 0000020F -/* 03B64 80A46894 1000002D */ beq $zero, $zero, .L80A4694C -/* 03B68 80A46898 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -glabel L80A4689C -/* 03B6C 80A4689C 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 03B70 80A468A0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03B74 80A468A4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 03B78 80A468A8 01616024 */ and $t4, $t3, $at -/* 03B7C 80A468AC AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 03B80 80A468B0 3C0D8012 */ lui $t5, %hi(gItemSlots+0x2d) -/* 03B84 80A468B4 91AD7491 */ lbu $t5, %lo(gItemSlots+0x2d)($t5) -/* 03B88 80A468B8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03B8C 80A468BC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 -/* 03B94 80A468C4 91C20074 */ lbu $v0, 0x0074($t6) ## 00000074 -/* 03B98 80A468C8 3C1980A4 */ lui $t9, %hi(func_80A4696C) ## $t9 = 80A40000 -/* 03B9C 80A468CC 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 03BA0 80A468D0 28410033 */ slti $at, $v0, 0x0033 -/* 03BA4 80A468D4 14200005 */ bne $at, $zero, .L80A468EC -/* 03BA8 80A468D8 2739696C */ addiu $t9, $t9, %lo(func_80A4696C) ## $t9 = 80A4696C -/* 03BAC 80A468DC 28410037 */ slti $at, $v0, 0x0037 -/* 03BB0 80A468E0 10200002 */ beq $at, $zero, .L80A468EC -/* 03BB4 80A468E4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03BB8 80A468E8 A20F0213 */ sb $t7, 0x0213($s0) ## 00000213 -.L80A468EC: -/* 03BBC 80A468EC A20001CD */ sb $zero, 0x01CD($s0) ## 000001CD -/* 03BC0 80A468F0 A21801CE */ sb $t8, 0x01CE($s0) ## 000001CE -/* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C -/* 03BC8 80A468F8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -glabel L80A468FC -/* 03BCC 80A468FC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03BD0 80A46900 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03BD4 80A46904 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 -/* 03BD8 80A46908 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 03BDC 80A4690C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 -/* 03BE4 80A46914 00000000 */ nop -/* 03BE8 80A46918 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 03BEC 80A4691C 0C023983 */ jal Path_CopyLastPoint -/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) -/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) -/* 03BF8 80A46928 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 -/* 03BFC 80A4692C AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 -/* 03C00 80A46930 8CAA0004 */ lw $t2, 0x0004($a1) ## 00000004 -/* 03C04 80A46934 AE0A000C */ sw $t2, 0x000C($s0) ## 0000000C -/* 03C08 80A46938 8CAB0008 */ lw $t3, 0x0008($a1) ## 00000008 -/* 03C0C 80A4693C AE0B0010 */ sw $t3, 0x0010($s0) ## 00000010 -glabel L80A46940 -.L80A46940: -/* 03C10 80A46940 3C0C80A4 */ lui $t4, %hi(func_80A4696C) ## $t4 = 80A40000 -/* 03C14 80A46944 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C -/* 03C18 80A46948 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -.L80A4694C: -/* 03C1C 80A4694C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A46950: -/* 03C20 80A46950 8FB00028 */ lw $s0, 0x0028($sp) -/* 03C24 80A46954 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03C28 80A46958 03E00008 */ jr $ra -/* 03C2C 80A4695C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s deleted file mode 100644 index 7915020a64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80A487C0 - .float 0.6 - -.text -glabel EnGo2_Update -/* 04B70 80A478A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B74 80A478A4 AFB10020 */ sw $s1, 0x0020($sp) -/* 04B78 80A478A8 AFB0001C */ sw $s0, 0x001C($sp) -/* 04B7C 80A478AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04B80 80A478B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04B84 80A478B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04B88 80A478B8 0C2914D8 */ jal func_80A45360 -/* 04B8C 80A478BC 26050220 */ addiu $a1, $s0, 0x0220 ## $a1 = 00000220 -/* 04B90 80A478C0 0C291680 */ jal func_80A45A00 -/* 04B94 80A478C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04B98 80A478C8 0C02927F */ jal SkelAnime_Update - -/* 04B9C 80A478CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04BA0 80A478D0 0C29151B */ jal func_80A4546C -/* 04BA4 80A478D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04BA8 80A478D8 860E01FE */ lh $t6, 0x01FE($s0) ## 000001FE -/* 04BAC 80A478DC 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC -/* 04BB0 80A478E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04BB4 80A478E4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 04BB8 80A478E8 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 04BBC 80A478EC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 04BC0 80A478F0 468021A0 */ cvt.s.w $f6, $f4 -/* 04BC4 80A478F4 3C0180A5 */ lui $at, %hi(D_80A487C0) ## $at = 80A50000 -/* 04BC8 80A478F8 C42487C0 */ lwc1 $f4, %lo(D_80A487C0)($at) -/* 04BCC 80A478FC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 04BD0 80A47900 AFB80014 */ sw $t8, 0x0014($sp) -/* 04BD4 80A47904 468084A0 */ cvt.s.w $f18, $f16 -/* 04BD8 80A47908 46083282 */ mul.s $f10, $f6, $f8 -/* 04BDC 80A4790C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 04BE0 80A47910 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04BE4 80A47914 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04BE8 80A47918 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04BEC 80A4791C 46049182 */ mul.s $f6, $f18, $f4 -/* 04BF0 80A47920 44065000 */ mfc1 $a2, $f10 -/* 04BF4 80A47924 44073000 */ mfc1 $a3, $f6 -/* 04BF8 80A47928 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 04BFC 80A4792C 00000000 */ nop -/* 04C00 80A47930 86190194 */ lh $t9, 0x0194($s0) ## 00000194 -/* 04C04 80A47934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C08 80A47938 57200004 */ bnel $t9, $zero, .L80A4794C -/* 04C0C 80A4793C 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 04C10 80A47940 0C2912AC */ jal func_80A44AB0 -/* 04C14 80A47944 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04C18 80A47948 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -.L80A4794C: -/* 04C1C 80A4794C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C20 80A47950 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04C24 80A47954 0320F809 */ jalr $ra, $t9 -/* 04C28 80A47958 00000000 */ nop -/* 04C2C 80A4795C 92080211 */ lbu $t0, 0x0211($s0) ## 00000211 -/* 04C30 80A47960 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04C34 80A47964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04C38 80A47968 15010004 */ bne $t0, $at, .L80A4797C -/* 04C3C 80A4796C 26050226 */ addiu $a1, $s0, 0x0226 ## $a1 = 00000226 -/* 04C40 80A47970 2606024A */ addiu $a2, $s0, 0x024A ## $a2 = 0000024A -/* 04C44 80A47974 0C00D3D5 */ jal func_80034F54 -/* 04C48 80A47978 24070012 */ addiu $a3, $zero, 0x0012 ## $a3 = 00000012 -.L80A4797C: -/* 04C4C 80A4797C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C50 80A47980 0C2914A2 */ jal func_80A45288 -/* 04C54 80A47984 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04C58 80A47988 0C29164B */ jal func_80A4592C -/* 04C5C 80A4798C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C60 80A47990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C64 80A47994 0C291250 */ jal func_80A44940 -/* 04C68 80A47998 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04C6C 80A4799C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04C70 80A479A0 8FB0001C */ lw $s0, 0x001C($sp) -/* 04C74 80A479A4 8FB10020 */ lw $s1, 0x0020($sp) -/* 04C78 80A479A8 03E00008 */ jr $ra -/* 04C7C 80A479AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s deleted file mode 100644 index 0bf45dde84..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A42D30 -/* 00000 80A42D30 24820270 */ addiu $v0, $a0, 0x0270 ## $v0 = 00000270 -/* 00004 80A42D34 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00008 80A42D38 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A42D3C: -/* 0000C 80A42D3C 904E0000 */ lbu $t6, 0x0000($v0) ## 00000270 -/* 00010 80A42D40 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00014 80A42D44 00031C00 */ sll $v1, $v1, 16 -/* 00018 80A42D48 108E001D */ beq $a0, $t6, .L80A42DC0 -/* 0001C 80A42D4C 00031C03 */ sra $v1, $v1, 16 -/* 00020 80A42D50 C7A40014 */ lwc1 $f4, 0x0014($sp) -/* 00024 80A42D54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00028 80A42D58 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000274 -/* 0002C 80A42D5C C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 00030 80A42D60 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000278 -/* 00034 80A42D64 93B80013 */ lbu $t8, 0x0013($sp) -/* 00038 80A42D68 A0590000 */ sb $t9, 0x0000($v0) ## 00000270 -/* 0003C 80A42D6C A0580001 */ sb $t8, 0x0001($v0) ## 00000271 -/* 00040 80A42D70 A0580002 */ sb $t8, 0x0002($v0) ## 00000272 -/* 00044 80A42D74 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 00048 80A42D78 AC490014 */ sw $t1, 0x0014($v0) ## 00000284 -/* 0004C 80A42D7C 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 00050 80A42D80 AC480018 */ sw $t0, 0x0018($v0) ## 00000288 -/* 00054 80A42D84 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 -/* 00058 80A42D88 AC49001C */ sw $t1, 0x001C($v0) ## 0000028C -/* 0005C 80A42D8C 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 00060 80A42D90 AC4B002C */ sw $t3, 0x002C($v0) ## 0000029C -/* 00064 80A42D94 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 00068 80A42D98 AC4A0030 */ sw $t2, 0x0030($v0) ## 000002A0 -/* 0006C 80A42D9C 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 00070 80A42DA0 AC4B0034 */ sw $t3, 0x0034($v0) ## 000002A4 -/* 00074 80A42DA4 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 -/* 00078 80A42DA8 AC4D0020 */ sw $t5, 0x0020($v0) ## 00000290 -/* 0007C 80A42DAC 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -/* 00080 80A42DB0 AC4C0024 */ sw $t4, 0x0024($v0) ## 00000294 -/* 00084 80A42DB4 8CCD0008 */ lw $t5, 0x0008($a2) ## 00000008 -/* 00088 80A42DB8 03E00008 */ jr $ra -/* 0008C 80A42DBC AC4D0028 */ sw $t5, 0x0028($v0) ## 00000298 -.L80A42DC0: -/* 00090 80A42DC0 2861000A */ slti $at, $v1, 0x000A -/* 00094 80A42DC4 1420FFDD */ bne $at, $zero, .L80A42D3C -/* 00098 80A42DC8 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 000002A8 -/* 0009C 80A42DCC 03E00008 */ jr $ra -/* 000A0 80A42DD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s deleted file mode 100644 index 6a073cf7d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s +++ /dev/null @@ -1,81 +0,0 @@ -.late_rodata -glabel D_80A4864C - .float 0.2 - -glabel D_80A48650 - .float 0.4 - -.text -glabel func_80A42DD4 -/* 000A4 80A42DD4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000A8 80A42DD8 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 000AC 80A42DDC 3C0180A5 */ lui $at, %hi(D_80A4864C) ## $at = 80A50000 -/* 000B0 80A42DE0 C436864C */ lwc1 $f22, %lo(D_80A4864C)($at) -/* 000B4 80A42DE4 AFB10028 */ sw $s1, 0x0028($sp) -/* 000B8 80A42DE8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000BC 80A42DEC F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 000C0 80A42DF0 3C0180A5 */ lui $at, %hi(D_80A48650) ## $at = 80A50000 -/* 000C4 80A42DF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 000C8 80A42DF8 24900270 */ addiu $s0, $a0, 0x0270 ## $s0 = 00000270 -/* 000CC 80A42DFC C4348650 */ lwc1 $f20, %lo(D_80A48650)($at) -/* 000D0 80A42E00 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -.L80A42E04: -/* 000D4 80A42E04 920E0000 */ lbu $t6, 0x0000($s0) ## 00000270 -/* 000D8 80A42E08 51C00029 */ beql $t6, $zero, .L80A42EB0 -/* 000DC 80A42E0C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 000E0 80A42E10 920F0001 */ lbu $t7, 0x0001($s0) ## 00000271 -/* 000E4 80A42E14 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E8 80A42E18 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 000000FF -/* 000EC 80A42E1C 17200002 */ bne $t9, $zero, .L80A42E28 -/* 000F0 80A42E20 A2180001 */ sb $t8, 0x0001($s0) ## 00000271 -/* 000F4 80A42E24 A2000000 */ sb $zero, 0x0000($s0) ## 00000270 -.L80A42E28: -/* 000F8 80A42E28 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 000FC 80A42E2C 00000000 */ nop -/* 00100 80A42E30 46140102 */ mul.s $f4, $f0, $f20 -/* 00104 80A42E34 46162181 */ sub.s $f6, $f4, $f22 -/* 00108 80A42E38 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0010C 80A42E3C E606002C */ swc1 $f6, 0x002C($s0) ## 0000029C -/* 00110 80A42E40 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000290 -/* 00114 80A42E44 C60A0014 */ lwc1 $f10, 0x0014($s0) ## 00000284 -/* 00118 80A42E48 46140202 */ mul.s $f8, $f0, $f20 -/* 0011C 80A42E4C C60E0024 */ lwc1 $f14, 0x0024($s0) ## 00000294 -/* 00120 80A42E50 460C5480 */ add.s $f18, $f10, $f12 -/* 00124 80A42E54 C6040018 */ lwc1 $f4, 0x0018($s0) ## 00000288 -/* 00128 80A42E58 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000298 -/* 0012C 80A42E5C E6120014 */ swc1 $f18, 0x0014($s0) ## 00000284 -/* 00130 80A42E60 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000029C -/* 00134 80A42E64 460E2180 */ add.s $f6, $f4, $f14 -/* 00138 80A42E68 46164081 */ sub.s $f2, $f8, $f22 -/* 0013C 80A42E6C C608001C */ lwc1 $f8, 0x001C($s0) ## 0000028C -/* 00140 80A42E70 E6060018 */ swc1 $f6, 0x0018($s0) ## 00000288 -/* 00144 80A42E74 46126100 */ add.s $f4, $f12, $f18 -/* 00148 80A42E78 C6060030 */ lwc1 $f6, 0x0030($s0) ## 000002A0 -/* 0014C 80A42E7C C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000274 -/* 00150 80A42E80 46104280 */ add.s $f10, $f8, $f16 -/* 00154 80A42E84 E6040020 */ swc1 $f4, 0x0020($s0) ## 00000290 -/* 00158 80A42E88 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000278 -/* 0015C 80A42E8C 46067200 */ add.s $f8, $f14, $f6 -/* 00160 80A42E90 E60A001C */ swc1 $f10, 0x001C($s0) ## 0000028C -/* 00164 80A42E94 E6020034 */ swc1 $f2, 0x0034($s0) ## 000002A4 -/* 00168 80A42E98 46028280 */ add.s $f10, $f16, $f2 -/* 0016C 80A42E9C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000294 -/* 00170 80A42EA0 46049180 */ add.s $f6, $f18, $f4 -/* 00174 80A42EA4 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000298 -/* 00178 80A42EA8 E6060004 */ swc1 $f6, 0x0004($s0) ## 00000274 -/* 0017C 80A42EAC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -.L80A42EB0: -/* 00180 80A42EB0 00118C00 */ sll $s1, $s1, 16 -/* 00184 80A42EB4 00118C03 */ sra $s1, $s1, 16 -/* 00188 80A42EB8 2A21000A */ slti $at, $s1, 0x000A -/* 0018C 80A42EBC 1420FFD1 */ bne $at, $zero, .L80A42E04 -/* 00190 80A42EC0 26100038 */ addiu $s0, $s0, 0x0038 ## $s0 = 000002A8 -/* 00194 80A42EC4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00198 80A42EC8 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 0019C 80A42ECC D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 001A0 80A42ED0 8FB00024 */ lw $s0, 0x0024($sp) -/* 001A4 80A42ED4 8FB10028 */ lw $s1, 0x0028($sp) -/* 001A8 80A42ED8 03E00008 */ jr $ra -/* 001AC 80A42EDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s deleted file mode 100644 index 9d0f3fbc09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ /dev/null @@ -1,225 +0,0 @@ -.rdata -glabel D_80A48590 - .asciz "../z_en_go2_eff.c" - .balign 4 - -glabel D_80A485A4 - .asciz "../z_en_go2_eff.c" - .balign 4 - -glabel D_80A485B8 - .asciz "../z_en_go2_eff.c" - .balign 4 - -.text -glabel func_80A42EE0 -/* 001B0 80A42EE0 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 001B4 80A42EE4 AFBE0050 */ sw $s8, 0x0050($sp) -/* 001B8 80A42EE8 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 001BC 80A42EEC AFBF0054 */ sw $ra, 0x0054($sp) -/* 001C0 80A42EF0 AFB7004C */ sw $s7, 0x004C($sp) -/* 001C4 80A42EF4 AFB60048 */ sw $s6, 0x0048($sp) -/* 001C8 80A42EF8 AFB50044 */ sw $s5, 0x0044($sp) -/* 001CC 80A42EFC AFB40040 */ sw $s4, 0x0040($sp) -/* 001D0 80A42F00 AFB3003C */ sw $s3, 0x003C($sp) -/* 001D4 80A42F04 AFB20038 */ sw $s2, 0x0038($sp) -/* 001D8 80A42F08 AFB10034 */ sw $s1, 0x0034($sp) -/* 001DC 80A42F0C AFB00030 */ sw $s0, 0x0030($sp) -/* 001E0 80A42F10 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 001E4 80A42F14 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 001E8 80A42F18 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 001EC 80A42F1C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 001F0 80A42F20 24920270 */ addiu $s2, $a0, 0x0270 ## $s2 = 00000270 -/* 001F4 80A42F24 3C0680A5 */ lui $a2, %hi(D_80A48590) ## $a2 = 80A50000 -/* 001F8 80A42F28 24C68590 */ addiu $a2, $a2, %lo(D_80A48590) ## $a2 = 80A48590 -/* 001FC 80A42F2C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00200 80A42F30 2407006F */ addiu $a3, $zero, 0x006F ## $a3 = 0000006F -/* 00204 80A42F34 0C031AB1 */ jal Graph_OpenDisps -/* 00208 80A42F38 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0020C 80A42F3C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 00210 80A42F40 0C024F61 */ jal func_80093D84 -/* 00214 80A42F44 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00218 80A42F48 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0021C 80A42F4C 4481C000 */ mtc1 $at, $f24 ## $f24 = 8.00 -/* 00220 80A42F50 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00224 80A42F54 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 00228 80A42F58 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0022C 80A42F5C 4481A000 */ mtc1 $at, $f20 ## $f20 = 255.00 -/* 00230 80A42F60 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 00234 80A42F64 3C16DE00 */ lui $s6, 0xDE00 ## $s6 = DE000000 -.L80A42F68: -/* 00238 80A42F68 924E0000 */ lbu $t6, 0x0000($s2) ## 00000270 -/* 0023C 80A42F6C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00240 80A42F70 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00244 80A42F74 11C0008A */ beq $t6, $zero, .L80A431A0 -/* 00248 80A42F78 03C19821 */ addu $s3, $s8, $at -/* 0024C 80A42F7C 3C150601 */ lui $s5, %hi(D_0600FD50) ## $s5 = 06010000 -/* 00250 80A42F80 16E00014 */ bne $s7, $zero, .L80A42FD4 -/* 00254 80A42F84 26B5FD50 */ addiu $s5, $s5, %lo(D_0600FD50) ## $s5 = 0600FD50 -/* 00258 80A42F88 3C110601 */ lui $s1, %hi(D_0600FD40) ## $s1 = 06010000 -/* 0025C 80A42F8C 2631FD40 */ addiu $s1, $s1, %lo(D_0600FD40) ## $s1 = 0600FD40 -/* 00260 80A42F90 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00264 80A42F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00268 80A42F98 0C024DDD */ jal Gfx_CallSetupDL -/* 0026C 80A42F9C 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 -/* 00270 80A42FA0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00274 80A42FA4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00278 80A42FA8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0027C 80A42FAC AC510004 */ sw $s1, 0x0004($v0) ## 00000004 -/* 00280 80A42FB0 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -/* 00284 80A42FB4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00288 80A42FB8 3C08643C */ lui $t0, 0x643C ## $t0 = 643C0000 -/* 0028C 80A42FBC 35081400 */ ori $t0, $t0, 0x1400 ## $t0 = 643C1400 -/* 00290 80A42FC0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00294 80A42FC4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00298 80A42FC8 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0029C 80A42FCC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002A0 80A42FD0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L80A42FD4: -/* 002A4 80A42FD4 92490001 */ lbu $t1, 0x0001($s2) ## 00000271 -/* 002A8 80A42FD8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002AC 80A42FDC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 002B0 80A42FE0 05210004 */ bgez $t1, .L80A42FF4 -/* 002B4 80A42FE4 468021A0 */ cvt.s.w $f6, $f4 -/* 002B8 80A42FE8 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 002BC 80A42FEC 00000000 */ nop -/* 002C0 80A42FF0 46083180 */ add.s $f6, $f6, $f8 -.L80A42FF4: -/* 002C4 80A42FF4 924A0002 */ lbu $t2, 0x0002($s2) ## 00000272 -/* 002C8 80A42FF8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002CC 80A42FFC 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 002D0 80A43000 05410004 */ bgez $t2, .L80A43014 -/* 002D4 80A43004 46805420 */ cvt.s.w $f16, $f10 -/* 002D8 80A43008 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 002DC 80A4300C 00000000 */ nop -/* 002E0 80A43010 46128400 */ add.s $f16, $f16, $f18 -.L80A43014: -/* 002E4 80A43014 4610A103 */ div.s $f4, $f20, $f16 -/* 002E8 80A43018 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002EC 80A4301C 3C01AA82 */ lui $at, 0xAA82 ## $at = AA820000 -/* 002F0 80A43020 34215A00 */ ori $at, $at, 0x5A00 ## $at = AA825A00 -/* 002F4 80A43024 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 002F8 80A43028 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002FC 80A4302C 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 00300 80A43030 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00304 80A43034 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00308 80A43038 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0030C 80A4303C 46043202 */ mul.s $f8, $f6, $f4 -/* 00310 80A43040 4600428D */ trunc.w.s $f10, $f8 -/* 00314 80A43044 44045000 */ mfc1 $a0, $f10 -/* 00318 80A43048 00000000 */ nop -/* 0031C 80A4304C 00042400 */ sll $a0, $a0, 16 -/* 00320 80A43050 00042403 */ sra $a0, $a0, 16 -/* 00324 80A43054 308E00FF */ andi $t6, $a0, 0x00FF ## $t6 = 00000000 -/* 00328 80A43058 01C17825 */ or $t7, $t6, $at ## $t7 = AA825A00 -/* 0032C 80A4305C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00330 80A43060 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00334 80A43064 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00338 80A43068 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0033C 80A4306C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00340 80A43070 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00344 80A43074 8E46001C */ lw $a2, 0x001C($s2) ## 0000028C -/* 00348 80A43078 C64E0018 */ lwc1 $f14, 0x0018($s2) ## 00000288 -/* 0034C 80A4307C 0C034261 */ jal Matrix_Translate -/* 00350 80A43080 C64C0014 */ lwc1 $f12, 0x0014($s2) ## 00000284 -/* 00354 80A43084 0C0347F5 */ jal func_800D1FD4 -/* 00358 80A43088 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0035C 80A4308C C64C0004 */ lwc1 $f12, 0x0004($s2) ## 00000274 -/* 00360 80A43090 4406B000 */ mfc1 $a2, $f22 -/* 00364 80A43094 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00368 80A43098 0C0342A3 */ jal Matrix_Scale -/* 0036C 80A4309C 46006386 */ mov.s $f14, $f12 -/* 00370 80A430A0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00374 80A430A4 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 00378 80A430A8 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 0037C 80A430AC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00380 80A430B0 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 00384 80A430B4 3C0580A5 */ lui $a1, %hi(D_80A485A4) ## $a1 = 80A50000 -/* 00388 80A430B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0038C 80A430BC 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00390 80A430C0 24A585A4 */ addiu $a1, $a1, %lo(D_80A485A4) ## $a1 = 80A485A4 -/* 00394 80A430C4 24060089 */ addiu $a2, $zero, 0x0089 ## $a2 = 00000089 -/* 00398 80A430C8 0C0346A2 */ jal Matrix_NewMtx -/* 0039C 80A430CC 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 003A0 80A430D0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 003A4 80A430D4 924A0001 */ lbu $t2, 0x0001($s2) ## 00000271 -/* 003A8 80A430D8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003AC 80A430DC 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 003B0 80A430E0 05410004 */ bgez $t2, .L80A430F4 -/* 003B4 80A430E4 46809420 */ cvt.s.w $f16, $f18 -/* 003B8 80A430E8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 003BC 80A430EC 00000000 */ nop -/* 003C0 80A430F0 46068400 */ add.s $f16, $f16, $f6 -.L80A430F4: -/* 003C4 80A430F4 924B0002 */ lbu $t3, 0x0002($s2) ## 00000272 -/* 003C8 80A430F8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003CC 80A430FC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 003D0 80A43100 05610004 */ bgez $t3, .L80A43114 -/* 003D4 80A43104 46802220 */ cvt.s.w $f8, $f4 -/* 003D8 80A43108 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 003DC 80A4310C 00000000 */ nop -/* 003E0 80A43110 460A4200 */ add.s $f8, $f8, $f10 -.L80A43114: -/* 003E4 80A43114 4608C483 */ div.s $f18, $f24, $f8 -/* 003E8 80A43118 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003EC 80A4311C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 003F0 80A43120 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 003F4 80A43124 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 003F8 80A43128 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 003FC 80A4312C 3C0480A5 */ lui $a0, %hi(D_80A480D0) ## $a0 = 80A50000 -/* 00400 80A43130 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00404 80A43134 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00408 80A43138 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0040C 80A4313C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00410 80A43140 46128182 */ mul.s $f6, $f16, $f18 -/* 00414 80A43144 4600310D */ trunc.w.s $f4, $f6 -/* 00418 80A43148 44052000 */ mfc1 $a1, $f4 -/* 0041C 80A4314C 00000000 */ nop -/* 00420 80A43150 00052C00 */ sll $a1, $a1, 16 -/* 00424 80A43154 00052C03 */ sra $a1, $a1, 16 -/* 00428 80A43158 00057880 */ sll $t7, $a1, 2 -/* 0042C 80A4315C 008F2021 */ addu $a0, $a0, $t7 -/* 00430 80A43160 8C8480D0 */ lw $a0, %lo(D_80A480D0)($a0) -/* 00434 80A43164 0004C900 */ sll $t9, $a0, 4 -/* 00438 80A43168 00194702 */ srl $t0, $t9, 28 -/* 0043C 80A4316C 00084880 */ sll $t1, $t0, 2 -/* 00440 80A43170 01495021 */ addu $t2, $t2, $t1 -/* 00444 80A43174 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00448 80A43178 0081C024 */ and $t8, $a0, $at -/* 0044C 80A4317C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00450 80A43180 030A5821 */ addu $t3, $t8, $t2 -/* 00454 80A43184 01616021 */ addu $t4, $t3, $at -/* 00458 80A43188 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0045C 80A4318C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00460 80A43190 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00464 80A43194 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00468 80A43198 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 0046C 80A4319C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80A431A0: -/* 00470 80A431A0 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00474 80A431A4 0014A400 */ sll $s4, $s4, 16 -/* 00478 80A431A8 0014A403 */ sra $s4, $s4, 16 -/* 0047C 80A431AC 2A81000A */ slti $at, $s4, 0x000A -/* 00480 80A431B0 1420FF6D */ bne $at, $zero, .L80A42F68 -/* 00484 80A431B4 26520038 */ addiu $s2, $s2, 0x0038 ## $s2 = 000002A8 -/* 00488 80A431B8 3C0680A5 */ lui $a2, %hi(D_80A485B8) ## $a2 = 80A50000 -/* 0048C 80A431BC 24C685B8 */ addiu $a2, $a2, %lo(D_80A485B8) ## $a2 = 80A485B8 -/* 00490 80A431C0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00494 80A431C4 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 00498 80A431C8 0C031AD5 */ jal Graph_CloseDisps -/* 0049C 80A431CC 24070097 */ addiu $a3, $zero, 0x0097 ## $a3 = 00000097 -/* 004A0 80A431D0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 004A4 80A431D4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 004A8 80A431D8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 004AC 80A431DC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 004B0 80A431E0 8FB00030 */ lw $s0, 0x0030($sp) -/* 004B4 80A431E4 8FB10034 */ lw $s1, 0x0034($sp) -/* 004B8 80A431E8 8FB20038 */ lw $s2, 0x0038($sp) -/* 004BC 80A431EC 8FB3003C */ lw $s3, 0x003C($sp) -/* 004C0 80A431F0 8FB40040 */ lw $s4, 0x0040($sp) -/* 004C4 80A431F4 8FB50044 */ lw $s5, 0x0044($sp) -/* 004C8 80A431F8 8FB60048 */ lw $s6, 0x0048($sp) -/* 004CC 80A431FC 8FB7004C */ lw $s7, 0x004C($sp) -/* 004D0 80A43200 8FBE0050 */ lw $s8, 0x0050($sp) -/* 004D4 80A43204 03E00008 */ jr $ra -/* 004D8 80A43208 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s deleted file mode 100644 index f97a466e56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_80A4320C -/* 004DC 80A4320C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 004E0 80A43210 3C0E80A5 */ lui $t6, %hi(D_80A480F0) ## $t6 = 80A50000 -/* 004E4 80A43214 AFBF0064 */ sw $ra, 0x0064($sp) -/* 004E8 80A43218 AFB70060 */ sw $s7, 0x0060($sp) -/* 004EC 80A4321C AFB6005C */ sw $s6, 0x005C($sp) -/* 004F0 80A43220 AFB50058 */ sw $s5, 0x0058($sp) -/* 004F4 80A43224 AFB40054 */ sw $s4, 0x0054($sp) -/* 004F8 80A43228 AFB30050 */ sw $s3, 0x0050($sp) -/* 004FC 80A4322C AFB2004C */ sw $s2, 0x004C($sp) -/* 00500 80A43230 AFB10048 */ sw $s1, 0x0048($sp) -/* 00504 80A43234 AFB00044 */ sw $s0, 0x0044($sp) -/* 00508 80A43238 F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 0050C 80A4323C F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00510 80A43240 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00514 80A43244 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 00518 80A43248 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 0051C 80A4324C 25CE80F0 */ addiu $t6, $t6, %lo(D_80A480F0) ## $t6 = 80A480F0 -/* 00520 80A43250 8DD80000 */ lw $t8, 0x0000($t6) ## 80A480F0 -/* 00524 80A43254 27B40094 */ addiu $s4, $sp, 0x0094 ## $s4 = FFFFFFF4 -/* 00528 80A43258 3C1980A5 */ lui $t9, %hi(D_80A480FC) ## $t9 = 80A50000 -/* 0052C 80A4325C AE980000 */ sw $t8, 0x0000($s4) ## FFFFFFF4 -/* 00530 80A43260 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A480F4 -/* 00534 80A43264 273980FC */ addiu $t9, $t9, %lo(D_80A480FC) ## $t9 = 80A480FC -/* 00538 80A43268 27B60088 */ addiu $s6, $sp, 0x0088 ## $s6 = FFFFFFE8 -/* 0053C 80A4326C AE8F0004 */ sw $t7, 0x0004($s4) ## FFFFFFF8 -/* 00540 80A43270 8DD80008 */ lw $t8, 0x0008($t6) ## 80A480F8 -/* 00544 80A43274 3C0A80A5 */ lui $t2, %hi(D_80A48108) ## $t2 = 80A50000 -/* 00548 80A43278 254A8108 */ addiu $t2, $t2, %lo(D_80A48108) ## $t2 = 80A48108 -/* 0054C 80A4327C AE980008 */ sw $t8, 0x0008($s4) ## FFFFFFFC -/* 00550 80A43280 8F290000 */ lw $t1, 0x0000($t9) ## 80A480FC -/* 00554 80A43284 27B7007C */ addiu $s7, $sp, 0x007C ## $s7 = FFFFFFDC -/* 00558 80A43288 4486C000 */ mtc1 $a2, $f24 ## $f24 = 0.00 -/* 0055C 80A4328C AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFE8 -/* 00560 80A43290 8F280004 */ lw $t0, 0x0004($t9) ## 80A48100 -/* 00564 80A43294 4487D000 */ mtc1 $a3, $f26 ## $f26 = 0.00 -/* 00568 80A43298 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0056C 80A4329C AEC80004 */ sw $t0, 0x0004($s6) ## FFFFFFEC -/* 00570 80A432A0 8F290008 */ lw $t1, 0x0008($t9) ## 80A48104 -/* 00574 80A432A4 30B500FF */ andi $s5, $a1, 0x00FF ## $s5 = 00000000 -/* 00578 80A432A8 AEC90008 */ sw $t1, 0x0008($s6) ## FFFFFFF0 -/* 0057C 80A432AC 8D4C0000 */ lw $t4, 0x0000($t2) ## 80A48108 -/* 00580 80A432B0 AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFDC -/* 00584 80A432B4 8D4B0004 */ lw $t3, 0x0004($t2) ## 80A4810C -/* 00588 80A432B8 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFE0 -/* 0058C 80A432BC 8D4C0008 */ lw $t4, 0x0008($t2) ## 80A48110 -/* 00590 80A432C0 AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFE4 -/* 00594 80A432C4 8C8E0024 */ lw $t6, 0x0024($a0) ## 00000024 -/* 00598 80A432C8 AE8E0000 */ sw $t6, 0x0000($s4) ## FFFFFFF4 -/* 0059C 80A432CC 8C8D0028 */ lw $t5, 0x0028($a0) ## 00000028 -/* 005A0 80A432D0 AE8D0004 */ sw $t5, 0x0004($s4) ## FFFFFFF8 -/* 005A4 80A432D4 8C8E002C */ lw $t6, 0x002C($a0) ## 0000002C -/* 005A8 80A432D8 AE8E0008 */ sw $t6, 0x0008($s4) ## FFFFFFFC -/* 005AC 80A432DC C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 005B0 80A432E0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 005B4 80A432E4 E7A40098 */ swc1 $f4, 0x0098($sp) -/* 005B8 80A432E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 005BC 80A432EC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 005C0 80A432F0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 005C4 80A432F4 44815000 */ mtc1 $at, $f10 ## $f10 = 65536.00 -/* 005C8 80A432F8 46060201 */ sub.s $f8, $f0, $f6 -/* 005CC 80A432FC 8FA200B0 */ lw $v0, 0x00B0($sp) -/* 005D0 80A43300 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 005D4 80A43304 C7B600B8 */ lwc1 $f22, 0x00B8($sp) -/* 005D8 80A43308 460A4402 */ mul.s $f16, $f8, $f10 -/* 005DC 80A4330C C7B400B4 */ lwc1 $f20, 0x00B4($sp) -/* 005E0 80A43310 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 005E4 80A43314 4600848D */ trunc.w.s $f18, $f16 -/* 005E8 80A43318 44109000 */ mfc1 $s0, $f18 -/* 005EC 80A4331C 00000000 */ nop -/* 005F0 80A43320 00108400 */ sll $s0, $s0, 16 -/* 005F4 80A43324 0440002F */ bltz $v0, .L80A433E4 -/* 005F8 80A43328 00108403 */ sra $s0, $s0, 16 -/* 005FC 80A4332C 0302001A */ div $zero, $t8, $v0 -/* 00600 80A43330 00009812 */ mflo $s3 -/* 00604 80A43334 00139C00 */ sll $s3, $s3, 16 -/* 00608 80A43338 00139C03 */ sra $s3, $s3, 16 -/* 0060C 80A4333C 14400002 */ bne $v0, $zero, .L80A43348 -/* 00610 80A43340 00000000 */ nop -/* 00614 80A43344 0007000D */ break 7 -.L80A43348: -/* 00618 80A43348 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0061C 80A4334C 14410004 */ bne $v0, $at, .L80A43360 -/* 00620 80A43350 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00624 80A43354 17010002 */ bne $t8, $at, .L80A43360 -/* 00628 80A43358 00000000 */ nop -/* 0062C 80A4335C 0006000D */ break 6 -.L80A43360: -/* 00630 80A43360 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00634 80A43364 00000000 */ nop -/* 00638 80A43368 46160182 */ mul.s $f6, $f0, $f22 -/* 0063C 80A4336C C7A40080 */ lwc1 $f4, 0x0080($sp) -/* 00640 80A43370 00102400 */ sll $a0, $s0, 16 -/* 00644 80A43374 00042403 */ sra $a0, $a0, 16 -/* 00648 80A43378 46062200 */ add.s $f8, $f4, $f6 -/* 0064C 80A4337C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00650 80A43380 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 00654 80A43384 46140282 */ mul.s $f10, $f0, $f20 -/* 00658 80A43388 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 0065C 80A4338C 00102400 */ sll $a0, $s0, 16 -/* 00660 80A43390 00042403 */ sra $a0, $a0, 16 -/* 00664 80A43394 46105480 */ add.s $f18, $f10, $f16 -/* 00668 80A43398 0C01DE0D */ jal Math_CosS - ## coss? -/* 0066C 80A4339C E7B20094 */ swc1 $f18, 0x0094($sp) -/* 00670 80A433A0 46140102 */ mul.s $f4, $f0, $f20 -/* 00674 80A433A4 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 00678 80A433A8 E7BA0018 */ swc1 $f26, 0x0018($sp) -/* 0067C 80A433AC E7B80014 */ swc1 $f24, 0x0014($sp) -/* 00680 80A433B0 AFB50010 */ sw $s5, 0x0010($sp) -/* 00684 80A433B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00688 80A433B8 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4 -/* 0068C 80A433BC 46062200 */ add.s $f8, $f4, $f6 -/* 00690 80A433C0 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFE8 -/* 00694 80A433C4 02E03825 */ or $a3, $s7, $zero ## $a3 = FFFFFFDC -/* 00698 80A433C8 0C290B4C */ jal func_80A42D30 -/* 0069C 80A433CC E7A8009C */ swc1 $f8, 0x009C($sp) -/* 006A0 80A433D0 02138021 */ addu $s0, $s0, $s3 -/* 006A4 80A433D4 00108400 */ sll $s0, $s0, 16 -/* 006A8 80A433D8 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = FFFFFFFF -/* 006AC 80A433DC 0641FFE0 */ bgez $s2, .L80A43360 -/* 006B0 80A433E0 00108403 */ sra $s0, $s0, 16 -.L80A433E4: -/* 006B4 80A433E4 8FBF0064 */ lw $ra, 0x0064($sp) -/* 006B8 80A433E8 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 006BC 80A433EC D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 006C0 80A433F0 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 006C4 80A433F4 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 006C8 80A433F8 8FB00044 */ lw $s0, 0x0044($sp) -/* 006CC 80A433FC 8FB10048 */ lw $s1, 0x0048($sp) -/* 006D0 80A43400 8FB2004C */ lw $s2, 0x004C($sp) -/* 006D4 80A43404 8FB30050 */ lw $s3, 0x0050($sp) -/* 006D8 80A43408 8FB40054 */ lw $s4, 0x0054($sp) -/* 006DC 80A4340C 8FB50058 */ lw $s5, 0x0058($sp) -/* 006E0 80A43410 8FB6005C */ lw $s6, 0x005C($sp) -/* 006E4 80A43414 8FB70060 */ lw $s7, 0x0060($sp) -/* 006E8 80A43418 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 006EC 80A4341C 03E00008 */ jr $ra -/* 006F0 80A43420 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s deleted file mode 100644 index 6cace13c05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A43424 -/* 006F4 80A43424 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006F8 80A43428 AFBF001C */ sw $ra, 0x001C($sp) -/* 006FC 80A4342C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00700 80A43430 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00704 80A43434 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00708 80A43438 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 0070C 80A4343C AC860594 */ sw $a2, 0x0594($a0) ## 00000594 -/* 00710 80A43440 46022180 */ add.s $f6, $f4, $f2 -/* 00714 80A43444 46000005 */ abs.s $f0, $f0 -/* 00718 80A43448 44073000 */ mfc1 $a3, $f6 -/* 0071C 80A4344C 46020200 */ add.s $f8, $f0, $f2 -/* 00720 80A43450 0C00BD0D */ jal func_8002F434 -/* 00724 80A43454 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00728 80A43458 8FBF001C */ lw $ra, 0x001C($sp) -/* 0072C 80A4345C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00730 80A43460 03E00008 */ jr $ra -/* 00734 80A43464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s deleted file mode 100644 index 1e7d7b3a67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A43468 -/* 00738 80A43468 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0073C 80A4346C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00740 80A43470 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00744 80A43474 AFA60018 */ sw $a2, 0x0018($sp) -/* 00748 80A43478 0C042F6F */ jal func_8010BDBC -/* 0074C 80A4347C 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00750 80A43480 8FA60018 */ lw $a2, 0x0018($sp) -/* 00754 80A43484 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00758 80A43488 00022400 */ sll $a0, $v0, 16 -/* 0075C 80A4348C 90C3020D */ lbu $v1, 0x020D($a2) ## 0000020D -/* 00760 80A43490 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00764 80A43494 00042403 */ sra $a0, $a0, 16 -/* 00768 80A43498 10610007 */ beq $v1, $at, .L80A434B8 -/* 0076C 80A4349C 00057400 */ sll $t6, $a1, 16 -/* 00770 80A434A0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00774 80A434A4 10610004 */ beq $v1, $at, .L80A434B8 -/* 00778 80A434A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0077C 80A434AC 10610002 */ beq $v1, $at, .L80A434B8 -/* 00780 80A434B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00784 80A434B4 14610006 */ bne $v1, $at, .L80A434D0 -.L80A434B8: -/* 00788 80A434B8 000E7C03 */ sra $t7, $t6, 16 -/* 0078C 80A434BC 51E30005 */ beql $t7, $v1, .L80A434D4 -/* 00790 80A434C0 A0C4020D */ sb $a0, 0x020D($a2) ## 0000020D -/* 00794 80A434C4 90D8020C */ lbu $t8, 0x020C($a2) ## 0000020C -/* 00798 80A434C8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0079C 80A434CC A0D9020C */ sb $t9, 0x020C($a2) ## 0000020C -.L80A434D0: -/* 007A0 80A434D0 A0C4020D */ sb $a0, 0x020D($a2) ## 0000020D -.L80A434D4: -/* 007A4 80A434D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007A8 80A434D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007AC 80A434DC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 007B0 80A434E0 03E00008 */ jr $ra -/* 007B4 80A434E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s deleted file mode 100644 index 6ff92ad1ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -.late_rodata_alignment 4 -glabel jtbl_80A48654 - .word L80A43550 - .word L80A43530 - .word L80A43518 - .word L80A43528 - .word L80A43520 - .word L80A43558 - .word L80A43558 - .word L80A43540 - .word L80A43558 - .word L80A43538 - .word L80A43548 - -.text -glabel func_80A434E8 -/* 007B8 80A434E8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 007BC 80A434EC 31CFFC00 */ andi $t7, $t6, 0xFC00 ## $t7 = 00000000 -/* 007C0 80A434F0 000FC283 */ sra $t8, $t7, 10 -/* 007C4 80A434F4 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 007C8 80A434F8 2F21000B */ sltiu $at, $t9, 0x000B -/* 007CC 80A434FC 10200016 */ beq $at, $zero, .L80A43558 -/* 007D0 80A43500 0019C880 */ sll $t9, $t9, 2 -/* 007D4 80A43504 3C0180A5 */ lui $at, %hi(jtbl_80A48654) ## $at = 80A50000 -/* 007D8 80A43508 00390821 */ addu $at, $at, $t9 -/* 007DC 80A4350C 8C398654 */ lw $t9, %lo(jtbl_80A48654)($at) -/* 007E0 80A43510 03200008 */ jr $t9 -/* 007E4 80A43514 00000000 */ nop -glabel L80A43518 -/* 007E8 80A43518 03E00008 */ jr $ra -/* 007EC 80A4351C 24023069 */ addiu $v0, $zero, 0x3069 ## $v0 = 00003069 -glabel L80A43520 -/* 007F0 80A43520 03E00008 */ jr $ra -/* 007F4 80A43524 2402306A */ addiu $v0, $zero, 0x306A ## $v0 = 0000306A -glabel L80A43528 -/* 007F8 80A43528 03E00008 */ jr $ra -/* 007FC 80A4352C 2402306B */ addiu $v0, $zero, 0x306B ## $v0 = 0000306B -glabel L80A43530 -/* 00800 80A43530 03E00008 */ jr $ra -/* 00804 80A43534 2402306C */ addiu $v0, $zero, 0x306C ## $v0 = 0000306C -glabel L80A43538 -/* 00808 80A43538 03E00008 */ jr $ra -/* 0080C 80A4353C 2402306D */ addiu $v0, $zero, 0x306D ## $v0 = 0000306D -glabel L80A43540 -/* 00810 80A43540 03E00008 */ jr $ra -/* 00814 80A43544 2402306E */ addiu $v0, $zero, 0x306E ## $v0 = 0000306E -glabel L80A43548 -/* 00818 80A43548 03E00008 */ jr $ra -/* 0081C 80A4354C 2402306F */ addiu $v0, $zero, 0x306F ## $v0 = 0000306F -glabel L80A43550 -/* 00820 80A43550 03E00008 */ jr $ra -/* 00824 80A43554 24023070 */ addiu $v0, $zero, 0x3070 ## $v0 = 00003070 -glabel L80A43558 -.L80A43558: -/* 00828 80A43558 24023052 */ addiu $v0, $zero, 0x3052 ## $v0 = 00003052 -/* 0082C 80A4355C 03E00008 */ jr $ra -/* 00830 80A43560 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s deleted file mode 100644 index 474b0c4088..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A43564 -/* 00834 80A43564 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00838 80A43568 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0083C 80A4356C 944E0F1A */ lhu $t6, 0x0F1A($v0) ## 8015F57A -/* 00840 80A43570 AFA40000 */ sw $a0, 0x0000($sp) -/* 00844 80A43574 3C198012 */ lui $t9, %hi(gUpgradeMasks+4) -/* 00848 80A43578 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 0084C 80A4357C 11E00003 */ beq $t7, $zero, .L80A4358C -/* 00850 80A43580 3C098012 */ lui $t1, %hi(gUpgradeShifts+1) -/* 00854 80A43584 03E00008 */ jr $ra -/* 00858 80A43588 24023013 */ addiu $v0, $zero, 0x3013 ## $v0 = 00003013 -.L80A4358C: -/* 0085C 80A4358C 8C5800A0 */ lw $t8, 0x00A0($v0) ## 000030B3 -/* 00860 80A43590 8F3971B4 */ lw $t9, %lo(gUpgradeMasks+4)($t9) -/* 00864 80A43594 912971F5 */ lbu $t1, %lo(gUpgradeShifts+1)($t1) -/* 00868 80A43598 3C0C8012 */ lui $t4, %hi(gUpgradeCapacities+8) -/* 0086C 80A4359C 03194024 */ and $t0, $t8, $t9 -/* 00870 80A435A0 01285007 */ srav $t2, $t0, $t1 -/* 00874 80A435A4 000A5840 */ sll $t3, $t2, 1 -/* 00878 80A435A8 018B6021 */ addu $t4, $t4, $t3 -/* 0087C 80A435AC 958C7204 */ lhu $t4, %lo(gUpgradeCapacities+8)($t4) -/* 00880 80A435B0 29810014 */ slti $at, $t4, 0x0014 -/* 00884 80A435B4 5420000A */ bnel $at, $zero, .L80A435E0 -/* 00888 80A435B8 24023011 */ addiu $v0, $zero, 0x3011 ## $v0 = 00003011 -/* 0088C 80A435BC 80A20210 */ lb $v0, 0x0210($a1) ## 00000210 -/* 00890 80A435C0 28410008 */ slti $at, $v0, 0x0008 -/* 00894 80A435C4 14200005 */ bne $at, $zero, .L80A435DC -/* 00898 80A435C8 2841000C */ slti $at, $v0, 0x000C -/* 0089C 80A435CC 50200004 */ beql $at, $zero, .L80A435E0 -/* 008A0 80A435D0 24023011 */ addiu $v0, $zero, 0x3011 ## $v0 = 00003011 -/* 008A4 80A435D4 03E00008 */ jr $ra -/* 008A8 80A435D8 24023012 */ addiu $v0, $zero, 0x3012 ## $v0 = 00003012 -.L80A435DC: -/* 008AC 80A435DC 24023011 */ addiu $v0, $zero, 0x3011 ## $v0 = 00003011 -.L80A435E0: -/* 008B0 80A435E0 03E00008 */ jr $ra -/* 008B4 80A435E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s deleted file mode 100644 index 84f542ecd2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80A435E8 -/* 008B8 80A435E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008BC 80A435EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 008C0 80A435F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 008C4 80A435F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 008C8 80A435F8 0C042F6F */ jal func_8010BDBC -/* 008CC 80A435FC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 008D0 80A43600 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 008D4 80A43604 10410005 */ beq $v0, $at, .L80A4361C -/* 008D8 80A43608 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 008DC 80A4360C 10410005 */ beq $v0, $at, .L80A43624 -/* 008E0 80A43610 00000000 */ nop -/* 008E4 80A43614 1000002D */ beq $zero, $zero, .L80A436CC -/* 008E8 80A43618 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4361C: -/* 008EC 80A4361C 1000002B */ beq $zero, $zero, .L80A436CC -/* 008F0 80A43620 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A43624: -/* 008F4 80A43624 0C041AF2 */ jal func_80106BC8 -/* 008F8 80A43628 8FA40018 */ lw $a0, 0x0018($sp) -/* 008FC 80A4362C 10400026 */ beq $v0, $zero, .L80A436C8 -/* 00900 80A43630 8FA7001C */ lw $a3, 0x001C($sp) -/* 00904 80A43634 94EE010E */ lhu $t6, 0x010E($a3) ## 0000010E -/* 00908 80A43638 24013012 */ addiu $at, $zero, 0x3012 ## $at = 00003012 -/* 0090C 80A4363C 3C0F80A4 */ lui $t7, %hi(func_80A470E8) ## $t7 = 80A40000 -/* 00910 80A43640 15C1001F */ bne $t6, $at, .L80A436C0 -/* 00914 80A43644 25EF70E8 */ addiu $t7, $t7, %lo(func_80A470E8) ## $t7 = 80A470E8 -/* 00918 80A43648 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 0091C 80A4364C 3C188016 */ lui $t8, %hi(gSaveContext+0xa0) -/* 00920 80A43650 3C198012 */ lui $t9, %hi(gUpgradeMasks+4) -/* 00924 80A43654 8F3971B4 */ lw $t9, %lo(gUpgradeMasks+4)($t9) -/* 00928 80A43658 8F18E700 */ lw $t8, %lo(gSaveContext+0xa0)($t8) -/* 0092C 80A4365C 3C098012 */ lui $t1, %hi(gUpgradeShifts+1) -/* 00930 80A43660 912971F5 */ lbu $t1, %lo(gUpgradeShifts+1)($t1) -/* 00934 80A43664 03194024 */ and $t0, $t8, $t9 -/* 00938 80A43668 3C0C8012 */ lui $t4, %hi(gUpgradeCapacities+8) -/* 0093C 80A4366C 01285007 */ srav $t2, $t0, $t1 -/* 00940 80A43670 000A5840 */ sll $t3, $t2, 1 -/* 00944 80A43674 018B6021 */ addu $t4, $t4, $t3 -/* 00948 80A43678 958C7204 */ lhu $t4, %lo(gUpgradeCapacities+8)($t4) -/* 0094C 80A4367C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00950 80A43680 24060033 */ addiu $a2, $zero, 0x0033 ## $a2 = 00000033 -/* 00954 80A43684 15810003 */ bne $t4, $at, .L80A43694 -/* 00958 80A43688 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0095C 80A4368C 10000001 */ beq $zero, $zero, .L80A43694 -/* 00960 80A43690 24060034 */ addiu $a2, $zero, 0x0034 ## $a2 = 00000034 -.L80A43694: -/* 00964 80A43694 0C290D09 */ jal func_80A43424 -/* 00968 80A43698 8FA50018 */ lw $a1, 0x0018($sp) -/* 0096C 80A4369C 0C041B33 */ jal func_80106CCC -/* 00970 80A436A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00974 80A436A4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00978 80A436A8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0097C 80A436AC 946D0F1A */ lhu $t5, 0x0F1A($v1) ## 8015F57A -/* 00980 80A436B0 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00984 80A436B4 35AE4000 */ ori $t6, $t5, 0x4000 ## $t6 = 00004000 -/* 00988 80A436B8 10000004 */ beq $zero, $zero, .L80A436CC -/* 0098C 80A436BC A46E0F1A */ sh $t6, 0x0F1A($v1) ## 8015F57A -.L80A436C0: -/* 00990 80A436C0 10000002 */ beq $zero, $zero, .L80A436CC -/* 00994 80A436C4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A436C8: -/* 00998 80A436C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A436CC: -/* 0099C 80A436CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009A0 80A436D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A4 80A436D4 03E00008 */ jr $ra -/* 009A8 80A436D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s deleted file mode 100644 index 36dcfd3fa0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A436DC -/* 009AC 80A436DC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) -/* 009B0 80A436E0 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) -/* 009B4 80A436E4 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) -/* 009B8 80A436E8 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) -/* 009BC 80A436EC AFA40000 */ sw $a0, 0x0000($sp) -/* 009C0 80A436F0 AFA50004 */ sw $a1, 0x0004($sp) -/* 009C4 80A436F4 01CFC024 */ and $t8, $t6, $t7 -/* 009C8 80A436F8 13000004 */ beq $t8, $zero, .L80A4370C -/* 009CC 80A436FC 2403300A */ addiu $v1, $zero, 0x300A ## $v1 = 0000300A -/* 009D0 80A43700 24033027 */ addiu $v1, $zero, 0x3027 ## $v1 = 00003027 -/* 009D4 80A43704 03E00008 */ jr $ra -/* 009D8 80A43708 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003027 -.L80A4370C: -/* 009DC 80A4370C 03E00008 */ jr $ra -/* 009E0 80A43710 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003027 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s deleted file mode 100644 index 0d1e5431ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80A43714 -/* 009E4 80A43714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009E8 80A43718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009EC 80A4371C AFA40018 */ sw $a0, 0x0018($sp) -/* 009F0 80A43720 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 009F4 80A43724 0C042F6F */ jal func_8010BDBC -/* 009F8 80A43728 AFA5001C */ sw $a1, 0x001C($sp) -/* 009FC 80A4372C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00A00 80A43730 10410006 */ beq $v0, $at, .L80A4374C -/* 00A04 80A43734 8FA6001C */ lw $a2, 0x001C($sp) -/* 00A08 80A43738 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00A0C 80A4373C 10410011 */ beq $v0, $at, .L80A43784 -/* 00A10 80A43740 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A14 80A43744 10000033 */ beq $zero, $zero, .L80A43814 -/* 00A18 80A43748 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4374C: -/* 00A1C 80A4374C 94CE010E */ lhu $t6, 0x010E($a2) ## 0000010E -/* 00A20 80A43750 2401300B */ addiu $at, $zero, 0x300B ## $at = 0000300B -/* 00A24 80A43754 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00A28 80A43758 15C10008 */ bne $t6, $at, .L80A4377C -/* 00A2C 80A4375C 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00A30 80A43760 94830F14 */ lhu $v1, 0x0F14($a0) ## 8015F574 -/* 00A34 80A43764 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00A38 80A43768 306F0800 */ andi $t7, $v1, 0x0800 ## $t7 = 00000000 -/* 00A3C 80A4376C 15E00003 */ bne $t7, $zero, .L80A4377C -/* 00A40 80A43770 34780800 */ ori $t8, $v1, 0x0800 ## $t8 = 00000800 -/* 00A44 80A43774 10000027 */ beq $zero, $zero, .L80A43814 -/* 00A48 80A43778 A4980F14 */ sh $t8, 0x0F14($a0) ## 8015F574 -.L80A4377C: -/* 00A4C 80A4377C 10000025 */ beq $zero, $zero, .L80A43814 -/* 00A50 80A43780 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43784: -/* 00A54 80A43784 0C041AF2 */ jal func_80106BC8 -/* 00A58 80A43788 AFA6001C */ sw $a2, 0x001C($sp) -/* 00A5C 80A4378C 10400020 */ beq $v0, $zero, .L80A43810 -/* 00A60 80A43790 8FA6001C */ lw $a2, 0x001C($sp) -/* 00A64 80A43794 94D9010E */ lhu $t9, 0x010E($a2) ## 0000010E -/* 00A68 80A43798 2401300A */ addiu $at, $zero, 0x300A ## $at = 0000300A -/* 00A6C 80A4379C 8FA80018 */ lw $t0, 0x0018($sp) -/* 00A70 80A437A0 17210019 */ bne $t9, $at, .L80A43808 -/* 00A74 80A437A4 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00A78 80A437A8 01284821 */ addu $t1, $t1, $t0 -/* 00A7C 80A437AC 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 00A80 80A437B0 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00A84 80A437B4 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00A88 80A437B8 1520000F */ bne $t1, $zero, .L80A437F8 -/* 00A8C 80A437BC 2419300D */ addiu $t9, $zero, 0x300D ## $t9 = 0000300D -/* 00A90 80A437C0 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+8) -/* 00A94 80A437C4 8D6B71B8 */ lw $t3, %lo(gUpgradeMasks+8)($t3) -/* 00A98 80A437C8 8C8A00A0 */ lw $t2, 0x00A0($a0) ## 8015E700 -/* 00A9C 80A437CC 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+2) -/* 00AA0 80A437D0 91AD71F6 */ lbu $t5, %lo(gUpgradeShifts+2)($t5) -/* 00AA4 80A437D4 014B6024 */ and $t4, $t2, $t3 -/* 00AA8 80A437D8 2418300C */ addiu $t8, $zero, 0x300C ## $t8 = 0000300C -/* 00AAC 80A437DC 01AC7007 */ srav $t6, $t4, $t5 -/* 00AB0 80A437E0 11C00003 */ beq $t6, $zero, .L80A437F0 -/* 00AB4 80A437E4 240F300B */ addiu $t7, $zero, 0x300B ## $t7 = 0000300B -/* 00AB8 80A437E8 10000004 */ beq $zero, $zero, .L80A437FC -/* 00ABC 80A437EC A4CF010E */ sh $t7, 0x010E($a2) ## 0000010E -.L80A437F0: -/* 00AC0 80A437F0 10000002 */ beq $zero, $zero, .L80A437FC -/* 00AC4 80A437F4 A4D8010E */ sh $t8, 0x010E($a2) ## 0000010E -.L80A437F8: -/* 00AC8 80A437F8 A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80A437FC: -/* 00ACC 80A437FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AD0 80A43800 0C042DC8 */ jal func_8010B720 -/* 00AD4 80A43804 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -.L80A43808: -/* 00AD8 80A43808 10000002 */ beq $zero, $zero, .L80A43814 -/* 00ADC 80A4380C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43810: -/* 00AE0 80A43810 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43814: -/* 00AE4 80A43814 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AE8 80A43818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AEC 80A4381C 03E00008 */ jr $ra -/* 00AF0 80A43820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s deleted file mode 100644 index a80a5bd7b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A43824 -/* 00AF4 80A43824 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00AF8 80A43828 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00AFC 80A4382C 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) -/* 00B00 80A43830 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) -/* 00B04 80A43834 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 00B08 80A43838 AFA40000 */ sw $a0, 0x0000($sp) -/* 00B0C 80A4383C AFA50004 */ sw $a1, 0x0004($sp) -/* 00B10 80A43840 01CFC024 */ and $t8, $t6, $t7 -/* 00B14 80A43844 53000004 */ beql $t8, $zero, .L80A43858 -/* 00B18 80A43848 94590ED8 */ lhu $t9, 0x0ED8($v0) ## 8015F538 -/* 00B1C 80A4384C 03E00008 */ jr $ra -/* 00B20 80A43850 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -.L80A43854: -/* 00B24 80A43854 94590ED8 */ lhu $t9, 0x0ED8($v0) ## 00003EFF -.L80A43858: -/* 00B28 80A43858 24033009 */ addiu $v1, $zero, 0x3009 ## $v1 = 00003009 -/* 00B2C 80A4385C 33280008 */ andi $t0, $t9, 0x0008 ## $t0 = 00000000 -/* 00B30 80A43860 11000003 */ beq $t0, $zero, .L80A43870 -/* 00B34 80A43864 00000000 */ nop -/* 00B38 80A43868 10000001 */ beq $zero, $zero, .L80A43870 -/* 00B3C 80A4386C 24033026 */ addiu $v1, $zero, 0x3026 ## $v1 = 00003026 -.L80A43870: -/* 00B40 80A43870 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003026 -/* 00B44 80A43874 03E00008 */ jr $ra -/* 00B48 80A43878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s deleted file mode 100644 index af23bcdd0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A4387C -/* 00B4C 80A4387C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B50 80A43880 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B54 80A43884 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B58 80A43888 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B5C 80A4388C 0C042F6F */ jal func_8010BDBC -/* 00B60 80A43890 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00B64 80A43894 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00B68 80A43898 14410003 */ bne $v0, $at, .L80A438A8 -/* 00B6C 80A4389C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B70 80A438A0 10000002 */ beq $zero, $zero, .L80A438AC -/* 00B74 80A438A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A438A8: -/* 00B78 80A438A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A438AC: -/* 00B7C 80A438AC 03E00008 */ jr $ra -/* 00B80 80A438B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s deleted file mode 100644 index 295c576382..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80A438B4 -/* 00B84 80A438B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00B88 80A438B8 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00B8C 80A438BC 3C038012 */ lui $v1, %hi(gBitFlags) -/* 00B90 80A438C0 24637120 */ addiu $v1, %lo(gBitFlags) -/* 00B94 80A438C4 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00B98 80A438C8 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 -/* 00B9C 80A438CC 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 -/* 00BA0 80A438D0 AFA50004 */ sw $a1, 0x0004($sp) -/* 00BA4 80A438D4 01C27824 */ and $t7, $t6, $v0 -/* 00BA8 80A438D8 51E00007 */ beql $t7, $zero, .L80A438F8 -/* 00BAC 80A438DC 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00BB0 80A438E0 8C980004 */ lw $t8, 0x0004($a0) ## 8015E664 -/* 00BB4 80A438E4 57000004 */ bnel $t8, $zero, .L80A438F8 -/* 00BB8 80A438E8 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00BBC 80A438EC 03E00008 */ jr $ra -/* 00BC0 80A438F0 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -.L80A438F4: -/* 00BC4 80A438F4 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -.L80A438F8: -/* 00BC8 80A438F8 03224024 */ and $t0, $t9, $v0 -/* 00BCC 80A438FC 51000004 */ beql $t0, $zero, .L80A43910 -/* 00BD0 80A43900 94890ED8 */ lhu $t1, 0x0ED8($a0) ## 8015F538 -/* 00BD4 80A43904 03E00008 */ jr $ra -/* 00BD8 80A43908 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -.L80A4390C: -/* 00BDC 80A4390C 94890ED8 */ lhu $t1, 0x0ED8($a0) ## 8015F538 -.L80A43910: -/* 00BE0 80A43910 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 -/* 00BE4 80A43914 51400004 */ beql $t2, $zero, .L80A43928 -/* 00BE8 80A43918 948B0F14 */ lhu $t3, 0x0F14($a0) ## 8015F574 -/* 00BEC 80A4391C 10000009 */ beq $zero, $zero, .L80A43944 -/* 00BF0 80A43920 24033021 */ addiu $v1, $zero, 0x3021 ## $v1 = 00003021 -/* 00BF4 80A43924 948B0F14 */ lhu $t3, 0x0F14($a0) ## 8015F574 -.L80A43928: -/* 00BF8 80A43928 24023008 */ addiu $v0, $zero, 0x3008 ## $v0 = 00003008 -/* 00BFC 80A4392C 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00C00 80A43930 11800003 */ beq $t4, $zero, .L80A43940 -/* 00C04 80A43934 00000000 */ nop -/* 00C08 80A43938 10000001 */ beq $zero, $zero, .L80A43940 -/* 00C0C 80A4393C 2402302A */ addiu $v0, $zero, 0x302A ## $v0 = 0000302A -.L80A43940: -/* 00C10 80A43940 00401825 */ or $v1, $v0, $zero ## $v1 = 0000302A -.L80A43944: -/* 00C14 80A43944 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 0000302A -/* 00C18 80A43948 03E00008 */ jr $ra -/* 00C1C 80A4394C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s deleted file mode 100644 index d689753ba8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A43950 -/* 00C20 80A43950 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C24 80A43954 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C28 80A43958 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C2C 80A4395C 0C042F6F */ jal func_8010BDBC -/* 00C30 80A43960 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00C34 80A43964 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00C38 80A43968 1441000B */ bne $v0, $at, .L80A43998 -/* 00C3C 80A4396C 8FAE001C */ lw $t6, 0x001C($sp) -/* 00C40 80A43970 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 00C44 80A43974 24013008 */ addiu $at, $zero, 0x3008 ## $at = 00003008 -/* 00C48 80A43978 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00C4C 80A4397C 15E10004 */ bne $t7, $at, .L80A43990 -/* 00C50 80A43980 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00C54 80A43984 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 -/* 00C58 80A43988 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00C5C 80A4398C A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 -.L80A43990: -/* 00C60 80A43990 10000002 */ beq $zero, $zero, .L80A4399C -/* 00C64 80A43994 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43998: -/* 00C68 80A43998 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4399C: -/* 00C6C 80A4399C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C70 80A439A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C74 80A439A4 03E00008 */ jr $ra -/* 00C78 80A439A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s deleted file mode 100644 index eb60123b2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A439AC -/* 00C7C 80A439AC AFA40000 */ sw $a0, 0x0000($sp) -/* 00C80 80A439B0 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00C84 80A439B4 3C038012 */ lui $v1, %hi(gBitFlags) -/* 00C88 80A439B8 24637120 */ addiu $v1, %lo(gBitFlags) -/* 00C8C 80A439BC 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00C90 80A439C0 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 -/* 00C94 80A439C4 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 -/* 00C98 80A439C8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00C9C 80A439CC 01C27824 */ and $t7, $t6, $v0 -/* 00CA0 80A439D0 51E00007 */ beql $t7, $zero, .L80A439F0 -/* 00CA4 80A439D4 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00CA8 80A439D8 8C980004 */ lw $t8, 0x0004($a0) ## 8015E664 -/* 00CAC 80A439DC 57000004 */ bnel $t8, $zero, .L80A439F0 -/* 00CB0 80A439E0 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00CB4 80A439E4 03E00008 */ jr $ra -/* 00CB8 80A439E8 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -.L80A439EC: -/* 00CBC 80A439EC 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -.L80A439F0: -/* 00CC0 80A439F0 03224024 */ and $t0, $t9, $v0 -/* 00CC4 80A439F4 51000004 */ beql $t0, $zero, .L80A43A08 -/* 00CC8 80A439F8 94890F16 */ lhu $t1, 0x0F16($a0) ## 8015F576 -/* 00CCC 80A439FC 03E00008 */ jr $ra -/* 00CD0 80A43A00 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -.L80A43A04: -/* 00CD4 80A43A04 94890F16 */ lhu $t1, 0x0F16($a0) ## 8015F576 -.L80A43A08: -/* 00CD8 80A43A08 24033014 */ addiu $v1, $zero, 0x3014 ## $v1 = 00003014 -/* 00CDC 80A43A0C 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00CE0 80A43A10 11400003 */ beq $t2, $zero, .L80A43A20 -/* 00CE4 80A43A14 00000000 */ nop -/* 00CE8 80A43A18 10000001 */ beq $zero, $zero, .L80A43A20 -/* 00CEC 80A43A1C 24033015 */ addiu $v1, $zero, 0x3015 ## $v1 = 00003015 -.L80A43A20: -/* 00CF0 80A43A20 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003015 -/* 00CF4 80A43A24 03E00008 */ jr $ra -/* 00CF8 80A43A28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s deleted file mode 100644 index fdcb682cf9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A43A2C -/* 00CFC 80A43A2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D00 80A43A30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D04 80A43A34 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D08 80A43A38 0C042F6F */ jal func_8010BDBC -/* 00D0C 80A43A3C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00D10 80A43A40 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00D14 80A43A44 1441000B */ bne $v0, $at, .L80A43A74 -/* 00D18 80A43A48 8FAE001C */ lw $t6, 0x001C($sp) -/* 00D1C 80A43A4C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 00D20 80A43A50 24013014 */ addiu $at, $zero, 0x3014 ## $at = 00003014 -/* 00D24 80A43A54 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D28 80A43A58 15E10004 */ bne $t7, $at, .L80A43A6C -/* 00D2C 80A43A5C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D30 80A43A60 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 -/* 00D34 80A43A64 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00D38 80A43A68 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 -.L80A43A6C: -/* 00D3C 80A43A6C 10000002 */ beq $zero, $zero, .L80A43A78 -/* 00D40 80A43A70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43A74: -/* 00D44 80A43A74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43A78: -/* 00D48 80A43A78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D4C 80A43A7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D50 80A43A80 03E00008 */ jr $ra -/* 00D54 80A43A84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s deleted file mode 100644 index b1aab3a81f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A43A88 -/* 00D58 80A43A88 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D5C 80A43A8C 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00D60 80A43A90 3C038012 */ lui $v1, %hi(gBitFlags) -/* 00D64 80A43A94 24637120 */ addiu $v1, %lo(gBitFlags) -/* 00D68 80A43A98 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00D6C 80A43A9C 8C8200A4 */ lw $v0, 0x00A4($a0) ## 8015E704 -/* 00D70 80A43AA0 8C6E0004 */ lw $t6, 0x0004($v1) ## 80127124 -/* 00D74 80A43AA4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00D78 80A43AA8 01C27824 */ and $t7, $t6, $v0 -/* 00D7C 80A43AAC 51E00007 */ beql $t7, $zero, .L80A43ACC -/* 00D80 80A43AB0 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00D84 80A43AB4 8C980004 */ lw $t8, 0x0004($a0) ## 8015E664 -/* 00D88 80A43AB8 57000004 */ bnel $t8, $zero, .L80A43ACC -/* 00D8C 80A43ABC 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -/* 00D90 80A43AC0 03E00008 */ jr $ra -/* 00D94 80A43AC4 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -.L80A43AC8: -/* 00D98 80A43AC8 8C79004C */ lw $t9, 0x004C($v1) ## 8012716C -.L80A43ACC: -/* 00D9C 80A43ACC 03224024 */ and $t0, $t9, $v0 -/* 00DA0 80A43AD0 51000004 */ beql $t0, $zero, .L80A43AE4 -/* 00DA4 80A43AD4 94890F16 */ lhu $t1, 0x0F16($a0) ## 8015F576 -/* 00DA8 80A43AD8 03E00008 */ jr $ra -/* 00DAC 80A43ADC 24023067 */ addiu $v0, $zero, 0x3067 ## $v0 = 00003067 -.L80A43AE0: -/* 00DB0 80A43AE0 94890F16 */ lhu $t1, 0x0F16($a0) ## 8015F576 -.L80A43AE4: -/* 00DB4 80A43AE4 24033016 */ addiu $v1, $zero, 0x3016 ## $v1 = 00003016 -/* 00DB8 80A43AE8 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 -/* 00DBC 80A43AEC 11400003 */ beq $t2, $zero, .L80A43AFC -/* 00DC0 80A43AF0 00000000 */ nop -/* 00DC4 80A43AF4 10000001 */ beq $zero, $zero, .L80A43AFC -/* 00DC8 80A43AF8 24033017 */ addiu $v1, $zero, 0x3017 ## $v1 = 00003017 -.L80A43AFC: -/* 00DCC 80A43AFC 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003017 -/* 00DD0 80A43B00 03E00008 */ jr $ra -/* 00DD4 80A43B04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s deleted file mode 100644 index f063a07b19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A43B08 -/* 00DD8 80A43B08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DDC 80A43B0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DE0 80A43B10 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DE4 80A43B14 0C042F6F */ jal func_8010BDBC -/* 00DE8 80A43B18 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00DEC 80A43B1C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00DF0 80A43B20 1441000B */ bne $v0, $at, .L80A43B50 -/* 00DF4 80A43B24 8FAE001C */ lw $t6, 0x001C($sp) -/* 00DF8 80A43B28 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 00DFC 80A43B2C 24013016 */ addiu $at, $zero, 0x3016 ## $at = 00003016 -/* 00E00 80A43B30 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00E04 80A43B34 15E10004 */ bne $t7, $at, .L80A43B48 -/* 00E08 80A43B38 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00E0C 80A43B3C 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 -/* 00E10 80A43B40 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 00E14 80A43B44 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 -.L80A43B48: -/* 00E18 80A43B48 10000002 */ beq $zero, $zero, .L80A43B54 -/* 00E1C 80A43B4C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43B50: -/* 00E20 80A43B50 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43B54: -/* 00E24 80A43B54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E28 80A43B58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E2C 80A43B5C 03E00008 */ jr $ra -/* 00E30 80A43B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s deleted file mode 100644 index c18c69af6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80A43B64 -/* 00E34 80A43B64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E38 80A43B68 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E3C 80A43B6C 3C058012 */ lui $a1, %hi(gBitFlags) -/* 00E40 80A43B70 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00E44 80A43B74 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00E48 80A43B78 24A57120 */ addiu $a1, %lo(gBitFlags) -/* 00E4C 80A43B7C 8CAE0004 */ lw $t6, 0x0004($a1) ## 80127124 -/* 00E50 80A43B80 8C6200A4 */ lw $v0, 0x00A4($v1) ## 8015E704 -/* 00E54 80A43B84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E58 80A43B88 01C27824 */ and $t7, $t6, $v0 -/* 00E5C 80A43B8C 51E00007 */ beql $t7, $zero, .L80A43BAC -/* 00E60 80A43B90 8CB9004C */ lw $t9, 0x004C($a1) ## 8012716C -/* 00E64 80A43B94 8C780004 */ lw $t8, 0x0004($v1) ## 8015E664 -/* 00E68 80A43B98 57000004 */ bnel $t8, $zero, .L80A43BAC -/* 00E6C 80A43B9C 8CB9004C */ lw $t9, 0x004C($a1) ## 8012716C -/* 00E70 80A43BA0 10000023 */ beq $zero, $zero, .L80A43C30 -/* 00E74 80A43BA4 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -/* 00E78 80A43BA8 8CB9004C */ lw $t9, 0x004C($a1) ## 8012716C -.L80A43BAC: -/* 00E7C 80A43BAC 3C0A8012 */ lui $t2, %hi(gUpgradeMasks+8) -/* 00E80 80A43BB0 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+2) -/* 00E84 80A43BB4 03224024 */ and $t0, $t9, $v0 -/* 00E88 80A43BB8 51000004 */ beql $t0, $zero, .L80A43BCC -/* 00E8C 80A43BBC 8C6900A0 */ lw $t1, 0x00A0($v1) ## 8015E700 -/* 00E90 80A43BC0 1000001B */ beq $zero, $zero, .L80A43C30 -/* 00E94 80A43BC4 24023027 */ addiu $v0, $zero, 0x3027 ## $v0 = 00003027 -/* 00E98 80A43BC8 8C6900A0 */ lw $t1, 0x00A0($v1) ## 8015E700 -.L80A43BCC: -/* 00E9C 80A43BCC 8D4A71B8 */ lw $t2, %lo(gUpgradeMasks+8)($t2) -/* 00EA0 80A43BD0 918C71F6 */ lbu $t4, %lo(gUpgradeShifts+2)($t4) -/* 00EA4 80A43BD4 012A5824 */ and $t3, $t1, $t2 -/* 00EA8 80A43BD8 018B6807 */ srav $t5, $t3, $t4 -/* 00EAC 80A43BDC 11A00003 */ beq $t5, $zero, .L80A43BEC -/* 00EB0 80A43BE0 00000000 */ nop -/* 00EB4 80A43BE4 10000011 */ beq $zero, $zero, .L80A43C2C -/* 00EB8 80A43BE8 2403302C */ addiu $v1, $zero, 0x302C ## $v1 = 0000302C -.L80A43BEC: -/* 00EBC 80A43BEC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00EC0 80A43BF0 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B -/* 00EC4 80A43BF4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00EC8 80A43BF8 14400003 */ bne $v0, $zero, .L80A43C08 -/* 00ECC 80A43BFC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00ED0 80A43C00 10000009 */ beq $zero, $zero, .L80A43C28 -/* 00ED4 80A43C04 24023017 */ addiu $v0, $zero, 0x3017 ## $v0 = 00003017 -.L80A43C08: -/* 00ED8 80A43C08 946E0F16 */ lhu $t6, 0x0F16($v1) ## 8015F576 -/* 00EDC 80A43C0C 24033018 */ addiu $v1, $zero, 0x3018 ## $v1 = 00003018 -/* 00EE0 80A43C10 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 00EE4 80A43C14 11E00003 */ beq $t7, $zero, .L80A43C24 -/* 00EE8 80A43C18 00000000 */ nop -/* 00EEC 80A43C1C 10000001 */ beq $zero, $zero, .L80A43C24 -/* 00EF0 80A43C20 24033019 */ addiu $v1, $zero, 0x3019 ## $v1 = 00003019 -.L80A43C24: -/* 00EF4 80A43C24 00601025 */ or $v0, $v1, $zero ## $v0 = 00003019 -.L80A43C28: -/* 00EF8 80A43C28 00401825 */ or $v1, $v0, $zero ## $v1 = 00003019 -.L80A43C2C: -/* 00EFC 80A43C2C 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003019 -.L80A43C30: -/* 00F00 80A43C30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F04 80A43C34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F08 80A43C38 03E00008 */ jr $ra -/* 00F0C 80A43C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s deleted file mode 100644 index ae49fcc3e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A43C40 -/* 00F10 80A43C40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F14 80A43C44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F18 80A43C48 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F1C 80A43C4C 0C042F6F */ jal func_8010BDBC -/* 00F20 80A43C50 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00F24 80A43C54 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00F28 80A43C58 1441000B */ bne $v0, $at, .L80A43C88 -/* 00F2C 80A43C5C 8FAE001C */ lw $t6, 0x001C($sp) -/* 00F30 80A43C60 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 00F34 80A43C64 24013018 */ addiu $at, $zero, 0x3018 ## $at = 00003018 -/* 00F38 80A43C68 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00F3C 80A43C6C 15E10004 */ bne $t7, $at, .L80A43C80 -/* 00F40 80A43C70 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00F44 80A43C74 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 -/* 00F48 80A43C78 37190100 */ ori $t9, $t8, 0x0100 ## $t9 = 00000100 -/* 00F4C 80A43C7C A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 -.L80A43C80: -/* 00F50 80A43C80 10000002 */ beq $zero, $zero, .L80A43C8C -/* 00F54 80A43C84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43C88: -/* 00F58 80A43C88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43C8C: -/* 00F5C 80A43C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F60 80A43C90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F64 80A43C94 03E00008 */ jr $ra -/* 00F68 80A43C98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s deleted file mode 100644 index c58299ac31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80A43C9C -/* 00F6C 80A43C9C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00F70 80A43CA0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00F74 80A43CA4 3C028012 */ lui $v0, %hi(gBitFlags+4) -/* 00F78 80A43CA8 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) -/* 00F7C 80A43CAC 8C6E00A4 */ lw $t6, 0x00A4($v1) ## 8015E704 -/* 00F80 80A43CB0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00F84 80A43CB4 3C088012 */ lui $t0, %hi(gEquipShifts+2) -/* 00F88 80A43CB8 004E7824 */ and $t7, $v0, $t6 -/* 00F8C 80A43CBC 11E0000B */ beq $t7, $zero, .L80A43CEC -/* 00F90 80A43CC0 00000000 */ nop -/* 00F94 80A43CC4 94780F18 */ lhu $t8, 0x0F18($v1) ## 8015F578 -/* 00F98 80A43CC8 24033041 */ addiu $v1, $zero, 0x3041 ## $v1 = 00003041 -/* 00F9C 80A43CCC 33198000 */ andi $t9, $t8, 0x8000 ## $t9 = 00000000 -/* 00FA0 80A43CD0 13200004 */ beq $t9, $zero, .L80A43CE4 -/* 00FA4 80A43CD4 00000000 */ nop -/* 00FA8 80A43CD8 24033042 */ addiu $v1, $zero, 0x3042 ## $v1 = 00003042 -/* 00FAC 80A43CDC 03E00008 */ jr $ra -/* 00FB0 80A43CE0 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003042 -.L80A43CE4: -/* 00FB4 80A43CE4 03E00008 */ jr $ra -/* 00FB8 80A43CE8 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003042 -.L80A43CEC: -/* 00FBC 80A43CEC 910871F2 */ lbu $t0, %lo(gEquipShifts+2)($t0) -/* 00FC0 80A43CF0 946A009C */ lhu $t2, 0x009C($v1) ## 000030DE -/* 00FC4 80A43CF4 01024804 */ sllv $t1, $v0, $t0 -/* 00FC8 80A43CF8 012A5824 */ and $t3, $t1, $t2 -/* 00FCC 80A43CFC 5160000C */ beql $t3, $zero, .L80A43D30 -/* 00FD0 80A43D00 946E0F18 */ lhu $t6, 0x0F18($v1) ## 00003F5A -/* 00FD4 80A43D04 946C0F18 */ lhu $t4, 0x0F18($v1) ## 00003F5A -/* 00FD8 80A43D08 24033037 */ addiu $v1, $zero, 0x3037 ## $v1 = 00003037 -/* 00FDC 80A43D0C 318D4000 */ andi $t5, $t4, 0x4000 ## $t5 = 00000000 -/* 00FE0 80A43D10 11A00004 */ beq $t5, $zero, .L80A43D24 -/* 00FE4 80A43D14 00000000 */ nop -/* 00FE8 80A43D18 24033038 */ addiu $v1, $zero, 0x3038 ## $v1 = 00003038 -/* 00FEC 80A43D1C 03E00008 */ jr $ra -/* 00FF0 80A43D20 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003038 -.L80A43D24: -/* 00FF4 80A43D24 03E00008 */ jr $ra -/* 00FF8 80A43D28 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003038 -.L80A43D2C: -/* 00FFC 80A43D2C 946E0F18 */ lhu $t6, 0x0F18($v1) ## 00003F50 -.L80A43D30: -/* 01000 80A43D30 24023030 */ addiu $v0, $zero, 0x3030 ## $v0 = 00003030 -/* 01004 80A43D34 31CF1000 */ andi $t7, $t6, 0x1000 ## $t7 = 00000000 -/* 01008 80A43D38 11E0000D */ beq $t7, $zero, .L80A43D70 -/* 0100C 80A43D3C 00000000 */ nop -/* 01010 80A43D40 A0A0020C */ sb $zero, 0x020C($a1) ## 0000020C -/* 01014 80A43D44 A0A0020D */ sb $zero, 0x020D($a1) ## 0000020D -/* 01018 80A43D48 94780F18 */ lhu $t8, 0x0F18($v1) ## 00003F50 -/* 0101C 80A43D4C 24033032 */ addiu $v1, $zero, 0x3032 ## $v1 = 00003032 -/* 01020 80A43D50 33190400 */ andi $t9, $t8, 0x0400 ## $t9 = 00000000 -/* 01024 80A43D54 13200004 */ beq $t9, $zero, .L80A43D68 -/* 01028 80A43D58 00000000 */ nop -/* 0102C 80A43D5C 24033033 */ addiu $v1, $zero, 0x3033 ## $v1 = 00003033 -/* 01030 80A43D60 03E00008 */ jr $ra -/* 01034 80A43D64 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003033 -.L80A43D68: -/* 01038 80A43D68 03E00008 */ jr $ra -/* 0103C 80A43D6C 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003033 -.L80A43D70: -/* 01040 80A43D70 03E00008 */ jr $ra -/* 01044 80A43D74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s deleted file mode 100644 index a987e611b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s +++ /dev/null @@ -1,152 +0,0 @@ -glabel func_80A43D78 -/* 01048 80A43D78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0104C 80A43D7C AFA40018 */ sw $a0, 0x0018($sp) -/* 01050 80A43D80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01054 80A43D84 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01058 80A43D88 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0105C 80A43D8C 8FA50018 */ lw $a1, 0x0018($sp) -/* 01060 80A43D90 0C290D1A */ jal func_80A43468 -/* 01064 80A43D94 AFA7001C */ sw $a3, 0x001C($sp) -/* 01068 80A43D98 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0106C 80A43D9C 10410009 */ beq $v0, $at, .L80A43DC4 -/* 01070 80A43DA0 8FA7001C */ lw $a3, 0x001C($sp) -/* 01074 80A43DA4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01078 80A43DA8 10410020 */ beq $v0, $at, .L80A43E2C -/* 0107C 80A43DAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01080 80A43DB0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01084 80A43DB4 10410058 */ beq $v0, $at, .L80A43F18 -/* 01088 80A43DB8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0108C 80A43DBC 10000070 */ beq $zero, $zero, .L80A43F80 -/* 01090 80A43DC0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43DC4: -/* 01094 80A43DC4 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 01098 80A43DC8 24013036 */ addiu $at, $zero, 0x3036 ## $at = 00003036 -/* 0109C 80A43DCC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 010A0 80A43DD0 10410006 */ beq $v0, $at, .L80A43DEC -/* 010A4 80A43DD4 8FA50018 */ lw $a1, 0x0018($sp) -/* 010A8 80A43DD8 24013037 */ addiu $at, $zero, 0x3037 ## $at = 00003037 -/* 010AC 80A43DDC 1041000C */ beq $v0, $at, .L80A43E10 -/* 010B0 80A43DE0 00000000 */ nop -/* 010B4 80A43DE4 10000066 */ beq $zero, $zero, .L80A43F80 -/* 010B8 80A43DE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43DEC: -/* 010BC 80A43DEC 2406002C */ addiu $a2, $zero, 0x002C ## $a2 = 0000002C -/* 010C0 80A43DF0 0C290D09 */ jal func_80A43424 -/* 010C4 80A43DF4 AFA7001C */ sw $a3, 0x001C($sp) -/* 010C8 80A43DF8 8FA7001C */ lw $a3, 0x001C($sp) -/* 010CC 80A43DFC 3C0E80A4 */ lui $t6, %hi(func_80A470E8) ## $t6 = 80A40000 -/* 010D0 80A43E00 25CE70E8 */ addiu $t6, $t6, %lo(func_80A470E8) ## $t6 = 80A470E8 -/* 010D4 80A43E04 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 010D8 80A43E08 1000005D */ beq $zero, $zero, .L80A43F80 -/* 010DC 80A43E0C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -.L80A43E10: -/* 010E0 80A43E10 3C028016 */ lui $v0, %hi(gSaveContext) -/* 010E4 80A43E14 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 010E8 80A43E18 944F0F18 */ lhu $t7, 0x0F18($v0) ## 8015F578 -/* 010EC 80A43E1C 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 -/* 010F0 80A43E20 A4580F18 */ sh $t8, 0x0F18($v0) ## 8015F578 -/* 010F4 80A43E24 10000056 */ beq $zero, $zero, .L80A43F80 -/* 010F8 80A43E28 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A43E2C: -/* 010FC 80A43E2C 0C041AF2 */ jal func_80106BC8 -/* 01100 80A43E30 AFA7001C */ sw $a3, 0x001C($sp) -/* 01104 80A43E34 10400051 */ beq $v0, $zero, .L80A43F7C -/* 01108 80A43E38 8FA7001C */ lw $a3, 0x001C($sp) -/* 0110C 80A43E3C 94F9010E */ lhu $t9, 0x010E($a3) ## 0000010E -/* 01110 80A43E40 24013034 */ addiu $at, $zero, 0x3034 ## $at = 00003034 -/* 01114 80A43E44 8FA80018 */ lw $t0, 0x0018($sp) -/* 01118 80A43E48 17210031 */ bne $t9, $at, .L80A43F10 -/* 0111C 80A43E4C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 01120 80A43E50 01284821 */ addu $t1, $t1, $t0 -/* 01124 80A43E54 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 01128 80A43E58 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0112C 80A43E5C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01130 80A43E60 55200016 */ bnel $t1, $zero, .L80A43EBC -/* 01134 80A43E64 944E0F18 */ lhu $t6, 0x0F18($v0) ## 8015F578 -/* 01138 80A43E68 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0113C 80A43E6C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01140 80A43E70 944A0F18 */ lhu $t2, 0x0F18($v0) ## 8015F578 -/* 01144 80A43E74 240D3035 */ addiu $t5, $zero, 0x3035 ## $t5 = 00003035 -/* 01148 80A43E78 240C3033 */ addiu $t4, $zero, 0x3033 ## $t4 = 00003033 -/* 0114C 80A43E7C 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 -/* 01150 80A43E80 11600003 */ beq $t3, $zero, .L80A43E90 -/* 01154 80A43E84 240439EB */ addiu $a0, $zero, 0x39EB ## $a0 = 000039EB -/* 01158 80A43E88 10000002 */ beq $zero, $zero, .L80A43E94 -/* 0115C 80A43E8C A4EC010E */ sh $t4, 0x010E($a3) ## 0000010E -.L80A43E90: -/* 01160 80A43E90 A4ED010E */ sh $t5, 0x010E($a3) ## 0000010E -.L80A43E94: -/* 01164 80A43E94 94E5010E */ lhu $a1, 0x010E($a3) ## 0000010E -/* 01168 80A43E98 24013035 */ addiu $at, $zero, 0x3035 ## $at = 00003035 -/* 0116C 80A43E9C 54A10018 */ bnel $a1, $at, .L80A43F00 -/* 01170 80A43EA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01174 80A43EA4 0C03E341 */ jal func_800F8D04 -/* 01178 80A43EA8 AFA7001C */ sw $a3, 0x001C($sp) -/* 0117C 80A43EAC 8FA7001C */ lw $a3, 0x001C($sp) -/* 01180 80A43EB0 10000012 */ beq $zero, $zero, .L80A43EFC -/* 01184 80A43EB4 94E5010E */ lhu $a1, 0x010E($a3) ## 0000010E -/* 01188 80A43EB8 944E0F18 */ lhu $t6, 0x0F18($v0) ## 00000F18 -.L80A43EBC: -/* 0118C 80A43EBC 24193033 */ addiu $t9, $zero, 0x3033 ## $t9 = 00003033 -/* 01190 80A43EC0 24183036 */ addiu $t8, $zero, 0x3036 ## $t8 = 00003036 -/* 01194 80A43EC4 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 01198 80A43EC8 11E00003 */ beq $t7, $zero, .L80A43ED8 -/* 0119C 80A43ECC 240439EB */ addiu $a0, $zero, 0x39EB ## $a0 = 000039EB -/* 011A0 80A43ED0 10000002 */ beq $zero, $zero, .L80A43EDC -/* 011A4 80A43ED4 A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -.L80A43ED8: -/* 011A8 80A43ED8 A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -.L80A43EDC: -/* 011AC 80A43EDC 94E5010E */ lhu $a1, 0x010E($a3) ## 0000010E -/* 011B0 80A43EE0 24013036 */ addiu $at, $zero, 0x3036 ## $at = 00003036 -/* 011B4 80A43EE4 54A10006 */ bnel $a1, $at, .L80A43F00 -/* 011B8 80A43EE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 011BC 80A43EEC 0C03E341 */ jal func_800F8D04 -/* 011C0 80A43EF0 AFA7001C */ sw $a3, 0x001C($sp) -/* 011C4 80A43EF4 8FA7001C */ lw $a3, 0x001C($sp) -/* 011C8 80A43EF8 94E5010E */ lhu $a1, 0x010E($a3) ## 0000010E -.L80A43EFC: -/* 011CC 80A43EFC 8FA40018 */ lw $a0, 0x0018($sp) -.L80A43F00: -/* 011D0 80A43F00 0C042DC8 */ jal func_8010B720 -/* 011D4 80A43F04 AFA7001C */ sw $a3, 0x001C($sp) -/* 011D8 80A43F08 8FA7001C */ lw $a3, 0x001C($sp) -/* 011DC 80A43F0C A0E0020C */ sb $zero, 0x020C($a3) ## 0000020C -.L80A43F10: -/* 011E0 80A43F10 1000001B */ beq $zero, $zero, .L80A43F80 -/* 011E4 80A43F14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43F18: -/* 011E8 80A43F18 0C041AF2 */ jal func_80106BC8 -/* 011EC 80A43F1C AFA7001C */ sw $a3, 0x001C($sp) -/* 011F0 80A43F20 10400016 */ beq $v0, $zero, .L80A43F7C -/* 011F4 80A43F24 8FA7001C */ lw $a3, 0x001C($sp) -/* 011F8 80A43F28 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 011FC 80A43F2C 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -/* 01200 80A43F30 240A3034 */ addiu $t2, $zero, 0x3034 ## $t2 = 00003034 -/* 01204 80A43F34 1041000A */ beq $v0, $at, .L80A43F60 -/* 01208 80A43F38 3145FFFF */ andi $a1, $t2, 0xFFFF ## $a1 = 00003034 -/* 0120C 80A43F3C 24013033 */ addiu $at, $zero, 0x3033 ## $at = 00003033 -/* 01210 80A43F40 10410007 */ beq $v0, $at, .L80A43F60 -/* 01214 80A43F44 24013035 */ addiu $at, $zero, 0x3035 ## $at = 00003035 -/* 01218 80A43F48 1441000A */ bne $v0, $at, .L80A43F74 -/* 0121C 80A43F4C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01220 80A43F50 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01224 80A43F54 94480F18 */ lhu $t0, 0x0F18($v0) ## 8015F578 -/* 01228 80A43F58 35090800 */ ori $t1, $t0, 0x0800 ## $t1 = 00000800 -/* 0122C 80A43F5C A4490F18 */ sh $t1, 0x0F18($v0) ## 8015F578 -.L80A43F60: -/* 01230 80A43F60 A4EA010E */ sh $t2, 0x010E($a3) ## 0000010E -/* 01234 80A43F64 0C042DC8 */ jal func_8010B720 -/* 01238 80A43F68 8FA40018 */ lw $a0, 0x0018($sp) -/* 0123C 80A43F6C 10000004 */ beq $zero, $zero, .L80A43F80 -/* 01240 80A43F70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43F74: -/* 01244 80A43F74 10000002 */ beq $zero, $zero, .L80A43F80 -/* 01248 80A43F78 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A43F7C: -/* 0124C 80A43F7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A43F80: -/* 01250 80A43F80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01254 80A43F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01258 80A43F88 03E00008 */ jr $ra -/* 0125C 80A43F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s deleted file mode 100644 index 789f4c0026..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A43F90 -/* 01260 80A43F90 AFA50004 */ sw $a1, 0x0004($sp) -/* 01264 80A43F94 3C058016 */ lui $a1, %hi(gSaveContext) -/* 01268 80A43F98 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 0126C 80A43F9C 90AE003E */ lbu $t6, 0x003E($a1) ## 8015E69E -/* 01270 80A43FA0 8C831C44 */ lw $v1, 0x1C44($a0) ## 00001C44 -/* 01274 80A43FA4 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F -/* 01278 80A43FA8 11C00004 */ beq $t6, $zero, .L80A43FBC -/* 0127C 80A43FAC 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) -/* 01280 80A43FB0 A06F0693 */ sb $t7, 0x0693($v1) ## 00000693 -/* 01284 80A43FB4 03E00008 */ jr $ra -/* 01288 80A43FB8 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E -.L80A43FBC: -/* 0128C 80A43FBC 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) -/* 01290 80A43FC0 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 01294 80A43FC4 00B8C821 */ addu $t9, $a1, $t8 -/* 01298 80A43FC8 93220074 */ lbu $v0, 0x0074($t9) ## 00000074 -/* 0129C 80A43FCC 28410037 */ slti $at, $v0, 0x0037 -/* 012A0 80A43FD0 54200005 */ bnel $at, $zero, .L80A43FE8 -/* 012A4 80A43FD4 28410034 */ slti $at, $v0, 0x0034 -/* 012A8 80A43FD8 A0680693 */ sb $t0, 0x0693($v1) ## 00000693 -/* 012AC 80A43FDC 03E00008 */ jr $ra -/* 012B0 80A43FE0 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E -.L80A43FE4: -/* 012B4 80A43FE4 28410034 */ slti $at, $v0, 0x0034 -.L80A43FE8: -/* 012B8 80A43FE8 14200005 */ bne $at, $zero, .L80A44000 -/* 012BC 80A43FEC 240A000B */ addiu $t2, $zero, 0x000B ## $t2 = 0000000B -/* 012C0 80A43FF0 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 012C4 80A43FF4 A0690693 */ sb $t1, 0x0693($v1) ## 00000693 -/* 012C8 80A43FF8 03E00008 */ jr $ra -/* 012CC 80A43FFC 24023058 */ addiu $v0, $zero, 0x3058 ## $v0 = 00003058 -.L80A44000: -/* 012D0 80A44000 A06A0693 */ sb $t2, 0x0693($v1) ## 00000693 -/* 012D4 80A44004 24023053 */ addiu $v0, $zero, 0x3053 ## $v0 = 00003053 -/* 012D8 80A44008 03E00008 */ jr $ra -/* 012DC 80A4400C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s deleted file mode 100644 index ee5e551eda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_80A44010 -/* 012E0 80A44010 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012E4 80A44014 AFBF001C */ sw $ra, 0x001C($sp) -/* 012E8 80A44018 AFA40028 */ sw $a0, 0x0028($sp) -/* 012EC 80A4401C 90AE020D */ lbu $t6, 0x020D($a1) ## 0000020D -/* 012F0 80A44020 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 012F4 80A44024 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012F8 80A44028 8FA50028 */ lw $a1, 0x0028($sp) -/* 012FC 80A4402C AFA7002C */ sw $a3, 0x002C($sp) -/* 01300 80A44030 0C290D1A */ jal func_80A43468 -/* 01304 80A44034 A3AE0023 */ sb $t6, 0x0023($sp) -/* 01308 80A44038 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0130C 80A4403C 10410020 */ beq $v0, $at, .L80A440C0 -/* 01310 80A44040 8FA7002C */ lw $a3, 0x002C($sp) -/* 01314 80A44044 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01318 80A44048 10410040 */ beq $v0, $at, .L80A4414C -/* 0131C 80A4404C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01320 80A44050 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01324 80A44054 1041005D */ beq $v0, $at, .L80A441CC -/* 01328 80A44058 8FA40028 */ lw $a0, 0x0028($sp) -/* 0132C 80A4405C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01330 80A44060 5441006C */ bnel $v0, $at, .L80A44214 -/* 01334 80A44064 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01338 80A44068 94EF010E */ lhu $t7, 0x010E($a3) ## 0000010E -/* 0133C 80A4406C 2401305E */ addiu $at, $zero, 0x305E ## $at = 0000305E -/* 01340 80A44070 3C188016 */ lui $t8, %hi(gSaveContext+0x3e) -/* 01344 80A44074 15E10010 */ bne $t7, $at, .L80A440B8 -/* 01348 80A44078 00000000 */ nop -/* 0134C 80A4407C 9318E69E */ lbu $t8, %lo(gSaveContext+0x3e)($t8) -/* 01350 80A44080 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01354 80A44084 8FA50028 */ lw $a1, 0x0028($sp) -/* 01358 80A44088 17000009 */ bne $t8, $zero, .L80A440B0 -/* 0135C 80A4408C 24060057 */ addiu $a2, $zero, 0x0057 ## $a2 = 00000057 -/* 01360 80A44090 0C290D09 */ jal func_80A43424 -/* 01364 80A44094 AFA7002C */ sw $a3, 0x002C($sp) -/* 01368 80A44098 8FA7002C */ lw $a3, 0x002C($sp) -/* 0136C 80A4409C 3C1980A4 */ lui $t9, %hi(func_80A470E8) ## $t9 = 80A40000 -/* 01370 80A440A0 273970E8 */ addiu $t9, $t9, %lo(func_80A470E8) ## $t9 = 80A470E8 -/* 01374 80A440A4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 01378 80A440A8 1000005A */ beq $zero, $zero, .L80A44214 -/* 0137C 80A440AC ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -.L80A440B0: -/* 01380 80A440B0 10000058 */ beq $zero, $zero, .L80A44214 -/* 01384 80A440B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A440B8: -/* 01388 80A440B8 10000056 */ beq $zero, $zero, .L80A44214 -/* 0138C 80A440BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A440C0: -/* 01390 80A440C0 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 01394 80A440C4 24013054 */ addiu $at, $zero, 0x3054 ## $at = 00003054 -/* 01398 80A440C8 10410011 */ beq $v0, $at, .L80A44110 -/* 0139C 80A440CC 24013059 */ addiu $at, $zero, 0x3059 ## $at = 00003059 -/* 013A0 80A440D0 10410008 */ beq $v0, $at, .L80A440F4 -/* 013A4 80A440D4 2401305E */ addiu $at, $zero, 0x305E ## $at = 0000305E -/* 013A8 80A440D8 1441001A */ bne $v0, $at, .L80A44144 -/* 013AC 80A440DC 00000000 */ nop -/* 013B0 80A440E0 0C00BCDA */ jal func_8002F368 -/* 013B4 80A440E4 8FA40028 */ lw $a0, 0x0028($sp) -/* 013B8 80A440E8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 013BC 80A440EC 14410015 */ bne $v0, $at, .L80A44144 -/* 013C0 80A440F0 00000000 */ nop -.L80A440F4: -/* 013C4 80A440F4 93A80023 */ lbu $t0, 0x0023($sp) -/* 013C8 80A440F8 3C048013 */ lui $a0, %hi(D_801333D4) -/* 013CC 80A440FC 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 013D0 80A44100 15000003 */ bne $t0, $zero, .L80A44110 -/* 013D4 80A44104 240538FC */ addiu $a1, $zero, 0x38FC ## $a1 = 000038FC -/* 013D8 80A44108 0C03D149 */ jal func_800F4524 -/* 013DC 80A4410C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -.L80A44110: -/* 013E0 80A44110 93A90023 */ lbu $t1, 0x0023($sp) -/* 013E4 80A44114 3C078013 */ lui $a3, %hi(D_801333E0) -/* 013E8 80A44118 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 013EC 80A4411C 15200009 */ bne $t1, $zero, .L80A44144 -/* 013F0 80A44120 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 013F4 80A44124 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 013F8 80A44128 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 013FC 80A4412C 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01400 80A44130 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01404 80A44134 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01408 80A44138 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0140C 80A4413C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01410 80A44140 AFA70010 */ sw $a3, 0x0010($sp) -.L80A44144: -/* 01414 80A44144 10000033 */ beq $zero, $zero, .L80A44214 -/* 01418 80A44148 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4414C: -/* 0141C 80A4414C 0C041AF2 */ jal func_80106BC8 -/* 01420 80A44150 AFA7002C */ sw $a3, 0x002C($sp) -/* 01424 80A44154 1040002E */ beq $v0, $zero, .L80A44210 -/* 01428 80A44158 8FA7002C */ lw $a3, 0x002C($sp) -/* 0142C 80A4415C 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 01430 80A44160 24013054 */ addiu $at, $zero, 0x3054 ## $at = 00003054 -/* 01434 80A44164 8FAB0028 */ lw $t3, 0x0028($sp) -/* 01438 80A44168 10410003 */ beq $v0, $at, .L80A44178 -/* 0143C 80A4416C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 01440 80A44170 24013055 */ addiu $at, $zero, 0x3055 ## $at = 00003055 -/* 01444 80A44174 14410013 */ bne $v0, $at, .L80A441C4 -.L80A44178: -/* 01448 80A44178 018B6021 */ addu $t4, $t4, $t3 -/* 0144C 80A4417C 918C04BD */ lbu $t4, 0x04BD($t4) ## 000104BD -/* 01450 80A44180 240E3056 */ addiu $t6, $zero, 0x3056 ## $t6 = 00003056 -/* 01454 80A44184 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01458 80A44188 1580000B */ bne $t4, $zero, .L80A441B8 -/* 0145C 80A4418C 31C5FFFF */ andi $a1, $t6, 0xFFFF ## $a1 = 00003056 -/* 01460 80A44190 01602825 */ or $a1, $t3, $zero ## $a1 = 00000000 -/* 01464 80A44194 24060023 */ addiu $a2, $zero, 0x0023 ## $a2 = 00000023 -/* 01468 80A44198 0C290D09 */ jal func_80A43424 -/* 0146C 80A4419C AFA7002C */ sw $a3, 0x002C($sp) -/* 01470 80A441A0 8FA7002C */ lw $a3, 0x002C($sp) -/* 01474 80A441A4 3C0D80A4 */ lui $t5, %hi(func_80A470E8) ## $t5 = 80A40000 -/* 01478 80A441A8 25AD70E8 */ addiu $t5, $t5, %lo(func_80A470E8) ## $t5 = 80A470E8 -/* 0147C 80A441AC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 01480 80A441B0 10000018 */ beq $zero, $zero, .L80A44214 -/* 01484 80A441B4 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -.L80A441B8: -/* 01488 80A441B8 A4EE010E */ sh $t6, 0x010E($a3) ## 0000010E -/* 0148C 80A441BC 0C042DC8 */ jal func_8010B720 -/* 01490 80A441C0 8FA40028 */ lw $a0, 0x0028($sp) -.L80A441C4: -/* 01494 80A441C4 10000013 */ beq $zero, $zero, .L80A44214 -/* 01498 80A441C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A441CC: -/* 0149C 80A441CC 0C041AF2 */ jal func_80106BC8 -/* 014A0 80A441D0 AFA7002C */ sw $a3, 0x002C($sp) -/* 014A4 80A441D4 1040000E */ beq $v0, $zero, .L80A44210 -/* 014A8 80A441D8 8FA7002C */ lw $a3, 0x002C($sp) -/* 014AC 80A441DC 94EF010E */ lhu $t7, 0x010E($a3) ## 0000010E -/* 014B0 80A441E0 24013059 */ addiu $at, $zero, 0x3059 ## $at = 00003059 -/* 014B4 80A441E4 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 014B8 80A441E8 15E10007 */ bne $t7, $at, .L80A44208 -/* 014BC 80A441EC 8FB90028 */ lw $t9, 0x0028($sp) -/* 014C0 80A441F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 014C4 80A441F4 00390821 */ addu $at, $at, $t9 -/* 014C8 80A441F8 3C0880A4 */ lui $t0, %hi(func_80A4725C) ## $t0 = 80A40000 -/* 014CC 80A441FC A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 014D0 80A44200 2508725C */ addiu $t0, $t0, %lo(func_80A4725C) ## $t0 = 80A4725C -/* 014D4 80A44204 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -.L80A44208: -/* 014D8 80A44208 10000002 */ beq $zero, $zero, .L80A44214 -/* 014DC 80A4420C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A44210: -/* 014E0 80A44210 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44214: -/* 014E4 80A44214 8FBF001C */ lw $ra, 0x001C($sp) -/* 014E8 80A44218 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014EC 80A4421C 03E00008 */ jr $ra -/* 014F0 80A44220 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s deleted file mode 100644 index a5eadedb62..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A44224 -/* 014F4 80A44224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014F8 80A44228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014FC 80A4422C 84A5001C */ lh $a1, 0x001C($a1) ## 0000001C -/* 01500 80A44230 30A5FC00 */ andi $a1, $a1, 0xFC00 ## $a1 = 00000000 -/* 01504 80A44234 0C00B2D0 */ jal Flags_GetSwitch - -/* 01508 80A44238 00052A83 */ sra $a1, $a1, 10 -/* 0150C 80A4423C 10400003 */ beq $v0, $zero, .L80A4424C -/* 01510 80A44240 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01514 80A44244 10000002 */ beq $zero, $zero, .L80A44250 -/* 01518 80A44248 24023071 */ addiu $v0, $zero, 0x3071 ## $v0 = 00003071 -.L80A4424C: -/* 0151C 80A4424C 24023051 */ addiu $v0, $zero, 0x3051 ## $v0 = 00003051 -.L80A44250: -/* 01520 80A44250 03E00008 */ jr $ra -/* 01524 80A44254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s deleted file mode 100644 index e9dd946219..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A44258 -/* 01528 80A44258 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0152C 80A4425C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01530 80A44260 AFA40018 */ sw $a0, 0x0018($sp) -/* 01534 80A44264 AFA5001C */ sw $a1, 0x001C($sp) -/* 01538 80A44268 0C042F6F */ jal func_8010BDBC -/* 0153C 80A4426C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01540 80A44270 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01544 80A44274 10410005 */ beq $v0, $at, .L80A4428C -/* 01548 80A44278 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0154C 80A4427C 10410005 */ beq $v0, $at, .L80A44294 -/* 01550 80A44280 00000000 */ nop -/* 01554 80A44284 10000016 */ beq $zero, $zero, .L80A442E0 -/* 01558 80A44288 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4428C: -/* 0155C 80A4428C 10000014 */ beq $zero, $zero, .L80A442E0 -/* 01560 80A44290 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44294: -/* 01564 80A44294 0C041AF2 */ jal func_80106BC8 -/* 01568 80A44298 8FA40018 */ lw $a0, 0x0018($sp) -/* 0156C 80A4429C 1040000F */ beq $v0, $zero, .L80A442DC -/* 01570 80A442A0 8FA4001C */ lw $a0, 0x001C($sp) -/* 01574 80A442A4 948E010E */ lhu $t6, 0x010E($a0) ## 0000010E -/* 01578 80A442A8 24013071 */ addiu $at, $zero, 0x3071 ## $at = 00003071 -/* 0157C 80A442AC 15C10009 */ bne $t6, $at, .L80A442D4 -/* 01580 80A442B0 00000000 */ nop -/* 01584 80A442B4 0C290D3A */ jal func_80A434E8 -/* 01588 80A442B8 00000000 */ nop -/* 0158C 80A442BC 8FAF001C */ lw $t7, 0x001C($sp) -/* 01590 80A442C0 A5E2010E */ sh $v0, 0x010E($t7) ## 0000010E -/* 01594 80A442C4 8FB8001C */ lw $t8, 0x001C($sp) -/* 01598 80A442C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0159C 80A442CC 0C042DC8 */ jal func_8010B720 -/* 015A0 80A442D0 9705010E */ lhu $a1, 0x010E($t8) ## 0000010E -.L80A442D4: -/* 015A4 80A442D4 10000002 */ beq $zero, $zero, .L80A442E0 -/* 015A8 80A442D8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A442DC: -/* 015AC 80A442DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A442E0: -/* 015B0 80A442E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015B4 80A442E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015B8 80A442E8 03E00008 */ jr $ra -/* 015BC 80A442EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s deleted file mode 100644 index 13b473ee80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A442F0 -/* 015C0 80A442F0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 015C4 80A442F4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 015C8 80A442F8 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 -/* 015CC 80A442FC AFA40000 */ sw $a0, 0x0000($sp) -/* 015D0 80A44300 AFA50004 */ sw $a1, 0x0004($sp) -/* 015D4 80A44304 11C0000B */ beq $t6, $zero, .L80A44334 -/* 015D8 80A44308 24033043 */ addiu $v1, $zero, 0x3043 ## $v1 = 00003043 -/* 015DC 80A4430C 944F0F14 */ lhu $t7, 0x0F14($v0) ## 8015F574 -/* 015E0 80A44310 2402300E */ addiu $v0, $zero, 0x300E ## $v0 = 0000300E -/* 015E4 80A44314 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 015E8 80A44318 13000004 */ beq $t8, $zero, .L80A4432C -/* 015EC 80A4431C 00000000 */ nop -/* 015F0 80A44320 24023022 */ addiu $v0, $zero, 0x3022 ## $v0 = 00003022 -/* 015F4 80A44324 03E00008 */ jr $ra -/* 015F8 80A44328 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00003022 -.L80A4432C: -/* 015FC 80A4432C 03E00008 */ jr $ra -/* 01600 80A44330 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00003022 -.L80A44334: -/* 01604 80A44334 03E00008 */ jr $ra -/* 01608 80A44338 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003043 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s deleted file mode 100644 index e0f4227784..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A4433C -/* 0160C 80A4433C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01610 80A44340 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01614 80A44344 AFA5001C */ sw $a1, 0x001C($sp) -/* 01618 80A44348 0C042F6F */ jal func_8010BDBC -/* 0161C 80A4434C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01620 80A44350 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01624 80A44354 1441000B */ bne $v0, $at, .L80A44384 -/* 01628 80A44358 8FAE001C */ lw $t6, 0x001C($sp) -/* 0162C 80A4435C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 01630 80A44360 2401300E */ addiu $at, $zero, 0x300E ## $at = 0000300E -/* 01634 80A44364 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01638 80A44368 15E10004 */ bne $t7, $at, .L80A4437C -/* 0163C 80A4436C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01640 80A44370 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 -/* 01644 80A44374 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 01648 80A44378 A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 -.L80A4437C: -/* 0164C 80A4437C 10000002 */ beq $zero, $zero, .L80A44388 -/* 01650 80A44380 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44384: -/* 01654 80A44384 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44388: -/* 01658 80A44388 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0165C 80A4438C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01660 80A44390 03E00008 */ jr $ra -/* 01664 80A44394 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s deleted file mode 100644 index fef878d406..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A44398 -/* 01668 80A44398 AFA40000 */ sw $a0, 0x0000($sp) -/* 0166C 80A4439C AFA50004 */ sw $a1, 0x0004($sp) -/* 01670 80A443A0 03E00008 */ jr $ra -/* 01674 80A443A4 24027122 */ addiu $v0, $zero, 0x7122 ## $v0 = 00007122 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s deleted file mode 100644 index d6858f9927..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A443A8 -/* 01678 80A443A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0167C 80A443AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01680 80A443B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01684 80A443B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01688 80A443B8 0C042F6F */ jal func_8010BDBC -/* 0168C 80A443BC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01690 80A443C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01694 80A443C4 14410003 */ bne $v0, $at, .L80A443D4 -/* 01698 80A443C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0169C 80A443CC 10000002 */ beq $zero, $zero, .L80A443D8 -/* 016A0 80A443D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A443D4: -/* 016A4 80A443D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A443D8: -/* 016A8 80A443D8 03E00008 */ jr $ra -/* 016AC 80A443DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s deleted file mode 100644 index 9a5fa9bc30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A443E0 -/* 016B0 80A443E0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 016B4 80A443E4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 016B8 80A443E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016BC 80A443EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 016C0 80A443F0 11C00011 */ beq $t6, $zero, .L80A44438 -/* 016C4 80A443F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 016C8 80A443F8 0C00B2D0 */ jal Flags_GetSwitch - -/* 016CC 80A443FC 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 016D0 80A44400 10400003 */ beq $v0, $zero, .L80A44410 -/* 016D4 80A44404 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf14) -/* 016D8 80A44408 1000000C */ beq $zero, $zero, .L80A4443C -/* 016DC 80A4440C 2402302F */ addiu $v0, $zero, 0x302F ## $v0 = 0000302F -.L80A44410: -/* 016E0 80A44410 95EFF574 */ lhu $t7, %lo(gSaveContext+0xf14)($t7) -/* 016E4 80A44414 24033024 */ addiu $v1, $zero, 0x3024 ## $v1 = 00003024 -/* 016E8 80A44418 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 016EC 80A4441C 13000004 */ beq $t8, $zero, .L80A44430 -/* 016F0 80A44420 00000000 */ nop -/* 016F4 80A44424 24033025 */ addiu $v1, $zero, 0x3025 ## $v1 = 00003025 -/* 016F8 80A44428 10000004 */ beq $zero, $zero, .L80A4443C -/* 016FC 80A4442C 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003025 -.L80A44430: -/* 01700 80A44430 10000002 */ beq $zero, $zero, .L80A4443C -/* 01704 80A44434 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003025 -.L80A44438: -/* 01708 80A44438 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -.L80A4443C: -/* 0170C 80A4443C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01710 80A44440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01714 80A44444 03E00008 */ jr $ra -/* 01718 80A44448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s deleted file mode 100644 index 1d2ca63309..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A4444C -/* 0171C 80A4444C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01720 80A44450 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01724 80A44454 AFA5001C */ sw $a1, 0x001C($sp) -/* 01728 80A44458 0C042F6F */ jal func_8010BDBC -/* 0172C 80A4445C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01730 80A44460 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01734 80A44464 1441000B */ bne $v0, $at, .L80A44494 -/* 01738 80A44468 8FAE001C */ lw $t6, 0x001C($sp) -/* 0173C 80A4446C 95CF010E */ lhu $t7, 0x010E($t6) ## 0000010E -/* 01740 80A44470 24013024 */ addiu $at, $zero, 0x3024 ## $at = 00003024 -/* 01744 80A44474 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01748 80A44478 15E10004 */ bne $t7, $at, .L80A4448C -/* 0174C 80A4447C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01750 80A44480 94580F14 */ lhu $t8, 0x0F14($v0) ## 8015F574 -/* 01754 80A44484 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 -/* 01758 80A44488 A4590F14 */ sh $t9, 0x0F14($v0) ## 8015F574 -.L80A4448C: -/* 0175C 80A4448C 10000002 */ beq $zero, $zero, .L80A44498 -/* 01760 80A44490 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44494: -/* 01764 80A44494 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44498: -/* 01768 80A44498 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0176C 80A4449C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01770 80A444A0 03E00008 */ jr $ra -/* 01774 80A444A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s deleted file mode 100644 index 3b6fb8780f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80A444A8 -/* 01778 80A444A8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0177C 80A444AC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01780 80A444B0 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 -/* 01784 80A444B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 01788 80A444B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 0178C 80A444BC 11C0000C */ beq $t6, $zero, .L80A444F0 -/* 01790 80A444C0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x4c) -/* 01794 80A444C4 8DEF716C */ lw $t7, %lo(gBitFlags+0x4c)($t7) -/* 01798 80A444C8 8C5800A4 */ lw $t8, 0x00A4($v0) ## 8015E704 -/* 0179C 80A444CC 24033064 */ addiu $v1, $zero, 0x3064 ## $v1 = 00003064 -/* 017A0 80A444D0 01F8C824 */ and $t9, $t7, $t8 -/* 017A4 80A444D4 13200004 */ beq $t9, $zero, .L80A444E8 -/* 017A8 80A444D8 00000000 */ nop -/* 017AC 80A444DC 24033065 */ addiu $v1, $zero, 0x3065 ## $v1 = 00003065 -/* 017B0 80A444E0 03E00008 */ jr $ra -/* 017B4 80A444E4 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003065 -.L80A444E8: -/* 017B8 80A444E8 03E00008 */ jr $ra -/* 017BC 80A444EC 3062FFFF */ andi $v0, $v1, 0xFFFF ## $v0 = 00003065 -.L80A444F0: -/* 017C0 80A444F0 24023043 */ addiu $v0, $zero, 0x3043 ## $v0 = 00003043 -/* 017C4 80A444F4 03E00008 */ jr $ra -/* 017C8 80A444F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s deleted file mode 100644 index dcf47012da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A444FC -/* 017CC 80A444FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017D0 80A44500 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017D4 80A44504 AFA40018 */ sw $a0, 0x0018($sp) -/* 017D8 80A44508 AFA5001C */ sw $a1, 0x001C($sp) -/* 017DC 80A4450C 0C042F6F */ jal func_8010BDBC -/* 017E0 80A44510 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 017E4 80A44514 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 017E8 80A44518 14410003 */ bne $v0, $at, .L80A44528 -/* 017EC 80A4451C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017F0 80A44520 10000002 */ beq $zero, $zero, .L80A4452C -/* 017F4 80A44524 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44528: -/* 017F8 80A44528 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4452C: -/* 017FC 80A4452C 03E00008 */ jr $ra -/* 01800 80A44530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s deleted file mode 100644 index f11910140d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s +++ /dev/null @@ -1,117 +0,0 @@ -.late_rodata -glabel jtbl_80A48680 - .word L80A44590 - .word L80A445A0 - .word L80A445B0 - .word L80A445C0 - .word L80A445D0 - .word L80A445E0 - .word L80A445F0 - .word L80A44600 - .word L80A44610 - .word L80A44620 - .word L80A44630 - .word L80A44640 - .word L80A44650 - .word L80A44660 - -.text -glabel func_80A44534 -/* 01804 80A44534 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01808 80A44538 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0180C 80A4453C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01810 80A44540 AFA6001C */ sw $a2, 0x001C($sp) -/* 01814 80A44544 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 01818 80A44548 0C01B0D8 */ jal Text_GetFaceReaction -/* 0181C 80A4454C AFA40018 */ sw $a0, 0x0018($sp) -/* 01820 80A44550 8FA40018 */ lw $a0, 0x0018($sp) -/* 01824 80A44554 8FA6001C */ lw $a2, 0x001C($sp) -/* 01828 80A44558 10400003 */ beq $v0, $zero, .L80A44568 -/* 0182C 80A4455C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 01830 80A44560 10000041 */ beq $zero, $zero, .L80A44668 -/* 01834 80A44564 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80A44568: -/* 01838 80A44568 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 0183C 80A4456C 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 01840 80A44570 2DE1000E */ sltiu $at, $t7, 0x000E -/* 01844 80A44574 1020003C */ beq $at, $zero, .L80A44668 -/* 01848 80A44578 000F7880 */ sll $t7, $t7, 2 -/* 0184C 80A4457C 3C0180A5 */ lui $at, %hi(jtbl_80A48680) ## $at = 80A50000 -/* 01850 80A44580 002F0821 */ addu $at, $at, $t7 -/* 01854 80A44584 8C2F8680 */ lw $t7, %lo(jtbl_80A48680)($at) -/* 01858 80A44588 01E00008 */ jr $t7 -/* 0185C 80A4458C 00000000 */ nop -glabel L80A44590 -/* 01860 80A44590 0C290D59 */ jal func_80A43564 -/* 01864 80A44594 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01868 80A44598 10000034 */ beq $zero, $zero, .L80A4466C -/* 0186C 80A4459C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445A0 -/* 01870 80A445A0 0C290F27 */ jal func_80A43C9C -/* 01874 80A445A4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01878 80A445A8 10000030 */ beq $zero, $zero, .L80A4466C -/* 0187C 80A445AC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445B0 -/* 01880 80A445B0 0C290FE4 */ jal func_80A43F90 -/* 01884 80A445B4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01888 80A445B8 1000002C */ beq $zero, $zero, .L80A4466C -/* 0188C 80A445BC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445C0 -/* 01890 80A445C0 0C291089 */ jal func_80A44224 -/* 01894 80A445C4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01898 80A445C8 10000028 */ beq $zero, $zero, .L80A4466C -/* 0189C 80A445CC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445D0 -/* 018A0 80A445D0 0C290DB7 */ jal func_80A436DC -/* 018A4 80A445D4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018A8 80A445D8 10000024 */ beq $zero, $zero, .L80A4466C -/* 018AC 80A445DC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445E0 -/* 018B0 80A445E0 0C290E09 */ jal func_80A43824 -/* 018B4 80A445E4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018B8 80A445E8 10000020 */ beq $zero, $zero, .L80A4466C -/* 018BC 80A445EC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A445F0 -/* 018C0 80A445F0 0C290E2D */ jal func_80A438B4 -/* 018C4 80A445F4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018C8 80A445F8 1000001C */ beq $zero, $zero, .L80A4466C -/* 018CC 80A445FC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44600 -/* 018D0 80A44600 0C290E6B */ jal func_80A439AC -/* 018D4 80A44604 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018D8 80A44608 10000018 */ beq $zero, $zero, .L80A4466C -/* 018DC 80A4460C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44610 -/* 018E0 80A44610 0C290EA2 */ jal func_80A43A88 -/* 018E4 80A44614 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018E8 80A44618 10000014 */ beq $zero, $zero, .L80A4466C -/* 018EC 80A4461C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44620 -/* 018F0 80A44620 0C290ED9 */ jal func_80A43B64 -/* 018F4 80A44624 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 018F8 80A44628 10000010 */ beq $zero, $zero, .L80A4466C -/* 018FC 80A4462C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44630 -/* 01900 80A44630 0C2910BC */ jal func_80A442F0 -/* 01904 80A44634 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01908 80A44638 1000000C */ beq $zero, $zero, .L80A4466C -/* 0190C 80A4463C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44640 -/* 01910 80A44640 0C2910F8 */ jal func_80A443E0 -/* 01914 80A44644 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01918 80A44648 10000008 */ beq $zero, $zero, .L80A4466C -/* 0191C 80A4464C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44650 -/* 01920 80A44650 0C29112A */ jal func_80A444A8 -/* 01924 80A44654 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01928 80A44658 10000004 */ beq $zero, $zero, .L80A4466C -/* 0192C 80A4465C 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44660 -/* 01930 80A44660 0C2910E6 */ jal func_80A44398 -/* 01934 80A44664 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -.L80A44668: -/* 01938 80A44668 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A4466C: -/* 0193C 80A4466C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01940 80A44670 03E00008 */ jr $ra -/* 01944 80A44674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s deleted file mode 100644 index 1ccc70e391..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s +++ /dev/null @@ -1,105 +0,0 @@ -.late_rodata -glabel jtbl_80A486B8 - .word L80A446A8 - .word L80A446B8 - .word L80A446C8 - .word L80A446D8 - .word L80A446E8 - .word L80A446F8 - .word L80A44708 - .word L80A44718 - .word L80A44728 - .word L80A44738 - .word L80A44748 - .word L80A44758 - .word L80A44768 - .word L80A44778 - -.text -glabel func_80A44678 -/* 01948 80A44678 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0194C 80A4467C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01950 80A44680 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -/* 01954 80A44684 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 01958 80A44688 2DE1000E */ sltiu $at, $t7, 0x000E -/* 0195C 80A4468C 1020003C */ beq $at, $zero, .L80A44780 -/* 01960 80A44690 000F7880 */ sll $t7, $t7, 2 -/* 01964 80A44694 3C0180A5 */ lui $at, %hi(jtbl_80A486B8) ## $at = 80A50000 -/* 01968 80A44698 002F0821 */ addu $at, $at, $t7 -/* 0196C 80A4469C 8C2F86B8 */ lw $t7, %lo(jtbl_80A486B8)($at) -/* 01970 80A446A0 01E00008 */ jr $t7 -/* 01974 80A446A4 00000000 */ nop -glabel L80A446A8 -/* 01978 80A446A8 0C290D7A */ jal func_80A435E8 -/* 0197C 80A446AC 00000000 */ nop -/* 01980 80A446B0 10000034 */ beq $zero, $zero, .L80A44784 -/* 01984 80A446B4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A446B8 -/* 01988 80A446B8 0C290F5E */ jal func_80A43D78 -/* 0198C 80A446BC 00000000 */ nop -/* 01990 80A446C0 10000030 */ beq $zero, $zero, .L80A44784 -/* 01994 80A446C4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A446C8 -/* 01998 80A446C8 0C291004 */ jal func_80A44010 -/* 0199C 80A446CC 00000000 */ nop -/* 019A0 80A446D0 1000002C */ beq $zero, $zero, .L80A44784 -/* 019A4 80A446D4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A446D8 -/* 019A8 80A446D8 0C291096 */ jal func_80A44258 -/* 019AC 80A446DC 00000000 */ nop -/* 019B0 80A446E0 10000028 */ beq $zero, $zero, .L80A44784 -/* 019B4 80A446E4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A446E8 -/* 019B8 80A446E8 0C290DC5 */ jal func_80A43714 -/* 019BC 80A446EC 00000000 */ nop -/* 019C0 80A446F0 10000024 */ beq $zero, $zero, .L80A44784 -/* 019C4 80A446F4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A446F8 -/* 019C8 80A446F8 0C290E1F */ jal func_80A4387C -/* 019CC 80A446FC 00000000 */ nop -/* 019D0 80A44700 10000020 */ beq $zero, $zero, .L80A44784 -/* 019D4 80A44704 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44708 -/* 019D8 80A44708 0C290E54 */ jal func_80A43950 -/* 019DC 80A4470C 00000000 */ nop -/* 019E0 80A44710 1000001C */ beq $zero, $zero, .L80A44784 -/* 019E4 80A44714 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44718 -/* 019E8 80A44718 0C290E8B */ jal func_80A43A2C -/* 019EC 80A4471C 00000000 */ nop -/* 019F0 80A44720 10000018 */ beq $zero, $zero, .L80A44784 -/* 019F4 80A44724 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44728 -/* 019F8 80A44728 0C290EC2 */ jal func_80A43B08 -/* 019FC 80A4472C 00000000 */ nop -/* 01A00 80A44730 10000014 */ beq $zero, $zero, .L80A44784 -/* 01A04 80A44734 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44738 -/* 01A08 80A44738 0C290F10 */ jal func_80A43C40 -/* 01A0C 80A4473C 00000000 */ nop -/* 01A10 80A44740 10000010 */ beq $zero, $zero, .L80A44784 -/* 01A14 80A44744 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44748 -/* 01A18 80A44748 0C2910CF */ jal func_80A4433C -/* 01A1C 80A4474C 00000000 */ nop -/* 01A20 80A44750 1000000C */ beq $zero, $zero, .L80A44784 -/* 01A24 80A44754 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44758 -/* 01A28 80A44758 0C291113 */ jal func_80A4444C -/* 01A2C 80A4475C 00000000 */ nop -/* 01A30 80A44760 10000008 */ beq $zero, $zero, .L80A44784 -/* 01A34 80A44764 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44768 -/* 01A38 80A44768 0C29113F */ jal func_80A444FC -/* 01A3C 80A4476C 00000000 */ nop -/* 01A40 80A44770 10000004 */ beq $zero, $zero, .L80A44784 -/* 01A44 80A44774 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A44778 -/* 01A48 80A44778 0C2910EA */ jal func_80A443A8 -/* 01A4C 80A4477C 00000000 */ nop -.L80A44780: -/* 01A50 80A44780 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A44784: -/* 01A54 80A44784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A58 80A44788 03E00008 */ jr $ra -/* 01A5C 80A4478C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s deleted file mode 100644 index 0d0fc431ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80A44790 -/* 01A60 80A44790 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A64 80A44794 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A68 80A44798 AFB00020 */ sw $s0, 0x0020($sp) -/* 01A6C 80A4479C AFA5002C */ sw $a1, 0x002C($sp) -/* 01A70 80A447A0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01A74 80A447A4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 01A78 80A447A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A7C 80A447AC 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 01A80 80A447B0 1062000F */ beq $v1, $v0, .L80A447F0 -/* 01A84 80A447B4 00000000 */ nop -/* 01A88 80A447B8 1040000D */ beq $v0, $zero, .L80A447F0 -/* 01A8C 80A447BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A90 80A447C0 3C0E80A4 */ lui $t6, %hi(func_80A44534) ## $t6 = 80A40000 -/* 01A94 80A447C4 3C0F80A4 */ lui $t7, %hi(func_80A44678) ## $t7 = 80A40000 -/* 01A98 80A447C8 25EF4678 */ addiu $t7, $t7, %lo(func_80A44678) ## $t7 = 80A44678 -/* 01A9C 80A447CC 25CE4534 */ addiu $t6, $t6, %lo(func_80A44534) ## $t6 = 80A44534 -/* 01AA0 80A447D0 8E070218 */ lw $a3, 0x0218($s0) ## 00000218 -/* 01AA4 80A447D4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01AA8 80A447D8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01AAC 80A447DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AB0 80A447E0 0C00D0F3 */ jal func_800343CC -/* 01AB4 80A447E4 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01AB8 80A447E8 10000024 */ beq $zero, $zero, .L80A4487C -/* 01ABC 80A447EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A447F0: -/* 01AC0 80A447F0 14620007 */ bne $v1, $v0, .L80A44810 -/* 01AC4 80A447F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AC8 80A447F8 921801CF */ lbu $t8, 0x01CF($s0) ## 000001CF -/* 01ACC 80A447FC 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 01AD0 80A44800 17200003 */ bne $t9, $zero, .L80A44810 -/* 01AD4 80A44804 00000000 */ nop -/* 01AD8 80A44808 1000001B */ beq $zero, $zero, .L80A44878 -/* 01ADC 80A4480C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44810: -/* 01AE0 80A44810 0C00BC65 */ jal func_8002F194 -/* 01AE4 80A44814 8FA5002C */ lw $a1, 0x002C($sp) -/* 01AE8 80A44818 10400004 */ beq $v0, $zero, .L80A4482C -/* 01AEC 80A4481C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01AF0 80A44820 A6080194 */ sh $t0, 0x0194($s0) ## 00000194 -/* 01AF4 80A44824 10000014 */ beq $zero, $zero, .L80A44878 -/* 01AF8 80A44828 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4482C: -/* 01AFC 80A4482C 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -/* 01B00 80A44830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B04 80A44834 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B08 80A44838 11200007 */ beq $t1, $zero, .L80A44858 -/* 01B0C 80A4483C 00000000 */ nop -/* 01B10 80A44840 8FA4002C */ lw $a0, 0x002C($sp) -/* 01B14 80A44844 0C29119E */ jal func_80A44678 -/* 01B18 80A44848 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B1C 80A4484C A6020194 */ sh $v0, 0x0194($s0) ## 00000194 -/* 01B20 80A44850 10000009 */ beq $zero, $zero, .L80A44878 -/* 01B24 80A44854 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44858: -/* 01B28 80A44858 0C00BCB3 */ jal func_8002F2CC -/* 01B2C 80A4485C 8E060218 */ lw $a2, 0x0218($s0) ## 00000218 -/* 01B30 80A44860 10400004 */ beq $v0, $zero, .L80A44874 -/* 01B34 80A44864 8FA4002C */ lw $a0, 0x002C($sp) -/* 01B38 80A44868 0C29114D */ jal func_80A44534 -/* 01B3C 80A4486C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B40 80A44870 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -.L80A44874: -/* 01B44 80A44874 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44878: -/* 01B48 80A44878 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A4487C: -/* 01B4C 80A4487C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01B50 80A44880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B54 80A44884 03E00008 */ jr $ra -/* 01B58 80A44888 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s deleted file mode 100644 index f801531676..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A4488C -/* 01B5C 80A4488C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01B60 80A44890 3C0F80A5 */ lui $t7, %hi(D_80A4816C) ## $t7 = 80A50000 -/* 01B64 80A44894 25EF816C */ addiu $t7, $t7, %lo(D_80A4816C) ## $t7 = 80A4816C -/* 01B68 80A44898 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 01B6C 80A4489C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 01B70 80A448A0 00027080 */ sll $t6, $v0, 2 -/* 01B74 80A448A4 01C27021 */ addu $t6, $t6, $v0 -/* 01B78 80A448A8 000E7040 */ sll $t6, $t6, 1 -/* 01B7C 80A448AC 01CF1821 */ addu $v1, $t6, $t7 -/* 01B80 80A448B0 84780006 */ lh $t8, 0x0006($v1) ## 00000006 -/* 01B84 80A448B4 A49801FC */ sh $t8, 0x01FC($a0) ## 000001FC -/* 01B88 80A448B8 84790008 */ lh $t9, 0x0008($v1) ## 00000008 -/* 01B8C 80A448BC 03E00008 */ jr $ra -/* 01B90 80A448C0 A49901FE */ sh $t9, 0x01FE($a0) ## 000001FE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s deleted file mode 100644 index 14c2dbb43a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A448C4 -/* 01B94 80A448C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B98 80A448C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B9C 80A448CC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01BA0 80A448D0 3C0F80A5 */ lui $t7, %hi(D_80A481F8) ## $t7 = 80A50000 -/* 01BA4 80A448D4 25EF81F8 */ addiu $t7, $t7, %lo(D_80A481F8) ## $t7 = 80A481F8 -/* 01BA8 80A448D8 3063001F */ andi $v1, $v1, 0x001F ## $v1 = 00000000 -/* 01BAC 80A448DC 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 01BB0 80A448E0 00037100 */ sll $t6, $v1, 4 -/* 01BB4 80A448E4 01CF1021 */ addu $v0, $t6, $t7 -/* 01BB8 80A448E8 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 -/* 01BBC 80A448EC E48400C4 */ swc1 $f4, 0x00C4($a0) ## 000000C4 -/* 01BC0 80A448F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01BC4 80A448F4 AFA20018 */ sw $v0, 0x0018($sp) -/* 01BC8 80A448F8 0C00B58B */ jal Actor_SetScale - -/* 01BCC 80A448FC 8C450004 */ lw $a1, 0x0004($v0) ## 00000004 -/* 01BD0 80A44900 8FA40020 */ lw $a0, 0x0020($sp) -/* 01BD4 80A44904 8FA20018 */ lw $v0, 0x0018($sp) -/* 01BD8 80A44908 849901FC */ lh $t9, 0x01FC($a0) ## 000001FC -/* 01BDC 80A4490C 80580008 */ lb $t8, 0x0008($v0) ## 00000008 -/* 01BE0 80A44910 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 01BE4 80A44914 A098001F */ sb $t8, 0x001F($a0) ## 0000001F -/* 01BE8 80A44918 C446000C */ lwc1 $f6, 0x000C($v0) ## 0000000C -/* 01BEC 80A4491C 46805420 */ cvt.s.w $f16, $f10 -/* 01BF0 80A44920 E4860218 */ swc1 $f6, 0x0218($a0) ## 00000218 -/* 01BF4 80A44924 C4880218 */ lwc1 $f8, 0x0218($a0) ## 00000218 -/* 01BF8 80A44928 46104480 */ add.s $f18, $f8, $f16 -/* 01BFC 80A4492C E4920218 */ swc1 $f18, 0x0218($a0) ## 00000218 -/* 01C00 80A44930 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C04 80A44934 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C08 80A44938 03E00008 */ jr $ra -/* 01C0C 80A4493C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s deleted file mode 100644 index 52b5896679..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80A44940 -/* 01C10 80A44940 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C14 80A44944 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C18 80A44948 AFA50034 */ sw $a1, 0x0034($sp) -/* 01C1C 80A4494C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 01C20 80A44950 3C0D80A5 */ lui $t5, %hi(D_80A48170) ## $t5 = 80A50000 -/* 01C24 80A44954 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01C28 80A44958 4600218D */ trunc.w.s $f6, $f4 -/* 01C2C 80A4495C 440F3000 */ mfc1 $t7, $f6 -/* 01C30 80A44960 00000000 */ nop -/* 01C34 80A44964 A7AF0028 */ sh $t7, 0x0028($sp) -/* 01C38 80A44968 C4880028 */ lwc1 $f8, 0x0028($a0) ## 00000028 -/* 01C3C 80A4496C 4600428D */ trunc.w.s $f10, $f8 -/* 01C40 80A44970 44195000 */ mfc1 $t9, $f10 -/* 01C44 80A44974 00000000 */ nop -/* 01C48 80A44978 A7B9002A */ sh $t9, 0x002A($sp) -/* 01C4C 80A4497C C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 01C50 80A44980 4600848D */ trunc.w.s $f18, $f16 -/* 01C54 80A44984 44099000 */ mfc1 $t1, $f18 -/* 01C58 80A44988 00000000 */ nop -/* 01C5C 80A4498C A7A9002C */ sh $t1, 0x002C($sp) -/* 01C60 80A44990 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -/* 01C64 80A44994 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 -/* 01C68 80A44998 000B6080 */ sll $t4, $t3, 2 -/* 01C6C 80A4499C 018B6021 */ addu $t4, $t4, $t3 -/* 01C70 80A449A0 000C6040 */ sll $t4, $t4, 1 -/* 01C74 80A449A4 01AC6821 */ addu $t5, $t5, $t4 -/* 01C78 80A449A8 85AD8170 */ lh $t5, %lo(D_80A48170)($t5) -/* 01C7C 80A449AC 448D2000 */ mtc1 $t5, $f4 ## $f4 = -0.00 -/* 01C80 80A449B0 00000000 */ nop -/* 01C84 80A449B4 468021A0 */ cvt.s.w $f6, $f4 -/* 01C88 80A449B8 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 01C8C 80A449BC 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01C90 80A449C0 0C01DE1C */ jal Math_SinS - ## sins? -/* 01C94 80A449C4 AFA70030 */ sw $a3, 0x0030($sp) -/* 01C98 80A449C8 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 01C9C 80A449CC 87AE0028 */ lh $t6, 0x0028($sp) -/* 01CA0 80A449D0 8FA70030 */ lw $a3, 0x0030($sp) -/* 01CA4 80A449D4 46004282 */ mul.s $f10, $f8, $f0 -/* 01CA8 80A449D8 4600540D */ trunc.w.s $f16, $f10 -/* 01CAC 80A449DC 44088000 */ mfc1 $t0, $f16 -/* 01CB0 80A449E0 00000000 */ nop -/* 01CB4 80A449E4 01C84821 */ addu $t1, $t6, $t0 -/* 01CB8 80A449E8 A7A90028 */ sh $t1, 0x0028($sp) -/* 01CBC 80A449EC 0C01DE0D */ jal Math_CosS - ## coss? -/* 01CC0 80A449F0 84E400B6 */ lh $a0, 0x00B6($a3) ## 000000B6 -/* 01CC4 80A449F4 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 01CC8 80A449F8 87AA002C */ lh $t2, 0x002C($sp) -/* 01CCC 80A449FC 8FA70030 */ lw $a3, 0x0030($sp) -/* 01CD0 80A44A00 46009102 */ mul.s $f4, $f18, $f0 -/* 01CD4 80A44A04 3C0B80A5 */ lui $t3, %hi(D_80A4816E) ## $t3 = 80A50000 -/* 01CD8 80A44A08 87B9002A */ lh $t9, 0x002A($sp) -/* 01CDC 80A44A0C 27AD0028 */ addiu $t5, $sp, 0x0028 ## $t5 = FFFFFFF8 -/* 01CE0 80A44A10 8FA40034 */ lw $a0, 0x0034($sp) -/* 01CE4 80A44A14 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01CE8 80A44A18 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01CEC 80A44A1C 4600218D */ trunc.w.s $f6, $f4 -/* 01CF0 80A44A20 24E601BC */ addiu $a2, $a3, 0x01BC ## $a2 = 000001BC -/* 01CF4 80A44A24 00812821 */ addu $a1, $a0, $at -/* 01CF8 80A44A28 440F3000 */ mfc1 $t7, $f6 -/* 01CFC 80A44A2C 00000000 */ nop -/* 01D00 80A44A30 014FC021 */ addu $t8, $t2, $t7 -/* 01D04 80A44A34 A7B8002C */ sh $t8, 0x002C($sp) -/* 01D08 80A44A38 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 01D0C 80A44A3C 31C8001F */ andi $t0, $t6, 0x001F ## $t0 = 00000000 -/* 01D10 80A44A40 00084880 */ sll $t1, $t0, 2 -/* 01D14 80A44A44 01284821 */ addu $t1, $t1, $t0 -/* 01D18 80A44A48 00094840 */ sll $t1, $t1, 1 -/* 01D1C 80A44A4C 01695821 */ addu $t3, $t3, $t1 -/* 01D20 80A44A50 856B816E */ lh $t3, %lo(D_80A4816E)($t3) -/* 01D24 80A44A54 032B6021 */ addu $t4, $t9, $t3 -/* 01D28 80A44A58 A7AC002A */ sh $t4, 0x002A($sp) -/* 01D2C 80A44A5C 8DAF0000 */ lw $t7, 0x0000($t5) ## FFFFFFF8 -/* 01D30 80A44A60 A8EF0202 */ swl $t7, 0x0202($a3) ## 00000202 -/* 01D34 80A44A64 B8EF0205 */ swr $t7, 0x0205($a3) ## 00000205 -/* 01D38 80A44A68 95AF0004 */ lhu $t7, 0x0004($t5) ## FFFFFFFC -/* 01D3C 80A44A6C A4EF0206 */ sh $t7, 0x0206($a3) ## 00000206 -/* 01D40 80A44A70 AFA60018 */ sw $a2, 0x0018($sp) -/* 01D44 80A44A74 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01D48 80A44A78 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D4C 80A44A7C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01D50 80A44A80 8FA60018 */ lw $a2, 0x0018($sp) -/* 01D54 80A44A84 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01D58 80A44A88 8FA40034 */ lw $a0, 0x0034($sp) -/* 01D5C 80A44A8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D60 80A44A90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D64 80A44A94 03E00008 */ jr $ra -/* 01D68 80A44A98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s deleted file mode 100644 index bf75d3d379..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80A44A9C -/* 01D6C 80A44A9C C4800158 */ lwc1 $f0, 0x0158($a0) ## 00000158 -/* 01D70 80A44AA0 C484015C */ lwc1 $f4, 0x015C($a0) ## 0000015C -/* 01D74 80A44AA4 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C -/* 01D78 80A44AA8 03E00008 */ jr $ra -/* 01D7C 80A44AAC E4840158 */ swc1 $f4, 0x0158($a0) ## 00000158 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s deleted file mode 100644 index 16097784eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel func_80A44AB0 -/* 01D80 80A44AB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D84 80A44AB4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D88 80A44AB8 AFB00020 */ sw $s0, 0x0020($sp) -/* 01D8C 80A44ABC AFA50034 */ sw $a1, 0x0034($sp) -/* 01D90 80A44AC0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 01D94 80A44AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01D98 80A44AC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D9C 80A44ACC 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 01DA0 80A44AD0 17010003 */ bne $t8, $at, .L80A44AE0 -/* 01DA4 80A44AD4 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01DA8 80A44AD8 1000005E */ beq $zero, $zero, .L80A44C54 -/* 01DAC 80A44ADC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44AE0: -/* 01DB0 80A44AE0 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 01DB4 80A44AE4 3C1980A4 */ lui $t9, %hi(func_80A46E54) ## $t9 = 80A40000 -/* 01DB8 80A44AE8 27396E54 */ addiu $t9, $t9, %lo(func_80A46E54) ## $t9 = 80A46E54 -/* 01DBC 80A44AEC 13220009 */ beq $t9, $v0, .L80A44B14 -/* 01DC0 80A44AF0 3C0880A4 */ lui $t0, %hi(func_80A47024) ## $t0 = 80A40000 -/* 01DC4 80A44AF4 25087024 */ addiu $t0, $t0, %lo(func_80A47024) ## $t0 = 80A47024 -/* 01DC8 80A44AF8 11020006 */ beq $t0, $v0, .L80A44B14 -/* 01DCC 80A44AFC 3C0980A4 */ lui $t1, %hi(func_80A46DBC) ## $t1 = 80A40000 -/* 01DD0 80A44B00 25296DBC */ addiu $t1, $t1, %lo(func_80A46DBC) ## $t1 = 80A46DBC -/* 01DD4 80A44B04 51220004 */ beql $t1, $v0, .L80A44B18 -/* 01DD8 80A44B08 920A01CD */ lbu $t2, 0x01CD($s0) ## 000001CD -/* 01DDC 80A44B0C 10000051 */ beq $zero, $zero, .L80A44C54 -/* 01DE0 80A44B10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44B14: -/* 01DE4 80A44B14 920A01CD */ lbu $t2, 0x01CD($s0) ## 000001CD -.L80A44B18: -/* 01DE8 80A44B18 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01DEC 80A44B1C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01DF0 80A44B20 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 01DF4 80A44B24 11600016 */ beq $t3, $zero, .L80A44B80 -/* 01DF8 80A44B28 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 01DFC 80A44B2C 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 01E00 80A44B30 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 01E04 80A44B34 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01E08 80A44B38 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01E0C 80A44B3C AFAC0014 */ sw $t4, 0x0014($sp) -/* 01E10 80A44B40 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01E14 80A44B44 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01E18 80A44B48 AFA70010 */ sw $a3, 0x0010($sp) -/* 01E1C 80A44B4C 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 01E20 80A44B50 920F01CD */ lbu $t7, 0x01CD($s0) ## 000001CD -/* 01E24 80A44B54 3C01FEFF */ lui $at, 0xFEFF ## $at = FEFF0000 -/* 01E28 80A44B58 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FEFFFFFF -/* 01E2C 80A44B5C 01A17024 */ and $t6, $t5, $at -/* 01E30 80A44B60 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 -/* 01E34 80A44B64 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 01E38 80A44B68 A21801CD */ sb $t8, 0x01CD($s0) ## 000001CD -/* 01E3C 80A44B6C 8FA50034 */ lw $a1, 0x0034($sp) -/* 01E40 80A44B70 0C291792 */ jal func_80A45E48 -/* 01E44 80A44B74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E48 80A44B78 10000036 */ beq $zero, $zero, .L80A44C54 -/* 01E4C 80A44B7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44B80: -/* 01E50 80A44B80 80790A78 */ lb $t9, 0x0A78($v1) ## 00000A78 -/* 01E54 80A44B84 1F200007 */ bgtz $t9, .L80A44BA4 -/* 01E58 80A44B88 00000000 */ nop -/* 01E5C 80A44B8C 920801CE */ lbu $t0, 0x01CE($s0) ## 000001CE -/* 01E60 80A44B90 3C0C80A4 */ lui $t4, %hi(func_80A46DBC) ## $t4 = 80A40000 -/* 01E64 80A44B94 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 01E68 80A44B98 35090008 */ ori $t1, $t0, 0x0008 ## $t1 = 00000008 -/* 01E6C 80A44B9C 10000003 */ beq $zero, $zero, .L80A44BAC -/* 01E70 80A44BA0 A20901CE */ sb $t1, 0x01CE($s0) ## 000001CE -.L80A44BA4: -/* 01E74 80A44BA4 1000002B */ beq $zero, $zero, .L80A44C54 -/* 01E78 80A44BA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44BAC: -/* 01E7C 80A44BAC 920201CF */ lbu $v0, 0x01CF($s0) ## 000001CF -/* 01E80 80A44BB0 304A0001 */ andi $t2, $v0, 0x0001 ## $t2 = 00000000 -/* 01E84 80A44BB4 51400027 */ beql $t2, $zero, .L80A44C54 -/* 01E88 80A44BB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01E8C 80A44BBC 8E0D0190 */ lw $t5, 0x0190($s0) ## 00000190 -/* 01E90 80A44BC0 304BFFFE */ andi $t3, $v0, 0xFFFE ## $t3 = 00000000 -/* 01E94 80A44BC4 258C6DBC */ addiu $t4, $t4, %lo(func_80A46DBC) ## $t4 = 80A46DBC -/* 01E98 80A44BC8 158D0005 */ bne $t4, $t5, .L80A44BE0 -/* 01E9C 80A44BCC A20B01CF */ sb $t3, 0x01CF($s0) ## 000001CF -/* 01EA0 80A44BD0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01EA4 80A44BD4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 01EA8 80A44BD8 10000007 */ beq $zero, $zero, .L80A44BF8 -/* 01EAC 80A44BDC 8FA40034 */ lw $a0, 0x0034($sp) -.L80A44BE0: -/* 01EB0 80A44BE0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01EB4 80A44BE4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 01EB8 80A44BE8 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01EBC 80A44BEC 46062002 */ mul.s $f0, $f4, $f6 -/* 01EC0 80A44BF0 00000000 */ nop -/* 01EC4 80A44BF4 8FA40034 */ lw $a0, 0x0034($sp) -.L80A44BF8: -/* 01EC8 80A44BF8 AFA3002C */ sw $v1, 0x002C($sp) -/* 01ECC 80A44BFC E7A00028 */ swc1 $f0, 0x0028($sp) -/* 01ED0 80A44C00 0324C821 */ addu $t9, $t9, $a0 -/* 01ED4 80A44C04 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 01ED8 80A44C08 2405FFFC */ addiu $a1, $zero, 0xFFFC ## $a1 = FFFFFFFC -/* 01EDC 80A44C0C 0320F809 */ jalr $ra, $t9 -/* 01EE0 80A44C10 00000000 */ nop -/* 01EE4 80A44C14 C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 01EE8 80A44C18 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01EEC 80A44C1C 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 01EF0 80A44C20 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 01EF4 80A44C24 44060000 */ mfc1 $a2, $f0 -/* 01EF8 80A44C28 8FA40034 */ lw $a0, 0x0034($sp) -/* 01EFC 80A44C2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01F00 80A44C30 0C00BDC7 */ jal func_8002F71C -/* 01F04 80A44C34 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01F08 80A44C38 8FA4002C */ lw $a0, 0x002C($sp) -/* 01F0C 80A44C3C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01F10 80A44C40 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01F14 80A44C44 920F01CE */ lbu $t7, 0x01CE($s0) ## 000001CE -/* 01F18 80A44C48 31F8FFF7 */ andi $t8, $t7, 0xFFF7 ## $t8 = 00000000 -/* 01F1C 80A44C4C A21801CE */ sb $t8, 0x01CE($s0) ## 000001CE -/* 01F20 80A44C50 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44C54: -/* 01F24 80A44C54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01F28 80A44C58 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F2C 80A44C5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01F30 80A44C60 03E00008 */ jr $ra -/* 01F34 80A44C64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s deleted file mode 100644 index ea863ec780..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A44C68 -/* 01F38 80A44C68 AFA50004 */ sw $a1, 0x0004($sp) -/* 01F3C 80A44C6C 8C820208 */ lw $v0, 0x0208($a0) ## 00000208 -/* 01F40 80A44C70 54400004 */ bnel $v0, $zero, .L80A44C84 -/* 01F44 80A44C74 90430000 */ lbu $v1, 0x0000($v0) ## 00000000 -/* 01F48 80A44C78 03E00008 */ jr $ra -/* 01F4C 80A44C7C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A44C80: -/* 01F50 80A44C80 90430000 */ lbu $v1, 0x0000($v0) ## 00000000 -.L80A44C84: -/* 01F54 80A44C84 908E020E */ lbu $t6, 0x020E($a0) ## 0000020E -/* 01F58 80A44C88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01F5C 80A44C8C 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFF -/* 01F60 80A44C90 11C0000A */ beq $t6, $zero, .L80A44CBC -/* 01F64 80A44C94 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 000000FF -/* 01F68 80A44C98 808F0210 */ lb $t7, 0x0210($a0) ## 00000210 -/* 01F6C 80A44C9C 2468FFFF */ addiu $t0, $v1, 0xFFFF ## $t0 = 000000FE -/* 01F70 80A44CA0 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 01F74 80A44CA4 A0980210 */ sb $t8, 0x0210($a0) ## 00000210 -/* 01F78 80A44CA8 80990210 */ lb $t9, 0x0210($a0) ## 00000210 -/* 01F7C 80A44CAC 0721000B */ bgez $t9, .L80A44CDC -/* 01F80 80A44CB0 00000000 */ nop -/* 01F84 80A44CB4 10000009 */ beq $zero, $zero, .L80A44CDC -/* 01F88 80A44CB8 A0880210 */ sb $t0, 0x0210($a0) ## 00000210 -.L80A44CBC: -/* 01F8C 80A44CBC 80890210 */ lb $t1, 0x0210($a0) ## 00000210 -/* 01F90 80A44CC0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01F94 80A44CC4 A08A0210 */ sb $t2, 0x0210($a0) ## 00000210 -/* 01F98 80A44CC8 808B0210 */ lb $t3, 0x0210($a0) ## 00000210 -/* 01F9C 80A44CCC 0163082A */ slt $at, $t3, $v1 -/* 01FA0 80A44CD0 14200002 */ bne $at, $zero, .L80A44CDC -/* 01FA4 80A44CD4 00000000 */ nop -/* 01FA8 80A44CD8 A0800210 */ sb $zero, 0x0210($a0) ## 00000210 -.L80A44CDC: -/* 01FAC 80A44CDC 03E00008 */ jr $ra -/* 01FB0 80A44CE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s deleted file mode 100644 index e8765d4093..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A44CE4 -/* 01FB4 80A44CE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01FB8 80A44CE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01FBC 80A44CEC AFB00020 */ sw $s0, 0x0020($sp) -/* 01FC0 80A44CF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01FC4 80A44CF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01FC8 80A44CF8 82060210 */ lb $a2, 0x0210($s0) ## 00000210 -/* 01FCC 80A44CFC 8E050208 */ lw $a1, 0x0208($s0) ## 00000208 -/* 01FD0 80A44D00 0C023948 */ jal Path_OrientAndGetDistSq -/* 01FD4 80A44D04 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE -/* 01FD8 80A44D08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01FDC 80A44D0C AFAE0010 */ sw $t6, 0x0010($sp) -/* 01FE0 80A44D10 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01FE4 80A44D14 87A5002E */ lh $a1, 0x002E($sp) -/* 01FE8 80A44D18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01FEC 80A44D1C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 01FF0 80A44D20 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01FF4 80A44D24 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 01FF8 80A44D28 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 01FFC 80A44D2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02000 80A44D30 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 02004 80A44D34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02008 80A44D38 4602203C */ c.lt.s $f4, $f2 -/* 0200C 80A44D3C 00000000 */ nop -/* 02010 80A44D40 4500000B */ bc1f .L80A44D70 -/* 02014 80A44D44 00000000 */ nop -/* 02018 80A44D48 44813000 */ mtc1 $at, $f6 ## $f6 = 900.00 -/* 0201C 80A44D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02020 80A44D50 4606103C */ c.lt.s $f2, $f6 -/* 02024 80A44D54 00000000 */ nop -/* 02028 80A44D58 45000005 */ bc1f .L80A44D70 -/* 0202C 80A44D5C 00000000 */ nop -/* 02030 80A44D60 0C29131A */ jal func_80A44C68 -/* 02034 80A44D64 8FA50034 */ lw $a1, 0x0034($sp) -/* 02038 80A44D68 10000002 */ beq $zero, $zero, .L80A44D74 -/* 0203C 80A44D6C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A44D70: -/* 02040 80A44D70 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A44D74: -/* 02044 80A44D74 8FB00020 */ lw $s0, 0x0020($sp) -/* 02048 80A44D78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0204C 80A44D7C 03E00008 */ jr $ra -/* 02050 80A44D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s deleted file mode 100644 index 58951c729b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A44D84 -/* 02054 80A44D84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02058 80A44D88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0205C 80A44D8C 80860210 */ lb $a2, 0x0210($a0) ## 00000210 -/* 02060 80A44D90 8C850208 */ lw $a1, 0x0208($a0) ## 00000208 -/* 02064 80A44D94 AFA40020 */ sw $a0, 0x0020($sp) -/* 02068 80A44D98 0C023948 */ jal Path_OrientAndGetDistSq -/* 0206C 80A44D9C 27A7001E */ addiu $a3, $sp, 0x001E ## $a3 = FFFFFFFE -/* 02070 80A44DA0 8FA40020 */ lw $a0, 0x0020($sp) -/* 02074 80A44DA4 87AE001E */ lh $t6, 0x001E($sp) -/* 02078 80A44DA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0207C 80A44DAC A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 02080 80A44DB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02084 80A44DB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02088 80A44DB8 03E00008 */ jr $ra -/* 0208C 80A44DBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s deleted file mode 100644 index 7cde17d41e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80A44DC0 -/* 02090 80A44DC0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 02094 80A44DC4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 02098 80A44DC8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0209C 80A44DCC 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 020A0 80A44DD0 54620006 */ bnel $v1, $v0, .L80A44DEC -/* 020A4 80A44DD4 44810000 */ mtc1 $at, $f0 ## $f0 = 200.00 -/* 020A8 80A44DD8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 020AC 80A44DDC 44810000 */ mtc1 $at, $f0 ## $f0 = 800.00 -/* 020B0 80A44DE0 10000003 */ beq $zero, $zero, .L80A44DF0 -/* 020B4 80A44DE4 00000000 */ nop -/* 020B8 80A44DE8 44810000 */ mtc1 $at, $f0 ## $f0 = 800.00 -.L80A44DEC: -/* 020BC 80A44DEC 00000000 */ nop -.L80A44DF0: -/* 020C0 80A44DF0 14620005 */ bne $v1, $v0, .L80A44E08 -/* 020C4 80A44DF4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 020C8 80A44DF8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 020CC 80A44DFC 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 020D0 80A44E00 10000003 */ beq $zero, $zero, .L80A44E10 -/* 020D4 80A44E04 00000000 */ nop -.L80A44E08: -/* 020D8 80A44E08 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 020DC 80A44E0C 00000000 */ nop -.L80A44E10: -/* 020E0 80A44E10 54620011 */ bnel $v1, $v0, .L80A44E58 -/* 020E4 80A44E14 848A008A */ lh $t2, 0x008A($a0) ## 0000008A -/* 020E8 80A44E18 908E01CF */ lbu $t6, 0x01CF($a0) ## 000001CF -/* 020EC 80A44E1C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 020F0 80A44E20 55E00008 */ bnel $t7, $zero, .L80A44E44 -/* 020F4 80A44E24 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -/* 020F8 80A44E28 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 020FC 80A44E2C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02100 80A44E30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02104 80A44E34 0301C824 */ and $t9, $t8, $at -/* 02108 80A44E38 03E00008 */ jr $ra -/* 0210C 80A44E3C AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -.L80A44E40: -/* 02110 80A44E40 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -.L80A44E44: -/* 02114 80A44E44 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02118 80A44E48 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 0211C 80A44E4C 03E00008 */ jr $ra -/* 02120 80A44E50 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -.L80A44E54: -/* 02124 80A44E54 848A008A */ lh $t2, 0x008A($a0) ## 0000008A -.L80A44E58: -/* 02128 80A44E58 848B00B6 */ lh $t3, 0x00B6($a0) ## 000000B6 -/* 0212C 80A44E5C 46000002 */ mul.s $f0, $f0, $f0 -/* 02130 80A44E60 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 02134 80A44E64 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 02138 80A44E68 468021A0 */ cvt.s.w $f6, $f4 -/* 0213C 80A44E6C 468042A0 */ cvt.s.w $f10, $f8 -/* 02140 80A44E70 460A3401 */ sub.s $f16, $f6, $f10 -/* 02144 80A44E74 4600848D */ trunc.w.s $f18, $f16 -/* 02148 80A44E78 44029000 */ mfc1 $v0, $f18 -/* 0214C 80A44E7C 00000000 */ nop -/* 02150 80A44E80 00021400 */ sll $v0, $v0, 16 -/* 02154 80A44E84 00021403 */ sra $v0, $v0, 16 -/* 02158 80A44E88 04400004 */ bltz $v0, .L80A44E9C -/* 0215C 80A44E8C 00021823 */ subu $v1, $zero, $v0 -/* 02160 80A44E90 00021C00 */ sll $v1, $v0, 16 -/* 02164 80A44E94 10000003 */ beq $zero, $zero, .L80A44EA4 -/* 02168 80A44E98 00031C03 */ sra $v1, $v1, 16 -.L80A44E9C: -/* 0216C 80A44E9C 00031C00 */ sll $v1, $v1, 16 -/* 02170 80A44EA0 00031C03 */ sra $v1, $v1, 16 -.L80A44EA4: -/* 02174 80A44EA4 C484008C */ lwc1 $f4, 0x008C($a0) ## 0000008C -/* 02178 80A44EA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0217C 80A44EAC 4600203E */ c.le.s $f4, $f0 -/* 02180 80A44EB0 00000000 */ nop -/* 02184 80A44EB4 4500000C */ bc1f .L80A44EE8 -/* 02188 80A44EB8 00000000 */ nop -/* 0218C 80A44EBC C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 02190 80A44EC0 28612AA8 */ slti $at, $v1, 0x2AA8 -/* 02194 80A44EC4 46000005 */ abs.s $f0, $f0 -/* 02198 80A44EC8 4602003C */ c.lt.s $f0, $f2 -/* 0219C 80A44ECC 00000000 */ nop -/* 021A0 80A44ED0 45000005 */ bc1f .L80A44EE8 -/* 021A4 80A44ED4 00000000 */ nop -/* 021A8 80A44ED8 10200003 */ beq $at, $zero, .L80A44EE8 -/* 021AC 80A44EDC 00000000 */ nop -/* 021B0 80A44EE0 03E00008 */ jr $ra -/* 021B4 80A44EE4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44EE8: -/* 021B8 80A44EE8 03E00008 */ jr $ra -/* 021BC 80A44EEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s deleted file mode 100644 index 42202d2065..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80A44EF0 -/* 021C0 80A44EF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021C4 80A44EF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 021C8 80A44EF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 021CC 80A44EFC AFA5001C */ sw $a1, 0x001C($sp) -/* 021D0 80A44F00 AFA60020 */ sw $a2, 0x0020($sp) -/* 021D4 80A44F04 AFA70024 */ sw $a3, 0x0024($sp) -/* 021D8 80A44F08 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 021DC 80A44F0C 00073C00 */ sll $a3, $a3, 16 -/* 021E0 80A44F10 00073C03 */ sra $a3, $a3, 16 -/* 021E4 80A44F14 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 021E8 80A44F18 11E00007 */ beq $t7, $zero, .L80A44F38 -/* 021EC 80A44F1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 021F0 80A44F20 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 021F4 80A44F24 C4860060 */ lwc1 $f6, 0x0060($a0) ## 00000060 -/* 021F8 80A44F28 4606203C */ c.lt.s $f4, $f6 -/* 021FC 80A44F2C 00000000 */ nop -/* 02200 80A44F30 45020004 */ bc1fl .L80A44F44 -/* 02204 80A44F34 84C20590 */ lh $v0, 0x0590($a2) ## 00000590 -.L80A44F38: -/* 02208 80A44F38 1000004F */ beq $zero, $zero, .L80A45078 -/* 0220C 80A44F3C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02210 80A44F40 84C20590 */ lh $v0, 0x0590($a2) ## 00000590 -.L80A44F44: -/* 02214 80A44F44 14400003 */ bne $v0, $zero, .L80A44F54 -/* 02218 80A44F48 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0221C 80A44F4C 10000004 */ beq $zero, $zero, .L80A44F60 -/* 02220 80A44F50 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A44F54: -/* 02224 80A44F54 A4D80590 */ sh $t8, 0x0590($a2) ## 00000590 -/* 02228 80A44F58 84C20590 */ lh $v0, 0x0590($a2) ## 00000590 -/* 0222C 80A44F5C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80A44F60: -/* 02230 80A44F60 50600017 */ beql $v1, $zero, .L80A44FC0 -/* 02234 80A44F64 84C3059C */ lh $v1, 0x059C($a2) ## 0000059C -/* 02238 80A44F68 14E00003 */ bne $a3, $zero, .L80A44F78 -/* 0223C 80A44F6C 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 02240 80A44F70 10000041 */ beq $zero, $zero, .L80A45078 -/* 02244 80A44F74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A44F78: -/* 02248 80A44F78 13200007 */ beq $t9, $zero, .L80A44F98 -/* 0224C 80A44F7C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02250 80A44F80 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 02254 80A44F84 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 02258 80A44F88 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 0225C 80A44F8C 460A4400 */ add.s $f16, $f8, $f10 -/* 02260 80A44F90 10000006 */ beq $zero, $zero, .L80A44FAC -/* 02264 80A44F94 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -.L80A44F98: -/* 02268 80A44F98 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0226C 80A44F9C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 02270 80A44FA0 C4D20028 */ lwc1 $f18, 0x0028($a2) ## 00000028 -/* 02274 80A44FA4 46049181 */ sub.s $f6, $f18, $f4 -/* 02278 80A44FA8 E4C60028 */ swc1 $f6, 0x0028($a2) ## 00000028 -.L80A44FAC: -/* 0227C 80A44FAC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02280 80A44FB0 240520B8 */ addiu $a1, $zero, 0x20B8 ## $a1 = 000020B8 -/* 02284 80A44FB4 10000030 */ beq $zero, $zero, .L80A45078 -/* 02288 80A44FB8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0228C 80A44FBC 84C3059C */ lh $v1, 0x059C($a2) ## 0000059C -.L80A44FC0: -/* 02290 80A44FC0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02294 80A44FC4 28610002 */ slti $at, $v1, 0x0002 -/* 02298 80A44FC8 5420000E */ bnel $at, $zero, .L80A45004 -/* 0229C 80A44FCC 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 022A0 80A44FD0 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 022A4 80A44FD4 2403387B */ addiu $v1, $zero, 0x387B ## $v1 = 0000387B -/* 022A8 80A44FD8 3109001F */ andi $t1, $t0, 0x001F ## $t1 = 00000000 -/* 022AC 80A44FDC 15200003 */ bne $t1, $zero, .L80A44FEC -/* 022B0 80A44FE0 00000000 */ nop -/* 022B4 80A44FE4 10000001 */ beq $zero, $zero, .L80A44FEC -/* 022B8 80A44FE8 24033879 */ addiu $v1, $zero, 0x3879 ## $v1 = 00003879 -.L80A44FEC: -/* 022BC 80A44FEC 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00003879 -/* 022C0 80A44FF0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 022C4 80A44FF4 AFA60018 */ sw $a2, 0x0018($sp) -/* 022C8 80A44FF8 8FA60018 */ lw $a2, 0x0018($sp) -/* 022CC 80A44FFC 84C3059C */ lh $v1, 0x059C($a2) ## 0000059C -/* 022D0 80A45000 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -.L80A45004: -/* 022D4 80A45004 A4CA059C */ sh $t2, 0x059C($a2) ## 0000059C -/* 022D8 80A45008 84C3059C */ lh $v1, 0x059C($a2) ## 0000059C -/* 022DC 80A4500C 5C600011 */ bgtzl $v1, .L80A45054 -/* 022E0 80A45010 87AC001E */ lh $t4, 0x001E($sp) -/* 022E4 80A45014 1460000C */ bne $v1, $zero, .L80A45048 -/* 022E8 80A45018 87AB001E */ lh $t3, 0x001E($sp) -/* 022EC 80A4501C 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 022F0 80A45020 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 022F4 80A45024 0C01DF64 */ jal Rand_S16Offset - -/* 022F8 80A45028 AFA60018 */ sw $a2, 0x0018($sp) -/* 022FC 80A4502C 8FA60018 */ lw $a2, 0x0018($sp) -/* 02300 80A45030 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02304 80A45034 A4C20590 */ sh $v0, 0x0590($a2) ## 00000590 -/* 02308 80A45038 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0230C 80A4503C A4C0059C */ sh $zero, 0x059C($a2) ## 0000059C -/* 02310 80A45040 1000000D */ beq $zero, $zero, .L80A45078 -/* 02314 80A45044 E4C80060 */ swc1 $f8, 0x0060($a2) ## 00000060 -.L80A45048: -/* 02318 80A45048 A4CB059C */ sh $t3, 0x059C($a2) ## 0000059C -/* 0231C 80A4504C 84C3059C */ lh $v1, 0x059C($a2) ## 0000059C -/* 02320 80A45050 87AC001E */ lh $t4, 0x001E($sp) -.L80A45054: -/* 02324 80A45054 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -/* 02328 80A45058 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 0232C 80A4505C 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 02330 80A45060 46805420 */ cvt.s.w $f16, $f10 -/* 02334 80A45064 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02338 80A45068 46809120 */ cvt.s.w $f4, $f18 -/* 0233C 80A4506C 46048183 */ div.s $f6, $f16, $f4 -/* 02340 80A45070 46083282 */ mul.s $f10, $f6, $f8 -/* 02344 80A45074 E4CA0060 */ swc1 $f10, 0x0060($a2) ## 00000060 -.L80A45078: -/* 02348 80A45078 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0234C 80A4507C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02350 80A45080 03E00008 */ jr $ra -/* 02354 80A45084 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s deleted file mode 100644 index b8be120dc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80A45088 -/* 02358 80A45088 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0235C 80A4508C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02360 80A45090 AFA60020 */ sw $a2, 0x0020($sp) -/* 02364 80A45094 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02368 80A45098 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0236C 80A4509C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02370 80A450A0 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 02374 80A450A4 15E10074 */ bne $t7, $at, .L80A45278 -/* 02378 80A450A8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0237C 80A450AC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02380 80A450B0 9062003E */ lbu $v0, 0x003E($v1) ## 8015E69E -/* 02384 80A450B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02388 80A450B8 1040000F */ beq $v0, $zero, .L80A450F8 -/* 0238C 80A450BC 00000000 */ nop -/* 02390 80A450C0 0C00BCDA */ jal func_8002F368 -/* 02394 80A450C4 AFA70018 */ sw $a3, 0x0018($sp) -/* 02398 80A450C8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0239C 80A450CC 14410004 */ bne $v0, $at, .L80A450E0 -/* 023A0 80A450D0 8FA70018 */ lw $a3, 0x0018($sp) -/* 023A4 80A450D4 24183003 */ addiu $t8, $zero, 0x3003 ## $t8 = 00003003 -/* 023A8 80A450D8 10000003 */ beq $zero, $zero, .L80A450E8 -/* 023AC 80A450DC A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -.L80A450E0: -/* 023B0 80A450E0 2419305E */ addiu $t9, $zero, 0x305E ## $t9 = 0000305E -/* 023B4 80A450E4 A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -.L80A450E8: -/* 023B8 80A450E8 94E8010E */ lhu $t0, 0x010E($a3) ## 0000010E -/* 023BC 80A450EC 8FA90020 */ lw $t1, 0x0020($sp) -/* 023C0 80A450F0 10000061 */ beq $zero, $zero, .L80A45278 -/* 023C4 80A450F4 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -.L80A450F8: -/* 023C8 80A450F8 14400024 */ bne $v0, $zero, .L80A4518C -/* 023CC 80A450FC 3C0A8012 */ lui $t2, %hi(gItemSlots+0x2d) -/* 023D0 80A45100 914A7491 */ lbu $t2, %lo(gItemSlots+0x2d)($t2) -/* 023D4 80A45104 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 023D8 80A45108 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 023DC 80A4510C 006A5821 */ addu $t3, $v1, $t2 -/* 023E0 80A45110 916C0074 */ lbu $t4, 0x0074($t3) ## 00000074 -/* 023E4 80A45114 1581001D */ bne $t4, $at, .L80A4518C -/* 023E8 80A45118 00000000 */ nop -/* 023EC 80A4511C 0C00BCDA */ jal func_8002F368 -/* 023F0 80A45120 AFA70018 */ sw $a3, 0x0018($sp) -/* 023F4 80A45124 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 023F8 80A45128 1441000B */ bne $v0, $at, .L80A45158 -/* 023FC 80A4512C 8FA70018 */ lw $a3, 0x0018($sp) -/* 02400 80A45130 0C01DD73 */ jal func_800775CC -/* 02404 80A45134 AFA70018 */ sw $a3, 0x0018($sp) -/* 02408 80A45138 28410003 */ slti $at, $v0, 0x0003 -/* 0240C 80A4513C 14200003 */ bne $at, $zero, .L80A4514C -/* 02410 80A45140 8FA70018 */ lw $a3, 0x0018($sp) -/* 02414 80A45144 10000002 */ beq $zero, $zero, .L80A45150 -/* 02418 80A45148 2402305E */ addiu $v0, $zero, 0x305E ## $v0 = 0000305E -.L80A4514C: -/* 0241C 80A4514C 2402305D */ addiu $v0, $zero, 0x305D ## $v0 = 0000305D -.L80A45150: -/* 02420 80A45150 1000000A */ beq $zero, $zero, .L80A4517C -/* 02424 80A45154 A4E2010E */ sh $v0, 0x010E($a3) ## 0000010E -.L80A45158: -/* 02428 80A45158 0C01DD73 */ jal func_800775CC -/* 0242C 80A4515C AFA70018 */ sw $a3, 0x0018($sp) -/* 02430 80A45160 28410003 */ slti $at, $v0, 0x0003 -/* 02434 80A45164 14200003 */ bne $at, $zero, .L80A45174 -/* 02438 80A45168 8FA70018 */ lw $a3, 0x0018($sp) -/* 0243C 80A4516C 10000002 */ beq $zero, $zero, .L80A45178 -/* 02440 80A45170 24023002 */ addiu $v0, $zero, 0x3002 ## $v0 = 00003002 -.L80A45174: -/* 02444 80A45174 2402305D */ addiu $v0, $zero, 0x305D ## $v0 = 0000305D -.L80A45178: -/* 02448 80A45178 A4E2010E */ sh $v0, 0x010E($a3) ## 0000010E -.L80A4517C: -/* 0244C 80A4517C 94ED010E */ lhu $t5, 0x010E($a3) ## 0000010E -/* 02450 80A45180 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02454 80A45184 1000003C */ beq $zero, $zero, .L80A45278 -/* 02458 80A45188 A5CD010E */ sh $t5, 0x010E($t6) ## 0000010E -.L80A4518C: -/* 0245C 80A4518C 3C0F8012 */ lui $t7, %hi(gItemSlots+0x2d) -/* 02460 80A45190 91EF7491 */ lbu $t7, %lo(gItemSlots+0x2d)($t7) -/* 02464 80A45194 006FC021 */ addu $t8, $v1, $t7 -/* 02468 80A45198 93020074 */ lbu $v0, 0x0074($t8) ## 00000074 -/* 0246C 80A4519C 28410034 */ slti $at, $v0, 0x0034 -/* 02470 80A451A0 14200018 */ bne $at, $zero, .L80A45204 -/* 02474 80A451A4 28410038 */ slti $at, $v0, 0x0038 -/* 02478 80A451A8 10200016 */ beq $at, $zero, .L80A45204 -/* 0247C 80A451AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02480 80A451B0 0C00BCDA */ jal func_8002F368 -/* 02484 80A451B4 AFA70018 */ sw $a3, 0x0018($sp) -/* 02488 80A451B8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0248C 80A451BC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02490 80A451C0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02494 80A451C4 14410004 */ bne $v0, $at, .L80A451D8 -/* 02498 80A451C8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0249C 80A451CC 24193059 */ addiu $t9, $zero, 0x3059 ## $t9 = 00003059 -/* 024A0 80A451D0 10000003 */ beq $zero, $zero, .L80A451E0 -/* 024A4 80A451D4 A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -.L80A451D8: -/* 024A8 80A451D8 24083058 */ addiu $t0, $zero, 0x3058 ## $t0 = 00003058 -/* 024AC 80A451DC A4E8010E */ sh $t0, 0x010E($a3) ## 0000010E -.L80A451E0: -/* 024B0 80A451E0 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 024B4 80A451E4 24013059 */ addiu $at, $zero, 0x3059 ## $at = 00003059 -/* 024B8 80A451E8 54410004 */ bnel $v0, $at, .L80A451FC -/* 024BC 80A451EC 8FA90020 */ lw $t1, 0x0020($sp) -/* 024C0 80A451F0 A46013D2 */ sh $zero, 0x13D2($v1) ## 8015FA32 -/* 024C4 80A451F4 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 024C8 80A451F8 8FA90020 */ lw $t1, 0x0020($sp) -.L80A451FC: -/* 024CC 80A451FC 1000001E */ beq $zero, $zero, .L80A45278 -/* 024D0 80A45200 A522010E */ sh $v0, 0x010E($t1) ## 0000010E -.L80A45204: -/* 024D4 80A45204 28410034 */ slti $at, $v0, 0x0034 -/* 024D8 80A45208 10200018 */ beq $at, $zero, .L80A4526C -/* 024DC 80A4520C 24183053 */ addiu $t8, $zero, 0x3053 ## $t8 = 00003053 -/* 024E0 80A45210 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 024E4 80A45214 0C00BCDA */ jal func_8002F368 -/* 024E8 80A45218 AFA70018 */ sw $a3, 0x0018($sp) -/* 024EC 80A4521C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 024F0 80A45220 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 024F4 80A45224 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 024F8 80A45228 1441000A */ bne $v0, $at, .L80A45254 -/* 024FC 80A4522C 8FA70018 */ lw $a3, 0x0018($sp) -/* 02500 80A45230 946A0F0E */ lhu $t2, 0x0F0E($v1) ## 8015F56E -/* 02504 80A45234 24023054 */ addiu $v0, $zero, 0x3054 ## $v0 = 00003054 -/* 02508 80A45238 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 -/* 0250C 80A4523C 11600003 */ beq $t3, $zero, .L80A4524C -/* 02510 80A45240 00000000 */ nop -/* 02514 80A45244 10000001 */ beq $zero, $zero, .L80A4524C -/* 02518 80A45248 24023055 */ addiu $v0, $zero, 0x3055 ## $v0 = 00003055 -.L80A4524C: -/* 0251C 80A4524C 10000003 */ beq $zero, $zero, .L80A4525C -/* 02520 80A45250 A4E2010E */ sh $v0, 0x010E($a3) ## 0000010E -.L80A45254: -/* 02524 80A45254 240C3053 */ addiu $t4, $zero, 0x3053 ## $t4 = 00003053 -/* 02528 80A45258 A4EC010E */ sh $t4, 0x010E($a3) ## 0000010E -.L80A4525C: -/* 0252C 80A4525C 94ED010E */ lhu $t5, 0x010E($a3) ## 0000010E -/* 02530 80A45260 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02534 80A45264 10000004 */ beq $zero, $zero, .L80A45278 -/* 02538 80A45268 A5CD010E */ sh $t5, 0x010E($t6) ## 0000010E -.L80A4526C: -/* 0253C 80A4526C A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -/* 02540 80A45270 8FB90020 */ lw $t9, 0x0020($sp) -/* 02544 80A45274 A738010E */ sh $t8, 0x010E($t9) ## 0000010E -.L80A45278: -/* 02548 80A45278 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0254C 80A4527C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02550 80A45280 03E00008 */ jr $ra -/* 02554 80A45284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s deleted file mode 100644 index 8d63499f22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80A45288 -/* 02558 80A45288 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0255C 80A4528C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02560 80A45290 AFA50024 */ sw $a1, 0x0024($sp) -/* 02564 80A45294 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 02568 80A45298 3C1880A4 */ lui $t8, %hi(func_80A47578) ## $t8 = 80A40000 -/* 0256C 80A4529C 27187578 */ addiu $t8, $t8, %lo(func_80A47578) ## $t8 = 80A47578 -/* 02570 80A452A0 AFAF001C */ sw $t7, 0x001C($sp) -/* 02574 80A452A4 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02578 80A452A8 13020019 */ beq $t8, $v0, .L80A45310 -/* 0257C 80A452AC 00000000 */ nop -/* 02580 80A452B0 8DE80024 */ lw $t0, 0x0024($t7) ## 00000024 -/* 02584 80A452B4 8489001C */ lh $t1, 0x001C($a0) ## 0000001C -/* 02588 80A452B8 3C028016 */ lui $v0, %hi(gSaveContext+4) -/* 0258C 80A452BC AC8801AC */ sw $t0, 0x01AC($a0) ## 000001AC -/* 02590 80A452C0 8DF90028 */ lw $t9, 0x0028($t7) ## 00000028 -/* 02594 80A452C4 312A001F */ andi $t2, $t1, 0x001F ## $t2 = 00000000 -/* 02598 80A452C8 000A58C0 */ sll $t3, $t2, 3 -/* 0259C 80A452CC AC9901B0 */ sw $t9, 0x01B0($a0) ## 000001B0 -/* 025A0 80A452D0 8DE8002C */ lw $t0, 0x002C($t7) ## 0000002C -/* 025A4 80A452D4 3C0180A5 */ lui $at, %hi(D_80A482D8) ## $at = 80A50000 -/* 025A8 80A452D8 8487026E */ lh $a3, 0x026E($a0) ## 0000026E -/* 025AC 80A452DC AC8801B4 */ sw $t0, 0x01B4($a0) ## 000001B4 -/* 025B0 80A452E0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* 025B4 80A452E4 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 -/* 025B8 80A452E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 025BC 80A452EC 00026080 */ sll $t4, $v0, 2 -/* 025C0 80A452F0 016C6821 */ addu $t5, $t3, $t4 -/* 025C4 80A452F4 002D0821 */ addu $at, $at, $t5 -/* 025C8 80A452F8 C42482D8 */ lwc1 $f4, %lo(D_80A482D8)($at) -/* 025CC 80A452FC E48401A8 */ swc1 $f4, 0x01A8($a0) ## 000001A8 -/* 025D0 80A45300 0C00D285 */ jal func_80034A14 -/* 025D4 80A45304 AFA40020 */ sw $a0, 0x0020($sp) -/* 025D8 80A45308 8FA40020 */ lw $a0, 0x0020($sp) -/* 025DC 80A4530C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80A45310: -/* 025E0 80A45310 3C0E80A4 */ lui $t6, %hi(func_80A47158) ## $t6 = 80A40000 -/* 025E4 80A45314 25CE7158 */ addiu $t6, $t6, %lo(func_80A47158) ## $t6 = 80A47158 -/* 025E8 80A45318 51C2000E */ beql $t6, $v0, .L80A45354 -/* 025EC 80A4531C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 025F0 80A45320 9098020F */ lbu $t8, 0x020F($a0) ## 0000020F -/* 025F4 80A45324 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 025F8 80A45328 8FA50024 */ lw $a1, 0x0024($sp) -/* 025FC 80A4532C 57010009 */ bnel $t8, $at, .L80A45354 -/* 02600 80A45330 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02604 80A45334 0C2911E4 */ jal func_80A44790 -/* 02608 80A45338 AFA40020 */ sw $a0, 0x0020($sp) -/* 0260C 80A4533C 10400004 */ beq $v0, $zero, .L80A45350 -/* 02610 80A45340 8FA40020 */ lw $a0, 0x0020($sp) -/* 02614 80A45344 8FA50024 */ lw $a1, 0x0024($sp) -/* 02618 80A45348 0C291422 */ jal func_80A45088 -/* 0261C 80A4534C 8FA6001C */ lw $a2, 0x001C($sp) -.L80A45350: -/* 02620 80A45350 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A45354: -/* 02624 80A45354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02628 80A45358 03E00008 */ jr $ra -/* 0262C 80A4535C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s deleted file mode 100644 index f02910dbd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80A45360 -/* 02630 80A45360 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02634 80A45364 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02638 80A45368 AFA40018 */ sw $a0, 0x0018($sp) -/* 0263C 80A4536C AFA5001C */ sw $a1, 0x001C($sp) -/* 02640 80A45370 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 02644 80A45374 3C0E0600 */ lui $t6, %hi(D_06004930) ## $t6 = 06000000 -/* 02648 80A45378 25CE4930 */ addiu $t6, $t6, %lo(D_06004930) ## $t6 = 06004930 -/* 0264C 80A4537C 15D8000B */ bne $t6, $t8, .L80A453AC -/* 02650 80A45380 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 02654 80A45384 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 02658 80A45388 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 0265C 80A4538C C4860164 */ lwc1 $f6, 0x0164($a0) ## 00000164 -/* 02660 80A45390 4604303E */ c.le.s $f6, $f4 -/* 02664 80A45394 00000000 */ nop -/* 02668 80A45398 45020005 */ bc1fl .L80A453B0 -/* 0266C 80A4539C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 02670 80A453A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02674 80A453A4 10000005 */ beq $zero, $zero, .L80A453BC -/* 02678 80A453A8 44050000 */ mfc1 $a1, $f0 -.L80A453AC: -/* 0267C 80A453AC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80A453B0: -/* 02680 80A453B0 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 -/* 02684 80A453B4 00000000 */ nop -/* 02688 80A453B8 44050000 */ mfc1 $a1, $f0 -.L80A453BC: -/* 0268C 80A453BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 02690 80A453C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 02694 80A453C4 0C01E107 */ jal Math_ApproachF - -/* 02698 80A453C8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 0269C 80A453CC 8FB9001C */ lw $t9, 0x001C($sp) -/* 026A0 80A453D0 4448F800 */ cfc1 $t0, $31 -/* 026A4 80A453D4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 026A8 80A453D8 44C9F800 */ ctc1 $t1, $31 -/* 026AC 80A453DC C7280000 */ lwc1 $f8, 0x0000($t9) ## 00000000 -/* 026B0 80A453E0 8FAA0018 */ lw $t2, 0x0018($sp) -/* 026B4 80A453E4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 026B8 80A453E8 460042A4 */ cvt.w.s $f10, $f8 -/* 026BC 80A453EC 4449F800 */ cfc1 $t1, $31 -/* 026C0 80A453F0 00000000 */ nop -/* 026C4 80A453F4 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 026C8 80A453F8 51200013 */ beql $t1, $zero, .L80A45448 -/* 026CC 80A453FC 44095000 */ mfc1 $t1, $f10 -/* 026D0 80A45400 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 026D4 80A45404 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 026D8 80A45408 460A4281 */ sub.s $f10, $f8, $f10 -/* 026DC 80A4540C 44C9F800 */ ctc1 $t1, $31 -/* 026E0 80A45410 00000000 */ nop -/* 026E4 80A45414 460052A4 */ cvt.w.s $f10, $f10 -/* 026E8 80A45418 4449F800 */ cfc1 $t1, $31 -/* 026EC 80A4541C 00000000 */ nop -/* 026F0 80A45420 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 026F4 80A45424 15200005 */ bne $t1, $zero, .L80A4543C -/* 026F8 80A45428 00000000 */ nop -/* 026FC 80A4542C 44095000 */ mfc1 $t1, $f10 -/* 02700 80A45430 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02704 80A45434 10000007 */ beq $zero, $zero, .L80A45454 -/* 02708 80A45438 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80A4543C: -/* 0270C 80A4543C 10000005 */ beq $zero, $zero, .L80A45454 -/* 02710 80A45440 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02714 80A45444 44095000 */ mfc1 $t1, $f10 -.L80A45448: -/* 02718 80A45448 00000000 */ nop -/* 0271C 80A4544C 0520FFFB */ bltz $t1, .L80A4543C -/* 02720 80A45450 00000000 */ nop -.L80A45454: -/* 02724 80A45454 A14900C8 */ sb $t1, 0x00C8($t2) ## 000000C8 -/* 02728 80A45458 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0272C 80A4545C 44C8F800 */ ctc1 $t0, $31 -/* 02730 80A45460 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02734 80A45464 03E00008 */ jr $ra -/* 02738 80A45468 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s deleted file mode 100644 index 34e1ce19b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A4546C -/* 0273C 80A4546C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02740 80A45470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02744 80A45474 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 -/* 02748 80A45478 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 0274C 80A4547C 51C00005 */ beql $t6, $zero, .L80A45494 -/* 02750 80A45480 8C980190 */ lw $t8, 0x0190($a0) ## 00000190 -/* 02754 80A45484 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02758 80A45488 00000000 */ nop -/* 0275C 80A4548C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02760 80A45490 8C980190 */ lw $t8, 0x0190($a0) ## 00000190 -.L80A45494: -/* 02764 80A45494 3C0F80A4 */ lui $t7, %hi(func_80A46DBC) ## $t7 = 80A40000 -/* 02768 80A45498 25EF6DBC */ addiu $t7, $t7, %lo(func_80A46DBC) ## $t7 = 80A46DBC -/* 0276C 80A4549C 51F80007 */ beql $t7, $t8, .L80A454BC -/* 02770 80A454A0 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 02774 80A454A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02778 80A454A8 0C00B638 */ jal Actor_MoveForward - -/* 0277C 80A454AC E7A0001C */ swc1 $f0, 0x001C($sp) -/* 02780 80A454B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 02784 80A454B4 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 02788 80A454B8 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -.L80A454BC: -/* 0278C 80A454BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02790 80A454C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02794 80A454C4 03E00008 */ jr $ra -/* 02798 80A454C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s deleted file mode 100644 index 775ad58d34..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s +++ /dev/null @@ -1,66 +0,0 @@ -.late_rodata -glabel jtbl_80A486F0 - .word L80A45500 - .word L80A4555C - .word L80A4551C - .word L80A4555C - .word L80A4555C - .word L80A4555C - .word L80A45500 - .word L80A45500 - .word L80A4555C - .word L80A4555C - .word L80A45500 - .word L80A4555C - .word L80A45500 - -.text -glabel func_80A454CC -/* 0279C 80A454CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027A0 80A454D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027A4 80A454D4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 027A8 80A454D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 027AC 80A454DC 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 027B0 80A454E0 2DE1000D */ sltiu $at, $t7, 0x000D -/* 027B4 80A454E4 1020001D */ beq $at, $zero, .L80A4555C -/* 027B8 80A454E8 000F7880 */ sll $t7, $t7, 2 -/* 027BC 80A454EC 3C0180A5 */ lui $at, %hi(jtbl_80A486F0) ## $at = 80A50000 -/* 027C0 80A454F0 002F0821 */ addu $at, $at, $t7 -/* 027C4 80A454F4 8C2F86F0 */ lw $t7, %lo(jtbl_80A486F0)($at) -/* 027C8 80A454F8 01E00008 */ jr $t7 -/* 027CC 80A454FC 00000000 */ nop -glabel L80A45500 -/* 027D0 80A45500 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 027D4 80A45504 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 027D8 80A45508 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 027DC 80A4550C 0C00D3B0 */ jal func_80034EC0 -/* 027E0 80A45510 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 027E4 80A45514 10000015 */ beq $zero, $zero, .L80A4556C -/* 027E8 80A45518 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A4551C -/* 027EC 80A4551C 3C188012 */ lui $t8, %hi(gItemSlots+0x2d) -/* 027F0 80A45520 93187491 */ lbu $t8, %lo(gItemSlots+0x2d)($t8) -/* 027F4 80A45524 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 027F8 80A45528 00581021 */ addu $v0, $v0, $t8 -/* 027FC 80A4552C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 02800 80A45530 28410033 */ slti $at, $v0, 0x0033 -/* 02804 80A45534 14200009 */ bne $at, $zero, .L80A4555C -/* 02808 80A45538 28410037 */ slti $at, $v0, 0x0037 -/* 0280C 80A4553C 10200007 */ beq $at, $zero, .L80A4555C -/* 02810 80A45540 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 02814 80A45544 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 02818 80A45548 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 0281C 80A4554C 0C00D3B0 */ jal func_80034EC0 -/* 02820 80A45550 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02824 80A45554 10000005 */ beq $zero, $zero, .L80A4556C -/* 02828 80A45558 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80A4555C -.L80A4555C: -/* 0282C 80A4555C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02830 80A45560 00000000 */ nop -/* 02834 80A45564 E4E40168 */ swc1 $f4, 0x0168($a3) ## 00000168 -/* 02838 80A45568 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A4556C: -/* 0283C 80A4556C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02840 80A45570 03E00008 */ jr $ra -/* 02844 80A45574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s deleted file mode 100644 index 49964090fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80A48724 - .float 3.6000001 - -.text -glabel func_80A45578 -/* 02848 80A45578 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0284C 80A4557C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02850 80A45580 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 02854 80A45584 14410004 */ bne $v0, $at, .L80A45598 -/* 02858 80A45588 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 0285C 80A4558C 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 02860 80A45590 10000005 */ beq $zero, $zero, .L80A455A8 -/* 02864 80A45594 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A45598: -/* 02868 80A45598 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0286C 80A4559C 44811000 */ mtc1 $at, $f2 ## $f2 = 60.00 -/* 02870 80A455A0 00000000 */ nop -/* 02874 80A455A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A455A8: -/* 02878 80A455A8 14410012 */ bne $v0, $at, .L80A455F4 -/* 0287C 80A455AC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 02880 80A455B0 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 02884 80A455B4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 02888 80A455B8 46000005 */ abs.s $f0, $f0 -/* 0288C 80A455BC 4602003C */ c.lt.s $f0, $f2 -/* 02890 80A455C0 00000000 */ nop -/* 02894 80A455C4 4500000B */ bc1f .L80A455F4 -/* 02898 80A455C8 00000000 */ nop -/* 0289C 80A455CC C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 028A0 80A455D0 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 028A4 80A455D4 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 028A8 80A455D8 4606203C */ c.lt.s $f4, $f6 -/* 028AC 80A455DC 00000000 */ nop -/* 028B0 80A455E0 45000004 */ bc1f .L80A455F4 -/* 028B4 80A455E4 00000000 */ nop -/* 028B8 80A455E8 44810000 */ mtc1 $at, $f0 ## $f0 = 9.00 -/* 028BC 80A455EC 03E00008 */ jr $ra -/* 028C0 80A455F0 00000000 */ nop -.L80A455F4: -/* 028C4 80A455F4 14600004 */ bne $v1, $zero, .L80A45608 -/* 028C8 80A455F8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 028CC 80A455FC 3C0180A5 */ lui $at, %hi(D_80A48724) ## $at = 80A50000 -/* 028D0 80A45600 10000003 */ beq $zero, $zero, .L80A45610 -/* 028D4 80A45604 C4228724 */ lwc1 $f2, %lo(D_80A48724)($at) -.L80A45608: -/* 028D8 80A45608 44811000 */ mtc1 $at, $f2 ## $f2 = -0.00 -/* 028DC 80A4560C 00000000 */ nop -.L80A45610: -/* 028E0 80A45610 46001006 */ mov.s $f0, $f2 -/* 028E4 80A45614 03E00008 */ jr $ra -/* 028E8 80A45618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s deleted file mode 100644 index dee100db86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80A4561C -/* 028EC 80A4561C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 028F0 80A45620 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028F4 80A45624 AFA40020 */ sw $a0, 0x0020($sp) -/* 028F8 80A45628 8CAE0790 */ lw $t6, 0x0790($a1) ## 00000790 -/* 028FC 80A4562C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02900 80A45630 AFAE001C */ sw $t6, 0x001C($sp) -/* 02904 80A45634 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 02908 80A45638 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 0290C 80A4563C 5721001A */ bnel $t9, $at, .L80A456A8 -/* 02910 80A45640 8FA90020 */ lw $t1, 0x0020($sp) -/* 02914 80A45644 0C291370 */ jal func_80A44DC0 -/* 02918 80A45648 00000000 */ nop -/* 0291C 80A4564C 10400008 */ beq $v0, $zero, .L80A45670 -/* 02920 80A45650 8FA4001C */ lw $a0, 0x001C($sp) -/* 02924 80A45654 0C0169DF */ jal Camera_ChangeSetting -/* 02928 80A45658 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -/* 0292C 80A4565C 8FA4001C */ lw $a0, 0x001C($sp) -/* 02930 80A45660 0C016B47 */ jal func_8005AD1C -/* 02934 80A45664 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 02938 80A45668 1000000F */ beq $zero, $zero, .L80A456A8 -/* 0293C 80A4566C 8FA90020 */ lw $t1, 0x0020($sp) -.L80A45670: -/* 02940 80A45670 0C291370 */ jal func_80A44DC0 -/* 02944 80A45674 8FA40020 */ lw $a0, 0x0020($sp) -/* 02948 80A45678 1440000A */ bne $v0, $zero, .L80A456A4 -/* 0294C 80A4567C 8FA4001C */ lw $a0, 0x001C($sp) -/* 02950 80A45680 84880142 */ lh $t0, 0x0142($a0) ## 00000142 -/* 02954 80A45684 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F -/* 02958 80A45688 55010007 */ bnel $t0, $at, .L80A456A8 -/* 0295C 80A4568C 8FA90020 */ lw $t1, 0x0020($sp) -/* 02960 80A45690 0C0169DF */ jal Camera_ChangeSetting -/* 02964 80A45694 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 02968 80A45698 8FA4001C */ lw $a0, 0x001C($sp) -/* 0296C 80A4569C 0C016B3F */ jal func_8005ACFC -/* 02970 80A456A0 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L80A456A4: -/* 02974 80A456A4 8FA90020 */ lw $t1, 0x0020($sp) -.L80A456A8: -/* 02978 80A456A8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0297C 80A456AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02980 80A456B0 8522001C */ lh $v0, 0x001C($t1) ## 0000001C -/* 02984 80A456B4 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 02988 80A456B8 10410009 */ beq $v0, $at, .L80A456E0 -/* 0298C 80A456BC 00000000 */ nop -/* 02990 80A456C0 10400007 */ beq $v0, $zero, .L80A456E0 -/* 02994 80A456C4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02998 80A456C8 10410005 */ beq $v0, $at, .L80A456E0 -/* 0299C 80A456CC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 029A0 80A456D0 10410003 */ beq $v0, $at, .L80A456E0 -/* 029A4 80A456D4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 029A8 80A456D8 14410003 */ bne $v0, $at, .L80A456E8 -/* 029AC 80A456DC 3C038016 */ lui $v1, %hi(gSaveContext) -.L80A456E0: -/* 029B0 80A456E0 10000012 */ beq $zero, $zero, .L80A4572C -/* 029B4 80A456E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A456E8: -/* 029B8 80A456E8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 029BC 80A456EC 3C028012 */ lui $v0, %hi(gBitFlags+4) -/* 029C0 80A456F0 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) -/* 029C4 80A456F4 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 -/* 029C8 80A456F8 3C0C8012 */ lui $t4, %hi(gEquipShifts+2) -/* 029CC 80A456FC 004A5824 */ and $t3, $v0, $t2 -/* 029D0 80A45700 5560000A */ bnel $t3, $zero, .L80A4572C -/* 029D4 80A45704 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 029D8 80A45708 918C71F2 */ lbu $t4, %lo(gEquipShifts+2)($t4) -/* 029DC 80A4570C 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC -/* 029E0 80A45710 01826804 */ sllv $t5, $v0, $t4 -/* 029E4 80A45714 01AEC024 */ and $t8, $t5, $t6 -/* 029E8 80A45718 53000004 */ beql $t8, $zero, .L80A4572C -/* 029EC 80A4571C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 029F0 80A45720 10000002 */ beq $zero, $zero, .L80A4572C -/* 029F4 80A45724 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 029F8 80A45728 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A4572C: -/* 029FC 80A4572C 03E00008 */ jr $ra -/* 02A00 80A45730 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s deleted file mode 100644 index 8fca228edf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A45734 -/* 02A04 80A45734 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A08 80A45738 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A0C 80A4573C 0C291370 */ jal func_80A44DC0 -/* 02A10 80A45740 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A14 80A45744 10400004 */ beq $v0, $zero, .L80A45758 -/* 02A18 80A45748 8FA40018 */ lw $a0, 0x0018($sp) -/* 02A1C 80A4574C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02A20 80A45750 10000003 */ beq $zero, $zero, .L80A45760 -/* 02A24 80A45754 A48E026E */ sh $t6, 0x026E($a0) ## 0000026E -.L80A45758: -/* 02A28 80A45758 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02A2C 80A4575C A48F026E */ sh $t7, 0x026E($a0) ## 0000026E -.L80A45760: -/* 02A30 80A45760 84980194 */ lh $t8, 0x0194($a0) ## 00000194 -/* 02A34 80A45764 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 02A38 80A45768 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02A3C 80A4576C 53000003 */ beql $t8, $zero, .L80A4577C -/* 02A40 80A45770 A088020F */ sb $t0, 0x020F($a0) ## 0000020F -/* 02A44 80A45774 A499026E */ sh $t9, 0x026E($a0) ## 0000026E -/* 02A48 80A45778 A088020F */ sb $t0, 0x020F($a0) ## 0000020F -.L80A4577C: -/* 02A4C 80A4577C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A50 80A45780 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A54 80A45784 03E00008 */ jr $ra -/* 02A58 80A45788 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s deleted file mode 100644 index 9fc4fd57f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80A4578C -/* 02A5C 80A4578C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02A60 80A45790 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02A64 80A45794 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 02A68 80A45798 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 02A6C 80A4579C 15E10005 */ bne $t7, $at, .L80A457B4 -/* 02A70 80A457A0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02A74 80A457A4 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 02A78 80A457A8 44810000 */ mtc1 $at, $f0 ## $f0 = 800.00 -/* 02A7C 80A457AC 10000004 */ beq $zero, $zero, .L80A457C0 -/* 02A80 80A457B0 00000000 */ nop -.L80A457B4: -/* 02A84 80A457B4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 02A88 80A457B8 44810000 */ mtc1 $at, $f0 ## $f0 = 200.00 -/* 02A8C 80A457BC 00000000 */ nop -.L80A457C0: -/* 02A90 80A457C0 46000002 */ mul.s $f0, $f0, $f0 -/* 02A94 80A457C4 C484008C */ lwc1 $f4, 0x008C($a0) ## 0000008C -/* 02A98 80A457C8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02A9C 80A457CC A498026E */ sh $t8, 0x026E($a0) ## 0000026E -/* 02AA0 80A457D0 4600203E */ c.le.s $f4, $f0 -/* 02AA4 80A457D4 00000000 */ nop -/* 02AA8 80A457D8 45030005 */ bc1tl .L80A457F0 -/* 02AAC 80A457DC A488026E */ sh $t0, 0x026E($a0) ## 0000026E -/* 02AB0 80A457E0 84990194 */ lh $t9, 0x0194($a0) ## 00000194 -/* 02AB4 80A457E4 13200002 */ beq $t9, $zero, .L80A457F0 -/* 02AB8 80A457E8 00000000 */ nop -/* 02ABC 80A457EC A488026E */ sh $t0, 0x026E($a0) ## 0000026E -.L80A457F0: -/* 02AC0 80A457F0 03E00008 */ jr $ra -/* 02AC4 80A457F4 A089020F */ sb $t1, 0x020F($a0) ## 0000020F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s deleted file mode 100644 index 92b9cfe85c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80A457F8 -/* 02AC8 80A457F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02ACC 80A457FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AD0 80A45800 0C291370 */ jal func_80A44DC0 -/* 02AD4 80A45804 AFA40018 */ sw $a0, 0x0018($sp) -/* 02AD8 80A45808 14400004 */ bne $v0, $zero, .L80A4581C -/* 02ADC 80A4580C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AE0 80A45810 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 -/* 02AE4 80A45814 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02AE8 80A45818 11C00005 */ beq $t6, $zero, .L80A45830 -.L80A4581C: -/* 02AEC 80A4581C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02AF0 80A45820 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02AF4 80A45824 A48F026E */ sh $t7, 0x026E($a0) ## 0000026E -/* 02AF8 80A45828 10000003 */ beq $zero, $zero, .L80A45838 -/* 02AFC 80A4582C A098020F */ sb $t8, 0x020F($a0) ## 0000020F -.L80A45830: -/* 02B00 80A45830 A499026E */ sh $t9, 0x026E($a0) ## 0000026E -/* 02B04 80A45834 A080020F */ sb $zero, 0x020F($a0) ## 0000020F -.L80A45838: -/* 02B08 80A45838 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B0C 80A4583C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B10 80A45840 03E00008 */ jr $ra -/* 02B14 80A45844 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s deleted file mode 100644 index 0bcb3a42dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80A45848 -/* 02B18 80A45848 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B1C 80A4584C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B20 80A45850 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 02B24 80A45854 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02B28 80A45858 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02B2C 80A4585C 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 02B30 80A45860 1041001B */ beq $v0, $at, .L80A458D0 -/* 02B34 80A45864 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02B38 80A45868 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02B3C 80A4586C 10410014 */ beq $v0, $at, .L80A458C0 -/* 02B40 80A45870 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02B44 80A45874 1041000E */ beq $v0, $at, .L80A458B0 -/* 02B48 80A45878 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02B4C 80A4587C 14410025 */ bne $v0, $at, .L80A45914 -/* 02B50 80A45880 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02B54 80A45884 A08E020F */ sb $t6, 0x020F($a0) ## 0000020F -/* 02B58 80A45888 0C291370 */ jal func_80A44DC0 -/* 02B5C 80A4588C AFA40018 */ sw $a0, 0x0018($sp) -/* 02B60 80A45890 10400004 */ beq $v0, $zero, .L80A458A4 -/* 02B64 80A45894 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B68 80A45898 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02B6C 80A4589C 1000001F */ beq $zero, $zero, .L80A4591C -/* 02B70 80A458A0 A48F026E */ sh $t7, 0x026E($a0) ## 0000026E -.L80A458A4: -/* 02B74 80A458A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02B78 80A458A8 1000001C */ beq $zero, $zero, .L80A4591C -/* 02B7C 80A458AC A498026E */ sh $t8, 0x026E($a0) ## 0000026E -.L80A458B0: -/* 02B80 80A458B0 0C2915E3 */ jal func_80A4578C -/* 02B84 80A458B4 00000000 */ nop -/* 02B88 80A458B8 10000019 */ beq $zero, $zero, .L80A45920 -/* 02B8C 80A458BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A458C0: -/* 02B90 80A458C0 0C2915FE */ jal func_80A457F8 -/* 02B94 80A458C4 00000000 */ nop -/* 02B98 80A458C8 10000015 */ beq $zero, $zero, .L80A45920 -/* 02B9C 80A458CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A458D0: -/* 02BA0 80A458D0 3C028012 */ lui $v0, %hi(gBitFlags+4) -/* 02BA4 80A458D4 8C427124 */ lw $v0, %lo(gBitFlags+4)($v0) -/* 02BA8 80A458D8 8C7900A4 */ lw $t9, 0x00A4($v1) ## 000000A4 -/* 02BAC 80A458DC 3C098012 */ lui $t1, %hi(gEquipShifts+2) -/* 02BB0 80A458E0 00594024 */ and $t0, $v0, $t9 -/* 02BB4 80A458E4 1500000B */ bne $t0, $zero, .L80A45914 -/* 02BB8 80A458E8 00000000 */ nop -/* 02BBC 80A458EC 912971F2 */ lbu $t1, %lo(gEquipShifts+2)($t1) -/* 02BC0 80A458F0 946B009C */ lhu $t3, 0x009C($v1) ## 0000009C -/* 02BC4 80A458F4 01225004 */ sllv $t2, $v0, $t1 -/* 02BC8 80A458F8 014B6024 */ and $t4, $t2, $t3 -/* 02BCC 80A458FC 11800005 */ beq $t4, $zero, .L80A45914 -/* 02BD0 80A45900 00000000 */ nop -/* 02BD4 80A45904 0C2915E3 */ jal func_80A4578C -/* 02BD8 80A45908 00000000 */ nop -/* 02BDC 80A4590C 10000004 */ beq $zero, $zero, .L80A45920 -/* 02BE0 80A45910 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A45914: -/* 02BE4 80A45914 0C2915CD */ jal func_80A45734 -/* 02BE8 80A45918 00000000 */ nop -.L80A4591C: -/* 02BEC 80A4591C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A45920: -/* 02BF0 80A45920 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BF4 80A45924 03E00008 */ jr $ra -/* 02BF8 80A45928 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s deleted file mode 100644 index b81df19652..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80A4592C -/* 02BFC 80A4592C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02C00 80A45930 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C04 80A45934 90820213 */ lbu $v0, 0x0213($a0) ## 00000213 -/* 02C08 80A45938 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02C0C 80A4593C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02C10 80A45940 10410008 */ beq $v0, $at, .L80A45964 -/* 02C14 80A45944 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02C18 80A45948 1041000A */ beq $v0, $at, .L80A45974 -/* 02C1C 80A4594C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02C20 80A45950 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02C24 80A45954 1041000B */ beq $v0, $at, .L80A45984 -/* 02C28 80A45958 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02C2C 80A4595C 1000000E */ beq $zero, $zero, .L80A45998 -/* 02C30 80A45960 84C30224 */ lh $v1, 0x0224($a2) ## 00000224 -.L80A45964: -/* 02C34 80A45964 A4C00224 */ sh $zero, 0x0224($a2) ## 00000224 -/* 02C38 80A45968 A0C00214 */ sb $zero, 0x0214($a2) ## 00000214 -/* 02C3C 80A4596C 10000020 */ beq $zero, $zero, .L80A459F0 -/* 02C40 80A45970 A0C00215 */ sb $zero, 0x0215($a2) ## 00000215 -.L80A45974: -/* 02C44 80A45974 A4C00224 */ sh $zero, 0x0224($a2) ## 00000224 -/* 02C48 80A45978 A0CE0214 */ sb $t6, 0x0214($a2) ## 00000214 -/* 02C4C 80A4597C 1000001C */ beq $zero, $zero, .L80A459F0 -/* 02C50 80A45980 A0C00215 */ sb $zero, 0x0215($a2) ## 00000215 -.L80A45984: -/* 02C54 80A45984 A4C00224 */ sh $zero, 0x0224($a2) ## 00000224 -/* 02C58 80A45988 A0C00214 */ sb $zero, 0x0214($a2) ## 00000214 -/* 02C5C 80A4598C 10000018 */ beq $zero, $zero, .L80A459F0 -/* 02C60 80A45990 A0CF0215 */ sb $t7, 0x0215($a2) ## 00000215 -/* 02C64 80A45994 84C30224 */ lh $v1, 0x0224($a2) ## 00000224 -.L80A45998: -/* 02C68 80A45998 14600003 */ bne $v1, $zero, .L80A459A8 -/* 02C6C 80A4599C 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 02C70 80A459A0 10000003 */ beq $zero, $zero, .L80A459B0 -/* 02C74 80A459A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A459A8: -/* 02C78 80A459A8 A4D80224 */ sh $t8, 0x0224($a2) ## 00000224 -/* 02C7C 80A459AC 84C20224 */ lh $v0, 0x0224($a2) ## 00000224 -.L80A459B0: -/* 02C80 80A459B0 54400010 */ bnel $v0, $zero, .L80A459F4 -/* 02C84 80A459B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C88 80A459B8 90D90214 */ lbu $t9, 0x0214($a2) ## 00000214 -/* 02C8C 80A459BC 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 02C90 80A459C0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 02C94 80A459C4 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 02C98 80A459C8 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000001 -/* 02C9C 80A459CC 29210004 */ slti $at, $t1, 0x0004 -/* 02CA0 80A459D0 14200007 */ bne $at, $zero, .L80A459F0 -/* 02CA4 80A459D4 A0C80214 */ sb $t0, 0x0214($a2) ## 00000214 -/* 02CA8 80A459D8 0C01DF64 */ jal Rand_S16Offset - -/* 02CAC 80A459DC AFA60018 */ sw $a2, 0x0018($sp) -/* 02CB0 80A459E0 8FA60018 */ lw $a2, 0x0018($sp) -/* 02CB4 80A459E4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02CB8 80A459E8 A4C20224 */ sh $v0, 0x0224($a2) ## 00000224 -/* 02CBC 80A459EC A0CA0214 */ sb $t2, 0x0214($a2) ## 00000214 -.L80A459F0: -/* 02CC0 80A459F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A459F4: -/* 02CC4 80A459F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02CC8 80A459F8 03E00008 */ jr $ra -/* 02CCC 80A459FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s deleted file mode 100644 index e85563c5d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80A45A00 -/* 02CD0 80A45A00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CD4 80A45A04 AFBF001C */ sw $ra, 0x001C($sp) -/* 02CD8 80A45A08 AFB00018 */ sw $s0, 0x0018($sp) -/* 02CDC 80A45A0C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02CE0 80A45A10 C4800168 */ lwc1 $f0, 0x0168($a0) ## 00000168 -/* 02CE4 80A45A14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02CE8 80A45A18 46001032 */ c.eq.s $f2, $f0 -/* 02CEC 80A45A1C 00000000 */ nop -/* 02CF0 80A45A20 45030038 */ bc1tl .L80A45B04 -/* 02CF4 80A45A24 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CF8 80A45A28 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 02CFC 80A45A2C 3C0E0600 */ lui $t6, %hi(D_06004930) ## $t6 = 06000000 -/* 02D00 80A45A30 25CE4930 */ addiu $t6, $t6, %lo(D_06004930) ## $t6 = 06004930 -/* 02D04 80A45A34 55CF0033 */ bnel $t6, $t7, .L80A45B04 -/* 02D08 80A45A38 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D0C 80A45A3C 4600103C */ c.lt.s $f2, $f0 -/* 02D10 80A45A40 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 02D14 80A45A44 45020018 */ bc1fl .L80A45AA8 -/* 02D18 80A45A48 4602003C */ c.lt.s $f0, $f2 -/* 02D1C 80A45A4C 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 -/* 02D20 80A45A50 C4860164 */ lwc1 $f6, 0x0164($a0) ## 00000164 -/* 02D24 80A45A54 46062032 */ c.eq.s $f4, $f6 -/* 02D28 80A45A58 00000000 */ nop -/* 02D2C 80A45A5C 45020012 */ bc1fl .L80A45AA8 -/* 02D30 80A45A60 4602003C */ c.lt.s $f0, $f2 -/* 02D34 80A45A64 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 02D38 80A45A68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02D3C 80A45A6C 240538FD */ addiu $a1, $zero, 0x38FD ## $a1 = 000038FD -/* 02D40 80A45A70 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 02D44 80A45A74 13210006 */ beq $t9, $at, .L80A45A90 -/* 02D48 80A45A78 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 02D4C 80A45A7C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02D50 80A45A80 240538FD */ addiu $a1, $zero, 0x38FD ## $a1 = 000038FD -/* 02D54 80A45A84 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02D58 80A45A88 10000006 */ beq $zero, $zero, .L80A45AA4 -/* 02D5C 80A45A8C C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -.L80A45A90: -/* 02D60 80A45A90 3C048013 */ lui $a0, %hi(D_801333D4) -/* 02D64 80A45A94 0C03D149 */ jal func_800F4524 -/* 02D68 80A45A98 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 02D6C 80A45A9C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02D70 80A45AA0 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -.L80A45AA4: -/* 02D74 80A45AA4 4602003C */ c.lt.s $f0, $f2 -.L80A45AA8: -/* 02D78 80A45AA8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02D7C 80A45AAC 45020015 */ bc1fl .L80A45B04 -/* 02D80 80A45AB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D84 80A45AB4 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 02D88 80A45AB8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 02D8C 80A45ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D90 80A45AC0 46004032 */ c.eq.s $f8, $f0 -/* 02D94 80A45AC4 00000000 */ nop -/* 02D98 80A45AC8 45020005 */ bc1fl .L80A45AE0 -/* 02D9C 80A45ACC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02DA0 80A45AD0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02DA4 80A45AD4 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 02DA8 80A45AD8 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 02DAC 80A45ADC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -.L80A45AE0: -/* 02DB0 80A45AE0 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 02DB4 80A45AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DB8 80A45AE8 46005032 */ c.eq.s $f10, $f0 -/* 02DBC 80A45AEC 00000000 */ nop -/* 02DC0 80A45AF0 45020004 */ bc1fl .L80A45B04 -/* 02DC4 80A45AF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DC8 80A45AF8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02DCC 80A45AFC 240538FD */ addiu $a1, $zero, 0x38FD ## $a1 = 000038FD -/* 02DD0 80A45B00 8FBF001C */ lw $ra, 0x001C($sp) -.L80A45B04: -/* 02DD4 80A45B04 8FB00018 */ lw $s0, 0x0018($sp) -/* 02DD8 80A45B08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DDC 80A45B0C 03E00008 */ jr $ra -/* 02DE0 80A45B10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s deleted file mode 100644 index 523113fada..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A45B14 -/* 02DE4 80A45B14 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02DE8 80A45B18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02DEC 80A45B1C AFA5002C */ sw $a1, 0x002C($sp) -/* 02DF0 80A45B20 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02DF4 80A45B24 8FB9002C */ lw $t9, 0x002C($sp) -/* 02DF8 80A45B28 3C0A80A5 */ lui $t2, %hi(D_80A48480) ## $t2 = 80A50000 -/* 02DFC 80A45B2C 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 02E00 80A45B30 15E00003 */ bne $t7, $zero, .L80A45B40 -/* 02E04 80A45B34 00194080 */ sll $t0, $t9, 2 -/* 02E08 80A45B38 10000002 */ beq $zero, $zero, .L80A45B44 -/* 02E0C 80A45B3C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A45B40: -/* 02E10 80A45B40 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A45B44: -/* 02E14 80A45B44 0003C080 */ sll $t8, $v1, 2 -/* 02E18 80A45B48 0303C023 */ subu $t8, $t8, $v1 -/* 02E1C 80A45B4C 01194023 */ subu $t0, $t0, $t9 -/* 02E20 80A45B50 000840C0 */ sll $t0, $t0, 3 -/* 02E24 80A45B54 0018C140 */ sll $t8, $t8, 5 -/* 02E28 80A45B58 03084821 */ addu $t1, $t8, $t0 -/* 02E2C 80A45B5C 254A8480 */ addiu $t2, $t2, %lo(D_80A48480) ## $t2 = 80A48480 -/* 02E30 80A45B60 012A1021 */ addu $v0, $t1, $t2 -/* 02E34 80A45B64 8C4B000C */ lw $t3, 0x000C($v0) ## 0000000C -/* 02E38 80A45B68 C4440010 */ lwc1 $f4, 0x0010($v0) ## 00000010 -/* 02E3C 80A45B6C C4460014 */ lwc1 $f6, 0x0014($v0) ## 00000014 -/* 02E40 80A45B70 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 -/* 02E44 80A45B74 8C460004 */ lw $a2, 0x0004($v0) ## 00000004 -/* 02E48 80A45B78 8C470008 */ lw $a3, 0x0008($v0) ## 00000008 -/* 02E4C 80A45B7C AFAB0010 */ sw $t3, 0x0010($sp) -/* 02E50 80A45B80 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 02E54 80A45B84 0C290C83 */ jal func_80A4320C -/* 02E58 80A45B88 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 02E5C 80A45B8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02E60 80A45B90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02E64 80A45B94 03E00008 */ jr $ra -/* 02E68 80A45B98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s deleted file mode 100644 index 7da12d996b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A45B9C -/* 02E6C 80A45B9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E70 80A45BA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E74 80A45BA4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02E78 80A45BA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 02E7C 80A45BAC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02E80 80A45BB0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02E84 80A45BB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E88 80A45BB8 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 02E8C 80A45BBC 15E1000E */ bne $t7, $at, .L80A45BF8 -/* 02E90 80A45BC0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 02E94 80A45BC4 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 02E98 80A45BC8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02E9C 80A45BCC 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 02EA0 80A45BD0 0301C824 */ and $t9, $t8, $at -/* 02EA4 80A45BD4 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 02EA8 80A45BD8 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 02EAC 80A45BDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02EB0 80A45BE0 0C00D3B0 */ jal func_80034EC0 -/* 02EB4 80A45BE4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02EB8 80A45BE8 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02EBC 80A45BEC 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 02EC0 80A45BF0 10000009 */ beq $zero, $zero, .L80A45C18 -/* 02EC4 80A45BF4 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -.L80A45BF8: -/* 02EC8 80A45BF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02ECC 80A45BFC 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = FFFF8348 -/* 02ED0 80A45C00 0C00D3B0 */ jal func_80034EC0 -/* 02ED4 80A45C04 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02ED8 80A45C08 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 02EDC 80A45C0C 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 02EE0 80A45C10 00000000 */ nop -/* 02EE4 80A45C14 E6060168 */ swc1 $f6, 0x0168($s0) ## 00000168 -.L80A45C18: -/* 02EE8 80A45C18 0C2912A7 */ jal func_80A44A9C -/* 02EEC 80A45C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EF0 80A45C20 3C0980A4 */ lui $t1, %hi(func_80A4696C) ## $t1 = 80A40000 -/* 02EF4 80A45C24 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02EF8 80A45C28 2529696C */ addiu $t1, $t1, %lo(func_80A4696C) ## $t1 = 80A4696C -/* 02EFC 80A45C2C A608026E */ sh $t0, 0x026E($s0) ## 0000026E -/* 02F00 80A45C30 A2000211 */ sb $zero, 0x0211($s0) ## 00000211 -/* 02F04 80A45C34 A200020F */ sb $zero, 0x020F($s0) ## 0000020F -/* 02F08 80A45C38 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 02F0C 80A45C3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F10 80A45C40 8FB00018 */ lw $s0, 0x0018($sp) -/* 02F14 80A45C44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02F18 80A45C48 03E00008 */ jr $ra -/* 02F1C 80A45C4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s deleted file mode 100644 index e17cc02c0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A45C50 -/* 02F20 80A45C50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02F24 80A45C54 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02F28 80A45C58 AFB00020 */ sw $s0, 0x0020($sp) -/* 02F2C 80A45C5C AFA5002C */ sw $a1, 0x002C($sp) -/* 02F30 80A45C60 C4860168 */ lwc1 $f6, 0x0168($a0) ## 00000168 -/* 02F34 80A45C64 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F38 80A45C68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02F3C 80A45C6C 46062032 */ c.eq.s $f4, $f6 -/* 02F40 80A45C70 00000000 */ nop -/* 02F44 80A45C74 4502000F */ bc1fl .L80A45CB4 -/* 02F48 80A45C78 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 02F4C 80A45C7C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02F50 80A45C80 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02F54 80A45C84 240538FC */ addiu $a1, $zero, 0x38FC ## $a1 = 000038FC -/* 02F58 80A45C88 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 02F5C 80A45C8C 11E10005 */ beq $t7, $at, .L80A45CA4 -/* 02F60 80A45C90 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 02F64 80A45C94 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02F68 80A45C98 240538FC */ addiu $a1, $zero, 0x38FC ## $a1 = 000038FC -/* 02F6C 80A45C9C 10000005 */ beq $zero, $zero, .L80A45CB4 -/* 02F70 80A45CA0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -.L80A45CA4: -/* 02F74 80A45CA4 3C048013 */ lui $a0, %hi(D_801333D4) -/* 02F78 80A45CA8 0C03D149 */ jal func_800F4524 -/* 02F7C 80A45CAC 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 02F80 80A45CB0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -.L80A45CB4: -/* 02F84 80A45CB4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02F88 80A45CB8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02F8C 80A45CBC 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 02F90 80A45CC0 17210010 */ bne $t9, $at, .L80A45D04 -/* 02F94 80A45CC4 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 02F98 80A45CC8 8FA4002C */ lw $a0, 0x002C($sp) -/* 02F9C 80A45CCC 24051068 */ addiu $a1, $zero, 0x1068 ## $a1 = 00001068 -/* 02FA0 80A45CD0 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 02FA4 80A45CD4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 02FA8 80A45CD8 0C02003E */ jal func_800800F8 -/* 02FAC 80A45CDC AFA00010 */ sw $zero, 0x0010($sp) -/* 02FB0 80A45CE0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 02FB4 80A45CE4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 02FB8 80A45CE8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02FBC 80A45CEC 0C00D3B0 */ jal func_80034EC0 -/* 02FC0 80A45CF0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02FC4 80A45CF4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02FC8 80A45CF8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 02FCC 80A45CFC 10000008 */ beq $zero, $zero, .L80A45D20 -/* 02FD0 80A45D00 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80A45D04: -/* 02FD4 80A45D04 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = FFFF8348 -/* 02FD8 80A45D08 0C00D3B0 */ jal func_80034EC0 -/* 02FDC 80A45D0C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02FE0 80A45D10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02FE4 80A45D14 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 02FE8 80A45D18 00000000 */ nop -/* 02FEC 80A45D1C E60A0168 */ swc1 $f10, 0x0168($s0) ## 00000168 -.L80A45D20: -/* 02FF0 80A45D20 3C0880A4 */ lui $t0, %hi(func_80A46B40) ## $t0 = 80A40000 -/* 02FF4 80A45D24 25086B40 */ addiu $t0, $t0, %lo(func_80A46B40) ## $t0 = 80A46B40 -/* 02FF8 80A45D28 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 02FFC 80A45D2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03000 80A45D30 8FB00020 */ lw $s0, 0x0020($sp) -/* 03004 80A45D34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03008 80A45D38 03E00008 */ jr $ra -/* 0300C 80A45D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s deleted file mode 100644 index 58958c5396..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A45D40 -/* 03010 80A45D40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03014 80A45D44 AFA5001C */ sw $a1, 0x001C($sp) -/* 03018 80A45D48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0301C 80A45D4C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03020 80A45D50 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 03024 80A45D54 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 03028 80A45D58 AFA70018 */ sw $a3, 0x0018($sp) -/* 0302C 80A45D5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03030 80A45D60 0C00D3B0 */ jal func_80034EC0 -/* 03034 80A45D64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03038 80A45D68 8FA70018 */ lw $a3, 0x0018($sp) -/* 0303C 80A45D6C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03040 80A45D70 3C0F80A4 */ lui $t7, %hi(func_80A46B40) ## $t7 = 80A40000 -/* 03044 80A45D74 C4E4015C */ lwc1 $f4, 0x015C($a3) ## 0000015C -/* 03048 80A45D78 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0304C 80A45D7C 25EF6B40 */ addiu $t7, $t7, %lo(func_80A46B40) ## $t7 = 80A46B40 -/* 03050 80A45D80 A0EE0211 */ sb $t6, 0x0211($a3) ## 00000211 -/* 03054 80A45D84 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 03058 80A45D88 E4E00168 */ swc1 $f0, 0x0168($a3) ## 00000168 -/* 0305C 80A45D8C E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 -/* 03060 80A45D90 E4E40164 */ swc1 $f4, 0x0164($a3) ## 00000164 -/* 03064 80A45D94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03068 80A45D98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0306C 80A45D9C 03E00008 */ jr $ra -/* 03070 80A45DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s deleted file mode 100644 index 1d4c4bad44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel D_80A48728 - .float 3.6000001 - -.text -glabel func_80A45DA4 -/* 03074 80A45DA4 AFA50004 */ sw $a1, 0x0004($sp) -/* 03078 80A45DA8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0307C 80A45DAC 3C0A80A4 */ lui $t2, %hi(func_80A46DBC) ## $t2 = 80A40000 -/* 03080 80A45DB0 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 03084 80A45DB4 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 03088 80A45DB8 10400003 */ beq $v0, $zero, .L80A45DC8 -/* 0308C 80A45DBC 254A6DBC */ addiu $t2, $t2, %lo(func_80A46DBC) ## $t2 = 80A46DBC -/* 03090 80A45DC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03094 80A45DC4 1441000F */ bne $v0, $at, .L80A45E04 -.L80A45DC8: -/* 03098 80A45DC8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0309C 80A45DCC A08E01EA */ sb $t6, 0x01EA($a0) ## 000001EA -/* 030A0 80A45DD0 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf1a) -/* 030A4 80A45DD4 95EFF57A */ lhu $t7, %lo(gSaveContext+0xf1a)($t7) -/* 030A8 80A45DD8 3C0180A5 */ lui $at, %hi(D_80A48728) ## $at = 80A50000 -/* 030AC 80A45DDC 31F84000 */ andi $t8, $t7, 0x4000 ## $t8 = 00000000 -/* 030B0 80A45DE0 13000005 */ beq $t8, $zero, .L80A45DF8 -/* 030B4 80A45DE4 00000000 */ nop -/* 030B8 80A45DE8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 030BC 80A45DEC 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 030C0 80A45DF0 10000008 */ beq $zero, $zero, .L80A45E14 -/* 030C4 80A45DF4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -.L80A45DF8: -/* 030C8 80A45DF8 C4268728 */ lwc1 $f6, %lo(D_80A48728)($at) -/* 030CC 80A45DFC 10000005 */ beq $zero, $zero, .L80A45E14 -/* 030D0 80A45E00 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -.L80A45E04: -/* 030D4 80A45E04 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 030D8 80A45E08 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 030DC 80A45E0C 00000000 */ nop -/* 030E0 80A45E10 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -.L80A45E14: -/* 030E4 80A45E14 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 030E8 80A45E18 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 030EC 80A45E1C 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 030F0 80A45E20 03214025 */ or $t0, $t9, $at ## $t0 = 01000000 -/* 030F4 80A45E24 46000400 */ add.s $f16, $f0, $f0 -/* 030F8 80A45E28 3C0144E1 */ lui $at, 0x44E1 ## $at = 44E10000 -/* 030FC 80A45E2C 44815000 */ mtc1 $at, $f10 ## $f10 = 1800.00 -/* 03100 80A45E30 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 03104 80A45E34 A4890592 */ sh $t1, 0x0592($a0) ## 00000592 -/* 03108 80A45E38 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -/* 0310C 80A45E3C AC8A0190 */ sw $t2, 0x0190($a0) ## 00000190 -/* 03110 80A45E40 03E00008 */ jr $ra -/* 03114 80A45E44 E48A00BC */ swc1 $f10, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s deleted file mode 100644 index e68a96d0c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80A45E48 -/* 03118 80A45E48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0311C 80A45E4C AFBF0034 */ sw $ra, 0x0034($sp) -/* 03120 80A45E50 AFB00030 */ sw $s0, 0x0030($sp) -/* 03124 80A45E54 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 03128 80A45E58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0312C 80A45E5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03130 80A45E60 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 03134 80A45E64 50400015 */ beql $v0, $zero, .L80A45EBC -/* 03138 80A45E68 A20001EA */ sb $zero, 0x01EA($s0) ## 000001EA -/* 0313C 80A45E6C 10410012 */ beq $v0, $at, .L80A45EB8 -/* 03140 80A45E70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03144 80A45E74 14410011 */ bne $v0, $at, .L80A45EBC -/* 03148 80A45E78 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0314C 80A45E7C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 03150 80A45E80 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 03154 80A45E84 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 03158 80A45E88 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0315C 80A45E8C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 03160 80A45E90 AFA00024 */ sw $zero, 0x0024($sp) -/* 03164 80A45E94 AFA00020 */ sw $zero, 0x0020($sp) -/* 03168 80A45E98 AFA0001C */ sw $zero, 0x001C($sp) -/* 0316C 80A45E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 03170 80A45EA0 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 03174 80A45EA4 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 03178 80A45EA8 50400005 */ beql $v0, $zero, .L80A45EC0 -/* 0317C 80A45EAC 8A0F0030 */ lwl $t7, 0x0030($s0) ## 00000030 -/* 03180 80A45EB0 10000002 */ beq $zero, $zero, .L80A45EBC -/* 03184 80A45EB4 A44001F8 */ sh $zero, 0x01F8($v0) ## 000001F8 -.L80A45EB8: -/* 03188 80A45EB8 A20001EA */ sb $zero, 0x01EA($s0) ## 000001EA -.L80A45EBC: -/* 0318C 80A45EBC 8A0F0030 */ lwl $t7, 0x0030($s0) ## 00000030 -.L80A45EC0: -/* 03190 80A45EC0 9A0F0033 */ lwr $t7, 0x0033($s0) ## 00000033 -/* 03194 80A45EC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03198 80A45EC8 3C1880A4 */ lui $t8, %hi(func_80A46F88) ## $t8 = 80A40000 -/* 0319C 80A45ECC AA0F00B4 */ swl $t7, 0x00B4($s0) ## 000000B4 -/* 031A0 80A45ED0 BA0F00B7 */ swr $t7, 0x00B7($s0) ## 000000B7 -/* 031A4 80A45ED4 960F0034 */ lhu $t7, 0x0034($s0) ## 00000034 -/* 031A8 80A45ED8 27186F88 */ addiu $t8, $t8, %lo(func_80A46F88) ## $t8 = 80A46F88 -/* 031AC 80A45EDC A600059C */ sh $zero, 0x059C($s0) ## 0000059C -/* 031B0 80A45EE0 A6000590 */ sh $zero, 0x0590($s0) ## 00000590 -/* 031B4 80A45EE4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 031B8 80A45EE8 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 031BC 80A45EEC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 031C0 80A45EF0 A60F00B8 */ sh $t7, 0x00B8($s0) ## 000000B8 -/* 031C4 80A45EF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 031C8 80A45EF8 8FB00030 */ lw $s0, 0x0030($sp) -/* 031CC 80A45EFC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 031D0 80A45F00 03E00008 */ jr $ra -/* 031D4 80A45F04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s deleted file mode 100644 index d6a5c4b9f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A45F08 -/* 031D8 80A45F08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 031DC 80A45F0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 031E0 80A45F10 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 031E4 80A45F14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 031E8 80A45F18 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 031EC 80A45F1C 304E001F */ andi $t6, $v0, 0x001F ## $t6 = 00000000 -/* 031F0 80A45F20 11C10003 */ beq $t6, $at, .L80A45F30 -/* 031F4 80A45F24 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 031F8 80A45F28 10000018 */ beq $zero, $zero, .L80A45F8C -/* 031FC 80A45F2C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A45F30: -/* 03200 80A45F30 8CEF009C */ lw $t7, 0x009C($a3) ## 0000009C -/* 03204 80A45F34 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 03208 80A45F38 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0320C 80A45F3C 53000006 */ beql $t8, $zero, .L80A45F58 -/* 03210 80A45F40 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 03214 80A45F44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03218 80A45F48 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0321C 80A45F4C 10000004 */ beq $zero, $zero, .L80A45F60 -/* 03220 80A45F50 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 03224 80A45F54 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -.L80A45F58: -/* 03228 80A45F58 00000000 */ nop -/* 0322C 80A45F5C C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -.L80A45F60: -/* 03230 80A45F60 3045FC00 */ andi $a1, $v0, 0xFC00 ## $a1 = 00000000 -/* 03234 80A45F64 00052A83 */ sra $a1, $a1, 10 -/* 03238 80A45F68 46002180 */ add.s $f6, $f4, $f0 -/* 0323C 80A45F6C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03240 80A45F70 0C00B2D0 */ jal Flags_GetSwitch - -/* 03244 80A45F74 E4C60024 */ swc1 $f6, 0x0024($a2) ## 00000024 -/* 03248 80A45F78 50400004 */ beql $v0, $zero, .L80A45F8C -/* 0324C 80A45F7C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03250 80A45F80 10000002 */ beq $zero, $zero, .L80A45F8C -/* 03254 80A45F84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03258 80A45F88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A45F8C: -/* 0325C 80A45F8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03260 80A45F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03264 80A45F94 03E00008 */ jr $ra -/* 03268 80A45F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s deleted file mode 100644 index bede681b12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A45F9C -/* 0326C 80A45F9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03270 80A45FA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03274 80A45FA4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03278 80A45FA8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0327C 80A45FAC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03280 80A45FB0 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 03284 80A45FB4 15E10006 */ bne $t7, $at, .L80A45FD0 -/* 03288 80A45FB8 00000000 */ nop -/* 0328C 80A45FBC 84980194 */ lh $t8, 0x0194($a0) ## 00000194 -/* 03290 80A45FC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03294 80A45FC4 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 03298 80A45FC8 13010003 */ beq $t8, $at, .L80A45FD8 -/* 0329C 80A45FCC 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -.L80A45FD0: -/* 032A0 80A45FD0 1000000E */ beq $zero, $zero, .L80A4600C -/* 032A4 80A45FD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A45FD8: -/* 032A8 80A45FD8 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 032AC 80A45FDC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 032B0 80A45FE0 0C00D3B0 */ jal func_80034EC0 -/* 032B4 80A45FE4 AFA70018 */ sw $a3, 0x0018($sp) -/* 032B8 80A45FE8 8FA70018 */ lw $a3, 0x0018($sp) -/* 032BC 80A45FEC 3C0880A4 */ lui $t0, %hi(func_80A46CD8) ## $t0 = 80A40000 -/* 032C0 80A45FF0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 032C4 80A45FF4 25086CD8 */ addiu $t0, $t0, %lo(func_80A46CD8) ## $t0 = 80A46CD8 -/* 032C8 80A45FF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 032CC 80A45FFC A4E00194 */ sh $zero, 0x0194($a3) ## 00000194 -/* 032D0 80A46000 A0E0020F */ sb $zero, 0x020F($a3) ## 0000020F -/* 032D4 80A46004 A4F9026E */ sh $t9, 0x026E($a3) ## 0000026E -/* 032D8 80A46008 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -.L80A4600C: -/* 032DC 80A4600C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 032E0 80A46010 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 032E4 80A46014 03E00008 */ jr $ra -/* 032E8 80A46018 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s deleted file mode 100644 index cec8f4d4ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A4601C -/* 032EC 80A4601C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032F0 80A46020 AFBF0014 */ sw $ra, 0x0014($sp) -/* 032F4 80A46024 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 032F8 80A46028 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 032FC 80A4602C 15E00005 */ bne $t7, $zero, .L80A46044 -/* 03300 80A46030 00000000 */ nop -/* 03304 80A46034 84980194 */ lh $t8, 0x0194($a0) ## 00000194 -/* 03308 80A46038 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0330C 80A4603C 53010004 */ beql $t8, $at, .L80A46050 -/* 03310 80A46040 A4800194 */ sh $zero, 0x0194($a0) ## 00000194 -.L80A46044: -/* 03314 80A46044 10000009 */ beq $zero, $zero, .L80A4606C -/* 03318 80A46048 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0331C 80A4604C A4800194 */ sh $zero, 0x0194($a0) ## 00000194 -.L80A46050: -/* 03320 80A46050 0C2916E7 */ jal func_80A45B9C -/* 03324 80A46054 AFA40018 */ sw $a0, 0x0018($sp) -/* 03328 80A46058 8FA40018 */ lw $a0, 0x0018($sp) -/* 0332C 80A4605C 3C1980A4 */ lui $t9, %hi(func_80A46D5C) ## $t9 = 80A40000 -/* 03330 80A46060 27396D5C */ addiu $t9, $t9, %lo(func_80A46D5C) ## $t9 = 80A46D5C -/* 03334 80A46064 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03338 80A46068 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -.L80A4606C: -/* 0333C 80A4606C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03340 80A46070 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03344 80A46074 03E00008 */ jr $ra -/* 03348 80A46078 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s deleted file mode 100644 index d1b266c972..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A4607C -/* 0334C 80A4607C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03350 80A46080 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03354 80A46084 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 03358 80A46088 15E10006 */ bne $t7, $at, .L80A460A4 -/* 0335C 80A4608C 00000000 */ nop -/* 03360 80A46090 84980194 */ lh $t8, 0x0194($a0) ## 00000194 -/* 03364 80A46094 3C1980A4 */ lui $t9, %hi(func_80A47578) ## $t9 = 80A40000 -/* 03368 80A46098 27397578 */ addiu $t9, $t9, %lo(func_80A47578) ## $t9 = 80A47578 -/* 0336C 80A4609C 17000003 */ bne $t8, $zero, .L80A460AC -/* 03370 80A460A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A460A4: -/* 03374 80A460A4 03E00008 */ jr $ra -/* 03378 80A460A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A460AC: -/* 0337C 80A460AC AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -/* 03380 80A460B0 03E00008 */ jr $ra -/* 03384 80A460B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s deleted file mode 100644 index e302c5277f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A460B8 -/* 03388 80A460B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0338C 80A460BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03390 80A460C0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03394 80A460C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03398 80A460C8 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 0339C 80A460CC 15E1000A */ bne $t7, $at, .L80A460F8 -/* 033A0 80A460D0 00000000 */ nop -/* 033A4 80A460D4 80980210 */ lb $t8, 0x0210($a0) ## 00000210 -/* 033A8 80A460D8 90990216 */ lbu $t9, 0x0216($a0) ## 00000216 -/* 033AC 80A460DC 0319082A */ slt $at, $t8, $t9 -/* 033B0 80A460E0 10200005 */ beq $at, $zero, .L80A460F8 -/* 033B4 80A460E4 00000000 */ nop -/* 033B8 80A460E8 0C291370 */ jal func_80A44DC0 -/* 033BC 80A460EC 00000000 */ nop -/* 033C0 80A460F0 54400004 */ bnel $v0, $zero, .L80A46104 -/* 033C4 80A460F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A460F8: -/* 033C8 80A460F8 10000002 */ beq $zero, $zero, .L80A46104 -/* 033CC 80A460FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 033D0 80A46100 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A46104: -/* 033D4 80A46104 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033D8 80A46108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033DC 80A4610C 03E00008 */ jr $ra -/* 033E0 80A46110 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s deleted file mode 100644 index 94124f59ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A46114 -/* 033E4 80A46114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 033E8 80A46118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 033EC 80A4611C 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 -/* 033F0 80A46120 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 033F4 80A46124 11C0000A */ beq $t6, $zero, .L80A46150 -/* 033F8 80A46128 00000000 */ nop -/* 033FC 80A4612C C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 03400 80A46130 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 03404 80A46134 3C0640D5 */ lui $a2, 0x40D5 ## $a2 = 40D50000 -/* 03408 80A46138 34C65555 */ ori $a2, $a2, 0x5555 ## $a2 = 40D55555 -/* 0340C 80A4613C 4606203C */ c.lt.s $f4, $f6 -/* 03410 80A46140 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 03414 80A46144 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03418 80A46148 45000003 */ bc1f .L80A46158 -/* 0341C 80A4614C 00000000 */ nop -.L80A46150: -/* 03420 80A46150 10000011 */ beq $zero, $zero, .L80A46198 -/* 03424 80A46154 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A46158: -/* 03428 80A46158 0C2913BC */ jal func_80A44EF0 -/* 0342C 80A4615C AFA40018 */ sw $a0, 0x0018($sp) -/* 03430 80A46160 1040000C */ beq $v0, $zero, .L80A46194 -/* 03434 80A46164 8FA40018 */ lw $a0, 0x0018($sp) -/* 03438 80A46168 848F0590 */ lh $t7, 0x0590($a0) ## 00000590 -/* 0343C 80A4616C 29E10009 */ slti $at, $t7, 0x0009 -/* 03440 80A46170 14200006 */ bne $at, $zero, .L80A4618C -/* 03444 80A46174 00000000 */ nop -/* 03448 80A46178 8498059C */ lh $t8, 0x059C($a0) ## 0000059C -/* 0344C 80A4617C 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 03450 80A46180 17000002 */ bne $t8, $zero, .L80A4618C -/* 03454 80A46184 00000000 */ nop -/* 03458 80A46188 A4990590 */ sh $t9, 0x0590($a0) ## 00000590 -.L80A4618C: -/* 0345C 80A4618C 0C2916C5 */ jal func_80A45B14 -/* 03460 80A46190 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80A46194: -/* 03464 80A46194 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A46198: -/* 03468 80A46198 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0346C 80A4619C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03470 80A461A0 03E00008 */ jr $ra -/* 03474 80A461A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s deleted file mode 100644 index 6345d5652e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80A461A8 -/* 03478 80A461A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0347C 80A461AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03480 80A461B0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03484 80A461B4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03488 80A461B8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0348C 80A461BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03490 80A461C0 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 03494 80A461C4 15E10040 */ bne $t7, $at, .L80A462C8 -/* 03498 80A461C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 0349C 80A461CC 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 034A0 80A461D0 24043035 */ addiu $a0, $zero, 0x3035 ## $a0 = 00003035 -/* 034A4 80A461D4 3C0E0600 */ lui $t6, %hi(D_06000750) ## $t6 = 06000000 -/* 034A8 80A461D8 14820003 */ bne $a0, $v0, .L80A461E8 -/* 034AC 80A461DC 25CE0750 */ addiu $t6, $t6, %lo(D_06000750) ## $t6 = 06000750 -/* 034B0 80A461E0 90F8020C */ lbu $t8, 0x020C($a3) ## 0000020C -/* 034B4 80A461E4 13000006 */ beq $t8, $zero, .L80A46200 -.L80A461E8: -/* 034B8 80A461E8 24013036 */ addiu $at, $zero, 0x3036 ## $at = 00003036 -/* 034BC 80A461EC 5441000D */ bnel $v0, $at, .L80A46224 -/* 034C0 80A461F0 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -/* 034C4 80A461F4 90F9020C */ lbu $t9, 0x020C($a3) ## 0000020C -/* 034C8 80A461F8 5720000A */ bnel $t9, $zero, .L80A46224 -/* 034CC 80A461FC 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -.L80A46200: -/* 034D0 80A46200 8CE90154 */ lw $t1, 0x0154($a3) ## 00000154 -/* 034D4 80A46204 3C080600 */ lui $t0, %hi(D_06000D5C) ## $t0 = 06000000 -/* 034D8 80A46208 25080D5C */ addiu $t0, $t0, %lo(D_06000D5C) ## $t0 = 06000D5C -/* 034DC 80A4620C 51090005 */ beql $t0, $t1, .L80A46224 -/* 034E0 80A46210 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -/* 034E4 80A46214 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 034E8 80A46218 A0E00213 */ sb $zero, 0x0213($a3) ## 00000213 -/* 034EC 80A4621C 94E2010E */ lhu $v0, 0x010E($a3) ## 0000010E -/* 034F0 80A46220 24013032 */ addiu $at, $zero, 0x3032 ## $at = 00003032 -.L80A46224: -/* 034F4 80A46224 14410004 */ bne $v0, $at, .L80A46238 -/* 034F8 80A46228 8CE30154 */ lw $v1, 0x0154($a3) ## 00000154 -/* 034FC 80A4622C 90EA020C */ lbu $t2, 0x020C($a3) ## 0000020C -/* 03500 80A46230 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 03504 80A46234 11410008 */ beq $t2, $at, .L80A46258 -.L80A46238: -/* 03508 80A46238 24013033 */ addiu $at, $zero, 0x3033 ## $at = 00003033 -/* 0350C 80A4623C 10410006 */ beq $v0, $at, .L80A46258 -/* 03510 80A46240 00000000 */ nop -/* 03514 80A46244 1482000B */ bne $a0, $v0, .L80A46274 -/* 03518 80A46248 00000000 */ nop -/* 0351C 80A4624C 90EB020C */ lbu $t3, 0x020C($a3) ## 0000020C -/* 03520 80A46250 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03524 80A46254 15610007 */ bne $t3, $at, .L80A46274 -.L80A46258: -/* 03528 80A46258 3C0C0600 */ lui $t4, %hi(D_06000750) ## $t4 = 06000000 -/* 0352C 80A4625C 258C0750 */ addiu $t4, $t4, %lo(D_06000750) ## $t4 = 06000750 -/* 03530 80A46260 11830004 */ beq $t4, $v1, .L80A46274 -/* 03534 80A46264 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03538 80A46268 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -/* 0353C 80A4626C A0ED0213 */ sb $t5, 0x0213($a3) ## 00000213 -/* 03540 80A46270 8CE30154 */ lw $v1, 0x0154($a3) ## 00000154 -.L80A46274: -/* 03544 80A46274 15C3000E */ bne $t6, $v1, .L80A462B0 -/* 03548 80A46278 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0354C 80A4627C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 03550 80A46280 C4E60164 */ lwc1 $f6, 0x0164($a3) ## 00000164 -/* 03554 80A46284 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03558 80A46288 240539EB */ addiu $a1, $zero, 0x39EB ## $a1 = 000039EB -/* 0355C 80A4628C 46062032 */ c.eq.s $f4, $f6 -/* 03560 80A46290 00000000 */ nop -/* 03564 80A46294 45020007 */ bc1fl .L80A462B4 -/* 03568 80A46298 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0356C 80A4629C AFA6001C */ sw $a2, 0x001C($sp) -/* 03570 80A462A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03574 80A462A4 AFA70020 */ sw $a3, 0x0020($sp) -/* 03578 80A462A8 8FA6001C */ lw $a2, 0x001C($sp) -/* 0357C 80A462AC 8FA70020 */ lw $a3, 0x0020($sp) -.L80A462B0: -/* 03580 80A462B0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -.L80A462B4: -/* 03584 80A462B4 10C10004 */ beq $a2, $at, .L80A462C8 -/* 03588 80A462B8 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 0358C 80A462BC 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 03590 80A462C0 0C00D3B0 */ jal func_80034EC0 -/* 03594 80A462C4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -.L80A462C8: -/* 03598 80A462C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0359C 80A462CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 035A0 80A462D0 03E00008 */ jr $ra -/* 035A4 80A462D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s deleted file mode 100644 index c8054edd1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80A462D8 -/* 035A8 80A462D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 035AC 80A462DC AFB00018 */ sw $s0, 0x0018($sp) -/* 035B0 80A462E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 035B4 80A462E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 035B8 80A462E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 035BC 80A462EC 0C03008C */ jal Gameplay_CreateSubCamera -/* 035C0 80A462F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 035C4 80A462F4 A602059A */ sh $v0, 0x059A($s0) ## 0000059A -/* 035C8 80A462F8 8FA4002C */ lw $a0, 0x002C($sp) -/* 035CC 80A462FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 035D0 80A46300 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 035D4 80A46304 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 035D8 80A46308 8FA4002C */ lw $a0, 0x002C($sp) -/* 035DC 80A4630C 8605059A */ lh $a1, 0x059A($s0) ## 0000059A -/* 035E0 80A46310 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 035E4 80A46314 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 035E8 80A46318 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 035EC 80A4631C 260504AC */ addiu $a1, $s0, 0x04AC ## $a1 = 000004AC -/* 035F0 80A46320 0C023983 */ jal Path_CopyLastPoint -/* 035F4 80A46324 AFA50020 */ sw $a1, 0x0020($sp) -/* 035F8 80A46328 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 035FC 80A4632C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 03600 80A46330 8FA50020 */ lw $a1, 0x0020($sp) -/* 03604 80A46334 24430E38 */ addiu $v1, $v0, 0x0E38 ## $v1 = 00000E38 -/* 03608 80A46338 00032400 */ sll $a0, $v1, 16 -/* 0360C 80A4633C A7A30026 */ sh $v1, 0x0026($sp) -/* 03610 80A46340 0C01DE1C */ jal Math_SinS - ## sins? -/* 03614 80A46344 00042403 */ sra $a0, $a0, 16 -/* 03618 80A46348 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0361C 80A4634C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 03620 80A46350 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 03624 80A46354 46040182 */ mul.s $f6, $f0, $f4 -/* 03628 80A46358 46083280 */ add.s $f10, $f6, $f8 -/* 0362C 80A4635C E60A04A0 */ swc1 $f10, 0x04A0($s0) ## 000004A0 -/* 03630 80A46360 0C01DE0D */ jal Math_CosS - ## coss? -/* 03634 80A46364 87A40026 */ lh $a0, 0x0026($sp) -/* 03638 80A46368 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0363C 80A4636C 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 03640 80A46370 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 03644 80A46374 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 03648 80A46378 46100482 */ mul.s $f18, $f0, $f16 -/* 0364C 80A4637C C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C -/* 03650 80A46380 C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 -/* 03654 80A46384 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 03658 80A46388 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 0365C 80A4638C 46066200 */ add.s $f8, $f12, $f6 -/* 03660 80A46390 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 03664 80A46394 E60204B4 */ swc1 $f2, 0x04B4($s0) ## 000004B4 -/* 03668 80A46398 46029100 */ add.s $f4, $f18, $f2 -/* 0366C 80A4639C E60804A4 */ swc1 $f8, 0x04A4($s0) ## 000004A4 -/* 03670 80A463A0 E60A04AC */ swc1 $f10, 0x04AC($s0) ## 000004AC -/* 03674 80A463A4 46106480 */ add.s $f18, $f12, $f16 -/* 03678 80A463A8 E60404A8 */ swc1 $f4, 0x04A8($s0) ## 000004A8 -/* 0367C 80A463AC 8605059A */ lh $a1, 0x059A($s0) ## 0000059A -/* 03680 80A463B0 260704A0 */ addiu $a3, $s0, 0x04A0 ## $a3 = 000004A0 -/* 03684 80A463B4 E61204B0 */ swc1 $f18, 0x04B0($s0) ## 000004B0 -/* 03688 80A463B8 8FA60020 */ lw $a2, 0x0020($sp) -/* 0368C 80A463BC 0C030136 */ jal Gameplay_CameraSetAtEye -/* 03690 80A463C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 03694 80A463C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03698 80A463C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0369C 80A463CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 036A0 80A463D0 03E00008 */ jr $ra -/* 036A4 80A463D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s deleted file mode 100644 index 64b45ac627..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A463D8 -/* 036A8 80A463D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036AC 80A463DC AFA40018 */ sw $a0, 0x0018($sp) -/* 036B0 80A463E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 036B4 80A463E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 036B8 80A463E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 036BC 80A463EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 036C0 80A463F0 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 036C4 80A463F4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 036C8 80A463F8 8FAE0018 */ lw $t6, 0x0018($sp) -/* 036CC 80A463FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 036D0 80A46400 0C0300E1 */ jal Gameplay_ClearCamera -/* 036D4 80A46404 85C5059A */ lh $a1, 0x059A($t6) ## 0000059A -/* 036D8 80A46408 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036DC 80A4640C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 036E0 80A46410 03E00008 */ jr $ra -/* 036E4 80A46414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s deleted file mode 100644 index 1a77a41e46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80A46418 -/* 036E8 80A46418 3C0E8012 */ lui $t6, %hi(gItemSlots+0x2d) -/* 036EC 80A4641C 91CE7491 */ lbu $t6, %lo(gItemSlots+0x2d)($t6) -/* 036F0 80A46420 3C028016 */ lui $v0, %hi(gSaveContext+0x74) -/* 036F4 80A46424 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036F8 80A46428 004E1021 */ addu $v0, $v0, $t6 -/* 036FC 80A4642C 9042E6D4 */ lbu $v0, %lo(gSaveContext+0x74)($v0) -/* 03700 80A46430 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03704 80A46434 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03708 80A46438 28410033 */ slti $at, $v0, 0x0033 -/* 0370C 80A4643C 1420001F */ bne $at, $zero, .L80A464BC -/* 03710 80A46440 28410037 */ slti $at, $v0, 0x0037 -/* 03714 80A46444 5020001E */ beql $at, $zero, .L80A464C0 -/* 03718 80A46448 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0371C 80A4644C 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 03720 80A46450 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03724 80A46454 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 03728 80A46458 57010019 */ bnel $t8, $at, .L80A464C0 -/* 0372C 80A4645C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03730 80A46460 84990194 */ lh $t9, 0x0194($a0) ## 00000194 -/* 03734 80A46464 57200016 */ bnel $t9, $zero, .L80A464C0 -/* 03738 80A46468 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0373C 80A4646C 84820592 */ lh $v0, 0x0592($a0) ## 00000592 -/* 03740 80A46470 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 03744 80A46474 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 03748 80A46478 14400003 */ bne $v0, $zero, .L80A46488 -/* 0374C 80A4647C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = 8015FFFF -/* 03750 80A46480 10000003 */ beq $zero, $zero, .L80A46490 -/* 03754 80A46484 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A46488: -/* 03758 80A46488 A4E80592 */ sh $t0, 0x0592($a3) ## 00000592 -/* 0375C 80A4648C 84E30592 */ lh $v1, 0x0592($a3) ## 00000592 -.L80A46490: -/* 03760 80A46490 5460000B */ bnel $v1, $zero, .L80A464C0 -/* 03764 80A46494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03768 80A46498 0C01DF64 */ jal Rand_S16Offset - -/* 0376C 80A4649C AFA70018 */ sw $a3, 0x0018($sp) -/* 03770 80A464A0 8FA70018 */ lw $a3, 0x0018($sp) -/* 03774 80A464A4 3C048013 */ lui $a0, %hi(D_801333D4) -/* 03778 80A464A8 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 0377C 80A464AC 2405391C */ addiu $a1, $zero, 0x391C ## $a1 = 0000391C -/* 03780 80A464B0 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 03784 80A464B4 0C03D149 */ jal func_800F4524 -/* 03788 80A464B8 A4E20592 */ sh $v0, 0x0592($a3) ## 00000592 -.L80A464BC: -/* 0378C 80A464BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A464C0: -/* 03790 80A464C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03794 80A464C4 03E00008 */ jr $ra -/* 03798 80A464C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s deleted file mode 100644 index 45bcd6fba9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s +++ /dev/null @@ -1,137 +0,0 @@ -.late_rodata -glabel D_80A48798 - .float 0.6 - -glabel D_80A4879C - .float 0.4 - -glabel D_80A487A0 - .float 0.6 - -.text -glabel func_80A4696C -/* 03C3C 80A4696C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03C40 80A46970 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03C44 80A46974 AFB00020 */ sw $s0, 0x0020($sp) -/* 03C48 80A46978 AFA5003C */ sw $a1, 0x003C($sp) -/* 03C4C 80A4697C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03C50 80A46980 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C54 80A46984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03C58 80A46988 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 03C5C 80A4698C A3AF0037 */ sb $t7, 0x0037($sp) -/* 03C60 80A46990 0C0295B2 */ jal Animation_OnFrame -/* 03C64 80A46994 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 03C68 80A46998 50400024 */ beql $v0, $zero, .L80A46A2C -/* 03C6C 80A4699C C6020164 */ lwc1 $f2, 0x0164($s0) ## 00000164 -/* 03C70 80A469A0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 03C74 80A469A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03C78 80A469A8 8FA2003C */ lw $v0, 0x003C($sp) -/* 03C7C 80A469AC 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 03C80 80A469B0 17210018 */ bne $t9, $at, .L80A46A14 -/* 03C84 80A469B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C88 80A469B8 844807A0 */ lh $t0, 0x07A0($v0) ## 000007A0 -/* 03C8C 80A469BC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03C90 80A469C0 00084880 */ sll $t1, $t0, 2 -/* 03C94 80A469C4 00495021 */ addu $t2, $v0, $t1 -/* 03C98 80A469C8 0C024BE2 */ jal Quake_Add -/* 03C9C 80A469CC 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 -/* 03CA0 80A469D0 00022400 */ sll $a0, $v0, 16 -/* 03CA4 80A469D4 AFA20030 */ sw $v0, 0x0030($sp) -/* 03CA8 80A469D8 00042403 */ sra $a0, $a0, 16 -/* 03CAC 80A469DC 0C024B6B */ jal Quake_SetSpeed -/* 03CB0 80A469E0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 -/* 03CB4 80A469E4 87A40032 */ lh $a0, 0x0032($sp) -/* 03CB8 80A469E8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 03CBC 80A469EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03CC0 80A469F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03CC4 80A469F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 03CC8 80A469F8 0C024B9C */ jal Quake_SetQuakeValues -/* 03CCC 80A469FC AFA4002C */ sw $a0, 0x002C($sp) -/* 03CD0 80A46A00 8FA4002C */ lw $a0, 0x002C($sp) -/* 03CD4 80A46A04 0C024B7C */ jal Quake_SetCountdown -/* 03CD8 80A46A08 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 03CDC 80A46A0C 10000004 */ beq $zero, $zero, .L80A46A20 -/* 03CE0 80A46A10 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80A46A14: -/* 03CE4 80A46A14 0C2916C5 */ jal func_80A45B14 -/* 03CE8 80A46A18 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03CEC 80A46A1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80A46A20: -/* 03CF0 80A46A20 00000000 */ nop -/* 03CF4 80A46A24 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 03CF8 80A46A28 C6020164 */ lwc1 $f2, 0x0164($s0) ## 00000164 -.L80A46A2C: -/* 03CFC 80A46A2C 93AD0037 */ lbu $t5, 0x0037($sp) -/* 03D00 80A46A30 3C0F80A5 */ lui $t7, %hi(D_80A48174) ## $t7 = 80A50000 -/* 03D04 80A46A34 4600118D */ trunc.w.s $f6, $f2 -/* 03D08 80A46A38 000D7080 */ sll $t6, $t5, 2 -/* 03D0C 80A46A3C 01CD7021 */ addu $t6, $t6, $t5 -/* 03D10 80A46A40 000E7040 */ sll $t6, $t6, 1 -/* 03D14 80A46A44 440C3000 */ mfc1 $t4, $f6 -/* 03D18 80A46A48 01EE7821 */ addu $t7, $t7, $t6 -/* 03D1C 80A46A4C 93A80037 */ lbu $t0, 0x0037($sp) -/* 03D20 80A46A50 1580000C */ bne $t4, $zero, .L80A46A84 -/* 03D24 80A46A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03D28 80A46A58 85EF8174 */ lh $t7, %lo(D_80A48174)($t7) -/* 03D2C 80A46A5C 3C0180A5 */ lui $at, %hi(D_80A48798) ## $at = 80A50000 -/* 03D30 80A46A60 C4308798 */ lwc1 $f16, %lo(D_80A48798)($at) -/* 03D34 80A46A64 448F4000 */ mtc1 $t7, $f8 ## $f8 = -0.00 -/* 03D38 80A46A68 00000000 */ nop -/* 03D3C 80A46A6C 468042A0 */ cvt.s.w $f10, $f8 -/* 03D40 80A46A70 46105482 */ mul.s $f18, $f10, $f16 -/* 03D44 80A46A74 4600910D */ trunc.w.s $f4, $f18 -/* 03D48 80A46A78 44192000 */ mfc1 $t9, $f4 -/* 03D4C 80A46A7C 10000019 */ beq $zero, $zero, .L80A46AE4 -/* 03D50 80A46A80 A61901FE */ sh $t9, 0x01FE($s0) ## 000001FE -.L80A46A84: -/* 03D54 80A46A84 C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 03D58 80A46A88 00084880 */ sll $t1, $t0, 2 -/* 03D5C 80A46A8C 01284821 */ addu $t1, $t1, $t0 -/* 03D60 80A46A90 46101483 */ div.s $f18, $f2, $f16 -/* 03D64 80A46A94 00094840 */ sll $t1, $t1, 1 -/* 03D68 80A46A98 3C0A80A5 */ lui $t2, %hi(D_80A48174) ## $t2 = 80A50000 -/* 03D6C 80A46A9C 01495021 */ addu $t2, $t2, $t1 -/* 03D70 80A46AA0 854A8174 */ lh $t2, %lo(D_80A48174)($t2) -/* 03D74 80A46AA4 3C0180A5 */ lui $at, %hi(D_80A4879C) ## $at = 80A50000 -/* 03D78 80A46AA8 C428879C */ lwc1 $f8, %lo(D_80A4879C)($at) -/* 03D7C 80A46AAC 448A3000 */ mtc1 $t2, $f6 ## $f6 = -0.00 -/* 03D80 80A46AB0 3C0180A5 */ lui $at, %hi(D_80A487A0) ## $at = 80A50000 -/* 03D84 80A46AB4 46803020 */ cvt.s.w $f0, $f6 -/* 03D88 80A46AB8 C42687A0 */ lwc1 $f6, %lo(D_80A487A0)($at) -/* 03D8C 80A46ABC 46080282 */ mul.s $f10, $f0, $f8 -/* 03D90 80A46AC0 00000000 */ nop -/* 03D94 80A46AC4 46125102 */ mul.s $f4, $f10, $f18 -/* 03D98 80A46AC8 00000000 */ nop -/* 03D9C 80A46ACC 46060202 */ mul.s $f8, $f0, $f6 -/* 03DA0 80A46AD0 46082400 */ add.s $f16, $f4, $f8 -/* 03DA4 80A46AD4 4600828D */ trunc.w.s $f10, $f16 -/* 03DA8 80A46AD8 440C5000 */ mfc1 $t4, $f10 -/* 03DAC 80A46ADC 00000000 */ nop -/* 03DB0 80A46AE0 A60C01FE */ sh $t4, 0x01FE($s0) ## 000001FE -.L80A46AE4: -/* 03DB4 80A46AE4 0C2917C2 */ jal func_80A45F08 -/* 03DB8 80A46AE8 8FA5003C */ lw $a1, 0x003C($sp) -/* 03DBC 80A46AEC 10400004 */ beq $v0, $zero, .L80A46B00 -/* 03DC0 80A46AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03DC4 80A46AF4 A200020F */ sb $zero, 0x020F($s0) ## 0000020F -/* 03DC8 80A46AF8 0C291714 */ jal func_80A45C50 -/* 03DCC 80A46AFC 8FA5003C */ lw $a1, 0x003C($sp) -.L80A46B00: -/* 03DD0 80A46B00 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 03DD4 80A46B04 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03DD8 80A46B08 31AE001F */ andi $t6, $t5, 0x001F ## $t6 = 00000000 -/* 03DDC 80A46B0C 51C10008 */ beql $t6, $at, .L80A46B30 -/* 03DE0 80A46B10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03DE4 80A46B14 0C291370 */ jal func_80A44DC0 -/* 03DE8 80A46B18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03DEC 80A46B1C 10400003 */ beq $v0, $zero, .L80A46B2C -/* 03DF0 80A46B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03DF4 80A46B24 0C291714 */ jal func_80A45C50 -/* 03DF8 80A46B28 8FA5003C */ lw $a1, 0x003C($sp) -.L80A46B2C: -/* 03DFC 80A46B2C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A46B30: -/* 03E00 80A46B30 8FB00020 */ lw $s0, 0x0020($sp) -/* 03E04 80A46B34 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03E08 80A46B38 03E00008 */ jr $ra -/* 03E0C 80A46B3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s deleted file mode 100644 index 4b8d321e93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s +++ /dev/null @@ -1,118 +0,0 @@ -.late_rodata -glabel D_80A487A4 - .float 0.4 - -glabel D_80A487A8 - .float 0.6 - -.text -glabel func_80A46B40 -/* 03E10 80A46B40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E14 80A46B44 AFBF001C */ sw $ra, 0x001C($sp) -/* 03E18 80A46B48 AFB00018 */ sw $s0, 0x0018($sp) -/* 03E1C 80A46B4C AFA5002C */ sw $a1, 0x002C($sp) -/* 03E20 80A46B50 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 03E24 80A46B54 908E0211 */ lbu $t6, 0x0211($a0) ## 00000211 -/* 03E28 80A46B58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03E2C 80A46B5C 3063001F */ andi $v1, $v1, 0x001F ## $v1 = 00000000 -/* 03E30 80A46B60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03E34 80A46B64 15C10017 */ bne $t6, $at, .L80A46BC4 -/* 03E38 80A46B68 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 03E3C 80A46B6C 0C291906 */ jal func_80A46418 -/* 03E40 80A46B70 00000000 */ nop -/* 03E44 80A46B74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E48 80A46B78 0C29186A */ jal func_80A461A8 -/* 03E4C 80A46B7C 8FA5002C */ lw $a1, 0x002C($sp) -/* 03E50 80A46B80 0C291612 */ jal func_80A45848 -/* 03E54 80A46B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E58 80A46B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E5C 80A46B8C 0C291807 */ jal func_80A4601C -/* 03E60 80A46B90 8FA5002C */ lw $a1, 0x002C($sp) -/* 03E64 80A46B94 5440004C */ bnel $v0, $zero, .L80A46CC8 -/* 03E68 80A46B98 8FBF001C */ lw $ra, 0x001C($sp) -/* 03E6C 80A46B9C 0C29181F */ jal func_80A4607C -/* 03E70 80A46BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E74 80A46BA4 54400048 */ bnel $v0, $zero, .L80A46CC8 -/* 03E78 80A46BA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 03E7C 80A46BAC 0C2917E7 */ jal func_80A45F9C -/* 03E80 80A46BB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E84 80A46BB4 50400039 */ beql $v0, $zero, .L80A46C9C -/* 03E88 80A46BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E8C 80A46BBC 10000042 */ beq $zero, $zero, .L80A46CC8 -/* 03E90 80A46BC0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A46BC4: -/* 03E94 80A46BC4 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 03E98 80A46BC8 A3A30027 */ sb $v1, 0x0027($sp) -/* 03E9C 80A46BCC 0C0295B2 */ jal Animation_OnFrame -/* 03EA0 80A46BD0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03EA4 80A46BD4 10400017 */ beq $v0, $zero, .L80A46C34 -/* 03EA8 80A46BD8 93A30027 */ lbu $v1, 0x0027($sp) -/* 03EAC 80A46BDC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 03EB0 80A46BE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03EB4 80A46BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03EB8 80A46BE8 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 03EBC 80A46BEC 17010004 */ bne $t8, $at, .L80A46C00 -/* 03EC0 80A46BF0 00000000 */ nop -/* 03EC4 80A46BF4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 03EC8 80A46BF8 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 03ECC 80A46BFC AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -.L80A46C00: -/* 03ED0 80A46C00 0C291533 */ jal func_80A454CC -/* 03ED4 80A46C04 A3A30027 */ sb $v1, 0x0027($sp) -/* 03ED8 80A46C08 93A30027 */ lbu $v1, 0x0027($sp) -/* 03EDC 80A46C0C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 03EE0 80A46C10 3C0B80A5 */ lui $t3, %hi(D_80A48174) ## $t3 = 80A50000 -/* 03EE4 80A46C14 00035080 */ sll $t2, $v1, 2 -/* 03EE8 80A46C18 01435021 */ addu $t2, $t2, $v1 -/* 03EEC 80A46C1C 000A5040 */ sll $t2, $t2, 1 -/* 03EF0 80A46C20 A2090211 */ sb $t1, 0x0211($s0) ## 00000211 -/* 03EF4 80A46C24 016A5821 */ addu $t3, $t3, $t2 -/* 03EF8 80A46C28 856B8174 */ lh $t3, %lo(D_80A48174)($t3) -/* 03EFC 80A46C2C 1000001A */ beq $zero, $zero, .L80A46C98 -/* 03F00 80A46C30 A60B01FE */ sh $t3, 0x01FE($s0) ## 000001FE -.L80A46C34: -/* 03F04 80A46C34 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 03F08 80A46C38 C608015C */ lwc1 $f8, 0x015C($s0) ## 0000015C -/* 03F0C 80A46C3C 00036080 */ sll $t4, $v1, 2 -/* 03F10 80A46C40 01836021 */ addu $t4, $t4, $v1 -/* 03F14 80A46C44 46083283 */ div.s $f10, $f6, $f8 -/* 03F18 80A46C48 000C6040 */ sll $t4, $t4, 1 -/* 03F1C 80A46C4C 3C0D80A5 */ lui $t5, %hi(D_80A48174) ## $t5 = 80A50000 -/* 03F20 80A46C50 01AC6821 */ addu $t5, $t5, $t4 -/* 03F24 80A46C54 85AD8174 */ lh $t5, %lo(D_80A48174)($t5) -/* 03F28 80A46C58 3C0180A5 */ lui $at, %hi(D_80A487A4) ## $at = 80A50000 -/* 03F2C 80A46C5C C43087A4 */ lwc1 $f16, %lo(D_80A487A4)($at) -/* 03F30 80A46C60 448D2000 */ mtc1 $t5, $f4 ## $f4 = -0.00 -/* 03F34 80A46C64 3C0180A5 */ lui $at, %hi(D_80A487A8) ## $at = 80A50000 -/* 03F38 80A46C68 C42687A8 */ lwc1 $f6, %lo(D_80A487A8)($at) -/* 03F3C 80A46C6C 46802020 */ cvt.s.w $f0, $f4 -/* 03F40 80A46C70 46100482 */ mul.s $f18, $f0, $f16 -/* 03F44 80A46C74 00000000 */ nop -/* 03F48 80A46C78 460A9102 */ mul.s $f4, $f18, $f10 -/* 03F4C 80A46C7C 00000000 */ nop -/* 03F50 80A46C80 46060202 */ mul.s $f8, $f0, $f6 -/* 03F54 80A46C84 46082400 */ add.s $f16, $f4, $f8 -/* 03F58 80A46C88 4600848D */ trunc.w.s $f18, $f16 -/* 03F5C 80A46C8C 440F9000 */ mfc1 $t7, $f18 -/* 03F60 80A46C90 00000000 */ nop -/* 03F64 80A46C94 A60F01FE */ sh $t7, 0x01FE($s0) ## 000001FE -.L80A46C98: -/* 03F68 80A46C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A46C9C: -/* 03F6C 80A46C9C 0C291587 */ jal func_80A4561C -/* 03F70 80A46CA0 8FA5002C */ lw $a1, 0x002C($sp) -/* 03F74 80A46CA4 54400008 */ bnel $v0, $zero, .L80A46CC8 -/* 03F78 80A46CA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 03F7C 80A46CAC 0C291370 */ jal func_80A44DC0 -/* 03F80 80A46CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F84 80A46CB4 14400003 */ bne $v0, $zero, .L80A46CC4 -/* 03F88 80A46CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F8C 80A46CBC 0C2916E7 */ jal func_80A45B9C -/* 03F90 80A46CC0 8FA5002C */ lw $a1, 0x002C($sp) -.L80A46CC4: -/* 03F94 80A46CC4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A46CC8: -/* 03F98 80A46CC8 8FB00018 */ lw $s0, 0x0018($sp) -/* 03F9C 80A46CCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03FA0 80A46CD0 03E00008 */ jr $ra -/* 03FA4 80A46CD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s deleted file mode 100644 index 3114a985a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A46CD8 -/* 03FA8 80A46CD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03FAC 80A46CDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03FB0 80A46CE0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03FB4 80A46CE4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 03FB8 80A46CE8 C480015C */ lwc1 $f0, 0x015C($a0) ## 0000015C -/* 03FBC 80A46CEC 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 03FC0 80A46CF0 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 03FC4 80A46CF4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03FC8 80A46CF8 46003203 */ div.s $f8, $f6, $f0 -/* 03FCC 80A46CFC AFA60018 */ sw $a2, 0x0018($sp) -/* 03FD0 80A46D00 46082082 */ mul.s $f2, $f4, $f8 -/* 03FD4 80A46D04 4600128D */ trunc.w.s $f10, $f2 -/* 03FD8 80A46D08 44045000 */ mfc1 $a0, $f10 -/* 03FDC 80A46D0C 00000000 */ nop -/* 03FE0 80A46D10 00042400 */ sll $a0, $a0, 16 -/* 03FE4 80A46D14 0C01DE1C */ jal Math_SinS - ## sins? -/* 03FE8 80A46D18 00042403 */ sra $a0, $a0, 16 -/* 03FEC 80A46D1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03FF0 80A46D20 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 03FF4 80A46D24 0C291339 */ jal func_80A44CE4 -/* 03FF8 80A46D28 8FA5001C */ lw $a1, 0x001C($sp) -/* 03FFC 80A46D2C 10400007 */ beq $v0, $zero, .L80A46D4C -/* 04000 80A46D30 8FA60018 */ lw $a2, 0x0018($sp) -/* 04004 80A46D34 80CF0210 */ lb $t7, 0x0210($a2) ## 00000210 -/* 04008 80A46D38 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0400C 80A46D3C 55E00004 */ bnel $t7, $zero, .L80A46D50 -/* 04010 80A46D40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04014 80A46D44 0C291750 */ jal func_80A45D40 -/* 04018 80A46D48 8FA5001C */ lw $a1, 0x001C($sp) -.L80A46D4C: -/* 0401C 80A46D4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A46D50: -/* 04020 80A46D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04024 80A46D54 03E00008 */ jr $ra -/* 04028 80A46D58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s deleted file mode 100644 index 5939725b58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A46D5C -/* 0402C 80A46D5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04030 80A46D60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04034 80A46D64 AFA5001C */ sw $a1, 0x001C($sp) -/* 04038 80A46D68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0403C 80A46D6C 8CC5015C */ lw $a1, 0x015C($a2) ## 0000015C -/* 04040 80A46D70 AFA60018 */ sw $a2, 0x0018($sp) -/* 04044 80A46D74 0C0295B2 */ jal Animation_OnFrame -/* 04048 80A46D78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0404C 80A46D7C 1040000B */ beq $v0, $zero, .L80A46DAC -/* 04050 80A46D80 8FA60018 */ lw $a2, 0x0018($sp) -/* 04054 80A46D84 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04058 80A46D88 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0405C 80A46D8C 0C2916C5 */ jal func_80A45B14 -/* 04060 80A46D90 AFA60018 */ sw $a2, 0x0018($sp) -/* 04064 80A46D94 8FA40018 */ lw $a0, 0x0018($sp) -/* 04068 80A46D98 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0406C 80A46D9C 00000000 */ nop -/* 04070 80A46DA0 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 -/* 04074 80A46DA4 0C291769 */ jal func_80A45DA4 -/* 04078 80A46DA8 8FA5001C */ lw $a1, 0x001C($sp) -.L80A46DAC: -/* 0407C 80A46DAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04080 80A46DB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04084 80A46DB4 03E00008 */ jr $ra -/* 04088 80A46DB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s deleted file mode 100644 index e1f54e53d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A46DBC -/* 0408C 80A46DBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04090 80A46DC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04094 80A46DC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 04098 80A46DC8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0409C 80A46DCC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 040A0 80A46DD0 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 040A4 80A46DD4 15E10008 */ bne $t7, $at, .L80A46DF8 -/* 040A8 80A46DD8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 040AC 80A46DDC 44810000 */ mtc1 $at, $f0 ## $f0 = 1000.00 -/* 040B0 80A46DE0 C486008C */ lwc1 $f6, 0x008C($a0) ## 0000008C -/* 040B4 80A46DE4 46000102 */ mul.s $f4, $f0, $f0 -/* 040B8 80A46DE8 4606203C */ c.lt.s $f4, $f6 -/* 040BC 80A46DEC 00000000 */ nop -/* 040C0 80A46DF0 45010012 */ bc1t .L80A46E3C -/* 040C4 80A46DF4 00000000 */ nop -.L80A46DF8: -/* 040C8 80A46DF8 84820592 */ lh $v0, 0x0592($a0) ## 00000592 -/* 040CC 80A46DFC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 040D0 80A46E00 14400003 */ bne $v0, $zero, .L80A46E10 -/* 040D4 80A46E04 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 040D8 80A46E08 10000003 */ beq $zero, $zero, .L80A46E18 -/* 040DC 80A46E0C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A46E10: -/* 040E0 80A46E10 A4980592 */ sh $t8, 0x0592($a0) ## 00000592 -/* 040E4 80A46E14 84830592 */ lh $v1, 0x0592($a0) ## 00000592 -.L80A46E18: -/* 040E8 80A46E18 14600008 */ bne $v1, $zero, .L80A46E3C -/* 040EC 80A46E1C 00000000 */ nop -/* 040F0 80A46E20 C4880068 */ lwc1 $f8, 0x0068($a0) ## 00000068 -/* 040F4 80A46E24 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 040F8 80A46E28 3C1980A4 */ lui $t9, %hi(func_80A46E54) ## $t9 = 80A40000 -/* 040FC 80A46E2C 27396E54 */ addiu $t9, $t9, %lo(func_80A46E54) ## $t9 = 80A46E54 -/* 04100 80A46E30 460A4402 */ mul.s $f16, $f8, $f10 -/* 04104 80A46E34 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -/* 04108 80A46E38 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -.L80A46E3C: -/* 0410C 80A46E3C 0C2916C5 */ jal func_80A45B14 -/* 04110 80A46E40 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04114 80A46E44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04118 80A46E48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0411C 80A46E4C 03E00008 */ jr $ra -/* 04120 80A46E50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s deleted file mode 100644 index 66686e6cb3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80A46E54 -/* 04124 80A46E54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04128 80A46E58 AFBF001C */ sw $ra, 0x001C($sp) -/* 0412C 80A46E5C AFB00018 */ sw $s0, 0x0018($sp) -/* 04130 80A46E60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04134 80A46E64 0C291845 */ jal func_80A46114 -/* 04138 80A46E68 AFA50024 */ sw $a1, 0x0024($sp) -/* 0413C 80A46E6C 14400041 */ bne $v0, $zero, .L80A46F74 -/* 04140 80A46E70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04144 80A46E74 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04148 80A46E78 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 -/* 0414C 80A46E7C 0C2913BC */ jal func_80A44EF0 -/* 04150 80A46E80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04154 80A46E84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04158 80A46E88 5441000C */ bnel $v0, $at, .L80A46EBC -/* 0415C 80A46E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04160 80A46E90 0C29182E */ jal func_80A460B8 -/* 04164 80A46E94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04168 80A46E98 10400005 */ beq $v0, $zero, .L80A46EB0 -/* 0416C 80A46E9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04170 80A46EA0 3C0E80A4 */ lui $t6, %hi(func_80A47024) ## $t6 = 80A40000 -/* 04174 80A46EA4 25CE7024 */ addiu $t6, $t6, %lo(func_80A47024) ## $t6 = 80A47024 -/* 04178 80A46EA8 10000032 */ beq $zero, $zero, .L80A46F74 -/* 0417C 80A46EAC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L80A46EB0: -/* 04180 80A46EB0 0C2916C5 */ jal func_80A45B14 -/* 04184 80A46EB4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 04188 80A46EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A46EBC: -/* 0418C 80A46EBC 0C291339 */ jal func_80A44CE4 -/* 04190 80A46EC0 8FA50024 */ lw $a1, 0x0024($sp) -/* 04194 80A46EC4 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 04198 80A46EC8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 0419C 80A46ECC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 041A0 80A46ED0 3063001F */ andi $v1, $v1, 0x001F ## $v1 = 00000000 -/* 041A4 80A46ED4 1064000E */ beq $v1, $a0, .L80A46F10 -/* 041A8 80A46ED8 00000000 */ nop -/* 041AC 80A46EDC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 041B0 80A46EE0 14610015 */ bne $v1, $at, .L80A46F38 -/* 041B4 80A46EE4 00000000 */ nop -/* 041B8 80A46EE8 14440013 */ bne $v0, $a0, .L80A46F38 -/* 041BC 80A46EEC 00000000 */ nop -/* 041C0 80A46EF0 820F0210 */ lb $t7, 0x0210($s0) ## 00000210 -/* 041C4 80A46EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041C8 80A46EF8 15E0000F */ bne $t7, $zero, .L80A46F38 -/* 041CC 80A46EFC 00000000 */ nop -/* 041D0 80A46F00 0C291792 */ jal func_80A45E48 -/* 041D4 80A46F04 8FA50024 */ lw $a1, 0x0024($sp) -/* 041D8 80A46F08 1000001B */ beq $zero, $zero, .L80A46F78 -/* 041DC 80A46F0C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A46F10: -/* 041E0 80A46F10 14410009 */ bne $v0, $at, .L80A46F38 -/* 041E4 80A46F14 00000000 */ nop -/* 041E8 80A46F18 82180210 */ lb $t8, 0x0210($s0) ## 00000210 -/* 041EC 80A46F1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 041F0 80A46F20 14980005 */ bne $a0, $t8, .L80A46F38 -/* 041F4 80A46F24 00000000 */ nop -/* 041F8 80A46F28 0C291792 */ jal func_80A45E48 -/* 041FC 80A46F2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04200 80A46F30 10000011 */ beq $zero, $zero, .L80A46F78 -/* 04204 80A46F34 8FBF001C */ lw $ra, 0x001C($sp) -.L80A46F38: -/* 04208 80A46F38 0C29155E */ jal func_80A45578 -/* 0420C 80A46F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04210 80A46F40 44050000 */ mfc1 $a1, $f0 -/* 04214 80A46F44 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 04218 80A46F48 3C073F19 */ lui $a3, 0x3F19 ## $a3 = 3F190000 -/* 0421C 80A46F4C 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3F19999A -/* 04220 80A46F50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 04224 80A46F54 0C01E107 */ jal Math_ApproachF - -/* 04228 80A46F58 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0422C 80A46F5C 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 04230 80A46F60 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 -/* 04234 80A46F64 AA0800B4 */ swl $t0, 0x00B4($s0) ## 000000B4 -/* 04238 80A46F68 BA0800B7 */ swr $t0, 0x00B7($s0) ## 000000B7 -/* 0423C 80A46F6C 96080034 */ lhu $t0, 0x0034($s0) ## 00000034 -/* 04240 80A46F70 A60800B8 */ sh $t0, 0x00B8($s0) ## 000000B8 -.L80A46F74: -/* 04244 80A46F74 8FBF001C */ lw $ra, 0x001C($sp) -.L80A46F78: -/* 04248 80A46F78 8FB00018 */ lw $s0, 0x0018($sp) -/* 0424C 80A46F7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04250 80A46F80 03E00008 */ jr $ra -/* 04254 80A46F84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s deleted file mode 100644 index cc479a686e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A46F88 -/* 04258 80A46F88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0425C 80A46F8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04260 80A46F90 AFA5001C */ sw $a1, 0x001C($sp) -/* 04264 80A46F94 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04268 80A46F98 AFA40018 */ sw $a0, 0x0018($sp) -/* 0426C 80A46F9C 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 -/* 04270 80A46FA0 0C2913BC */ jal func_80A44EF0 -/* 04274 80A46FA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04278 80A46FA8 1040001A */ beq $v0, $zero, .L80A47014 -/* 0427C 80A46FAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04280 80A46FB0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04284 80A46FB4 0C2916C5 */ jal func_80A45B14 -/* 04288 80A46FB8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0428C 80A46FBC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04290 80A46FC0 848E059C */ lh $t6, 0x059C($a0) ## 0000059C -/* 04294 80A46FC4 55C00014 */ bnel $t6, $zero, .L80A47018 -/* 04298 80A46FC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0429C 80A46FCC 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 042A0 80A46FD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 042A4 80A46FD4 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 042A8 80A46FD8 10400008 */ beq $v0, $zero, .L80A46FFC -/* 042AC 80A46FDC 00000000 */ nop -/* 042B0 80A46FE0 1441000A */ bne $v0, $at, .L80A4700C -/* 042B4 80A46FE4 3C1880A4 */ lui $t8, %hi(func_80A4696C) ## $t8 = 80A40000 -/* 042B8 80A46FE8 3C0F80A4 */ lui $t7, %hi(func_80A47490) ## $t7 = 80A40000 -/* 042BC 80A46FEC 25EF7490 */ addiu $t7, $t7, %lo(func_80A47490) ## $t7 = 80A47490 -/* 042C0 80A46FF0 A0800212 */ sb $zero, 0x0212($a0) ## 00000212 -/* 042C4 80A46FF4 10000007 */ beq $zero, $zero, .L80A47014 -/* 042C8 80A46FF8 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -.L80A46FFC: -/* 042CC 80A46FFC 0C291714 */ jal func_80A45C50 -/* 042D0 80A47000 8FA5001C */ lw $a1, 0x001C($sp) -/* 042D4 80A47004 10000004 */ beq $zero, $zero, .L80A47018 -/* 042D8 80A47008 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A4700C: -/* 042DC 80A4700C 2718696C */ addiu $t8, $t8, %lo(func_80A4696C) ## $t8 = 0000696C -/* 042E0 80A47010 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -.L80A47014: -/* 042E4 80A47014 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A47018: -/* 042E8 80A47018 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 042EC 80A4701C 03E00008 */ jr $ra -/* 042F0 80A47020 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s deleted file mode 100644 index eaaea752c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80A47024 -/* 042F4 80A47024 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 042F8 80A47028 AFBF001C */ sw $ra, 0x001C($sp) -/* 042FC 80A4702C AFB00018 */ sw $s0, 0x0018($sp) -/* 04300 80A47030 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04304 80A47034 0C291845 */ jal func_80A46114 -/* 04308 80A47038 AFA50024 */ sw $a1, 0x0024($sp) -/* 0430C 80A4703C 14400025 */ bne $v0, $zero, .L80A470D4 -/* 04310 80A47040 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 04314 80A47044 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 04318 80A47048 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 0431C 80A4704C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 04320 80A47050 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 04324 80A47054 0C01E107 */ jal Math_ApproachF - -/* 04328 80A47058 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0432C 80A4705C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04330 80A47060 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 04334 80A47064 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 04338 80A47068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0433C 80A4706C 4600203E */ c.le.s $f4, $f0 -/* 04340 80A47070 00000000 */ nop -/* 04344 80A47074 45020005 */ bc1fl .L80A4708C -/* 04348 80A47078 4600018D */ trunc.w.s $f6, $f0 -/* 0434C 80A4707C 0C2916C5 */ jal func_80A45B14 -/* 04350 80A47080 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 04354 80A47084 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 04358 80A47088 4600018D */ trunc.w.s $f6, $f0 -.L80A4708C: -/* 0435C 80A4708C 440F3000 */ mfc1 $t7, $f6 -/* 04360 80A47090 00000000 */ nop -/* 04364 80A47094 55E00010 */ bnel $t7, $zero, .L80A470D8 -/* 04368 80A47098 8FBF001C */ lw $ra, 0x001C($sp) -/* 0436C 80A4709C 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 04370 80A470A0 9209020E */ lbu $t1, 0x020E($s0) ## 0000020E -/* 04374 80A470A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04378 80A470A8 3B198000 */ xori $t9, $t8, 0x8000 ## $t9 = FFFF8000 -/* 0437C 80A470AC A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 04380 80A470B0 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 04384 80A470B4 392A0001 */ xori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 04388 80A470B8 A20A020E */ sb $t2, 0x020E($s0) ## 0000020E -/* 0438C 80A470BC A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 04390 80A470C0 0C29131A */ jal func_80A44C68 -/* 04394 80A470C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 04398 80A470C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0439C 80A470CC 0C291769 */ jal func_80A45DA4 -/* 043A0 80A470D0 8FA50024 */ lw $a1, 0x0024($sp) -.L80A470D4: -/* 043A4 80A470D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A470D8: -/* 043A8 80A470D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 043AC 80A470DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 043B0 80A470E0 03E00008 */ jr $ra -/* 043B4 80A470E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s deleted file mode 100644 index f29bea3ea0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80A470E8 -/* 043B8 80A470E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 043BC 80A470EC AFBF001C */ sw $ra, 0x001C($sp) -/* 043C0 80A470F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 043C4 80A470F4 0C00BD04 */ jal Actor_HasParent -/* 043C8 80A470F8 AFA40020 */ sw $a0, 0x0020($sp) -/* 043CC 80A470FC 10400006 */ beq $v0, $zero, .L80A47118 -/* 043D0 80A47100 8FA40020 */ lw $a0, 0x0020($sp) -/* 043D4 80A47104 3C0E80A4 */ lui $t6, %hi(func_80A47158) ## $t6 = 80A40000 -/* 043D8 80A47108 25CE7158 */ addiu $t6, $t6, %lo(func_80A47158) ## $t6 = 80A47158 -/* 043DC 80A4710C AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 043E0 80A47110 1000000D */ beq $zero, $zero, .L80A47148 -/* 043E4 80A47114 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -.L80A47118: -/* 043E8 80A47118 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 043EC 80A4711C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 043F0 80A47120 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 043F4 80A47124 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 043F8 80A47128 8C860594 */ lw $a2, 0x0594($a0) ## 00000594 -/* 043FC 80A4712C 46000005 */ abs.s $f0, $f0 -/* 04400 80A47130 46022180 */ add.s $f6, $f4, $f2 -/* 04404 80A47134 8FA50024 */ lw $a1, 0x0024($sp) -/* 04408 80A47138 46020200 */ add.s $f8, $f0, $f2 -/* 0440C 80A4713C 44073000 */ mfc1 $a3, $f6 -/* 04410 80A47140 0C00BD0D */ jal func_8002F434 -/* 04414 80A47144 E7A80010 */ swc1 $f8, 0x0010($sp) -.L80A47148: -/* 04418 80A47148 8FBF001C */ lw $ra, 0x001C($sp) -/* 0441C 80A4714C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04420 80A47150 03E00008 */ jr $ra -/* 04424 80A47154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s deleted file mode 100644 index 92b3b67543..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80A47158 -/* 04428 80A47158 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0442C 80A4715C AFB00018 */ sw $s0, 0x0018($sp) -/* 04430 80A47160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04434 80A47164 AFBF001C */ sw $ra, 0x001C($sp) -/* 04438 80A47168 AFA50024 */ sw $a1, 0x0024($sp) -/* 0443C 80A4716C 0C042F6F */ jal func_8010BDBC -/* 04440 80A47170 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 04444 80A47174 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04448 80A47178 54410034 */ bnel $v0, $at, .L80A4724C -/* 0444C 80A4717C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04450 80A47180 0C041AF2 */ jal func_80106BC8 -/* 04454 80A47184 8FA40024 */ lw $a0, 0x0024($sp) -/* 04458 80A47188 50400030 */ beql $v0, $zero, .L80A4724C -/* 0445C 80A4718C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04460 80A47190 8E020594 */ lw $v0, 0x0594($s0) ## 00000594 -/* 04464 80A47194 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 04468 80A47198 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -/* 0446C 80A4719C 1041000C */ beq $v0, $at, .L80A471D0 -/* 04470 80A471A0 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 04474 80A471A4 10410011 */ beq $v0, $at, .L80A471EC -/* 04478 80A471A8 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 0447C 80A471AC 1041001E */ beq $v0, $at, .L80A47228 -/* 04480 80A471B0 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 -/* 04484 80A471B4 1041001C */ beq $v0, $at, .L80A47228 -/* 04488 80A471B8 3C0880A4 */ lui $t0, %hi(func_80A46B40) ## $t0 = 80A40000 -/* 0448C 80A471BC 24010057 */ addiu $at, $zero, 0x0057 ## $at = 00000057 -/* 04490 80A471C0 10410014 */ beq $v0, $at, .L80A47214 -/* 04494 80A471C4 25086B40 */ addiu $t0, $t0, %lo(func_80A46B40) ## $t0 = 80A46B40 -/* 04498 80A471C8 1000001F */ beq $zero, $zero, .L80A47248 -/* 0449C 80A471CC AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L80A471D0: -/* 044A0 80A471D0 0C01DD76 */ jal func_800775D8 -/* 044A4 80A471D4 00000000 */ nop -/* 044A8 80A471D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044AC 80A471DC 0C291750 */ jal func_80A45D40 -/* 044B0 80A471E0 8FA50024 */ lw $a1, 0x0024($sp) -/* 044B4 80A471E4 10000019 */ beq $zero, $zero, .L80A4724C -/* 044B8 80A471E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A471EC: -/* 044BC 80A471EC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 044C0 80A471F0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 044C4 80A471F4 944E0F18 */ lhu $t6, 0x0F18($v0) ## 8015F578 -/* 044C8 80A471F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044CC 80A471FC 8FA50024 */ lw $a1, 0x0024($sp) -/* 044D0 80A47200 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 044D4 80A47204 0C291750 */ jal func_80A45D40 -/* 044D8 80A47208 A44F0F18 */ sh $t7, 0x0F18($v0) ## 8015F578 -/* 044DC 80A4720C 1000000F */ beq $zero, $zero, .L80A4724C -/* 044E0 80A47210 8FBF001C */ lw $ra, 0x001C($sp) -.L80A47214: -/* 044E4 80A47214 3C028016 */ lui $v0, %hi(gSaveContext) -/* 044E8 80A47218 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 044EC 80A4721C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 044F0 80A47220 10000008 */ beq $zero, $zero, .L80A47244 -/* 044F4 80A47224 A058003E */ sb $t8, 0x003E($v0) ## 8015E69E -.L80A47228: -/* 044F8 80A47228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044FC 80A4722C 0C2916E7 */ jal func_80A45B9C -/* 04500 80A47230 8FA50024 */ lw $a1, 0x0024($sp) -/* 04504 80A47234 3C1980A4 */ lui $t9, %hi(func_80A46D5C) ## $t9 = 80A40000 -/* 04508 80A47238 27396D5C */ addiu $t9, $t9, %lo(func_80A46D5C) ## $t9 = 80A46D5C -/* 0450C 80A4723C 10000002 */ beq $zero, $zero, .L80A47248 -/* 04510 80A47240 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L80A47244: -/* 04514 80A47244 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L80A47248: -/* 04518 80A47248 8FBF001C */ lw $ra, 0x001C($sp) -.L80A4724C: -/* 0451C 80A4724C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04520 80A47250 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04524 80A47254 03E00008 */ jr $ra -/* 04528 80A47258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s deleted file mode 100644 index 6c54ea56e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s +++ /dev/null @@ -1,152 +0,0 @@ -glabel func_80A4725C -/* 0452C 80A4725C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04530 80A47260 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04534 80A47264 AFB00020 */ sw $s0, 0x0020($sp) -/* 04538 80A47268 AFA50034 */ sw $a1, 0x0034($sp) -/* 0453C 80A4726C 90820212 */ lbu $v0, 0x0212($a0) ## 00000212 -/* 04540 80A47270 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04544 80A47274 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04548 80A47278 10400008 */ beq $v0, $zero, .L80A4729C -/* 0454C 80A4727C 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 04550 80A47280 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04554 80A47284 1041002A */ beq $v0, $at, .L80A47330 -/* 04558 80A47288 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0455C 80A4728C 1041005A */ beq $v0, $at, .L80A473F8 -/* 04560 80A47290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04564 80A47294 1000007A */ beq $zero, $zero, .L80A47480 -/* 04568 80A47298 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A4729C: -/* 0456C 80A4729C 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 04570 80A472A0 0C00D3B0 */ jal func_80034EC0 -/* 04574 80A472A4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 04578 80A472A8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0457C 80A472AC 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 04580 80A472B0 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 04584 80A472B4 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 04588 80A472B8 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 0458C 80A472BC 46002180 */ add.s $f6, $f4, $f0 -/* 04590 80A472C0 920C0212 */ lbu $t4, 0x0212($s0) ## 00000212 -/* 04594 80A472C4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 04598 80A472C8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0459C 80A472CC 46003200 */ add.s $f8, $f6, $f0 -/* 045A0 80A472D0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 045A4 80A472D4 01C17824 */ and $t7, $t6, $at -/* 045A8 80A472D8 271905B0 */ addiu $t9, $t8, 0x05B0 ## $t9 = 000005B0 -/* 045AC 80A472DC 4600428D */ trunc.w.s $f10, $f8 -/* 045B0 80A472E0 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 045B4 80A472E4 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 045B8 80A472E8 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 045BC 80A472EC 440A5000 */ mfc1 $t2, $f10 -/* 045C0 80A472F0 A608026E */ sh $t0, 0x026E($s0) ## 0000026E -/* 045C4 80A472F4 A20B0213 */ sb $t3, 0x0213($s0) ## 00000213 -/* 045C8 80A472F8 A200020C */ sb $zero, 0x020C($s0) ## 0000020C -/* 045CC 80A472FC A20D0212 */ sb $t5, 0x0212($s0) ## 00000212 -/* 045D0 80A47300 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 -/* 045D4 80A47304 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 045D8 80A47308 0C03D20F */ jal func_800F483C -/* 045DC 80A4730C A60A0592 */ sh $t2, 0x0592($s0) ## 00000592 -/* 045E0 80A47310 8FA40034 */ lw $a0, 0x0034($sp) -/* 045E4 80A47314 2405105E */ addiu $a1, $zero, 0x105E ## $a1 = 0000105E -/* 045E8 80A47318 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 045EC 80A4731C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 045F0 80A47320 0C02003E */ jal func_800800F8 -/* 045F4 80A47324 AFA00010 */ sw $zero, 0x0010($sp) -/* 045F8 80A47328 10000055 */ beq $zero, $zero, .L80A47480 -/* 045FC 80A4732C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A47330: -/* 04600 80A47330 86030592 */ lh $v1, 0x0592($s0) ## 00000592 -/* 04604 80A47334 3C048013 */ lui $a0, %hi(D_801333D4) -/* 04608 80A47338 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 0460C 80A4733C 14600003 */ bne $v1, $zero, .L80A4734C -/* 04610 80A47340 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 04614 80A47344 10000004 */ beq $zero, $zero, .L80A47358 -/* 04618 80A47348 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A4734C: -/* 0461C 80A4734C A60E0592 */ sh $t6, 0x0592($s0) ## 00000592 -/* 04620 80A47350 86030592 */ lh $v1, 0x0592($s0) ## 00000592 -/* 04624 80A47354 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80A47358: -/* 04628 80A47358 10400013 */ beq $v0, $zero, .L80A473A8 -/* 0462C 80A4735C 2405391D */ addiu $a1, $zero, 0x391D ## $a1 = 0000391D -/* 04630 80A47360 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 04634 80A47364 10610004 */ beq $v1, $at, .L80A47378 -/* 04638 80A47368 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0463C 80A4736C 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 04640 80A47370 54610043 */ bnel $v1, $at, .L80A47480 -/* 04644 80A47374 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A47378: -/* 04648 80A47378 85F807A0 */ lh $t8, 0x07A0($t7) ## 000007A0 -/* 0464C 80A4737C 0018C880 */ sll $t9, $t8, 2 -/* 04650 80A47380 01F94021 */ addu $t0, $t7, $t9 -/* 04654 80A47384 0C016C69 */ jal func_8005B1A4 -/* 04658 80A47388 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 0465C 80A4738C 3C048013 */ lui $a0, %hi(D_801333D4) -/* 04660 80A47390 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 04664 80A47394 240528B5 */ addiu $a1, $zero, 0x28B5 ## $a1 = 000028B5 -/* 04668 80A47398 0C03D149 */ jal func_800F4524 -/* 0466C 80A4739C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 04670 80A473A0 10000037 */ beq $zero, $zero, .L80A47480 -/* 04674 80A473A4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A473A8: -/* 04678 80A473A8 0C03D149 */ jal func_800F4524 -/* 0467C 80A473AC 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 04680 80A473B0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 04684 80A473B4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 04688 80A473B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0468C 80A473BC 0C00D3B0 */ jal func_80034EC0 -/* 04690 80A473C0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04694 80A473C4 8FA40034 */ lw $a0, 0x0034($sp) -/* 04698 80A473C8 0C042DC8 */ jal func_8010B720 -/* 0469C 80A473CC 2405305A */ addiu $a1, $zero, 0x305A ## $a1 = 0000305A -/* 046A0 80A473D0 920A0212 */ lbu $t2, 0x0212($s0) ## 00000212 -/* 046A4 80A473D4 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 046A8 80A473D8 A2090213 */ sb $t1, 0x0213($s0) ## 00000213 -/* 046AC 80A473DC 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 046B0 80A473E0 A20B0212 */ sb $t3, 0x0212($s0) ## 00000212 -/* 046B4 80A473E4 2404007F */ addiu $a0, $zero, 0x007F ## $a0 = 0000007F -/* 046B8 80A473E8 0C03D20F */ jal func_800F483C -/* 046BC 80A473EC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 046C0 80A473F0 10000023 */ beq $zero, $zero, .L80A47480 -/* 046C4 80A473F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A473F8: -/* 046C8 80A473F8 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 046CC 80A473FC 0C0295B2 */ jal Animation_OnFrame -/* 046D0 80A47400 AFA40028 */ sw $a0, 0x0028($sp) -/* 046D4 80A47404 50400003 */ beql $v0, $zero, .L80A47414 -/* 046D8 80A47408 8FA40034 */ lw $a0, 0x0034($sp) -/* 046DC 80A4740C A2000213 */ sb $zero, 0x0213($s0) ## 00000213 -/* 046E0 80A47410 8FA40034 */ lw $a0, 0x0034($sp) -.L80A47414: -/* 046E4 80A47414 0C042F6F */ jal func_8010BDBC -/* 046E8 80A47418 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 046EC 80A4741C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 046F0 80A47420 14410016 */ bne $v0, $at, .L80A4747C -/* 046F4 80A47424 8FA40028 */ lw $a0, 0x0028($sp) -/* 046F8 80A47428 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 046FC 80A4742C 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 04700 80A47430 0C00D3B0 */ jal func_80034EC0 -/* 04704 80A47434 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04708 80A47438 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 0470C 80A4743C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04710 80A47440 C612015C */ lwc1 $f18, 0x015C($s0) ## 0000015C -/* 04714 80A47444 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 04718 80A47448 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0471C 80A4744C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 04720 80A47450 A60E026E */ sh $t6, 0x026E($s0) ## 0000026E -/* 04724 80A47454 E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 -/* 04728 80A47458 E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 -/* 0472C 80A4745C 8FA50034 */ lw $a1, 0x0034($sp) -/* 04730 80A47460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04734 80A47464 0C290D09 */ jal func_80A43424 -/* 04738 80A47468 24060026 */ addiu $a2, $zero, 0x0026 ## $a2 = 00000026 -/* 0473C 80A4746C 3C1880A4 */ lui $t8, %hi(func_80A470E8) ## $t8 = 80A40000 -/* 04740 80A47470 271870E8 */ addiu $t8, $t8, %lo(func_80A470E8) ## $t8 = 80A470E8 -/* 04744 80A47474 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 04748 80A47478 A2000212 */ sb $zero, 0x0212($s0) ## 00000212 -.L80A4747C: -/* 0474C 80A4747C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A47480: -/* 04750 80A47480 8FB00020 */ lw $s0, 0x0020($sp) -/* 04754 80A47484 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04758 80A47488 03E00008 */ jr $ra -/* 0475C 80A4748C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s deleted file mode 100644 index 0047231d3b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80A47490 -/* 04760 80A47490 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04764 80A47494 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04768 80A47498 AFA50024 */ sw $a1, 0x0024($sp) -/* 0476C 80A4749C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 04770 80A474A0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04774 80A474A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04778 80A474A8 AFAF001C */ sw $t7, 0x001C($sp) -/* 0477C 80A474AC 90820212 */ lbu $v0, 0x0212($a0) ## 00000212 -/* 04780 80A474B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 04784 80A474B4 10400005 */ beq $v0, $zero, .L80A474CC -/* 04788 80A474B8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 0478C 80A474BC 50410014 */ beql $v0, $at, .L80A47510 -/* 04790 80A474C0 8FA40024 */ lw $a0, 0x0024($sp) -/* 04794 80A474C4 10000029 */ beq $zero, $zero, .L80A4756C -/* 04798 80A474C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A474CC: -/* 0479C 80A474CC 0C042F6F */ jal func_8010BDBC -/* 047A0 80A474D0 AFA70020 */ sw $a3, 0x0020($sp) -/* 047A4 80A474D4 14400024 */ bne $v0, $zero, .L80A47568 -/* 047A8 80A474D8 8FA70020 */ lw $a3, 0x0020($sp) -/* 047AC 80A474DC 8FA40024 */ lw $a0, 0x0024($sp) -/* 047B0 80A474E0 24053031 */ addiu $a1, $zero, 0x3031 ## $a1 = 00003031 -/* 047B4 80A474E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 047B8 80A474E8 0C042DA0 */ jal func_8010B680 -/* 047BC 80A474EC AFA70020 */ sw $a3, 0x0020($sp) -/* 047C0 80A474F0 8FB9001C */ lw $t9, 0x001C($sp) -/* 047C4 80A474F4 8FA70020 */ lw $a3, 0x0020($sp) -/* 047C8 80A474F8 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 047CC 80A474FC A7380110 */ sh $t8, 0x0110($t9) ## 00000110 -/* 047D0 80A47500 90E80212 */ lbu $t0, 0x0212($a3) ## 00000212 -/* 047D4 80A47504 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 047D8 80A47508 A0E90212 */ sb $t1, 0x0212($a3) ## 00000212 -/* 047DC 80A4750C 8FA40024 */ lw $a0, 0x0024($sp) -.L80A47510: -/* 047E0 80A47510 AFA70020 */ sw $a3, 0x0020($sp) -/* 047E4 80A47514 0C042F6F */ jal func_8010BDBC -/* 047E8 80A47518 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 047EC 80A4751C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 047F0 80A47520 10410005 */ beq $v0, $at, .L80A47538 -/* 047F4 80A47524 8FA70020 */ lw $a3, 0x0020($sp) -/* 047F8 80A47528 8FAB001C */ lw $t3, 0x001C($sp) -/* 047FC 80A4752C 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 04800 80A47530 1000000D */ beq $zero, $zero, .L80A47568 -/* 04804 80A47534 A56A0110 */ sh $t2, 0x0110($t3) ## 00000110 -.L80A47538: -/* 04808 80A47538 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0480C 80A4753C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 04810 80A47540 944C0F18 */ lhu $t4, 0x0F18($v0) ## 8015F578 -/* 04814 80A47544 3C0F80A4 */ lui $t7, %hi(func_80A4696C) ## $t7 = 80A40000 -/* 04818 80A47548 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0481C 80A4754C 358D1000 */ ori $t5, $t4, 0x1000 ## $t5 = 00001000 -/* 04820 80A47550 A44D0F18 */ sh $t5, 0x0F18($v0) ## 8015F578 -/* 04824 80A47554 25EF696C */ addiu $t7, $t7, %lo(func_80A4696C) ## $t7 = 80A4696C -/* 04828 80A47558 A4EE026E */ sh $t6, 0x026E($a3) ## 0000026E -/* 0482C 80A4755C A0E00211 */ sb $zero, 0x0211($a3) ## 00000211 -/* 04830 80A47560 A0E0020F */ sb $zero, 0x020F($a3) ## 0000020F -/* 04834 80A47564 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -.L80A47568: -/* 04838 80A47568 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A4756C: -/* 0483C 80A4756C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04840 80A47570 03E00008 */ jr $ra -/* 04844 80A47574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s deleted file mode 100644 index 6c60c6a30d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s +++ /dev/null @@ -1,237 +0,0 @@ -.late_rodata -glabel jtbl_80A487AC - .word L80A475D4 - .word L80A4788C - .word L80A47728 - .word L80A477EC - .word L80A47860 - -.text -glabel func_80A47578 -/* 04848 80A47578 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0484C 80A4757C AFBF001C */ sw $ra, 0x001C($sp) -/* 04850 80A47580 AFB00018 */ sw $s0, 0x0018($sp) -/* 04854 80A47584 AFA5003C */ sw $a1, 0x003C($sp) -/* 04858 80A47588 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0485C 80A4758C 3C1980A5 */ lui $t9, %hi(D_80A4854C) ## $t9 = 80A50000 -/* 04860 80A47590 2739854C */ addiu $t9, $t9, %lo(D_80A4854C) ## $t9 = 80A4854C -/* 04864 80A47594 AFAF0034 */ sw $t7, 0x0034($sp) -/* 04868 80A47598 8F290000 */ lw $t1, 0x0000($t9) ## 80A4854C -/* 0486C 80A4759C 27B8002C */ addiu $t8, $sp, 0x002C ## $t8 = FFFFFFF4 -/* 04870 80A475A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04874 80A475A4 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFF4 -/* 04878 80A475A8 97290004 */ lhu $t1, 0x0004($t9) ## 80A48550 -/* 0487C 80A475AC A7090004 */ sh $t1, 0x0004($t8) ## FFFFFFF8 -/* 04880 80A475B0 908A0212 */ lbu $t2, 0x0212($a0) ## 00000212 -/* 04884 80A475B4 2D410005 */ sltiu $at, $t2, 0x0005 -/* 04888 80A475B8 102000B4 */ beq $at, $zero, .L80A4788C -/* 0488C 80A475BC 000A5080 */ sll $t2, $t2, 2 -/* 04890 80A475C0 3C0180A5 */ lui $at, %hi(jtbl_80A487AC) ## $at = 80A50000 -/* 04894 80A475C4 002A0821 */ addu $at, $at, $t2 -/* 04898 80A475C8 8C2A87AC */ lw $t2, %lo(jtbl_80A487AC)($at) -/* 0489C 80A475CC 01400008 */ jr $t2 -/* 048A0 80A475D0 00000000 */ nop -glabel L80A475D4 -/* 048A4 80A475D4 8FA4003C */ lw $a0, 0x003C($sp) -/* 048A8 80A475D8 0C042F6F */ jal func_8010BDBC -/* 048AC 80A475DC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 048B0 80A475E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 048B4 80A475E4 144100A9 */ bne $v0, $at, .L80A4788C -/* 048B8 80A475E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 048BC 80A475EC 0C2918B6 */ jal func_80A462D8 -/* 048C0 80A475F0 8FA5003C */ lw $a1, 0x003C($sp) -/* 048C4 80A475F4 8FAC003C */ lw $t4, 0x003C($sp) -/* 048C8 80A475F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 048CC 80A475FC 240B0037 */ addiu $t3, $zero, 0x0037 ## $t3 = 00000037 -/* 048D0 80A47600 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 -/* 048D4 80A47604 002C0821 */ addu $at, $at, $t4 -/* 048D8 80A47608 A02B03DC */ sb $t3, 0x03DC($at) ## 000103DC -/* 048DC 80A4760C 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 048E0 80A47610 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 048E4 80A47614 0C00D3B0 */ jal func_80034EC0 -/* 048E8 80A47618 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 048EC 80A4761C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 048F0 80A47620 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 048F4 80A47624 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 048F8 80A47628 A20D0210 */ sb $t5, 0x0210($s0) ## 00000210 -/* 048FC 80A4762C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04900 80A47630 0C291361 */ jal func_80A44D84 -/* 04904 80A47634 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 04908 80A47638 8A0F0030 */ lwl $t7, 0x0030($s0) ## 00000030 -/* 0490C 80A4763C 9A0F0033 */ lwr $t7, 0x0033($s0) ## 00000033 -/* 04910 80A47640 8FA30034 */ lw $v1, 0x0034($sp) -/* 04914 80A47644 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 04918 80A47648 AA0F00B4 */ swl $t7, 0x00B4($s0) ## 000000B4 -/* 0491C 80A4764C BA0F00B7 */ swr $t7, 0x00B7($s0) ## 000000B7 -/* 04920 80A47650 960F0034 */ lhu $t7, 0x0034($s0) ## 00000034 -/* 04924 80A47654 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04928 80A47658 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 0492C 80A4765C 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 04930 80A47660 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 04934 80A47664 A6180592 */ sh $t8, 0x0592($s0) ## 00000592 -/* 04938 80A47668 A60F00B8 */ sh $t7, 0x00B8($s0) ## 000000B8 -/* 0493C 80A4766C E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 04940 80A47670 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 04944 80A47674 8CA80000 */ lw $t0, 0x0000($a1) ## FFFFFFF4 -/* 04948 80A47678 920B0212 */ lbu $t3, 0x0212($s0) ## 00000212 -/* 0494C 80A4767C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 04950 80A47680 AA08019C */ swl $t0, 0x019C($s0) ## 0000019C -/* 04954 80A47684 BA08019F */ swr $t0, 0x019F($s0) ## 0000019F -/* 04958 80A47688 94A80004 */ lhu $t0, 0x0004($a1) ## FFFFFFF8 -/* 0495C 80A4768C 256D0001 */ addiu $t5, $t3, 0x0001 ## $t5 = 00000001 -/* 04960 80A47690 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000002 -/* 04964 80A47694 A60801A0 */ sh $t0, 0x01A0($s0) ## 000001A0 -/* 04968 80A47698 8CAA0000 */ lw $t2, 0x0000($a1) ## FFFFFFF4 -/* 0496C 80A4769C AA0A01A2 */ swl $t2, 0x01A2($s0) ## 000001A2 -/* 04970 80A476A0 BA0A01A5 */ swr $t2, 0x01A5($s0) ## 000001A5 -/* 04974 80A476A4 94AA0004 */ lhu $t2, 0x0004($a1) ## FFFFFFF8 -/* 04978 80A476A8 A20D0212 */ sb $t5, 0x0212($s0) ## 00000212 -/* 0497C 80A476AC A20E0212 */ sb $t6, 0x0212($s0) ## 00000212 -/* 04980 80A476B0 A60A01A6 */ sh $t2, 0x01A6($s0) ## 000001A6 -/* 04984 80A476B4 A46F0032 */ sh $t7, 0x0032($v1) ## 00000032 -/* 04988 80A476B8 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 0498C 80A476BC A47800B6 */ sh $t8, 0x00B6($v1) ## 000000B6 -/* 04990 80A476C0 0C01DE1C */ jal Math_SinS - ## sins? -/* 04994 80A476C4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 04998 80A476C8 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 0499C 80A476CC 44815000 */ mtc1 $at, $f10 ## $f10 = -30.00 -/* 049A0 80A476D0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 049A4 80A476D4 8FB90034 */ lw $t9, 0x0034($sp) -/* 049A8 80A476D8 460A0402 */ mul.s $f16, $f0, $f10 -/* 049AC 80A476DC 46128100 */ add.s $f4, $f16, $f18 -/* 049B0 80A476E0 E7240024 */ swc1 $f4, 0x0024($t9) ## 00000024 -/* 049B4 80A476E4 0C01DE0D */ jal Math_CosS - ## coss? -/* 049B8 80A476E8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 049BC 80A476EC 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 049C0 80A476F0 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 -/* 049C4 80A476F4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 049C8 80A476F8 8FA80034 */ lw $t0, 0x0034($sp) -/* 049CC 80A476FC 46060202 */ mul.s $f8, $f0, $f6 -/* 049D0 80A47700 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 049D4 80A47704 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 049D8 80A47708 460A4400 */ add.s $f16, $f8, $f10 -/* 049DC 80A4770C E510002C */ swc1 $f16, 0x002C($t0) ## 0000002C -/* 049E0 80A47710 0C00B7D5 */ jal func_8002DF54 -/* 049E4 80A47714 8FA4003C */ lw $a0, 0x003C($sp) -/* 049E8 80A47718 0C03D719 */ jal func_800F5C64 -/* 049EC 80A4771C 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 049F0 80A47720 1000005B */ beq $zero, $zero, .L80A47890 -/* 049F4 80A47724 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80A47728 -/* 049F8 80A47728 86020592 */ lh $v0, 0x0592($s0) ## 00000592 -/* 049FC 80A4772C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04A00 80A47730 14400003 */ bne $v0, $zero, .L80A47740 -/* 04A04 80A47734 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 04A08 80A47738 10000004 */ beq $zero, $zero, .L80A4774C -/* 04A0C 80A4773C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A47740: -/* 04A10 80A47740 A6090592 */ sh $t1, 0x0592($s0) ## 00000592 -/* 04A14 80A47744 86020592 */ lh $v0, 0x0592($s0) ## 00000592 -/* 04A18 80A47748 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80A4774C: -/* 04A1C 80A4774C 5060000F */ beql $v1, $zero, .L80A4778C -/* 04A20 80A47750 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 04A24 80A47754 04410004 */ bgez $v0, .L80A47768 -/* 04A28 80A47758 304A0007 */ andi $t2, $v0, 0x0007 ## $t2 = 00000000 -/* 04A2C 80A4775C 11400002 */ beq $t2, $zero, .L80A47768 -/* 04A30 80A47760 00000000 */ nop -/* 04A34 80A47764 254AFFF8 */ addiu $t2, $t2, 0xFFF8 ## $t2 = FFFFFFF8 -.L80A47768: -/* 04A38 80A47768 15400003 */ bne $t2, $zero, .L80A47778 -/* 04A3C 80A4776C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A40 80A47770 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04A44 80A47774 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 -.L80A47778: -/* 04A48 80A47778 0C00B638 */ jal Actor_MoveForward - -/* 04A4C 80A4777C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A50 80A47780 10000043 */ beq $zero, $zero, .L80A47890 -/* 04A54 80A47784 8FBF001C */ lw $ra, 0x001C($sp) -/* 04A58 80A47788 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A4778C: -/* 04A5C 80A4778C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 04A60 80A47790 A6000592 */ sh $zero, 0x0592($s0) ## 00000592 -/* 04A64 80A47794 3042FC00 */ andi $v0, $v0, 0xFC00 ## $v0 = 00000000 -/* 04A68 80A47798 00021283 */ sra $v0, $v0, 10 -/* 04A6C 80A4779C 1041000F */ beq $v0, $at, .L80A477DC -/* 04A70 80A477A0 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 04A74 80A477A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04A78 80A477A8 1041000C */ beq $v0, $at, .L80A477DC -/* 04A7C 80A477AC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04A80 80A477B0 1041000A */ beq $v0, $at, .L80A477DC -/* 04A84 80A477B4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04A88 80A477B8 10410008 */ beq $v0, $at, .L80A477DC -/* 04A8C 80A477BC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 04A90 80A477C0 10410006 */ beq $v0, $at, .L80A477DC -/* 04A94 80A477C4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 04A98 80A477C8 50410005 */ beql $v0, $at, .L80A477E0 -/* 04A9C 80A477CC 920D0212 */ lbu $t5, 0x0212($s0) ## 00000212 -/* 04AA0 80A477D0 920B0212 */ lbu $t3, 0x0212($s0) ## 00000212 -/* 04AA4 80A477D4 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 04AA8 80A477D8 A20C0212 */ sb $t4, 0x0212($s0) ## 00000212 -.L80A477DC: -/* 04AAC 80A477DC 920D0212 */ lbu $t5, 0x0212($s0) ## 00000212 -.L80A477E0: -/* 04AB0 80A477E0 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 04AB4 80A477E4 10000029 */ beq $zero, $zero, .L80A4788C -/* 04AB8 80A477E8 A20E0212 */ sb $t6, 0x0212($s0) ## 00000212 -glabel L80A477EC -/* 04ABC 80A477EC 860F0592 */ lh $t7, 0x0592($s0) ## 00000592 -/* 04AC0 80A477F0 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 04AC4 80A477F4 A6180592 */ sh $t8, 0x0592($s0) ## 00000592 -/* 04AC8 80A477F8 86020592 */ lh $v0, 0x0592($s0) ## 00000592 -/* 04ACC 80A477FC 04410004 */ bgez $v0, .L80A47810 -/* 04AD0 80A47800 30590007 */ andi $t9, $v0, 0x0007 ## $t9 = 00000000 -/* 04AD4 80A47804 13200002 */ beq $t9, $zero, .L80A47810 -/* 04AD8 80A47808 00000000 */ nop -/* 04ADC 80A4780C 2739FFF8 */ addiu $t9, $t9, 0xFFF8 ## $t9 = FFFFFFF8 -.L80A47810: -/* 04AE0 80A47810 17200006 */ bne $t9, $zero, .L80A4782C -/* 04AE4 80A47814 2841000A */ slti $at, $v0, 0x000A -/* 04AE8 80A47818 10200004 */ beq $at, $zero, .L80A4782C -/* 04AEC 80A4781C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AF0 80A47820 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04AF4 80A47824 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 -/* 04AF8 80A47828 86020592 */ lh $v0, 0x0592($s0) ## 00000592 -.L80A4782C: -/* 04AFC 80A4782C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 04B00 80A47830 14410004 */ bne $v0, $at, .L80A47844 -/* 04B04 80A47834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04B08 80A47838 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04B0C 80A4783C 240528DB */ addiu $a1, $zero, 0x28DB ## $a1 = 000028DB -/* 04B10 80A47840 86020592 */ lh $v0, 0x0592($s0) ## 00000592 -.L80A47844: -/* 04B14 80A47844 2841002D */ slti $at, $v0, 0x002D -/* 04B18 80A47848 14200010 */ bne $at, $zero, .L80A4788C -/* 04B1C 80A4784C 8FA4003C */ lw $a0, 0x003C($sp) -/* 04B20 80A47850 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 04B24 80A47854 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 04B28 80A47858 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 04B2C 80A4785C 240728DC */ addiu $a3, $zero, 0x28DC ## $a3 = 000028DC -glabel L80A47860 -/* 04B30 80A47860 0C041B33 */ jal func_80106CCC -/* 04B34 80A47864 8FA4003C */ lw $a0, 0x003C($sp) -/* 04B38 80A47868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04B3C 80A4786C 0C2918F6 */ jal func_80A463D8 -/* 04B40 80A47870 8FA5003C */ lw $a1, 0x003C($sp) -/* 04B44 80A47874 8FA4003C */ lw $a0, 0x003C($sp) -/* 04B48 80A47878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04B4C 80A4787C 0C00B7D5 */ jal func_8002DF54 -/* 04B50 80A47880 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 04B54 80A47884 0C00B55C */ jal Actor_Kill - -/* 04B58 80A47888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L80A4788C -.L80A4788C: -/* 04B5C 80A4788C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A47890: -/* 04B60 80A47890 8FB00018 */ lw $s0, 0x0018($sp) -/* 04B64 80A47894 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 04B68 80A47898 03E00008 */ jr $ra -/* 04B6C 80A4789C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s deleted file mode 100644 index 34be9393d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s +++ /dev/null @@ -1,79 +0,0 @@ -.rdata -glabel D_80A485CC - .asciz "../z_en_go2.c" - .balign 4 - -glabel D_80A485DC - .asciz "../z_en_go2.c" - .balign 4 - -glabel D_80A485EC - .asciz "../z_en_go2.c" - .balign 4 - -.text -glabel func_80A479B0 -/* 04C80 80A479B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 04C84 80A479B4 3C0F80A5 */ lui $t7, %hi(D_80A48554) ## $t7 = 80A50000 -/* 04C88 80A479B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 04C8C 80A479BC AFB00018 */ sw $s0, 0x0018($sp) -/* 04C90 80A479C0 AFA40050 */ sw $a0, 0x0050($sp) -/* 04C94 80A479C4 AFA50054 */ sw $a1, 0x0054($sp) -/* 04C98 80A479C8 25EF8554 */ addiu $t7, $t7, %lo(D_80A48554) ## $t7 = 80A48554 -/* 04C9C 80A479CC 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48554 -/* 04CA0 80A479D0 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 04CA4 80A479D4 8DF80004 */ lw $t8, 0x0004($t7) ## 80A48558 -/* 04CA8 80A479D8 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 04CAC 80A479DC 8DF90008 */ lw $t9, 0x0008($t7) ## 80A4855C -/* 04CB0 80A479E0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 04CB4 80A479E4 3C0680A5 */ lui $a2, %hi(D_80A485CC) ## $a2 = 80A50000 -/* 04CB8 80A479E8 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 04CBC 80A479EC 8FA80054 */ lw $t0, 0x0054($sp) -/* 04CC0 80A479F0 24C685CC */ addiu $a2, $a2, %lo(D_80A485CC) ## $a2 = 80A485CC -/* 04CC4 80A479F4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 04CC8 80A479F8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 04CCC 80A479FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 04CD0 80A47A00 0C031AB1 */ jal Graph_OpenDisps -/* 04CD4 80A47A04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04CD8 80A47A08 8FA90054 */ lw $t1, 0x0054($sp) -/* 04CDC 80A47A0C 0C024F46 */ jal func_80093D18 -/* 04CE0 80A47A10 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 04CE4 80A47A14 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04CE8 80A47A18 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 04CEC 80A47A1C 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 04CF0 80A47A20 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04CF4 80A47A24 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 04CF8 80A47A28 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04CFC 80A47A2C 8FAC0054 */ lw $t4, 0x0054($sp) -/* 04D00 80A47A30 3C0580A5 */ lui $a1, %hi(D_80A485DC) ## $a1 = 80A50000 -/* 04D04 80A47A34 24A585DC */ addiu $a1, $a1, %lo(D_80A485DC) ## $a1 = 80A485DC -/* 04D08 80A47A38 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 04D0C 80A47A3C 24060B44 */ addiu $a2, $zero, 0x0B44 ## $a2 = 00000B44 -/* 04D10 80A47A40 0C0346A2 */ jal Matrix_NewMtx -/* 04D14 80A47A44 AFA2002C */ sw $v0, 0x002C($sp) -/* 04D18 80A47A48 8FA3002C */ lw $v1, 0x002C($sp) -/* 04D1C 80A47A4C 3C0F0601 */ lui $t7, %hi(D_0600BD80) ## $t7 = 06010000 -/* 04D20 80A47A50 25EFBD80 */ addiu $t7, $t7, %lo(D_0600BD80) ## $t7 = 0600BD80 -/* 04D24 80A47A54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04D28 80A47A58 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04D2C 80A47A5C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 04D30 80A47A60 3C0680A5 */ lui $a2, %hi(D_80A485EC) ## $a2 = 80A50000 -/* 04D34 80A47A64 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04D38 80A47A68 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 04D3C 80A47A6C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04D40 80A47A70 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04D44 80A47A74 8FB80054 */ lw $t8, 0x0054($sp) -/* 04D48 80A47A78 24C685EC */ addiu $a2, $a2, %lo(D_80A485EC) ## $a2 = 80A485EC -/* 04D4C 80A47A7C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 04D50 80A47A80 24070B49 */ addiu $a3, $zero, 0x0B49 ## $a3 = 00000B49 -/* 04D54 80A47A84 0C031AD5 */ jal Graph_CloseDisps -/* 04D58 80A47A88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 04D5C 80A47A8C 8FA50050 */ lw $a1, 0x0050($sp) -/* 04D60 80A47A90 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFF4 -/* 04D64 80A47A94 0C0346BD */ jal Matrix_MultVec3f -/* 04D68 80A47A98 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 04D6C 80A47A9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04D70 80A47AA0 8FB00018 */ lw $s0, 0x0018($sp) -/* 04D74 80A47AA4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 04D78 80A47AA8 03E00008 */ jr $ra -/* 04D7C 80A47AAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s deleted file mode 100644 index 545fd36e18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ /dev/null @@ -1,109 +0,0 @@ -.rdata -glabel D_80A485FC - .asciz "../z_en_go2.c" - .balign 4 - -glabel D_80A4860C - .asciz "../z_en_go2.c" - .balign 4 - -glabel D_80A4861C - .asciz "../z_en_go2.c" - .balign 4 - -.text -glabel func_80A47AB0 -/* 04D80 80A47AB0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 04D84 80A47AB4 3C0F80A5 */ lui $t7, %hi(D_80A48560) ## $t7 = 80A50000 -/* 04D88 80A47AB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 04D8C 80A47ABC AFB10018 */ sw $s1, 0x0018($sp) -/* 04D90 80A47AC0 AFB00014 */ sw $s0, 0x0014($sp) -/* 04D94 80A47AC4 AFA40058 */ sw $a0, 0x0058($sp) -/* 04D98 80A47AC8 25EF8560 */ addiu $t7, $t7, %lo(D_80A48560) ## $t7 = 80A48560 -/* 04D9C 80A47ACC 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48560 -/* 04DA0 80A47AD0 27AE0048 */ addiu $t6, $sp, 0x0048 ## $t6 = FFFFFFF0 -/* 04DA4 80A47AD4 8DF80004 */ lw $t8, 0x0004($t7) ## 80A48564 -/* 04DA8 80A47AD8 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 04DAC 80A47ADC 8DF90008 */ lw $t9, 0x0008($t7) ## 80A48568 -/* 04DB0 80A47AE0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04DB4 80A47AE4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 04DB8 80A47AE8 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 04DBC 80A47AEC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 04DC0 80A47AF0 3C0680A5 */ lui $a2, %hi(D_80A485FC) ## $a2 = 80A50000 -/* 04DC4 80A47AF4 24C685FC */ addiu $a2, $a2, %lo(D_80A485FC) ## $a2 = 80A485FC -/* 04DC8 80A47AF8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 -/* 04DCC 80A47AFC 24070B62 */ addiu $a3, $zero, 0x0B62 ## $a3 = 00000B62 -/* 04DD0 80A47B00 0C031AB1 */ jal Graph_OpenDisps -/* 04DD4 80A47B04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 -/* 04DDC 80A47B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04DE0 80A47B10 8FA20058 */ lw $v0, 0x0058($sp) -/* 04DE4 80A47B14 3C0880A4 */ lui $t0, %hi(func_80A47024) ## $t0 = 80A40000 -/* 04DE8 80A47B18 25087024 */ addiu $t0, $t0, %lo(func_80A47024) ## $t0 = 80A47024 -/* 04DEC 80A47B1C 8C490190 */ lw $t1, 0x0190($v0) ## 00000190 -/* 04DF0 80A47B20 55090005 */ bnel $t0, $t1, .L80A47B38 -/* 04DF4 80A47B24 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 -/* 04DF8 80A47B28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04DFC 80A47B2C 10000003 */ beq $zero, $zero, .L80A47B3C -/* 04E00 80A47B30 4600010D */ trunc.w.s $f4, $f0 -/* 04E04 80A47B34 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 -.L80A47B38: -/* 04E08 80A47B38 4600010D */ trunc.w.s $f4, $f0 -.L80A47B3C: -/* 04E0C 80A47B3C 8E2A009C */ lw $t2, 0x009C($s1) ## 0000009C -/* 04E10 80A47B40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04E14 80A47B44 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 04E18 80A47B48 440C2000 */ mfc1 $t4, $f4 -/* 04E1C 80A47B4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04E20 80A47B50 000C6C00 */ sll $t5, $t4, 16 -/* 04E24 80A47B54 000D7403 */ sra $t6, $t5, 16 -/* 04E28 80A47B58 000E7880 */ sll $t7, $t6, 2 -/* 04E2C 80A47B5C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E30 80A47B60 000F7880 */ sll $t7, $t7, 2 -/* 04E34 80A47B64 01EE7823 */ subu $t7, $t7, $t6 -/* 04E38 80A47B68 000F7900 */ sll $t7, $t7, 4 -/* 04E3C 80A47B6C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E40 80A47B70 000F78C0 */ sll $t7, $t7, 3 -/* 04E44 80A47B74 014F0019 */ multu $t2, $t7 -/* 04E48 80A47B78 00002012 */ mflo $a0 -/* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 -/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateRPY -/* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 -/* 04E58 80A47B88 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04E5C 80A47B8C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 04E60 80A47B90 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 04E64 80A47B94 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04E68 80A47B98 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 04E6C 80A47B9C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04E70 80A47BA0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04E74 80A47BA4 3C0580A5 */ lui $a1, %hi(D_80A4860C) ## $a1 = 80A50000 -/* 04E78 80A47BA8 24A5860C */ addiu $a1, $a1, %lo(D_80A4860C) ## $a1 = 80A4860C -/* 04E7C 80A47BAC 24060B6E */ addiu $a2, $zero, 0x0B6E ## $a2 = 00000B6E -/* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx -/* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) -/* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) -/* 04E8C 80A47BBC 3C0B0601 */ lui $t3, %hi(D_0600C140) ## $t3 = 06010000 -/* 04E90 80A47BC0 256BC140 */ addiu $t3, $t3, %lo(D_0600C140) ## $t3 = 0600C140 -/* 04E94 80A47BC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04E98 80A47BC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 04E9C 80A47BCC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 04EA0 80A47BD0 3C0680A5 */ lui $a2, %hi(D_80A4861C) ## $a2 = 80A50000 -/* 04EA4 80A47BD4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 04EA8 80A47BD8 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 04EAC 80A47BDC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 04EB0 80A47BE0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04EB4 80A47BE4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04EB8 80A47BE8 24C6861C */ addiu $a2, $a2, %lo(D_80A4861C) ## $a2 = 80A4861C -/* 04EBC 80A47BEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 -/* 04EC0 80A47BF0 0C031AD5 */ jal Graph_CloseDisps -/* 04EC4 80A47BF4 24070B72 */ addiu $a3, $zero, 0x0B72 ## $a3 = 00000B72 -/* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) -/* 04ECC 80A47BFC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 -/* 04ED0 80A47C00 0C0346BD */ jal Matrix_MultVec3f -/* 04ED4 80A47C04 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 04ED8 80A47C08 8FBF001C */ lw $ra, 0x001C($sp) -/* 04EDC 80A47C0C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04EE0 80A47C10 8FB10018 */ lw $s1, 0x0018($sp) -/* 04EE4 80A47C14 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 04EE8 80A47C18 03E00008 */ jr $ra -/* 04EEC 80A47C1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s deleted file mode 100644 index 533eb463ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s +++ /dev/null @@ -1,154 +0,0 @@ -.late_rodata -glabel D_80A487C4 - .float 3.14159274101 - -glabel D_80A487C8 - .float 3.14159274101 - -glabel D_80A487CC - .float 3.14159274101 - -glabel D_80A487D0 - .float 3.14159274101 - -.text -glabel func_80A47C20 -/* 04EF0 80A47C20 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 04EF4 80A47C24 AFB00018 */ sw $s0, 0x0018($sp) -/* 04EF8 80A47C28 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 04EFC 80A47C2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04F00 80A47C30 AFBF001C */ sw $ra, 0x001C($sp) -/* 04F04 80A47C34 AFA40038 */ sw $a0, 0x0038($sp) -/* 04F08 80A47C38 AFA60040 */ sw $a2, 0x0040($sp) -/* 04F0C 80A47C3C 14A1002D */ bne $a1, $at, .L80A47CF4 -/* 04F10 80A47C40 AFA70044 */ sw $a3, 0x0044($sp) -/* 04F14 80A47C44 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 04F18 80A47C48 3C01452F */ lui $at, 0x452F ## $at = 452F0000 -/* 04F1C 80A47C4C 44816000 */ mtc1 $at, $f12 ## $f12 = 2800.00 -/* 04F20 80A47C50 44067000 */ mfc1 $a2, $f14 -/* 04F24 80A47C54 0C034261 */ jal Matrix_Translate -/* 04F28 80A47C58 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04F2C 80A47C5C 8FAF004C */ lw $t7, 0x004C($sp) -/* 04F30 80A47C60 27AE002C */ addiu $t6, $sp, 0x002C ## $t6 = FFFFFFF4 -/* 04F34 80A47C64 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 04F38 80A47C68 89F9019C */ lwl $t9, 0x019C($t7) ## 0000019C -/* 04F3C 80A47C6C 99F9019F */ lwr $t9, 0x019F($t7) ## 0000019F -/* 04F40 80A47C70 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 04F44 80A47C74 3C0180A5 */ lui $at, %hi(D_80A487C4) ## $at = 80A50000 -/* 04F48 80A47C78 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 04F4C 80A47C7C 95F901A0 */ lhu $t9, 0x01A0($t7) ## 000001A0 -/* 04F50 80A47C80 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04F54 80A47C84 A5D90004 */ sh $t9, 0x0004($t6) ## FFFFFFF8 -/* 04F58 80A47C88 87A8002E */ lh $t0, 0x002E($sp) -/* 04F5C 80A47C8C C43087C4 */ lwc1 $f16, %lo(D_80A487C4)($at) -/* 04F60 80A47C90 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04F64 80A47C94 00000000 */ nop -/* 04F68 80A47C98 468021A0 */ cvt.s.w $f6, $f4 -/* 04F6C 80A47C9C 46083283 */ div.s $f10, $f6, $f8 -/* 04F70 80A47CA0 46105302 */ mul.s $f12, $f10, $f16 -/* 04F74 80A47CA4 0C0342DC */ jal Matrix_RotateX -/* 04F78 80A47CA8 00000000 */ nop -/* 04F7C 80A47CAC 87A9002C */ lh $t1, 0x002C($sp) -/* 04F80 80A47CB0 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 04F84 80A47CB4 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 04F88 80A47CB8 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 04F8C 80A47CBC 3C0180A5 */ lui $at, %hi(D_80A487C8) ## $at = 80A50000 -/* 04F90 80A47CC0 C42A87C8 */ lwc1 $f10, %lo(D_80A487C8)($at) -/* 04F94 80A47CC4 46809120 */ cvt.s.w $f4, $f18 -/* 04F98 80A47CC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04F9C 80A47CCC 46062203 */ div.s $f8, $f4, $f6 -/* 04FA0 80A47CD0 460A4302 */ mul.s $f12, $f8, $f10 -/* 04FA4 80A47CD4 0C0343B5 */ jal Matrix_RotateZ -/* 04FA8 80A47CD8 00000000 */ nop -/* 04FAC 80A47CDC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 04FB0 80A47CE0 3C01C52F */ lui $at, 0xC52F ## $at = C52F0000 -/* 04FB4 80A47CE4 44816000 */ mtc1 $at, $f12 ## $f12 = -2800.00 -/* 04FB8 80A47CE8 44067000 */ mfc1 $a2, $f14 -/* 04FBC 80A47CEC 0C034261 */ jal Matrix_Translate -/* 04FC0 80A47CF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A47CF4: -/* 04FC4 80A47CF4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 04FC8 80A47CF8 16010020 */ bne $s0, $at, .L80A47D7C -/* 04FCC 80A47CFC 8FAB004C */ lw $t3, 0x004C($sp) -/* 04FD0 80A47D00 896D01A2 */ lwl $t5, 0x01A2($t3) ## 000001A2 -/* 04FD4 80A47D04 996D01A5 */ lwr $t5, 0x01A5($t3) ## 000001A5 -/* 04FD8 80A47D08 27AA002C */ addiu $t2, $sp, 0x002C ## $t2 = FFFFFFF4 -/* 04FDC 80A47D0C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 04FE0 80A47D10 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFF4 -/* 04FE4 80A47D14 956D01A6 */ lhu $t5, 0x01A6($t3) ## 000001A6 -/* 04FE8 80A47D18 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 04FEC 80A47D1C 3C0180A5 */ lui $at, %hi(D_80A487CC) ## $at = 80A50000 -/* 04FF0 80A47D20 A54D0004 */ sh $t5, 0x0004($t2) ## FFFFFFF8 -/* 04FF4 80A47D24 87AE002E */ lh $t6, 0x002E($sp) -/* 04FF8 80A47D28 C42887CC */ lwc1 $f8, %lo(D_80A487CC)($at) -/* 04FFC 80A47D2C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 05000 80A47D30 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 05004 80A47D34 00000000 */ nop -/* 05008 80A47D38 468084A0 */ cvt.s.w $f18, $f16 -/* 0500C 80A47D3C 46049183 */ div.s $f6, $f18, $f4 -/* 05010 80A47D40 46083302 */ mul.s $f12, $f6, $f8 -/* 05014 80A47D44 0C034348 */ jal Matrix_RotateY -/* 05018 80A47D48 00000000 */ nop -/* 0501C 80A47D4C 87AF002C */ lh $t7, 0x002C($sp) -/* 05020 80A47D50 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 05024 80A47D54 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 05028 80A47D58 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 0502C 80A47D5C 3C0180A5 */ lui $at, %hi(D_80A487D0) ## $at = 80A50000 -/* 05030 80A47D60 C42687D0 */ lwc1 $f6, %lo(D_80A487D0)($at) -/* 05034 80A47D64 46805420 */ cvt.s.w $f16, $f10 -/* 05038 80A47D68 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0503C 80A47D6C 46128103 */ div.s $f4, $f16, $f18 -/* 05040 80A47D70 46062302 */ mul.s $f12, $f4, $f6 -/* 05044 80A47D74 0C0342DC */ jal Matrix_RotateX -/* 05048 80A47D78 00000000 */ nop -.L80A47D7C: -/* 0504C 80A47D7C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 05050 80A47D80 12010005 */ beq $s0, $at, .L80A47D98 -/* 05054 80A47D84 8FB8004C */ lw $t8, 0x004C($sp) -/* 05058 80A47D88 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0505C 80A47D8C 12010002 */ beq $s0, $at, .L80A47D98 -/* 05060 80A47D90 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 05064 80A47D94 16010022 */ bne $s0, $at, .L80A47E20 -.L80A47D98: -/* 05068 80A47D98 0010C840 */ sll $t9, $s0, 1 -/* 0506C 80A47D9C 03191821 */ addu $v1, $t8, $t9 -/* 05070 80A47DA0 84640226 */ lh $a0, 0x0226($v1) ## 00000226 -/* 05074 80A47DA4 0C01DE1C */ jal Math_SinS - ## sins? -/* 05078 80A47DA8 AFA30024 */ sw $v1, 0x0024($sp) -/* 0507C 80A47DAC 8FA20048 */ lw $v0, 0x0048($sp) -/* 05080 80A47DB0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05084 80A47DB4 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 05088 80A47DB8 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 0508C 80A47DBC 8FA30024 */ lw $v1, 0x0024($sp) -/* 05090 80A47DC0 46100482 */ mul.s $f18, $f0, $f16 -/* 05094 80A47DC4 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 05098 80A47DC8 00000000 */ nop -/* 0509C 80A47DCC 468042A0 */ cvt.s.w $f10, $f8 -/* 050A0 80A47DD0 46125100 */ add.s $f4, $f10, $f18 -/* 050A4 80A47DD4 4600218D */ trunc.w.s $f6, $f4 -/* 050A8 80A47DD8 440A3000 */ mfc1 $t2, $f6 -/* 050AC 80A47DDC 00000000 */ nop -/* 050B0 80A47DE0 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 050B4 80A47DE4 0C01DE0D */ jal Math_CosS - ## coss? -/* 050B8 80A47DE8 8464024A */ lh $a0, 0x024A($v1) ## 0000024A -/* 050BC 80A47DEC 8FA20048 */ lw $v0, 0x0048($sp) -/* 050C0 80A47DF0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 050C4 80A47DF4 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 050C8 80A47DF8 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 050CC 80A47DFC 460A0482 */ mul.s $f18, $f0, $f10 -/* 050D0 80A47E00 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 050D4 80A47E04 00000000 */ nop -/* 050D8 80A47E08 46804420 */ cvt.s.w $f16, $f8 -/* 050DC 80A47E0C 46128100 */ add.s $f4, $f16, $f18 -/* 050E0 80A47E10 4600218D */ trunc.w.s $f6, $f4 -/* 050E4 80A47E14 440D3000 */ mfc1 $t5, $f6 -/* 050E8 80A47E18 00000000 */ nop -/* 050EC 80A47E1C A44D0004 */ sh $t5, 0x0004($v0) ## 00000004 -.L80A47E20: -/* 050F0 80A47E20 8FBF001C */ lw $ra, 0x001C($sp) -/* 050F4 80A47E24 8FB00018 */ lw $s0, 0x0018($sp) -/* 050F8 80A47E28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 050FC 80A47E2C 03E00008 */ jr $ra -/* 05100 80A47E30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s deleted file mode 100644 index efe77984e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A47E34 -/* 05104 80A47E34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05108 80A47E38 3C0E80A5 */ lui $t6, %hi(D_80A4856C) ## $t6 = 80A50000 -/* 0510C 80A47E3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05110 80A47E40 AFA40028 */ sw $a0, 0x0028($sp) -/* 05114 80A47E44 AFA60030 */ sw $a2, 0x0030($sp) -/* 05118 80A47E48 AFA70034 */ sw $a3, 0x0034($sp) -/* 0511C 80A47E4C 25CE856C */ addiu $t6, $t6, %lo(D_80A4856C) ## $t6 = 80A4856C -/* 05120 80A47E50 8DD80000 */ lw $t8, 0x0000($t6) ## 80A4856C -/* 05124 80A47E54 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 05128 80A47E58 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 0512C 80A47E5C AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 05130 80A47E60 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A48570 -/* 05134 80A47E64 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 05138 80A47E68 8DD80008 */ lw $t8, 0x0008($t6) ## 80A48574 -/* 0513C 80A47E6C 14A10004 */ bne $a1, $at, .L80A47E80 -/* 05140 80A47E70 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 05144 80A47E74 8FA50038 */ lw $a1, 0x0038($sp) -/* 05148 80A47E78 0C0346BD */ jal Matrix_MultVec3f -/* 0514C 80A47E7C 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80A47E80: -/* 05150 80A47E80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05154 80A47E84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05158 80A47E88 03E00008 */ jr $ra -/* 0515C 80A47E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s deleted file mode 100644 index 3745613191..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnMk_Destroy -/* 00118 80AACA18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0011C 80AACA1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00120 80AACA20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00124 80AACA24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00128 80AACA28 0C0170EB */ jal Collider_DestroyCylinder - -/* 0012C 80AACA2C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 00130 80AACA30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00134 80AACA34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00138 80AACA38 03E00008 */ jr $ra -/* 0013C 80AACA3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s deleted file mode 100644 index d6582d1a19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel EnMk_Draw -/* 00C9C 80AAD59C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CA0 80AAD5A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CA4 80AAD5A4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00CA8 80AAD5A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CAC 80AAD5AC 0C0250F2 */ jal func_800943C8 -/* 00CB0 80AAD5B0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00CB4 80AAD5B4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00CB8 80AAD5B8 3C0F80AB */ lui $t7, %hi(func_80AAD518) ## $t7 = 80AB0000 -/* 00CBC 80AAD5BC 3C1880AB */ lui $t8, %hi(func_80AAD55C) ## $t8 = 80AB0000 -/* 00CC0 80AAD5C0 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C -/* 00CC4 80AAD5C4 8C4601B8 */ lw $a2, 0x01B8($v0) ## 000001B8 -/* 00CC8 80AAD5C8 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A -/* 00CCC 80AAD5CC 2718D55C */ addiu $t8, $t8, %lo(func_80AAD55C) ## $t8 = 80AAD55C -/* 00CD0 80AAD5D0 25EFD518 */ addiu $t7, $t7, %lo(func_80AAD518) ## $t7 = 80AAD518 -/* 00CD4 80AAD5D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00CD8 80AAD5D8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00CDC 80AAD5DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CE0 80AAD5E0 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 00CE4 80AAD5E4 AFA20018 */ sw $v0, 0x0018($sp) -/* 00CE8 80AAD5E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00CEC 80AAD5EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CF0 80AAD5F0 03E00008 */ jr $ra -/* 00CF4 80AAD5F4 00000000 */ nop -/* 00CF8 80AAD5F8 00000000 */ nop -/* 00CFC 80AAD5FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s deleted file mode 100644 index 355a4265d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel EnMk_Init -/* 00000 80AAC900 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AAC904 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00008 80AAC908 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 0000C 80AAC90C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00010 80AAC910 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00014 80AAC914 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) -/* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) -/* 00020 80AAC920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80AAC924 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00028 80AAC928 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 0002C 80AAC92C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80AAC930 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00034 80AAC934 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00038 80AAC938 E484FFBC */ swc1 $f4, -0x0044($a0) ## 00000070 -/* 0003C 80AAC93C 0C00AC78 */ jal ActorShape_Init - -/* 00040 80AAC940 E486FFB8 */ swc1 $f6, -0x0048($a0) ## 0000006C -/* 00044 80AAC944 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 00048 80AAC948 3C060600 */ lui $a2, %hi(D_06005DF0) ## $a2 = 06000000 -/* 0004C 80AAC94C 3C070600 */ lui $a3, %hi(D_06000D88) ## $a3 = 06000000 -/* 00050 80AAC950 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC -/* 00054 80AAC954 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A -/* 00058 80AAC958 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) -/* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00068 80AAC968 24E70D88 */ addiu $a3, $a3, %lo(D_06000D88) ## $a3 = 06000D88 -/* 0006C 80AAC96C 24C65DF0 */ addiu $a2, $a2, %lo(D_06005DF0) ## $a2 = 06005DF0 -/* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) -/* 00074 80AAC974 0C0291BE */ jal SkelAnime_InitFlex -/* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) -/* 0007C 80AAC97C 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 -/* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 -/* 00084 80AAC984 0C0294BE */ jal Animation_PlayLoop -/* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) -/* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) -/* 00094 80AAC994 0C0170D9 */ jal Collider_InitCylinder - -/* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) -/* 0009C 80AAC99C 3C0780AB */ lui $a3, %hi(D_80AAD620) ## $a3 = 80AB0000 -/* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) -/* 000A4 80AAC9A4 24E7D620 */ addiu $a3, $a3, %lo(D_80AAD620) ## $a3 = 80AAD620 -/* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) -/* 000AC 80AAC9AC 0C01712B */ jal Collider_SetCylinder - -/* 000B0 80AAC9B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B4 80AAC9B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 000B8 80AAC9B8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 000BC 80AAC9BC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 000C0 80AAC9C0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 000C4 80AAC9C4 0C00B58B */ jal Actor_SetScale - -/* 000C8 80AAC9C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000CC 80AAC9CC 3C0880AB */ lui $t0, %hi(func_80AAD080) ## $t0 = 80AB0000 -/* 000D0 80AAC9D0 2508D080 */ addiu $t0, $t0, %lo(func_80AAD080) ## $t0 = 80AAD080 -/* 000D4 80AAC9D4 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 000D8 80AAC9D8 AE080284 */ sw $t0, 0x0284($s0) ## 00000284 -/* 000DC 80AAC9DC A600027E */ sh $zero, 0x027E($s0) ## 0000027E -/* 000E0 80AAC9E0 A6000280 */ sh $zero, 0x0280($s0) ## 00000280 -/* 000E4 80AAC9E4 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000E8 80AAC9E8 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef2) -/* 000EC 80AAC9EC 954AF552 */ lhu $t2, %lo(gSaveContext+0xef2)($t2) -/* 000F0 80AAC9F0 340D0004 */ ori $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 000F4 80AAC9F4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 -/* 000FC 80AAC9FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00100 80AACA00 A60D027E */ sh $t5, 0x027E($s0) ## 0000027E -/* 00104 80AACA04 8FBF002C */ lw $ra, 0x002C($sp) -.L80AACA08: -/* 00108 80AACA08 8FB00028 */ lw $s0, 0x0028($sp) -/* 0010C 80AACA0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00110 80AACA10 03E00008 */ jr $ra -/* 00114 80AACA14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s deleted file mode 100644 index ec7b6e6cab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s +++ /dev/null @@ -1,169 +0,0 @@ -.late_rodata -glabel D_80AAD660 - .float 0.025 - -.text -glabel EnMk_Update -/* 009D0 80AAD2D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 009D4 80AAD2D4 AFB00028 */ sw $s0, 0x0028($sp) -/* 009D8 80AAD2D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009DC 80AAD2DC AFBF002C */ sw $ra, 0x002C($sp) -/* 009E0 80AAD2E0 AFA50054 */ sw $a1, 0x0054($sp) -/* 009E4 80AAD2E4 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 009E8 80AAD2E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 009EC 80AAD2EC 0C0189B7 */ jal Collider_UpdateCylinder - -/* 009F0 80AAD2F0 AFA60034 */ sw $a2, 0x0034($sp) -/* 009F4 80AAD2F4 8FA40054 */ lw $a0, 0x0054($sp) -/* 009F8 80AAD2F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009FC 80AAD2FC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00A00 80AAD300 8FA60034 */ lw $a2, 0x0034($sp) -/* 00A04 80AAD304 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00A08 80AAD308 00812821 */ addu $a1, $a0, $at -/* 00A0C 80AAD30C 0C00B638 */ jal Actor_MoveForward - -/* 00A10 80AAD310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A14 80AAD314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A18 80AAD318 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00A1C 80AAD31C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A20 80AAD320 44060000 */ mfc1 $a2, $f0 -/* 00A24 80AAD324 44070000 */ mfc1 $a3, $f0 -/* 00A28 80AAD328 8FA40054 */ lw $a0, 0x0054($sp) -/* 00A2C 80AAD32C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A30 80AAD330 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00A34 80AAD334 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A38 80AAD338 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E -/* 00A3C 80AAD33C 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 00A40 80AAD340 57000009 */ bnel $t8, $zero, .L80AAD368 -/* 00A44 80AAD344 8E190284 */ lw $t9, 0x0284($s0) ## 00000284 -/* 00A48 80AAD348 0C02927F */ jal SkelAnime_Update - -/* 00A4C 80AAD34C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00A50 80AAD350 50400005 */ beql $v0, $zero, .L80AAD368 -/* 00A54 80AAD354 8E190284 */ lw $t9, 0x0284($s0) ## 00000284 -/* 00A58 80AAD358 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E -/* 00A5C 80AAD35C 37280002 */ ori $t0, $t9, 0x0002 ## $t0 = 00000002 -/* 00A60 80AAD360 A608027E */ sh $t0, 0x027E($s0) ## 0000027E -/* 00A64 80AAD364 8E190284 */ lw $t9, 0x0284($s0) ## 00000284 -.L80AAD368: -/* 00A68 80AAD368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A6C 80AAD36C 8FA50054 */ lw $a1, 0x0054($sp) -/* 00A70 80AAD370 0320F809 */ jalr $ra, $t9 -/* 00A74 80AAD374 00000000 */ nop -/* 00A78 80AAD378 9609027E */ lhu $t1, 0x027E($s0) ## 0000027E -/* 00A7C 80AAD37C 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 00A80 80AAD380 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A84 80AAD384 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00A88 80AAD388 1140000E */ beq $t2, $zero, .L80AAD3C4 -/* 00A8C 80AAD38C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00A90 80AAD390 8E0C0038 */ lw $t4, 0x0038($s0) ## 00000038 -/* 00A94 80AAD394 8FA40054 */ lw $a0, 0x0054($sp) -/* 00A98 80AAD398 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A9C 80AAD39C AFAC0010 */ sw $t4, 0x0010($sp) -/* 00AA0 80AAD3A0 8E0B003C */ lw $t3, 0x003C($s0) ## 0000003C -/* 00AA4 80AAD3A4 26060278 */ addiu $a2, $s0, 0x0278 ## $a2 = 00000278 -/* 00AA8 80AAD3A8 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFF0 -/* 00AAC 80AAD3AC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00AB0 80AAD3B0 8E0C0040 */ lw $t4, 0x0040($s0) ## 00000040 -/* 00AB4 80AAD3B4 0C00E0A4 */ jal func_80038290 -/* 00AB8 80AAD3B8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00ABC 80AAD3BC 1000000D */ beq $zero, $zero, .L80AAD3F4 -/* 00AC0 80AAD3C0 9605027E */ lhu $a1, 0x027E($s0) ## 0000027E -.L80AAD3C4: -/* 00AC4 80AAD3C4 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 00AC8 80AAD3C8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00ACC 80AAD3CC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00AD0 80AAD3D0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00AD4 80AAD3D4 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00AD8 80AAD3D8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00ADC 80AAD3DC 2604027A */ addiu $a0, $s0, 0x027A ## $a0 = 0000027A -/* 00AE0 80AAD3E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00AE4 80AAD3E4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00AE8 80AAD3E8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00AEC 80AAD3EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00AF0 80AAD3F0 9605027E */ lhu $a1, 0x027E($s0) ## 0000027E -.L80AAD3F4: -/* 00AF4 80AAD3F4 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00AF8 80AAD3F8 30B80008 */ andi $t8, $a1, 0x0008 ## $t8 = 00000000 -/* 00AFC 80AAD3FC 13000008 */ beq $t8, $zero, .L80AAD420 -/* 00B00 80AAD400 8DE31C44 */ lw $v1, 0x1C44($t7) ## 00001C44 -/* 00B04 80AAD404 8C680680 */ lw $t0, 0x0680($v1) ## 00000680 -/* 00B08 80AAD408 30A9FFF7 */ andi $t1, $a1, 0xFFF7 ## $t1 = 00000000 -/* 00B0C 80AAD40C 31190400 */ andi $t9, $t0, 0x0400 ## $t9 = 00000000 -/* 00B10 80AAD410 5720003D */ bnel $t9, $zero, .L80AAD508 -/* 00B14 80AAD414 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B18 80AAD418 1000003A */ beq $zero, $zero, .L80AAD504 -/* 00B1C 80AAD41C A609027E */ sh $t1, 0x027E($s0) ## 0000027E -.L80AAD420: -/* 00B20 80AAD420 806A014F */ lb $t2, 0x014F($v1) ## 0000014F -/* 00B24 80AAD424 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00B28 80AAD428 34AB0008 */ ori $t3, $a1, 0x0008 ## $t3 = 00000008 -/* 00B2C 80AAD42C 55410004 */ bnel $t2, $at, .L80AAD440 -/* 00B30 80AAD430 8C6C0680 */ lw $t4, 0x0680($v1) ## 00000680 -/* 00B34 80AAD434 10000033 */ beq $zero, $zero, .L80AAD504 -/* 00B38 80AAD438 A60B027E */ sh $t3, 0x027E($s0) ## 0000027E -/* 00B3C 80AAD43C 8C6C0680 */ lw $t4, 0x0680($v1) ## 00000680 -.L80AAD440: -/* 00B40 80AAD440 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 -/* 00B44 80AAD444 51A00030 */ beql $t5, $zero, .L80AAD508 -/* 00B48 80AAD448 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B4C 80AAD44C C4640084 */ lwc1 $f4, 0x0084($v1) ## 00000084 -/* 00B50 80AAD450 4600218D */ trunc.w.s $f6, $f4 -/* 00B54 80AAD454 44023000 */ mfc1 $v0, $f6 -/* 00B58 80AAD458 00000000 */ nop -/* 00B5C 80AAD45C 00021400 */ sll $v0, $v0, 16 -/* 00B60 80AAD460 00021403 */ sra $v0, $v0, 16 -/* 00B64 80AAD464 18400027 */ blez $v0, .L80AAD504 -/* 00B68 80AAD468 28410140 */ slti $at, $v0, 0x0140 -/* 00B6C 80AAD46C 14200008 */ bne $at, $zero, .L80AAD490 -/* 00B70 80AAD470 30A80004 */ andi $t0, $a1, 0x0004 ## $t0 = 00000000 -/* 00B74 80AAD474 28410163 */ slti $at, $v0, 0x0163 -/* 00B78 80AAD478 14200003 */ bne $at, $zero, .L80AAD488 -/* 00B7C 80AAD47C 00000000 */ nop -/* 00B80 80AAD480 10000012 */ beq $zero, $zero, .L80AAD4CC -/* 00B84 80AAD484 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -.L80AAD488: -/* 00B88 80AAD488 10000010 */ beq $zero, $zero, .L80AAD4CC -/* 00B8C 80AAD48C 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -.L80AAD490: -/* 00B90 80AAD490 28410050 */ slti $at, $v0, 0x0050 -/* 00B94 80AAD494 50200004 */ beql $at, $zero, .L80AAD4A8 -/* 00B98 80AAD498 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00B9C 80AAD49C 1000000B */ beq $zero, $zero, .L80AAD4CC -/* 00BA0 80AAD4A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00BA4 80AAD4A4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -.L80AAD4A8: -/* 00BA8 80AAD4A8 3C0180AB */ lui $at, %hi(D_80AAD660) ## $at = 80AB0000 -/* 00BAC 80AAD4AC C430D660 */ lwc1 $f16, %lo(D_80AAD660)($at) -/* 00BB0 80AAD4B0 468042A0 */ cvt.s.w $f10, $f8 -/* 00BB4 80AAD4B4 46105482 */ mul.s $f18, $f10, $f16 -/* 00BB8 80AAD4B8 4600910D */ trunc.w.s $f4, $f18 -/* 00BBC 80AAD4BC 44022000 */ mfc1 $v0, $f4 -/* 00BC0 80AAD4C0 00000000 */ nop -/* 00BC4 80AAD4C4 00021400 */ sll $v0, $v0, 16 -/* 00BC8 80AAD4C8 00021403 */ sra $v0, $v0, 16 -.L80AAD4CC: -/* 00BCC 80AAD4CC 86180280 */ lh $t8, 0x0280($s0) ## 00000280 -/* 00BD0 80AAD4D0 0302082A */ slt $at, $t8, $v0 -/* 00BD4 80AAD4D4 5020000C */ beql $at, $zero, .L80AAD508 -/* 00BD8 80AAD4D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BDC 80AAD4DC 15000009 */ bne $t0, $zero, .L80AAD504 -/* 00BE0 80AAD4E0 A6020280 */ sh $v0, 0x0280($s0) ## 00000280 -/* 00BE4 80AAD4E4 86190280 */ lh $t9, 0x0280($s0) ## 00000280 -/* 00BE8 80AAD4E8 34A90004 */ ori $t1, $a1, 0x0004 ## $t1 = 00000004 -/* 00BEC 80AAD4EC 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00BF0 80AAD4F0 2B210008 */ slti $at, $t9, 0x0008 -/* 00BF4 80AAD4F4 54200004 */ bnel $at, $zero, .L80AAD508 -/* 00BF8 80AAD4F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BFC 80AAD4FC 0C01E221 */ jal func_80078884 -/* 00C00 80AAD500 A609027E */ sh $t1, 0x027E($s0) ## 0000027E -.L80AAD504: -/* 00C04 80AAD504 8FBF002C */ lw $ra, 0x002C($sp) -.L80AAD508: -/* 00C08 80AAD508 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C0C 80AAD50C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00C10 80AAD510 03E00008 */ jr $ra -/* 00C14 80AAD514 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s deleted file mode 100644 index 74598e2ab8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AACA40 -/* 00140 80AACA40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00144 80AACA44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00148 80AACA48 0C00BCCD */ jal func_8002F334 -/* 0014C 80AACA4C AFA40018 */ sw $a0, 0x0018($sp) -/* 00150 80AACA50 10400009 */ beq $v0, $zero, .L80AACA78 -/* 00154 80AACA54 8FA40018 */ lw $a0, 0x0018($sp) -/* 00158 80AACA58 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0015C 80AACA5C 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00160 80AACA60 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00164 80AACA64 3C1880AB */ lui $t8, %hi(func_80AAD080) ## $t8 = 80AB0000 -/* 00168 80AACA68 2718D080 */ addiu $t8, $t8, %lo(func_80AAD080) ## $t8 = 80AAD080 -/* 0016C 80AACA6C 01C17824 */ and $t7, $t6, $at -/* 00170 80AACA70 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00174 80AACA74 AC980284 */ sw $t8, 0x0284($a0) ## 00000284 -.L80AACA78: -/* 00178 80AACA78 9499027E */ lhu $t9, 0x027E($a0) ## 0000027E -/* 0017C 80AACA7C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00180 80AACA80 A488027E */ sh $t0, 0x027E($a0) ## 0000027E -/* 00184 80AACA84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00188 80AACA88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0018C 80AACA8C 03E00008 */ jr $ra -/* 00190 80AACA90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s deleted file mode 100644 index 0b20ac6ac1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AACA94 -/* 00194 80AACA94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00198 80AACA98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0019C 80AACA9C AFA40020 */ sw $a0, 0x0020($sp) -/* 001A0 80AACAA0 0C00BD04 */ jal Actor_HasParent -/* 001A4 80AACAA4 AFA50024 */ sw $a1, 0x0024($sp) -/* 001A8 80AACAA8 1040000D */ beq $v0, $zero, .L80AACAE0 -/* 001AC 80AACAAC 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 -/* 001B0 80AACAB0 8FA20020 */ lw $v0, 0x0020($sp) -/* 001B4 80AACAB4 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 -/* 001B8 80AACAB8 240400F0 */ addiu $a0, $zero, 0x00F0 ## $a0 = 000000F0 -/* 001BC 80AACABC AC400118 */ sw $zero, 0x0118($v0) ## 00000118 -/* 001C0 80AACAC0 0C0222A8 */ jal func_80088AA0 -/* 001C4 80AACAC4 AC4E0284 */ sw $t6, 0x0284($v0) ## 00000284 -/* 001C8 80AACAC8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 001CC 80AACACC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 001D0 80AACAD0 944F13FC */ lhu $t7, 0x13FC($v0) ## 8015FA5C -/* 001D4 80AACAD4 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 001D8 80AACAD8 1000000A */ beq $zero, $zero, .L80AACB04 -/* 001DC 80AACADC A45813FC */ sh $t8, 0x13FC($v0) ## 8015FA5C -.L80AACAE0: -/* 001E0 80AACAE0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 001E4 80AACAE4 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 001E8 80AACAE8 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 001EC 80AACAEC 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 001F0 80AACAF0 8FA40020 */ lw $a0, 0x0020($sp) -/* 001F4 80AACAF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 001F8 80AACAF8 24060025 */ addiu $a2, $zero, 0x0025 ## $a2 = 00000025 -/* 001FC 80AACAFC 0C00BD0D */ jal func_8002F434 -/* 00200 80AACB00 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80AACB04: -/* 00204 80AACB04 8FBF001C */ lw $ra, 0x001C($sp) -/* 00208 80AACB08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0020C 80AACB0C 03E00008 */ jr $ra -/* 00210 80AACB10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s deleted file mode 100644 index 9f3e761265..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AACB14 -/* 00214 80AACB14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00218 80AACB18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0021C 80AACB1C AFA50024 */ sw $a1, 0x0024($sp) -/* 00220 80AACB20 0C00BCCD */ jal func_8002F334 -/* 00224 80AACB24 AFA40020 */ sw $a0, 0x0020($sp) -/* 00228 80AACB28 1040000C */ beq $v0, $zero, .L80AACB5C -/* 0022C 80AACB2C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00230 80AACB30 3C0E80AB */ lui $t6, %hi(func_80AACA94) ## $t6 = 80AB0000 -/* 00234 80AACB34 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00238 80AACB38 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 0023C 80AACB3C 25CECA94 */ addiu $t6, $t6, %lo(func_80AACA94) ## $t6 = 80AACA94 -/* 00240 80AACB40 AC8E0284 */ sw $t6, 0x0284($a0) ## 00000284 -/* 00244 80AACB44 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00248 80AACB48 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0024C 80AACB4C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00250 80AACB50 24060025 */ addiu $a2, $zero, 0x0025 ## $a2 = 00000025 -/* 00254 80AACB54 0C00BD0D */ jal func_8002F434 -/* 00258 80AACB58 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80AACB5C: -/* 0025C 80AACB5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00260 80AACB60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00264 80AACB64 03E00008 */ jr $ra -/* 00268 80AACB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s deleted file mode 100644 index f71b726c6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AACB6C -/* 0026C 80AACB6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00270 80AACB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00274 80AACB74 0C00BC65 */ jal func_8002F194 -/* 00278 80AACB78 AFA40018 */ sw $a0, 0x0018($sp) -/* 0027C 80AACB7C 10400004 */ beq $v0, $zero, .L80AACB90 -/* 00280 80AACB80 8FA40018 */ lw $a0, 0x0018($sp) -/* 00284 80AACB84 3C0E80AB */ lui $t6, %hi(func_80AACB14) ## $t6 = 80AB0000 -/* 00288 80AACB88 25CECB14 */ addiu $t6, $t6, %lo(func_80AACB14) ## $t6 = 80AACB14 -/* 0028C 80AACB8C AC8E0284 */ sw $t6, 0x0284($a0) ## 00000284 -.L80AACB90: -/* 00290 80AACB90 948F027E */ lhu $t7, 0x027E($a0) ## 0000027E -/* 00294 80AACB94 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00298 80AACB98 A498027E */ sh $t8, 0x027E($a0) ## 0000027E -/* 0029C 80AACB9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A0 80AACBA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002A4 80AACBA4 03E00008 */ jr $ra -/* 002A8 80AACBA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s deleted file mode 100644 index 65dcbcee6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AACBAC -/* 002AC 80AACBAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002B0 80AACBB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002B4 80AACBB4 94820282 */ lhu $v0, 0x0282($a0) ## 00000282 -/* 002B8 80AACBB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002BC 80AACBBC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 002C0 80AACBC0 18400007 */ blez $v0, .L80AACBE0 -/* 002C4 80AACBC4 3C1980AB */ lui $t9, %hi(func_80AACB6C) ## $t9 = 80AB0000 -/* 002C8 80AACBC8 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 002CC 80AACBCC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 002D0 80AACBD0 A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 -/* 002D4 80AACBD4 25F8F800 */ addiu $t8, $t7, 0xF800 ## $t8 = FFFFF800 -/* 002D8 80AACBD8 10000006 */ beq $zero, $zero, .L80AACBF4 -/* 002DC 80AACBDC A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -.L80AACBE0: -/* 002E0 80AACBE0 2739CB6C */ addiu $t9, $t9, %lo(func_80AACB6C) ## $t9 = 80AACB6C -/* 002E4 80AACBE4 ACD90284 */ sw $t9, 0x0284($a2) ## 00000284 -/* 002E8 80AACBE8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 002EC 80AACBEC 0C042DC8 */ jal func_8010B720 -/* 002F0 80AACBF0 24054030 */ addiu $a1, $zero, 0x4030 ## $a1 = 00004030 -.L80AACBF4: -/* 002F4 80AACBF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002F8 80AACBF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002FC 80AACBFC 03E00008 */ jr $ra -/* 00300 80AACC00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s deleted file mode 100644 index 1b8157a36c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AACC04 -/* 00304 80AACC04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00308 80AACC08 AFBF002C */ sw $ra, 0x002C($sp) -/* 0030C 80AACC0C AFB00028 */ sw $s0, 0x0028($sp) -/* 00310 80AACC10 AFA50034 */ sw $a1, 0x0034($sp) -/* 00314 80AACC14 94820282 */ lhu $v0, 0x0282($a0) ## 00000282 -/* 00318 80AACC18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0031C 80AACC1C 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 00320 80AACC20 18400004 */ blez $v0, .L80AACC34 -/* 00324 80AACC24 3C1880AB */ lui $t8, %hi(func_80AACBAC) ## $t8 = 80AB0000 -/* 00328 80AACC28 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0032C 80AACC2C 10000017 */ beq $zero, $zero, .L80AACC8C -/* 00330 80AACC30 A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 -.L80AACC34: -/* 00334 80AACC34 2718CBAC */ addiu $t8, $t8, %lo(func_80AACBAC) ## $t8 = 80AACBAC -/* 00338 80AACC38 3C040600 */ lui $a0, %hi(D_06000D88) ## $a0 = 06000000 -/* 0033C 80AACC3C A60F0282 */ sh $t7, 0x0282($s0) ## 00000282 -/* 00340 80AACC40 AE180284 */ sw $t8, 0x0284($s0) ## 00000284 -/* 00344 80AACC44 0C028800 */ jal Animation_GetLastFrame - -/* 00348 80AACC48 24840D88 */ addiu $a0, $a0, %lo(D_06000D88) ## $a0 = 06000D88 -/* 0034C 80AACC4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00350 80AACC50 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00354 80AACC54 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00358 80AACC58 468021A0 */ cvt.s.w $f6, $f4 -/* 0035C 80AACC5C 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 -/* 00360 80AACC60 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 -/* 00364 80AACC64 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00368 80AACC68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0036C 80AACC6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00370 80AACC70 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00374 80AACC74 AFA00014 */ sw $zero, 0x0014($sp) -/* 00378 80AACC78 0C029468 */ jal Animation_Change - -/* 0037C 80AACC7C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00380 80AACC80 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E -/* 00384 80AACC84 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 00388 80AACC88 A608027E */ sh $t0, 0x027E($s0) ## 0000027E -.L80AACC8C: -/* 0038C 80AACC8C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00390 80AACC90 8FB00028 */ lw $s0, 0x0028($sp) -/* 00394 80AACC94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00398 80AACC98 03E00008 */ jr $ra -/* 0039C 80AACC9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s deleted file mode 100644 index 14178c0cbc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80AACCA0 -/* 003A0 80AACCA0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003A4 80AACCA4 AFBF002C */ sw $ra, 0x002C($sp) -/* 003A8 80AACCA8 AFB00028 */ sw $s0, 0x0028($sp) -/* 003AC 80AACCAC AFA50034 */ sw $a1, 0x0034($sp) -/* 003B0 80AACCB0 94820282 */ lhu $v0, 0x0282($a0) ## 00000282 -/* 003B4 80AACCB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003B8 80AACCB8 24190078 */ addiu $t9, $zero, 0x0078 ## $t9 = 00000078 -/* 003BC 80AACCBC 18400007 */ blez $v0, .L80AACCDC -/* 003C0 80AACCC0 3C0880AB */ lui $t0, %hi(func_80AACC04) ## $t0 = 80AB0000 -/* 003C4 80AACCC4 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 003C8 80AACCC8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003CC 80AACCCC A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 -/* 003D0 80AACCD0 25F80800 */ addiu $t8, $t7, 0x0800 ## $t8 = 00000800 -/* 003D4 80AACCD4 10000017 */ beq $zero, $zero, .L80AACD34 -/* 003D8 80AACCD8 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -.L80AACCDC: -/* 003DC 80AACCDC 2508CC04 */ addiu $t0, $t0, %lo(func_80AACC04) ## $t0 = 80AACC04 -/* 003E0 80AACCE0 3C040600 */ lui $a0, %hi(D_06000724) ## $a0 = 06000000 -/* 003E4 80AACCE4 A6190282 */ sh $t9, 0x0282($s0) ## 00000282 -/* 003E8 80AACCE8 AE080284 */ sw $t0, 0x0284($s0) ## 00000284 -/* 003EC 80AACCEC 0C028800 */ jal Animation_GetLastFrame - -/* 003F0 80AACCF0 24840724 */ addiu $a0, $a0, %lo(D_06000724) ## $a0 = 06000724 -/* 003F4 80AACCF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003F8 80AACCF8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 003FC 80AACCFC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00400 80AACD00 468021A0 */ cvt.s.w $f6, $f4 -/* 00404 80AACD04 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 -/* 00408 80AACD08 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 -/* 0040C 80AACD0C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00410 80AACD10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00414 80AACD14 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00418 80AACD18 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0041C 80AACD1C AFA00014 */ sw $zero, 0x0014($sp) -/* 00420 80AACD20 0C029468 */ jal Animation_Change - -/* 00424 80AACD24 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00428 80AACD28 9609027E */ lhu $t1, 0x027E($s0) ## 0000027E -/* 0042C 80AACD2C 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 -/* 00430 80AACD30 A60A027E */ sh $t2, 0x027E($s0) ## 0000027E -.L80AACD34: -/* 00434 80AACD34 8FBF002C */ lw $ra, 0x002C($sp) -/* 00438 80AACD38 8FB00028 */ lw $s0, 0x0028($sp) -/* 0043C 80AACD3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00440 80AACD40 03E00008 */ jr $ra -/* 00444 80AACD44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s deleted file mode 100644 index 1be3cbace2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80AACD48 -/* 00448 80AACD48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0044C 80AACD4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00450 80AACD50 AFB10028 */ sw $s1, 0x0028($sp) -/* 00454 80AACD54 AFB00024 */ sw $s0, 0x0024($sp) -/* 00458 80AACD58 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 0045C 80AACD5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00460 80AACD60 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00464 80AACD64 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00468 80AACD68 0C042F6F */ jal func_8010BDBC -/* 0046C 80AACD6C AFAE0034 */ sw $t6, 0x0034($sp) -/* 00470 80AACD70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00474 80AACD74 54410026 */ bnel $v0, $at, .L80AACE10 -/* 00478 80AACD78 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -/* 0047C 80AACD7C 0C041AF2 */ jal func_80106BC8 -/* 00480 80AACD80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00484 80AACD84 50400022 */ beql $v0, $zero, .L80AACE10 -/* 00488 80AACD88 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -/* 0048C 80AACD8C 0C041B33 */ jal func_80106CCC -/* 00490 80AACD90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00494 80AACD94 3C0F80AB */ lui $t7, %hi(func_80AACCA0) ## $t7 = 80AB0000 -/* 00498 80AACD98 25EFCCA0 */ addiu $t7, $t7, %lo(func_80AACCA0) ## $t7 = 80AACCA0 -/* 0049C 80AACD9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004A0 80AACDA0 AE0F0284 */ sw $t7, 0x0284($s0) ## 00000284 -/* 004A4 80AACDA4 00310821 */ addu $at, $at, $s1 -/* 004A8 80AACDA8 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 004AC 80AACDAC A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 004B0 80AACDB0 8FB90034 */ lw $t9, 0x0034($sp) -/* 004B4 80AACDB4 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 004B8 80AACDB8 3C040600 */ lui $a0, %hi(D_06000D88) ## $a0 = 06000000 -/* 004BC 80AACDBC A3200693 */ sb $zero, 0x0693($t9) ## 00000693 -/* 004C0 80AACDC0 A6080282 */ sh $t0, 0x0282($s0) ## 00000282 -/* 004C4 80AACDC4 0C028800 */ jal Animation_GetLastFrame - -/* 004C8 80AACDC8 24840D88 */ addiu $a0, $a0, %lo(D_06000D88) ## $a0 = 06000D88 -/* 004CC 80AACDCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 004D0 80AACDD0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 004D4 80AACDD4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 004D8 80AACDD8 468021A0 */ cvt.s.w $f6, $f4 -/* 004DC 80AACDDC 3C050600 */ lui $a1, %hi(D_06000D88) ## $a1 = 06000000 -/* 004E0 80AACDE0 24A50D88 */ addiu $a1, $a1, %lo(D_06000D88) ## $a1 = 06000D88 -/* 004E4 80AACDE4 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 004E8 80AACDE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004EC 80AACDEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004F0 80AACDF0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004F4 80AACDF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 004F8 80AACDF8 0C029468 */ jal Animation_Change - -/* 004FC 80AACDFC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00500 80AACE00 9609027E */ lhu $t1, 0x027E($s0) ## 0000027E -/* 00504 80AACE04 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 -/* 00508 80AACE08 A60A027E */ sh $t2, 0x027E($s0) ## 0000027E -/* 0050C 80AACE0C 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -.L80AACE10: -/* 00510 80AACE10 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00514 80AACE14 A60C027E */ sh $t4, 0x027E($s0) ## 0000027E -/* 00518 80AACE18 8FBF002C */ lw $ra, 0x002C($sp) -/* 0051C 80AACE1C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00520 80AACE20 8FB00024 */ lw $s0, 0x0024($sp) -/* 00524 80AACE24 03E00008 */ jr $ra -/* 00528 80AACE28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s deleted file mode 100644 index e0265bdd1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AACE2C -/* 0052C 80AACE2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00530 80AACE30 AFB00028 */ sw $s0, 0x0028($sp) -/* 00534 80AACE34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00538 80AACE38 AFBF002C */ sw $ra, 0x002C($sp) -/* 0053C 80AACE3C AFA50034 */ sw $a1, 0x0034($sp) -/* 00540 80AACE40 0C042F6F */ jal func_8010BDBC -/* 00544 80AACE44 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00548 80AACE48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0054C 80AACE4C 5441001F */ bnel $v0, $at, .L80AACECC -/* 00550 80AACE50 9608027E */ lhu $t0, 0x027E($s0) ## 0000027E -/* 00554 80AACE54 0C041AF2 */ jal func_80106BC8 -/* 00558 80AACE58 8FA40034 */ lw $a0, 0x0034($sp) -/* 0055C 80AACE5C 1040001A */ beq $v0, $zero, .L80AACEC8 -/* 00560 80AACE60 8FA40034 */ lw $a0, 0x0034($sp) -/* 00564 80AACE64 0C042DC8 */ jal func_8010B720 -/* 00568 80AACE68 24054001 */ addiu $a1, $zero, 0x4001 ## $a1 = 00004001 -/* 0056C 80AACE6C 3C040600 */ lui $a0, %hi(D_06000AC0) ## $a0 = 06000000 -/* 00570 80AACE70 0C028800 */ jal Animation_GetLastFrame - -/* 00574 80AACE74 24840AC0 */ addiu $a0, $a0, %lo(D_06000AC0) ## $a0 = 06000AC0 -/* 00578 80AACE78 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0057C 80AACE7C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00580 80AACE80 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00584 80AACE84 468021A0 */ cvt.s.w $f6, $f4 -/* 00588 80AACE88 3C050600 */ lui $a1, %hi(D_06000AC0) ## $a1 = 06000000 -/* 0058C 80AACE8C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00590 80AACE90 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00594 80AACE94 24A50AC0 */ addiu $a1, $a1, %lo(D_06000AC0) ## $a1 = 06000AC0 -/* 00598 80AACE98 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 0059C 80AACE9C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005A0 80AACEA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 005A4 80AACEA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005A8 80AACEA8 0C029468 */ jal Animation_Change - -/* 005AC 80AACEAC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005B0 80AACEB0 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E -/* 005B4 80AACEB4 3C1980AB */ lui $t9, %hi(func_80AACD48) ## $t9 = 80AB0000 -/* 005B8 80AACEB8 2739CD48 */ addiu $t9, $t9, %lo(func_80AACD48) ## $t9 = 80AACD48 -/* 005BC 80AACEBC 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 -/* 005C0 80AACEC0 A618027E */ sh $t8, 0x027E($s0) ## 0000027E -/* 005C4 80AACEC4 AE190284 */ sw $t9, 0x0284($s0) ## 00000284 -.L80AACEC8: -/* 005C8 80AACEC8 9608027E */ lhu $t0, 0x027E($s0) ## 0000027E -.L80AACECC: -/* 005CC 80AACECC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 005D0 80AACED0 A609027E */ sh $t1, 0x027E($s0) ## 0000027E -/* 005D4 80AACED4 8FBF002C */ lw $ra, 0x002C($sp) -/* 005D8 80AACED8 8FB00028 */ lw $s0, 0x0028($sp) -/* 005DC 80AACEDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005E0 80AACEE0 03E00008 */ jr $ra -/* 005E4 80AACEE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s deleted file mode 100644 index 9873f6612b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AACEE8 -/* 005E8 80AACEE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005EC 80AACEEC AFB00028 */ sw $s0, 0x0028($sp) -/* 005F0 80AACEF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005F4 80AACEF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 005F8 80AACEF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 005FC 80AACEFC 0C042F6F */ jal func_8010BDBC -/* 00600 80AACF00 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00604 80AACF04 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00608 80AACF08 5441001E */ bnel $v0, $at, .L80AACF84 -/* 0060C 80AACF0C 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E -/* 00610 80AACF10 0C041AF2 */ jal func_80106BC8 -/* 00614 80AACF14 8FA40034 */ lw $a0, 0x0034($sp) -/* 00618 80AACF18 10400019 */ beq $v0, $zero, .L80AACF80 -/* 0061C 80AACF1C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00620 80AACF20 0C042DC8 */ jal func_8010B720 -/* 00624 80AACF24 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00628 80AACF28 3C040600 */ lui $a0, %hi(D_06000AC0) ## $a0 = 06000000 -/* 0062C 80AACF2C 0C028800 */ jal Animation_GetLastFrame - -/* 00630 80AACF30 24840AC0 */ addiu $a0, $a0, %lo(D_06000AC0) ## $a0 = 06000AC0 -/* 00634 80AACF34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00638 80AACF38 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 0063C 80AACF3C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00640 80AACF40 468021A0 */ cvt.s.w $f6, $f4 -/* 00644 80AACF44 3C050600 */ lui $a1, %hi(D_06000AC0) ## $a1 = 06000000 -/* 00648 80AACF48 24A50AC0 */ addiu $a1, $a1, %lo(D_06000AC0) ## $a1 = 06000AC0 -/* 0064C 80AACF4C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00650 80AACF50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00654 80AACF54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00658 80AACF58 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0065C 80AACF5C AFA00014 */ sw $zero, 0x0014($sp) -/* 00660 80AACF60 0C029468 */ jal Animation_Change - -/* 00664 80AACF64 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00668 80AACF68 960E027E */ lhu $t6, 0x027E($s0) ## 0000027E -/* 0066C 80AACF6C 3C1880AB */ lui $t8, %hi(func_80AACE2C) ## $t8 = 80AB0000 -/* 00670 80AACF70 2718CE2C */ addiu $t8, $t8, %lo(func_80AACE2C) ## $t8 = 80AACE2C -/* 00674 80AACF74 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 -/* 00678 80AACF78 A60F027E */ sh $t7, 0x027E($s0) ## 0000027E -/* 0067C 80AACF7C AE180284 */ sw $t8, 0x0284($s0) ## 00000284 -.L80AACF80: -/* 00680 80AACF80 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E -.L80AACF84: -/* 00684 80AACF84 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00688 80AACF88 A608027E */ sh $t0, 0x027E($s0) ## 0000027E -/* 0068C 80AACF8C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00690 80AACF90 8FB00028 */ lw $s0, 0x0028($sp) -/* 00694 80AACF94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00698 80AACF98 03E00008 */ jr $ra -/* 0069C 80AACF9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s deleted file mode 100644 index 373d383e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AACFA0 -/* 006A0 80AACFA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006A4 80AACFA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 006A8 80AACFA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 006AC 80AACFAC 0C00BD04 */ jal Actor_HasParent -/* 006B0 80AACFB0 AFA40020 */ sw $a0, 0x0020($sp) -/* 006B4 80AACFB4 1040000B */ beq $v0, $zero, .L80AACFE4 -/* 006B8 80AACFB8 8FA40020 */ lw $a0, 0x0020($sp) -/* 006BC 80AACFBC 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 -/* 006C0 80AACFC0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 006C4 80AACFC4 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 -/* 006C8 80AACFC8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 006CC 80AACFCC AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 006D0 80AACFD0 AC8E0284 */ sw $t6, 0x0284($a0) ## 00000284 -/* 006D4 80AACFD4 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 -/* 006D8 80AACFD8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 006DC 80AACFDC 10000009 */ beq $zero, $zero, .L80AAD004 -/* 006E0 80AACFE0 A4580EF2 */ sh $t8, 0x0EF2($v0) ## 8015F552 -.L80AACFE4: -/* 006E4 80AACFE4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 006E8 80AACFE8 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 006EC 80AACFEC 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 006F0 80AACFF0 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 006F4 80AACFF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 006F8 80AACFF8 2406003E */ addiu $a2, $zero, 0x003E ## $a2 = 0000003E -/* 006FC 80AACFFC 0C00BD0D */ jal func_8002F434 -/* 00700 80AAD000 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80AAD004: -/* 00704 80AAD004 8FBF001C */ lw $ra, 0x001C($sp) -/* 00708 80AAD008 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0070C 80AAD00C 03E00008 */ jr $ra -/* 00710 80AAD010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s deleted file mode 100644 index c964b6da00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AAD014 -/* 00714 80AAD014 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00718 80AAD018 AFBF001C */ sw $ra, 0x001C($sp) -/* 0071C 80AAD01C AFA50024 */ sw $a1, 0x0024($sp) -/* 00720 80AAD020 0C00BCCD */ jal func_8002F334 -/* 00724 80AAD024 AFA40020 */ sw $a0, 0x0020($sp) -/* 00728 80AAD028 1040000E */ beq $v0, $zero, .L80AAD064 -/* 0072C 80AAD02C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00730 80AAD030 3C0E80AB */ lui $t6, %hi(func_80AACFA0) ## $t6 = 80AB0000 -/* 00734 80AAD034 25CECFA0 */ addiu $t6, $t6, %lo(func_80AACFA0) ## $t6 = 80AACFA0 -/* 00738 80AAD038 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0073C 80AAD03C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00740 80AAD040 AC8E0284 */ sw $t6, 0x0284($a0) ## 00000284 -/* 00744 80AAD044 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00748 80AAD048 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0074C 80AAD04C AFA40020 */ sw $a0, 0x0020($sp) -/* 00750 80AAD050 8FA50024 */ lw $a1, 0x0024($sp) -/* 00754 80AAD054 2406003E */ addiu $a2, $zero, 0x003E ## $a2 = 0000003E -/* 00758 80AAD058 0C00BD0D */ jal func_8002F434 -/* 0075C 80AAD05C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00760 80AAD060 8FA40020 */ lw $a0, 0x0020($sp) -.L80AAD064: -/* 00764 80AAD064 948F027E */ lhu $t7, 0x027E($a0) ## 0000027E -/* 00768 80AAD068 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0076C 80AAD06C A498027E */ sh $t8, 0x027E($a0) ## 0000027E -/* 00770 80AAD070 8FBF001C */ lw $ra, 0x001C($sp) -/* 00774 80AAD074 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00778 80AAD078 03E00008 */ jr $ra -/* 0077C 80AAD07C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s deleted file mode 100644 index cf4692c939..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s +++ /dev/null @@ -1,163 +0,0 @@ -glabel func_80AAD080 -/* 00780 80AAD080 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00784 80AAD084 AFBF002C */ sw $ra, 0x002C($sp) -/* 00788 80AAD088 AFB00028 */ sw $s0, 0x0028($sp) -/* 0078C 80AAD08C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00790 80AAD090 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00794 80AAD094 AFA50044 */ sw $a1, 0x0044($sp) -/* 00798 80AAD098 0C00BC65 */ jal func_8002F194 -/* 0079C 80AAD09C AFA30034 */ sw $v1, 0x0034($sp) -/* 007A0 80AAD0A0 10400064 */ beq $v0, $zero, .L80AAD234 -/* 007A4 80AAD0A4 8FA30034 */ lw $v1, 0x0034($sp) -/* 007A8 80AAD0A8 8FA40044 */ lw $a0, 0x0044($sp) -/* 007AC 80AAD0AC 0C00BCDA */ jal func_8002F368 -/* 007B0 80AAD0B0 AFA30034 */ sw $v1, 0x0034($sp) -/* 007B4 80AAD0B4 9604010E */ lhu $a0, 0x010E($s0) ## 0000010E -/* 007B8 80AAD0B8 24014018 */ addiu $at, $zero, 0x4018 ## $at = 00004018 -/* 007BC 80AAD0BC 8FA30034 */ lw $v1, 0x0034($sp) -/* 007C0 80AAD0C0 10810006 */ beq $a0, $at, .L80AAD0DC -/* 007C4 80AAD0C4 3C0F8012 */ lui $t7, %hi(gItemSlots+0x30) -/* 007C8 80AAD0C8 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 -/* 007CC 80AAD0CC A464010E */ sh $a0, 0x010E($v1) ## 0000010E -/* 007D0 80AAD0D0 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 -/* 007D4 80AAD0D4 10000079 */ beq $zero, $zero, .L80AAD2BC -/* 007D8 80AAD0D8 AE0E0284 */ sw $t6, 0x0284($s0) ## 00000284 -.L80AAD0DC: -/* 007DC 80AAD0DC 91EF7494 */ lbu $t7, %lo(gItemSlots+0x30)($t7) -/* 007E0 80AAD0E0 3C058016 */ lui $a1, %hi(gSaveContext) -/* 007E4 80AAD0E4 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 007E8 80AAD0E8 00AFC021 */ addu $t8, $a1, $t7 -/* 007EC 80AAD0EC 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 -/* 007F0 80AAD0F0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 007F4 80AAD0F4 24084032 */ addiu $t0, $zero, 0x4032 ## $t0 = 00004032 -/* 007F8 80AAD0F8 17210005 */ bne $t9, $at, .L80AAD110 -/* 007FC 80AAD0FC 3C0980AB */ lui $t1, %hi(func_80AACA40) ## $t1 = 80AB0000 -/* 00800 80AAD100 A468010E */ sh $t0, 0x010E($v1) ## 0000010E -/* 00804 80AAD104 2529CA40 */ addiu $t1, $t1, %lo(func_80AACA40) ## $t1 = 80AACA40 -/* 00808 80AAD108 1000006C */ beq $zero, $zero, .L80AAD2BC -/* 0080C 80AAD10C AE090284 */ sw $t1, 0x0284($s0) ## 00000284 -.L80AAD110: -/* 00810 80AAD110 10400009 */ beq $v0, $zero, .L80AAD138 -/* 00814 80AAD114 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00818 80AAD118 10410028 */ beq $v0, $at, .L80AAD1BC -/* 0081C 80AAD11C 240C4019 */ addiu $t4, $zero, 0x4019 ## $t4 = 00004019 -/* 00820 80AAD120 240A4018 */ addiu $t2, $zero, 0x4018 ## $t2 = 00004018 -/* 00824 80AAD124 3C0B80AB */ lui $t3, %hi(func_80AACA40) ## $t3 = 80AB0000 -/* 00828 80AAD128 256BCA40 */ addiu $t3, $t3, %lo(func_80AACA40) ## $t3 = 80AACA40 -/* 0082C 80AAD12C A46A010E */ sh $t2, 0x010E($v1) ## 0000010E -/* 00830 80AAD130 10000062 */ beq $zero, $zero, .L80AAD2BC -/* 00834 80AAD134 AE0B0284 */ sw $t3, 0x0284($s0) ## 00000284 -.L80AAD138: -/* 00838 80AAD138 86020280 */ lh $v0, 0x0280($s0) ## 00000280 -/* 0083C 80AAD13C 28410008 */ slti $at, $v0, 0x0008 -/* 00840 80AAD140 14200011 */ bne $at, $zero, .L80AAD188 -/* 00844 80AAD144 00000000 */ nop -/* 00848 80AAD148 94AC0EF2 */ lhu $t4, 0x0EF2($a1) ## 8015F552 -/* 0084C 80AAD14C 3C1980AB */ lui $t9, %hi(func_80AAD014) ## $t9 = 80AB0000 -/* 00850 80AAD150 24184074 */ addiu $t8, $zero, 0x4074 ## $t8 = 00004074 -/* 00854 80AAD154 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00858 80AAD158 11A00007 */ beq $t5, $zero, .L80AAD178 -/* 0085C 80AAD15C 2739D014 */ addiu $t9, $t9, %lo(func_80AAD014) ## $t9 = 80AAD014 -/* 00860 80AAD160 240E4075 */ addiu $t6, $zero, 0x4075 ## $t6 = 00004075 -/* 00864 80AAD164 3C0F80AB */ lui $t7, %hi(func_80AACA40) ## $t7 = 80AB0000 -/* 00868 80AAD168 A46E010E */ sh $t6, 0x010E($v1) ## 0000010E -/* 0086C 80AAD16C 25EFCA40 */ addiu $t7, $t7, %lo(func_80AACA40) ## $t7 = 80AACA40 -/* 00870 80AAD170 10000052 */ beq $zero, $zero, .L80AAD2BC -/* 00874 80AAD174 AE0F0284 */ sw $t7, 0x0284($s0) ## 00000284 -.L80AAD178: -/* 00878 80AAD178 A478010E */ sh $t8, 0x010E($v1) ## 0000010E -/* 0087C 80AAD17C AE190284 */ sw $t9, 0x0284($s0) ## 00000284 -/* 00880 80AAD180 1000004E */ beq $zero, $zero, .L80AAD2BC -/* 00884 80AAD184 A6000280 */ sh $zero, 0x0280($s0) ## 00000280 -.L80AAD188: -/* 00888 80AAD188 14400007 */ bne $v0, $zero, .L80AAD1A8 -/* 0088C 80AAD18C 244A406C */ addiu $t2, $v0, 0x406C ## $t2 = 0000406C -/* 00890 80AAD190 24084018 */ addiu $t0, $zero, 0x4018 ## $t0 = 00004018 -/* 00894 80AAD194 3C0980AB */ lui $t1, %hi(func_80AACA40) ## $t1 = 80AB0000 -/* 00898 80AAD198 A468010E */ sh $t0, 0x010E($v1) ## 0000010E -/* 0089C 80AAD19C 2529CA40 */ addiu $t1, $t1, %lo(func_80AACA40) ## $t1 = 80AACA40 -/* 008A0 80AAD1A0 10000046 */ beq $zero, $zero, .L80AAD2BC -/* 008A4 80AAD1A4 AE090284 */ sw $t1, 0x0284($s0) ## 00000284 -.L80AAD1A8: -/* 008A8 80AAD1A8 3C0B80AB */ lui $t3, %hi(func_80AACA40) ## $t3 = 80AB0000 -/* 008AC 80AAD1AC A46A010E */ sh $t2, 0x010E($v1) ## 0000010E -/* 008B0 80AAD1B0 256BCA40 */ addiu $t3, $t3, %lo(func_80AACA40) ## $t3 = 80AACA40 -/* 008B4 80AAD1B4 10000041 */ beq $zero, $zero, .L80AAD2BC -/* 008B8 80AAD1B8 AE0B0284 */ sw $t3, 0x0284($s0) ## 00000284 -.L80AAD1BC: -/* 008BC 80AAD1BC 3C0D80AB */ lui $t5, %hi(func_80AACEE8) ## $t5 = 80AB0000 -/* 008C0 80AAD1C0 A46C010E */ sh $t4, 0x010E($v1) ## 0000010E -/* 008C4 80AAD1C4 25ADCEE8 */ addiu $t5, $t5, %lo(func_80AACEE8) ## $t5 = 80AACEE8 -/* 008C8 80AAD1C8 3C040600 */ lui $a0, %hi(D_06000368) ## $a0 = 06000000 -/* 008CC 80AAD1CC AE0D0284 */ sw $t5, 0x0284($s0) ## 00000284 -/* 008D0 80AAD1D0 0C028800 */ jal Animation_GetLastFrame - -/* 008D4 80AAD1D4 24840368 */ addiu $a0, $a0, %lo(D_06000368) ## $a0 = 06000368 -/* 008D8 80AAD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008DC 80AAD1DC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 008E0 80AAD1E0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 008E4 80AAD1E4 468021A0 */ cvt.s.w $f6, $f4 -/* 008E8 80AAD1E8 3C050600 */ lui $a1, %hi(D_06000368) ## $a1 = 06000000 -/* 008EC 80AAD1EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F0 80AAD1F0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 008F4 80AAD1F4 24A50368 */ addiu $a1, $a1, %lo(D_06000368) ## $a1 = 06000368 -/* 008F8 80AAD1F8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 008FC 80AAD1FC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00900 80AAD200 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00904 80AAD204 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00908 80AAD208 0C029468 */ jal Animation_Change - -/* 0090C 80AAD20C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00910 80AAD210 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E -/* 00914 80AAD214 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) -/* 00918 80AAD218 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 0091C 80AAD21C 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 -/* 00920 80AAD220 A618027E */ sh $t8, 0x027E($s0) ## 0000027E -/* 00924 80AAD224 0C01E221 */ jal func_80078884 -/* 00928 80AAD228 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) -/* 0092C 80AAD22C 10000024 */ beq $zero, $zero, .L80AAD2C0 -/* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp) -.L80AAD234: -/* 00934 80AAD234 8FA40044 */ lw $a0, 0x0044($sp) -/* 00938 80AAD238 0C01B0D8 */ jal Text_GetFaceReaction -/* 0093C 80AAD23C 2405001A */ addiu $a1, $zero, 0x001A ## $a1 = 0000001A -/* 00940 80AAD240 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000 -/* 00944 80AAD244 17200003 */ bne $t9, $zero, .L80AAD254 -/* 00948 80AAD248 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 0094C 80AAD24C 24084018 */ addiu $t0, $zero, 0x4018 ## $t0 = 00004018 -/* 00950 80AAD250 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -.L80AAD254: -/* 00954 80AAD254 8609008A */ lh $t1, 0x008A($s0) ## 0000008A -/* 00958 80AAD258 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0095C 80AAD25C 012A1023 */ subu $v0, $t1, $t2 -/* 00960 80AAD260 00021400 */ sll $v0, $v0, 16 -/* 00964 80AAD264 00021403 */ sra $v0, $v0, 16 -/* 00968 80AAD268 04400003 */ bltz $v0, .L80AAD278 -/* 0096C 80AAD26C 00021823 */ subu $v1, $zero, $v0 -/* 00970 80AAD270 10000001 */ beq $zero, $zero, .L80AAD278 -/* 00974 80AAD274 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80AAD278: -/* 00978 80AAD278 28612151 */ slti $at, $v1, 0x2151 -/* 0097C 80AAD27C 1020000F */ beq $at, $zero, .L80AAD2BC -/* 00980 80AAD280 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00984 80AAD284 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 00988 80AAD288 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 0098C 80AAD28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00990 80AAD290 8FA50044 */ lw $a1, 0x0044($sp) -/* 00994 80AAD294 4600503C */ c.lt.s $f10, $f0 -/* 00998 80AAD298 00000000 */ nop -/* 0099C 80AAD29C 45020008 */ bc1fl .L80AAD2C0 -/* 009A0 80AAD2A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 009A4 80AAD2A4 44060000 */ mfc1 $a2, $f0 -/* 009A8 80AAD2A8 0C00BCA6 */ jal func_8002F298 -/* 009AC 80AAD2AC 2407000D */ addiu $a3, $zero, 0x000D ## $a3 = 0000000D -/* 009B0 80AAD2B0 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -/* 009B4 80AAD2B4 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 009B8 80AAD2B8 A60C027E */ sh $t4, 0x027E($s0) ## 0000027E -.L80AAD2BC: -/* 009BC 80AAD2BC 8FBF002C */ lw $ra, 0x002C($sp) -.L80AAD2C0: -/* 009C0 80AAD2C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 009C4 80AAD2C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 009C8 80AAD2C8 03E00008 */ jr $ra -/* 009CC 80AAD2CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s deleted file mode 100644 index a1df22a9e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AAD518 -/* 00C18 80AAD518 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00C1C 80AAD51C AFA40000 */ sw $a0, 0x0000($sp) -/* 00C20 80AAD520 AFA60008 */ sw $a2, 0x0008($sp) -/* 00C24 80AAD524 14A1000B */ bne $a1, $at, .L80AAD554 -/* 00C28 80AAD528 AFA7000C */ sw $a3, 0x000C($sp) -/* 00C2C 80AAD52C 8FA20014 */ lw $v0, 0x0014($sp) -/* 00C30 80AAD530 8FA30010 */ lw $v1, 0x0010($sp) -/* 00C34 80AAD534 844F027A */ lh $t7, 0x027A($v0) ## 0000027A -/* 00C38 80AAD538 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 00C3C 80AAD53C 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 00C40 80AAD540 01CFC023 */ subu $t8, $t6, $t7 -/* 00C44 80AAD544 A4780002 */ sh $t8, 0x0002($v1) ## 00000002 -/* 00C48 80AAD548 84480278 */ lh $t0, 0x0278($v0) ## 00000278 -/* 00C4C 80AAD54C 03284821 */ addu $t1, $t9, $t0 -/* 00C50 80AAD550 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 -.L80AAD554: -/* 00C54 80AAD554 03E00008 */ jr $ra -/* 00C58 80AAD558 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s deleted file mode 100644 index a578d8f70a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AAD55C -/* 00C5C 80AAD55C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C60 80AAD560 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00C64 80AAD564 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C68 80AAD568 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C6C 80AAD56C AFA60020 */ sw $a2, 0x0020($sp) -/* 00C70 80AAD570 14A10006 */ bne $a1, $at, .L80AAD58C -/* 00C74 80AAD574 AFA70024 */ sw $a3, 0x0024($sp) -/* 00C78 80AAD578 8FA50028 */ lw $a1, 0x0028($sp) -/* 00C7C 80AAD57C 3C0480AB */ lui $a0, %hi(D_80AAD64C) ## $a0 = 80AB0000 -/* 00C80 80AAD580 2484D64C */ addiu $a0, $a0, %lo(D_80AAD64C) ## $a0 = 80AAD64C -/* 00C84 80AAD584 0C0346BD */ jal Matrix_MultVec3f -/* 00C88 80AAD588 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80AAD58C: -/* 00C8C 80AAD58C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C90 80AAD590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C94 80AAD594 03E00008 */ jr $ra -/* 00C98 80AAD598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s deleted file mode 100644 index e9969b9608..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel EnNy_Destroy -/* 00168 80ABCD18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0016C 80ABCD1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00170 80ABCD20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00174 80ABCD24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00178 80ABCD28 0C016F32 */ jal Collider_DestroyJntSph -/* 0017C 80ABCD2C 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 00180 80ABCD30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00184 80ABCD34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00188 80ABCD38 03E00008 */ jr $ra -/* 0018C 80ABCD3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s deleted file mode 100644 index b5bd3ddbc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ /dev/null @@ -1,223 +0,0 @@ -.rdata -glabel D_80ABE444 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE454 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE464 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE474 - .asciz "../z_en_ny.c" - .balign 4 - -.text -glabel EnNy_Draw -/* 01174 80ABDD24 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 01178 80ABDD28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0117C 80ABDD2C AFB10028 */ sw $s1, 0x0028($sp) -/* 01180 80ABDD30 AFB00024 */ sw $s0, 0x0024($sp) -/* 01184 80ABDD34 AFA50094 */ sw $a1, 0x0094($sp) -/* 01188 80ABDD38 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0118C 80ABDD3C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01190 80ABDD40 3C0680AC */ lui $a2, %hi(D_80ABE444) ## $a2 = 80AC0000 -/* 01194 80ABDD44 24C6E444 */ addiu $a2, $a2, %lo(D_80ABE444) ## $a2 = 80ABE444 -/* 01198 80ABDD48 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 -/* 0119C 80ABDD4C 24070345 */ addiu $a3, $zero, 0x0345 ## $a3 = 00000345 -/* 011A0 80ABDD50 0C031AB1 */ jal Graph_OpenDisps -/* 011A4 80ABDD54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 011A8 80ABDD58 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 011AC 80ABDD5C 0C018A29 */ jal Collider_UpdateSpheres -/* 011B0 80ABDD60 26250150 */ addiu $a1, $s1, 0x0150 ## $a1 = 00000150 -/* 011B4 80ABDD64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 011B8 80ABDD68 8FA50094 */ lw $a1, 0x0094($sp) -/* 011BC 80ABDD6C 0C00BB60 */ jal func_8002ED80 -/* 011C0 80ABDD70 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 011C4 80ABDD74 8FAF0094 */ lw $t7, 0x0094($sp) -/* 011C8 80ABDD78 0C024F61 */ jal func_80093D84 -/* 011CC 80ABDD7C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 011D0 80ABDD80 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 011D4 80ABDD84 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 011D8 80ABDD88 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 011DC 80ABDD8C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 011E0 80ABDD90 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 011E4 80ABDD94 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 011E8 80ABDD98 8FA90094 */ lw $t1, 0x0094($sp) -/* 011EC 80ABDD9C 3C0580AC */ lui $a1, %hi(D_80ABE454) ## $a1 = 80AC0000 -/* 011F0 80ABDDA0 24A5E454 */ addiu $a1, $a1, %lo(D_80ABE454) ## $a1 = 80ABE454 -/* 011F4 80ABDDA4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 011F8 80ABDDA8 2406034D */ addiu $a2, $zero, 0x034D ## $a2 = 0000034D -/* 011FC 80ABDDAC 0C0346A2 */ jal Matrix_NewMtx -/* 01200 80ABDDB0 AFA20070 */ sw $v0, 0x0070($sp) -/* 01204 80ABDDB4 8FA30070 */ lw $v1, 0x0070($sp) -/* 01208 80ABDDB8 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 -/* 0120C 80ABDDBC 3C05E200 */ lui $a1, 0xE200 ## $a1 = E2000000 -/* 01210 80ABDDC0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01214 80ABDDC4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01218 80ABDDC8 3C0C0C18 */ lui $t4, 0x0C18 ## $t4 = 0C180000 -/* 0121C 80ABDDCC 358C49D8 */ ori $t4, $t4, 0x49D8 ## $t4 = 0C1849D8 -/* 01220 80ABDDD0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01224 80ABDDD4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01228 80ABDDD8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 0122C 80ABDDDC AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 01230 80ABDDE0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01234 80ABDDE4 34A5001C */ ori $a1, $a1, 0x001C ## $a1 = E200001C -/* 01238 80ABDDE8 3C06FB00 */ lui $a2, 0xFB00 ## $a2 = FB000000 -/* 0123C 80ABDDEC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01240 80ABDDF0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 01244 80ABDDF4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01248 80ABDDF8 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 0124C 80ABDDFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01250 80ABDE00 3C190600 */ lui $t9, %hi(D_06001EA8) ## $t9 = 06000000 -/* 01254 80ABDE04 27391EA8 */ addiu $t9, $t9, %lo(D_06001EA8) ## $t9 = 06001EA8 -/* 01258 80ABDE08 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0125C 80ABDE0C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01260 80ABDE10 AC460000 */ sw $a2, 0x0000($v0) ## 00000000 -/* 01264 80ABDE14 8E2E01D8 */ lw $t6, 0x01D8($s1) ## 000001D8 -/* 01268 80ABDE18 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 0126C 80ABDE1C 3C0BC810 */ lui $t3, 0xC810 ## $t3 = C8100000 -/* 01270 80ABDE20 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 01274 80ABDE24 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01278 80ABDE28 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0127C 80ABDE2C 356B49D8 */ ori $t3, $t3, 0x49D8 ## $t3 = C81049D8 -/* 01280 80ABDE30 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 01284 80ABDE34 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01288 80ABDE38 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0128C 80ABDE3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01290 80ABDE40 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01294 80ABDE44 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01298 80ABDE48 3C180600 */ lui $t8, %hi(D_06001DD0) ## $t8 = 06000000 -/* 0129C 80ABDE4C 27181DD0 */ addiu $t8, $t8, %lo(D_06001DD0) ## $t8 = 06001DD0 -/* 012A0 80ABDE50 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 012A4 80ABDE54 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 012A8 80ABDE58 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 012AC 80ABDE5C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 012B0 80ABDE60 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 012B4 80ABDE64 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 -/* 012B8 80ABDE68 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012BC 80ABDE6C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 012C0 80ABDE70 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 012C4 80ABDE74 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 012C8 80ABDE78 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 012CC 80ABDE7C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 012D0 80ABDE80 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 012D4 80ABDE84 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 012D8 80ABDE88 AC460000 */ sw $a2, 0x0000($v0) ## 00000000 -/* 012DC 80ABDE8C 8E2D01D4 */ lw $t5, 0x01D4($s1) ## 000001D4 -/* 012E0 80ABDE90 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000008 -/* 012E4 80ABDE94 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 012E8 80ABDE98 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 012EC 80ABDE9C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 012F0 80ABDEA0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 012F4 80ABDEA4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 012F8 80ABDEA8 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 012FC 80ABDEAC C62C01E0 */ lwc1 $f12, 0x01E0($s1) ## 000001E0 -/* 01300 80ABDEB0 460C203C */ c.lt.s $f4, $f12 -/* 01304 80ABDEB4 00000000 */ nop -/* 01308 80ABDEB8 45020023 */ bc1fl .L80ABDF48 -/* 0130C 80ABDEBC 8FAF0094 */ lw $t7, 0x0094($sp) -/* 01310 80ABDEC0 44066000 */ mfc1 $a2, $f12 -/* 01314 80ABDEC4 0C0342A3 */ jal Matrix_Scale -/* 01318 80ABDEC8 46006386 */ mov.s $f14, $f12 -/* 0131C 80ABDECC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01320 80ABDED0 8FA50094 */ lw $a1, 0x0094($sp) -/* 01324 80ABDED4 0C00BAF3 */ jal func_8002EBCC -/* 01328 80ABDED8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0132C 80ABDEDC 8FB90094 */ lw $t9, 0x0094($sp) -/* 01330 80ABDEE0 0C024F46 */ jal func_80093D18 -/* 01334 80ABDEE4 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01338 80ABDEE8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0133C 80ABDEEC 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01340 80ABDEF0 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 01344 80ABDEF4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01348 80ABDEF8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 0134C 80ABDEFC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01350 80ABDF00 8FAB0094 */ lw $t3, 0x0094($sp) -/* 01354 80ABDF04 3C0580AC */ lui $a1, %hi(D_80ABE464) ## $a1 = 80AC0000 -/* 01358 80ABDF08 24A5E464 */ addiu $a1, $a1, %lo(D_80ABE464) ## $a1 = 80ABE464 -/* 0135C 80ABDF0C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01360 80ABDF10 24060364 */ addiu $a2, $zero, 0x0364 ## $a2 = 00000364 -/* 01364 80ABDF14 0C0346A2 */ jal Matrix_NewMtx -/* 01368 80ABDF18 AFA2004C */ sw $v0, 0x004C($sp) -/* 0136C 80ABDF1C 8FA3004C */ lw $v1, 0x004C($sp) -/* 01370 80ABDF20 3C0E0600 */ lui $t6, %hi(D_06001FC8) ## $t6 = 06000000 -/* 01374 80ABDF24 25CE1FC8 */ addiu $t6, $t6, %lo(D_06001FC8) ## $t6 = 06001FC8 -/* 01378 80ABDF28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0137C 80ABDF2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01380 80ABDF30 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 01384 80ABDF34 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01388 80ABDF38 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0138C 80ABDF3C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01390 80ABDF40 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01394 80ABDF44 8FAF0094 */ lw $t7, 0x0094($sp) -.L80ABDF48: -/* 01398 80ABDF48 3C0680AC */ lui $a2, %hi(D_80ABE474) ## $a2 = 80AC0000 -/* 0139C 80ABDF4C 24C6E474 */ addiu $a2, $a2, %lo(D_80ABE474) ## $a2 = 80ABE474 -/* 013A0 80ABDF50 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 -/* 013A4 80ABDF54 24070368 */ addiu $a3, $zero, 0x0368 ## $a3 = 00000368 -/* 013A8 80ABDF58 0C031AD5 */ jal Graph_CloseDisps -/* 013AC 80ABDF5C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 013B0 80ABDF60 862301CA */ lh $v1, 0x01CA($s1) ## 000001CA -/* 013B4 80ABDF64 10600031 */ beq $v1, $zero, .L80ABE02C -/* 013B8 80ABDF68 2462FFFF */ addiu $v0, $v1, 0xFFFF ## $v0 = FFFFFFFF -/* 013BC 80ABDF6C 92380114 */ lbu $t8, 0x0114($s1) ## 00000114 -/* 013C0 80ABDF70 00021400 */ sll $v0, $v0, 16 -/* 013C4 80ABDF74 00021403 */ sra $v0, $v0, 16 -/* 013C8 80ABDF78 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 013CC 80ABDF7C 1440002B */ bne $v0, $zero, .L80ABE02C -/* 013D0 80ABDF80 A2390114 */ sb $t9, 0x0114($s1) ## 00000114 -/* 013D4 80ABDF84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 013D8 80ABDF88 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 013DC 80ABDF8C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 013E0 80ABDF90 A7A20036 */ sh $v0, 0x0036($sp) -/* 013E4 80ABDF94 87A20036 */ lh $v0, 0x0036($sp) -/* 013E8 80ABDF98 3C0B80AC */ lui $t3, %hi(D_80ABE3A8) ## $t3 = 80AC0000 -/* 013EC 80ABDF9C 256BE3A8 */ addiu $t3, $t3, %lo(D_80ABE3A8) ## $t3 = 80ABE3A8 -/* 013F0 80ABDFA0 30490003 */ andi $t1, $v0, 0x0003 ## $t1 = 00000000 -/* 013F4 80ABDFA4 00095080 */ sll $t2, $t1, 2 -/* 013F8 80ABDFA8 01495023 */ subu $t2, $t2, $t1 -/* 013FC 80ABDFAC 000A5080 */ sll $t2, $t2, 2 -/* 01400 80ABDFB0 014B8021 */ addu $s0, $t2, $t3 -/* 01404 80ABDFB4 C6080000 */ lwc1 $f8, 0x0000($s0) ## 00000000 -/* 01408 80ABDFB8 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 0140C 80ABDFBC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01410 80ABDFC0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 01414 80ABDFC4 46083280 */ add.s $f10, $f6, $f8 -/* 01418 80ABDFC8 460A0400 */ add.s $f16, $f0, $f10 -/* 0141C 80ABDFCC 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01420 80ABDFD0 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 01424 80ABDFD4 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 01428 80ABDFD8 C6040004 */ lwc1 $f4, 0x0004($s0) ## 00000004 -/* 0142C 80ABDFDC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01430 80ABDFE0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 01434 80ABDFE4 46049180 */ add.s $f6, $f18, $f4 -/* 01438 80ABDFE8 46060200 */ add.s $f8, $f0, $f6 -/* 0143C 80ABDFEC 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01440 80ABDFF0 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 01444 80ABDFF4 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 01448 80ABDFF8 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008 -/* 0144C 80ABDFFC 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01450 80ABE000 AFAC0018 */ sw $t4, 0x0018($sp) -/* 01454 80ABE004 46105480 */ add.s $f18, $f10, $f16 -/* 01458 80ABE008 AFA00014 */ sw $zero, 0x0014($sp) -/* 0145C 80ABE00C AFA00010 */ sw $zero, 0x0010($sp) -/* 01460 80ABE010 8FA40094 */ lw $a0, 0x0094($sp) -/* 01464 80ABE014 46120100 */ add.s $f4, $f0, $f18 -/* 01468 80ABE018 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0146C 80ABE01C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFAC -/* 01470 80ABE020 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01474 80ABE024 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 01478 80ABE028 E7A40044 */ swc1 $f4, 0x0044($sp) -.L80ABE02C: -/* 0147C 80ABE02C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01480 80ABE030 8FB00024 */ lw $s0, 0x0024($sp) -/* 01484 80ABE034 8FB10028 */ lw $s1, 0x0028($sp) -/* 01488 80ABE038 03E00008 */ jr $ra -/* 0148C 80ABE03C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s deleted file mode 100644 index ece5183f78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s +++ /dev/null @@ -1,117 +0,0 @@ -.rdata -glabel D_80ABE3E0 - .asciz "ニュウ イニシャル[ %d ] ！！\n" - .balign 4 - -glabel D_80ABE400 - .asciz "ダミーニュウ イニシャル[ %d ] ！！\n" - .balign 4 - -glabel D_80ABE424 - .asciz "En_Ny_actor_move2[ %x ] ！！\n" - .balign 4 - -.late_rodata -glabel D_80ABE4B4 - .word 0xBECCCCCD - -.text -glabel EnNy_Init -/* 00000 80ABCBB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80ABCBB4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 80ABCBB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0000C 80ABCBBC AFB00020 */ sw $s0, 0x0020($sp) -/* 00010 80ABCBC0 3C0580AC */ lui $a1, %hi(D_80ABE384) ## $a1 = 80AC0000 -/* 00014 80ABCBC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80ABCBC8 0C01E037 */ jal Actor_ProcessInitChain - -/* 0001C 80ABCBCC 24A5E384 */ addiu $a1, $a1, %lo(D_80ABE384) ## $a1 = 80ABE384 -/* 00020 80ABCBD0 3C0E80AC */ lui $t6, %hi(D_80ABE364) ## $t6 = 80AC0000 -/* 00024 80ABCBD4 25CEE364 */ addiu $t6, $t6, %lo(D_80ABE364) ## $t6 = 80ABE364 -/* 00028 80ABCBD8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0002C 80ABCBDC AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 00030 80ABCBE0 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF -/* 00034 80ABCBE4 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00038 80ABCBE8 AFA50028 */ sw $a1, 0x0028($sp) -/* 0003C 80ABCBEC 0C016EFE */ jal Collider_InitJntSph -/* 00040 80ABCBF0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00044 80ABCBF4 3C0780AC */ lui $a3, %hi(D_80ABE354) ## $a3 = 80AC0000 -/* 00048 80ABCBF8 26180170 */ addiu $t8, $s0, 0x0170 ## $t8 = 00000170 -/* 0004C 80ABCBFC 8FA50028 */ lw $a1, 0x0028($sp) -/* 00050 80ABCC00 AFB80010 */ sw $t8, 0x0010($sp) -/* 00054 80ABCC04 24E7E354 */ addiu $a3, $a3, %lo(D_80ABE354) ## $a3 = 80ABE354 -/* 00058 80ABCC08 8FA40034 */ lw $a0, 0x0034($sp) -/* 0005C 80ABCC0C 0C017014 */ jal Collider_SetJntSph -/* 00060 80ABCC10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00064 80ABCC14 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00068 80ABCC18 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 0006C 80ABCC1C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00070 80ABCC20 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00074 80ABCC24 0C00AC78 */ jal ActorShape_Init - -/* 00078 80ABCC28 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 0007C 80ABCC2C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00080 80ABCC30 A60001CA */ sh $zero, 0x01CA($s0) ## 000001CA -/* 00084 80ABCC34 A20001D0 */ sb $zero, 0x01D0($s0) ## 000001D0 -/* 00088 80ABCC38 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 0008C 80ABCC3C 0C00B58B */ jal Actor_SetScale - -/* 00090 80ABCC40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 80ABCC44 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00098 80ABCC48 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 0009C 80ABCC4C 3C0180AC */ lui $at, %hi(D_80ABE4B4) ## $at = 80AC0000 -/* 000A0 80ABCC50 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 000A4 80ABCC54 C424E4B4 */ lwc1 $f4, %lo(D_80ABE4B4)($at) -/* 000A8 80ABCC58 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000AC 80ABCC5C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 000B0 80ABCC60 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 000B4 80ABCC64 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 000B8 80ABCC68 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 000BC 80ABCC6C A60001CC */ sh $zero, 0x01CC($s0) ## 000001CC -/* 000C0 80ABCC70 A61901CE */ sh $t9, 0x01CE($s0) ## 000001CE -/* 000C4 80ABCC74 AE0801D4 */ sw $t0, 0x01D4($s0) ## 000001D4 -/* 000C8 80ABCC78 AE0001D8 */ sw $zero, 0x01D8($s0) ## 000001D8 -/* 000CC 80ABCC7C E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 000D0 80ABCC80 E60001E8 */ swc1 $f0, 0x01E8($s0) ## 000001E8 -/* 000D4 80ABCC84 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000D8 80ABCC88 14A0000F */ bne $a1, $zero, .L80ABCCC8 -/* 000DC 80ABCC8C E60601E0 */ swc1 $f6, 0x01E0($s0) ## 000001E0 -/* 000E0 80ABCC90 3C0480AC */ lui $a0, %hi(D_80ABE3E0) ## $a0 = 80AC0000 -/* 000E4 80ABCC94 0C00084C */ jal osSyncPrintf - -/* 000E8 80ABCC98 2484E3E0 */ addiu $a0, $a0, %lo(D_80ABE3E0) ## $a0 = 80ABE3E0 -/* 000EC 80ABCC9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000F0 80ABCCA0 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 000F4 80ABCCA4 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 000F8 80ABCCA8 A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE -/* 000FC 80ABCCAC AE0001D4 */ sw $zero, 0x01D4($s0) ## 000001D4 -/* 00100 80ABCCB0 AE0901D8 */ sw $t1, 0x01D8($s0) ## 000001D8 -/* 00104 80ABCCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 80ABCCB8 0C2AF36F */ jal func_80ABCDBC -/* 0010C 80ABCCBC E60801E0 */ swc1 $f8, 0x01E0($s0) ## 000001E0 -/* 00110 80ABCCC0 10000011 */ beq $zero, $zero, .L80ABCD08 -/* 00114 80ABCCC4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABCCC8: -/* 00118 80ABCCC8 3C0480AC */ lui $a0, %hi(D_80ABE400) ## $a0 = 80AC0000 -/* 0011C 80ABCCCC 0C00084C */ jal osSyncPrintf - -/* 00120 80ABCCD0 2484E400 */ addiu $a0, $a0, %lo(D_80ABE400) ## $a0 = 80ABE400 -/* 00124 80ABCCD4 3C0580AC */ lui $a1, %hi(func_80ABDBF8) ## $a1 = 80AC0000 -/* 00128 80ABCCD8 24A5DBF8 */ addiu $a1, $a1, %lo(func_80ABDBF8) ## $a1 = 80ABDBF8 -/* 0012C 80ABCCDC 3C0480AC */ lui $a0, %hi(D_80ABE424) ## $a0 = 80AC0000 -/* 00130 80ABCCE0 2484E424 */ addiu $a0, $a0, %lo(D_80ABE424) ## $a0 = 80ABE424 -/* 00134 80ABCCE4 0C00084C */ jal osSyncPrintf - -/* 00138 80ABCCE8 AFA50028 */ sw $a1, 0x0028($sp) -/* 0013C 80ABCCEC 8FA50028 */ lw $a1, 0x0028($sp) -/* 00140 80ABCCF0 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00144 80ABCCF4 240B0009 */ addiu $t3, $zero, 0x0009 ## $t3 = 00000009 -/* 00148 80ABCCF8 A20A00AE */ sb $t2, 0x00AE($s0) ## 000000AE -/* 0014C 80ABCCFC A20B0164 */ sb $t3, 0x0164($s0) ## 00000164 -/* 00150 80ABCD00 AE050130 */ sw $a1, 0x0130($s0) ## 00000130 -/* 00154 80ABCD04 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABCD08: -/* 00158 80ABCD08 8FB00020 */ lw $s0, 0x0020($sp) -/* 0015C 80ABCD0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00160 80ABCD10 03E00008 */ jr $ra -/* 00164 80ABCD14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s deleted file mode 100644 index 9f8cb36d29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s +++ /dev/null @@ -1,184 +0,0 @@ -.late_rodata -glabel D_80ABE4D0 - .word 0x3FAA3D71 - -.text -glabel EnNy_Update -/* 008EC 80ABD49C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 008F0 80ABD4A0 AFBF003C */ sw $ra, 0x003C($sp) -/* 008F4 80ABD4A4 AFB30038 */ sw $s3, 0x0038($sp) -/* 008F8 80ABD4A8 AFB20034 */ sw $s2, 0x0034($sp) -/* 008FC 80ABD4AC AFB10030 */ sw $s1, 0x0030($sp) -/* 00900 80ABD4B0 AFB0002C */ sw $s0, 0x002C($sp) -/* 00904 80ABD4B4 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00908 80ABD4B8 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 0090C 80ABD4BC 848E01C8 */ lh $t6, 0x01C8($a0) ## 000001C8 -/* 00910 80ABD4C0 848201CA */ lh $v0, 0x01CA($a0) ## 000001CA -/* 00914 80ABD4C4 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00918 80ABD4C8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 0091C 80ABD4CC C48401E0 */ lwc1 $f4, 0x01E0($a0) ## 000001E0 -/* 00920 80ABD4D0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00924 80ABD4D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00928 80ABD4D8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0092C 80ABD4DC A48F01C8 */ sh $t7, 0x01C8($a0) ## 000001C8 -/* 00930 80ABD4E0 10400003 */ beq $v0, $zero, .L80ABD4F0 -/* 00934 80ABD4E4 46062501 */ sub.s $f20, $f4, $f6 -/* 00938 80ABD4E8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0093C 80ABD4EC A49801CA */ sh $t8, 0x01CA($a0) ## 000001CA -.L80ABD4F0: -/* 00940 80ABD4F0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00944 80ABD4F4 0C00B56E */ jal Actor_SetFocus - -/* 00948 80ABD4F8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0094C 80ABD4FC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00950 80ABD500 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00954 80ABD504 0C00B58B */ jal Actor_SetScale - -/* 00958 80ABD508 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0095C 80ABD50C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00960 80ABD510 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00964 80ABD514 3C0180AC */ lui $at, %hi(D_80ABE4D0) ## $at = 80AC0000 -/* 00968 80ABD518 C428E4D0 */ lwc1 $f8, %lo(D_80ABE4D0)($at) -/* 0096C 80ABD51C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00970 80ABD520 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00974 80ABD524 46144282 */ mul.s $f10, $f8, $f20 -/* 00978 80ABD528 8E59016C */ lw $t9, 0x016C($s2) ## 0000016C -/* 0097C 80ABD52C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00980 80ABD530 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00984 80ABD534 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 00988 80ABD538 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0098C 80ABD53C 46105480 */ add.s $f18, $f10, $f16 -/* 00990 80ABD540 44818000 */ mtc1 $at, $f16 ## $f16 = 24.00 -/* 00994 80ABD544 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00998 80ABD548 E7320038 */ swc1 $f18, 0x0038($t9) ## 00000038 -/* 0099C 80ABD54C C64401E8 */ lwc1 $f4, 0x01E8($s2) ## 000001E8 -/* 009A0 80ABD550 864C00B4 */ lh $t4, 0x00B4($s2) ## 000000B4 -/* 009A4 80ABD554 46062202 */ mul.s $f8, $f4, $f6 -/* 009A8 80ABD558 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 009AC 80ABD55C 46148482 */ mul.s $f18, $f16, $f20 -/* 009B0 80ABD560 4600428D */ trunc.w.s $f10, $f8 -/* 009B4 80ABD564 46049580 */ add.s $f22, $f18, $f4 -/* 009B8 80ABD568 440B5000 */ mfc1 $t3, $f10 -/* 009BC 80ABD56C 4600B180 */ add.s $f6, $f22, $f0 -/* 009C0 80ABD570 018B6821 */ addu $t5, $t4, $t3 -/* 009C4 80ABD574 A64D00B4 */ sh $t5, 0x00B4($s2) ## 000000B4 -/* 009C8 80ABD578 4600B201 */ sub.s $f8, $f22, $f0 -/* 009CC 80ABD57C 44053000 */ mfc1 $a1, $f6 -/* 009D0 80ABD580 44064000 */ mfc1 $a2, $f8 -/* 009D4 80ABD584 0C2AF4EE */ jal func_80ABD3B8 -/* 009D8 80ABD588 00000000 */ nop -/* 009DC 80ABD58C 0C00B638 */ jal Actor_MoveForward - -/* 009E0 80ABD590 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 009E4 80ABD594 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 009E8 80ABD598 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 009EC 80ABD59C 264401E4 */ addiu $a0, $s2, 0x01E4 ## $a0 = 000001E4 -/* 009F0 80ABD5A0 0C01DE80 */ jal Math_StepToF - -/* 009F4 80ABD5A4 8E4501E8 */ lw $a1, 0x01E8($s2) ## 000001E8 -/* 009F8 80ABD5A8 8E59014C */ lw $t9, 0x014C($s2) ## 0000014C -/* 009FC 80ABD5AC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00A00 80ABD5B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A04 80ABD5B4 0320F809 */ jalr $ra, $t9 -/* 00A08 80ABD5B8 00000000 */ nop -/* 00A0C 80ABD5BC C64A0104 */ lwc1 $f10, 0x0104($s2) ## 00000104 -/* 00A10 80ABD5C0 C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 -/* 00A14 80ABD5C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00A18 80ABD5C8 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 00A1C 80ABD5CC 46165401 */ sub.s $f16, $f10, $f22 -/* 00A20 80ABD5D0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00A24 80ABD5D4 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 00A28 80ABD5D8 46169101 */ sub.s $f4, $f18, $f22 -/* 00A2C 80ABD5DC E6500104 */ swc1 $f16, 0x0104($s2) ## 00000104 -/* 00A30 80ABD5E0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00A34 80ABD5E4 4406A000 */ mfc1 $a2, $f20 -/* 00A38 80ABD5E8 E6440028 */ swc1 $f4, 0x0028($s2) ## 00000028 -/* 00A3C 80ABD5EC 4407A000 */ mfc1 $a3, $f20 -/* 00A40 80ABD5F0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A44 80ABD5F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A48 80ABD5F8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00A4C 80ABD5FC 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00A50 80ABD600 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00A54 80ABD604 C6480028 */ lwc1 $f8, 0x0028($s2) ## 00000028 -/* 00A58 80ABD608 E65601F0 */ swc1 $f22, 0x01F0($s2) ## 000001F0 -/* 00A5C 80ABD60C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00A60 80ABD610 46164280 */ add.s $f10, $f8, $f22 -/* 00A64 80ABD614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A68 80ABD618 0C2AF464 */ jal func_80ABD190 -/* 00A6C 80ABD61C E64A0028 */ swc1 $f10, 0x0028($s2) ## 00000028 -/* 00A70 80ABD620 10400021 */ beq $v0, $zero, .L80ABD6A8 -/* 00A74 80ABD624 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00A78 80ABD628 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00A7C 80ABD62C 02408025 */ or $s0, $s2, $zero ## $s0 = 00000000 -/* 00A80 80ABD630 24130008 */ addiu $s3, $zero, 0x0008 ## $s3 = 00000008 -.L80ABD634: -/* 00A84 80ABD634 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00A88 80ABD638 4600A306 */ mov.s $f12, $f20 -/* 00A8C 80ABD63C C6500024 */ lwc1 $f16, 0x0024($s2) ## 00000024 -/* 00A90 80ABD640 4600A306 */ mov.s $f12, $f20 -/* 00A94 80ABD644 46100480 */ add.s $f18, $f0, $f16 -/* 00A98 80ABD648 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00A9C 80ABD64C E61201F8 */ swc1 $f18, 0x01F8($s0) ## 000001F8 -/* 00AA0 80ABD650 C6440028 */ lwc1 $f4, 0x0028($s2) ## 00000028 -/* 00AA4 80ABD654 4600A306 */ mov.s $f12, $f20 -/* 00AA8 80ABD658 46040180 */ add.s $f6, $f0, $f4 -/* 00AAC 80ABD65C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00AB0 80ABD660 E60601FC */ swc1 $f6, 0x01FC($s0) ## 000001FC -/* 00AB4 80ABD664 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C -/* 00AB8 80ABD668 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00ABC 80ABD66C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 00AC0 80ABD670 46080280 */ add.s $f10, $f0, $f8 -/* 00AC4 80ABD674 1633FFEF */ bne $s1, $s3, .L80ABD634 -/* 00AC8 80ABD678 E60A01F4 */ swc1 $f10, 0x01F4($s0) ## 00000200 -/* 00ACC 80ABD67C 3C0F80AC */ lui $t7, %hi(func_80ABDBB8) ## $t7 = 80AC0000 -/* 00AD0 80ABD680 3C1880AC */ lui $t8, %hi(func_80ABE040) ## $t8 = 80AC0000 -/* 00AD4 80ABD684 3C0880AC */ lui $t0, %hi(func_80ABD728) ## $t0 = 80AC0000 -/* 00AD8 80ABD688 25EFDBB8 */ addiu $t7, $t7, %lo(func_80ABDBB8) ## $t7 = 80ABDBB8 -/* 00ADC 80ABD68C 2718E040 */ addiu $t8, $t8, %lo(func_80ABE040) ## $t8 = 80ABE040 -/* 00AE0 80ABD690 2508D728 */ addiu $t0, $t0, %lo(func_80ABD728) ## $t0 = 80ABD728 -/* 00AE4 80ABD694 A64001C8 */ sh $zero, 0x01C8($s2) ## 000001C8 -/* 00AE8 80ABD698 AE4F0130 */ sw $t7, 0x0130($s2) ## 00000130 -/* 00AEC 80ABD69C AE580134 */ sw $t8, 0x0134($s2) ## 00000134 -/* 00AF0 80ABD6A0 10000018 */ beq $zero, $zero, .L80ABD704 -/* 00AF4 80ABD6A4 AE48014C */ sw $t0, 0x014C($s2) ## 0000014C -.L80ABD6A8: -/* 00AF8 80ABD6A8 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 00AFC 80ABD6AC C65201E0 */ lwc1 $f18, 0x01E0($s2) ## 000001E0 -/* 00B00 80ABD6B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B04 80ABD6B4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00B08 80ABD6B8 4612803C */ c.lt.s $f16, $f18 -/* 00B0C 80ABD6BC 02012821 */ addu $a1, $s0, $at -/* 00B10 80ABD6C0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C -/* 00B14 80ABD6C4 45020004 */ bc1fl .L80ABD6D8 -/* 00B18 80ABD6C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B1C 80ABD6CC 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00B20 80ABD6D0 26460150 */ addiu $a2, $s2, 0x0150 ## $a2 = 00000150 -/* 00B24 80ABD6D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80ABD6D8: -/* 00B28 80ABD6D8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00B2C 80ABD6DC 02018821 */ addu $s1, $s0, $at -/* 00B30 80ABD6E0 26530150 */ addiu $s3, $s2, 0x0150 ## $s3 = 00000150 -/* 00B34 80ABD6E4 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 -/* 00B38 80ABD6E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 -/* 00B3C 80ABD6EC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00B40 80ABD6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C -/* 00B44 80ABD6F4 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C -/* 00B48 80ABD6F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 -/* 00B4C 80ABD6FC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00B50 80ABD700 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 -.L80ABD704: -/* 00B54 80ABD704 8FBF003C */ lw $ra, 0x003C($sp) -/* 00B58 80ABD708 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00B5C 80ABD70C D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00B60 80ABD710 8FB0002C */ lw $s0, 0x002C($sp) -/* 00B64 80ABD714 8FB10030 */ lw $s1, 0x0030($sp) -/* 00B68 80ABD718 8FB20034 */ lw $s2, 0x0034($sp) -/* 00B6C 80ABD71C 8FB30038 */ lw $s3, 0x0038($sp) -/* 00B70 80ABD720 03E00008 */ jr $ra -/* 00B74 80ABD724 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s deleted file mode 100644 index ba7134bd98..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -glabel D_80ABE4B8 - .float 0.7 - -glabel D_80ABE4BC - .word 0x40333333 - -.text -glabel func_80ABCD40 -/* 00190 80ABCD40 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00194 80ABCD44 C4860084 */ lwc1 $f6, 0x0084($a0) ## 00000084 -/* 00198 80ABCD48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0019C 80ABCD4C 4606203C */ c.lt.s $f4, $f6 -/* 001A0 80ABCD50 00000000 */ nop -/* 001A4 80ABCD54 45020005 */ bc1fl .L80ABCD6C -/* 001A8 80ABCD58 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 001AC 80ABCD5C 3C0180AC */ lui $at, %hi(D_80ABE4B8) ## $at = 80AC0000 -/* 001B0 80ABCD60 10000003 */ beq $zero, $zero, .L80ABCD70 -/* 001B4 80ABCD64 C420E4B8 */ lwc1 $f0, %lo(D_80ABE4B8)($at) -/* 001B8 80ABCD68 44810000 */ mtc1 $at, $f0 ## $f0 = -0.00 -.L80ABCD6C: -/* 001BC 80ABCD6C 00000000 */ nop -.L80ABCD70: -/* 001C0 80ABCD70 3C0180AC */ lui $at, %hi(D_80ABE4BC) ## $at = 80AC0000 -/* 001C4 80ABCD74 C428E4BC */ lwc1 $f8, %lo(D_80ABE4BC)($at) -/* 001C8 80ABCD78 46004282 */ mul.s $f10, $f8, $f0 -/* 001CC 80ABCD7C 03E00008 */ jr $ra -/* 001D0 80ABCD80 E48A01E8 */ swc1 $f10, 0x01E8($a0) ## 000001E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s deleted file mode 100644 index d27535efe5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80ABCD84 -/* 001D4 80ABCD84 3C0E80AC */ lui $t6, %hi(func_80ABCE50) ## $t6 = 80AC0000 -/* 001D8 80ABCD88 25CECE50 */ addiu $t6, $t6, %lo(func_80ABCE50) ## $t6 = 80ABCE50 -/* 001DC 80ABCD8C 03E00008 */ jr $ra -/* 001E0 80ABCD90 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s deleted file mode 100644 index 28d24d9730..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80ABCD94 -/* 001E4 80ABCD94 3C0F80AC */ lui $t7, %hi(func_80ABCE90) ## $t7 = 80AC0000 -/* 001E8 80ABCD98 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 001EC 80ABCD9C 25EFCE90 */ addiu $t7, $t7, %lo(func_80ABCE90) ## $t7 = 80ABCE90 -/* 001F0 80ABCDA0 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC -/* 001F4 80ABCDA4 03E00008 */ jr $ra -/* 001F8 80ABCDA8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s deleted file mode 100644 index a54aac7737..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80ABCDAC -/* 001FC 80ABCDAC 3C0E80AC */ lui $t6, %hi(func_80ABCEEC) ## $t6 = 80AC0000 -/* 00200 80ABCDB0 25CECEEC */ addiu $t6, $t6, %lo(func_80ABCEEC) ## $t6 = 80ABCEEC -/* 00204 80ABCDB4 03E00008 */ jr $ra -/* 00208 80ABCDB8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s deleted file mode 100644 index ac2e5db887..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80ABCDBC -/* 0020C 80ABCDBC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00210 80ABCDC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 80ABCDC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00218 80ABCDC8 E48401F4 */ swc1 $f4, 0x01F4($a0) ## 000001F4 -/* 0021C 80ABCDCC 0C2AF350 */ jal func_80ABCD40 -/* 00220 80ABCDD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00224 80ABCDD4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00228 80ABCDD8 3C0F80AC */ lui $t7, %hi(func_80ABCF4C) ## $t7 = 80AC0000 -/* 0022C 80ABCDDC 240E00B4 */ addiu $t6, $zero, 0x00B4 ## $t6 = 000000B4 -/* 00230 80ABCDE0 25EFCF4C */ addiu $t7, $t7, %lo(func_80ABCF4C) ## $t7 = 80ABCF4C -/* 00234 80ABCDE4 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC -/* 00238 80ABCDE8 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 0023C 80ABCDEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00240 80ABCDF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00244 80ABCDF4 03E00008 */ jr $ra -/* 00248 80ABCDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s deleted file mode 100644 index f38aa4f453..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80ABCDFC -/* 0024C 80ABCDFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00250 80ABCE00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00254 80ABCE04 AFA40018 */ sw $a0, 0x0018($sp) -/* 00258 80ABCE08 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0025C 80ABCE0C 240538EA */ addiu $a1, $zero, 0x38EA ## $a1 = 000038EA -/* 00260 80ABCE10 8FA40018 */ lw $a0, 0x0018($sp) -/* 00264 80ABCE14 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00268 80ABCE18 3C0E80AC */ lui $t6, %hi(func_80ABD05C) ## $t6 = 80AC0000 -/* 0026C 80ABCE1C 25CED05C */ addiu $t6, $t6, %lo(func_80ABD05C) ## $t6 = 80ABD05C -/* 00270 80ABCE20 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00274 80ABCE24 E48401E8 */ swc1 $f4, 0x01E8($a0) ## 000001E8 -/* 00278 80ABCE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0027C 80ABCE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00280 80ABCE30 03E00008 */ jr $ra -/* 00284 80ABCE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s deleted file mode 100644 index bdcdac5a0e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80ABCE38 -/* 00288 80ABCE38 3C0F80AC */ lui $t7, %hi(func_80ABD11C) ## $t7 = 80AC0000 -/* 0028C 80ABCE3C 240E003C */ addiu $t6, $zero, 0x003C ## $t6 = 0000003C -/* 00290 80ABCE40 25EFD11C */ addiu $t7, $t7, %lo(func_80ABD11C) ## $t7 = 80ABD11C -/* 00294 80ABCE44 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC -/* 00298 80ABCE48 03E00008 */ jr $ra -/* 0029C 80ABCE4C AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s deleted file mode 100644 index 70550cc90d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80ABCE50 -/* 002A0 80ABCE50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 80ABCE54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A8 80ABCE58 AFA5001C */ sw $a1, 0x001C($sp) -/* 002AC 80ABCE5C 3C0146C8 */ lui $at, 0x46C8 ## $at = 46C80000 -/* 002B0 80ABCE60 44812000 */ mtc1 $at, $f4 ## $f4 = 25600.00 -/* 002B4 80ABCE64 C486008C */ lwc1 $f6, 0x008C($a0) ## 0000008C -/* 002B8 80ABCE68 4604303E */ c.le.s $f6, $f4 -/* 002BC 80ABCE6C 00000000 */ nop -/* 002C0 80ABCE70 45020004 */ bc1fl .L80ABCE84 -/* 002C4 80ABCE74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002C8 80ABCE78 0C2AF365 */ jal func_80ABCD94 -/* 002CC 80ABCE7C 00000000 */ nop -/* 002D0 80ABCE80 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ABCE84: -/* 002D4 80ABCE84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D8 80ABCE88 03E00008 */ jr $ra -/* 002DC 80ABCE8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s deleted file mode 100644 index 981b5a91d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ABCE90 -/* 002E0 80ABCE90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002E4 80ABCE94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002E8 80ABCE98 AFA50024 */ sw $a1, 0x0024($sp) -/* 002EC 80ABCE9C 8C8201D8 */ lw $v0, 0x01D8($a0) ## 000001D8 -/* 002F0 80ABCEA0 8C8301D4 */ lw $v1, 0x01D4($a0) ## 000001D4 -/* 002F4 80ABCEA4 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 002F8 80ABCEA8 284100FF */ slti $at, $v0, 0x00FF -/* 002FC 80ABCEAC 14200009 */ bne $at, $zero, .L80ABCED4 -/* 00300 80ABCEB0 2463FFC0 */ addiu $v1, $v1, 0xFFC0 ## $v1 = FFFFFFC0 -/* 00304 80ABCEB4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00308 80ABCEB8 AFA20018 */ sw $v0, 0x0018($sp) -/* 0030C 80ABCEBC AFA0001C */ sw $zero, 0x001C($sp) -/* 00310 80ABCEC0 0C2AF36B */ jal func_80ABCDAC -/* 00314 80ABCEC4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00318 80ABCEC8 8FA20018 */ lw $v0, 0x0018($sp) -/* 0031C 80ABCECC 8FA3001C */ lw $v1, 0x001C($sp) -/* 00320 80ABCED0 8FA40020 */ lw $a0, 0x0020($sp) -.L80ABCED4: -/* 00324 80ABCED4 AC8301D4 */ sw $v1, 0x01D4($a0) ## 000001D4 -/* 00328 80ABCED8 AC8201D8 */ sw $v0, 0x01D8($a0) ## 000001D8 -/* 0032C 80ABCEDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00330 80ABCEE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00334 80ABCEE4 03E00008 */ jr $ra -/* 00338 80ABCEE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s deleted file mode 100644 index d21dcbe9b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80ABCEEC -/* 0033C 80ABCEEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00340 80ABCEF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00344 80ABCEF4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00348 80ABCEF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0034C 80ABCEFC AFA50024 */ sw $a1, 0x0024($sp) -/* 00350 80ABCF00 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00354 80ABCF04 C48001E0 */ lwc1 $f0, 0x01E0($a0) ## 000001E0 -/* 00358 80ABCF08 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0035C 80ABCF0C 00000000 */ nop -/* 00360 80ABCF10 46040000 */ add.s $f0, $f0, $f4 -/* 00364 80ABCF14 4600103E */ c.le.s $f2, $f0 -/* 00368 80ABCF18 00000000 */ nop -/* 0036C 80ABCF1C 45020007 */ bc1fl .L80ABCF3C -/* 00370 80ABCF20 E48001E0 */ swc1 $f0, 0x01E0($a0) ## 000001E0 -/* 00374 80ABCF24 AFA40020 */ sw $a0, 0x0020($sp) -/* 00378 80ABCF28 0C2AF36F */ jal func_80ABCDBC -/* 0037C 80ABCF2C E7A2001C */ swc1 $f2, 0x001C($sp) -/* 00380 80ABCF30 8FA40020 */ lw $a0, 0x0020($sp) -/* 00384 80ABCF34 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 00388 80ABCF38 E48001E0 */ swc1 $f0, 0x01E0($a0) ## 000001E0 -.L80ABCF3C: -/* 0038C 80ABCF3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00390 80ABCF40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00394 80ABCF44 03E00008 */ jr $ra -/* 00398 80ABCF48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s deleted file mode 100644 index 9037c4e25a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80ABCF4C -/* 0039C 80ABCF4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003A0 80ABCF50 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003A4 80ABCF54 AFB00020 */ sw $s0, 0x0020($sp) -/* 003A8 80ABCF58 AFA50034 */ sw $a1, 0x0034($sp) -/* 003AC 80ABCF5C C4860084 */ lwc1 $f6, 0x0084($a0) ## 00000084 -/* 003B0 80ABCF60 C48401F0 */ lwc1 $f4, 0x01F0($a0) ## 000001F0 -/* 003B4 80ABCF64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003B8 80ABCF68 4606203C */ c.lt.s $f4, $f6 -/* 003BC 80ABCF6C 00000000 */ nop -/* 003C0 80ABCF70 45010003 */ bc1t .L80ABCF80 -/* 003C4 80ABCF74 00000000 */ nop -/* 003C8 80ABCF78 0C00BE5D */ jal func_8002F974 -/* 003CC 80ABCF7C 240530E9 */ addiu $a1, $zero, 0x30E9 ## $a1 = 000030E9 -.L80ABCF80: -/* 003D0 80ABCF80 0C2AF350 */ jal func_80ABCD40 -/* 003D4 80ABCF84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003D8 80ABCF88 8E0201DC */ lw $v0, 0x01DC($s0) ## 000001DC -/* 003DC 80ABCF8C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003E0 80ABCF90 18400004 */ blez $v0, .L80ABCFA4 -/* 003E4 80ABCF94 AE0E01DC */ sw $t6, 0x01DC($s0) ## 000001DC -/* 003E8 80ABCF98 860F01CC */ lh $t7, 0x01CC($s0) ## 000001CC -/* 003EC 80ABCF9C 51E00006 */ beql $t7, $zero, .L80ABCFB8 -/* 003F0 80ABCFA0 C60801F4 */ lwc1 $f8, 0x01F4($s0) ## 000001F4 -.L80ABCFA4: -/* 003F4 80ABCFA4 0C2AF37F */ jal func_80ABCDFC -/* 003F8 80ABCFA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003FC 80ABCFAC 10000027 */ beq $zero, $zero, .L80ABD04C -/* 00400 80ABCFB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 80ABCFB4 C60801F4 */ lwc1 $f8, 0x01F4($s0) ## 000001F4 -.L80ABCFB8: -/* 00408 80ABCFB8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0040C 80ABCFBC AFA00010 */ sw $zero, 0x0010($sp) -/* 00410 80ABCFC0 4600428D */ trunc.w.s $f10, $f8 -/* 00414 80ABCFC4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00418 80ABCFC8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0041C 80ABCFCC 44075000 */ mfc1 $a3, $f10 -/* 00420 80ABCFD0 00000000 */ nop -/* 00424 80ABCFD4 00073C00 */ sll $a3, $a3, 16 -/* 00428 80ABCFD8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0042C 80ABCFDC 00073C03 */ sra $a3, $a3, 16 -/* 00430 80ABCFE0 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 -/* 00434 80ABCFE4 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 -/* 00438 80ABCFE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0043C 80ABCFEC 0C01E107 */ jal Math_ApproachF - -/* 00440 80ABCFF0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 00444 80ABCFF4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00448 80ABCFF8 C60C0094 */ lwc1 $f12, 0x0094($s0) ## 00000094 -/* 0044C 80ABCFFC C60E0090 */ lwc1 $f14, 0x0090($s0) ## 00000090 -/* 00450 80ABD000 0C03F494 */ jal Math_FAtan2F -/* 00454 80ABD004 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00458 80ABD008 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 0045C 80ABD00C 0C041184 */ jal cosf - -/* 00460 80ABD010 46000306 */ mov.s $f12, $f0 -/* 00464 80ABD014 C61001E8 */ lwc1 $f16, 0x01E8($s0) ## 000001E8 -/* 00468 80ABD018 C61201F0 */ lwc1 $f18, 0x01F0($s0) ## 000001F0 -/* 0046C 80ABD01C C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 -/* 00470 80ABD020 46100002 */ mul.s $f0, $f0, $f16 -/* 00474 80ABD024 4604903C */ c.lt.s $f18, $f4 -/* 00478 80ABD028 46000005 */ abs.s $f0, $f0 -/* 0047C 80ABD02C 45000006 */ bc1f .L80ABD048 -/* 00480 80ABD030 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00484 80ABD034 0C0400A4 */ jal sinf - -/* 00488 80ABD038 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 0048C 80ABD03C C60601E8 */ lwc1 $f6, 0x01E8($s0) ## 000001E8 -/* 00490 80ABD040 46060202 */ mul.s $f8, $f0, $f6 -/* 00494 80ABD044 E60801EC */ swc1 $f8, 0x01EC($s0) ## 000001EC -.L80ABD048: -/* 00498 80ABD048 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABD04C: -/* 0049C 80ABD04C 8FB00020 */ lw $s0, 0x0020($sp) -/* 004A0 80ABD050 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 004A4 80ABD054 03E00008 */ jr $ra -/* 004A8 80ABD058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s deleted file mode 100644 index 87964c734c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80ABD05C -/* 004AC 80ABD05C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004B0 80ABD060 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 004B4 80ABD064 44811000 */ mtc1 $at, $f2 ## $f2 = 0.25 -/* 004B8 80ABD068 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004BC 80ABD06C AFA50024 */ sw $a1, 0x0024($sp) -/* 004C0 80ABD070 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 004C4 80ABD074 C48001E0 */ lwc1 $f0, 0x01E0($a0) ## 000001E0 -/* 004C8 80ABD078 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 004CC 80ABD07C 00000000 */ nop -/* 004D0 80ABD080 46040001 */ sub.s $f0, $f0, $f4 -/* 004D4 80ABD084 4602003E */ c.le.s $f0, $f2 -/* 004D8 80ABD088 00000000 */ nop -/* 004DC 80ABD08C 4502001F */ bc1fl .L80ABD10C -/* 004E0 80ABD090 E48001E0 */ swc1 $f0, 0x01E0($a0) ## 000001E0 -/* 004E4 80ABD094 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 004E8 80ABD098 46001006 */ mov.s $f0, $f2 -/* 004EC 80ABD09C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 004F0 80ABD0A0 51C0001A */ beql $t6, $zero, .L80ABD10C -/* 004F4 80ABD0A4 E48001E0 */ swc1 $f0, 0x01E0($a0) ## 000001E0 -/* 004F8 80ABD0A8 C48601F0 */ lwc1 $f6, 0x01F0($a0) ## 000001F0 -/* 004FC 80ABD0AC C4880084 */ lwc1 $f8, 0x0084($a0) ## 00000084 -/* 00500 80ABD0B0 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 00504 80ABD0B4 4608303C */ c.lt.s $f6, $f8 -/* 00508 80ABD0B8 00000000 */ nop -/* 0050C 80ABD0BC 45030008 */ bc1tl .L80ABD0E0 -/* 00510 80ABD0C0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00514 80ABD0C4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00518 80ABD0C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0051C 80ABD0CC E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00520 80ABD0D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00524 80ABD0D4 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 00528 80ABD0D8 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 0052C 80ABD0DC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80ABD0E0: -/* 00530 80ABD0E0 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00534 80ABD0E4 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 00538 80ABD0E8 A48F0088 */ sh $t7, 0x0088($a0) ## 00000088 -/* 0053C 80ABD0EC E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00540 80ABD0F0 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 00544 80ABD0F4 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00548 80ABD0F8 0C2AF38E */ jal func_80ABCE38 -/* 0054C 80ABD0FC AFA40020 */ sw $a0, 0x0020($sp) -/* 00550 80ABD100 8FA40020 */ lw $a0, 0x0020($sp) -/* 00554 80ABD104 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 00558 80ABD108 E48001E0 */ swc1 $f0, 0x01E0($a0) ## 000001E0 -.L80ABD10C: -/* 0055C 80ABD10C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00560 80ABD110 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00564 80ABD114 03E00008 */ jr $ra -/* 00568 80ABD118 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s deleted file mode 100644 index 6b235a0abc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ABD11C -/* 0056C 80ABD11C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00570 80ABD120 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00574 80ABD124 AFA50024 */ sw $a1, 0x0024($sp) -/* 00578 80ABD128 8C8201D4 */ lw $v0, 0x01D4($a0) ## 000001D4 -/* 0057C 80ABD12C 8C8301D8 */ lw $v1, 0x01D8($a0) ## 000001D8 -/* 00580 80ABD130 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 00584 80ABD134 284100FF */ slti $at, $v0, 0x00FF -/* 00588 80ABD138 1420000F */ bne $at, $zero, .L80ABD178 -/* 0058C 80ABD13C 2463FFC0 */ addiu $v1, $v1, 0xFFC0 ## $v1 = FFFFFFC0 -/* 00590 80ABD140 8C8501DC */ lw $a1, 0x01DC($a0) ## 000001DC -/* 00594 80ABD144 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00598 80ABD148 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0059C 80ABD14C 10A00003 */ beq $a1, $zero, .L80ABD15C -/* 005A0 80ABD150 24AEFFFF */ addiu $t6, $a1, 0xFFFF ## $t6 = FFFFFFFF -/* 005A4 80ABD154 10000008 */ beq $zero, $zero, .L80ABD178 -/* 005A8 80ABD158 AC8E01DC */ sw $t6, 0x01DC($a0) ## 000001DC -.L80ABD15C: -/* 005AC 80ABD15C AFA2001C */ sw $v0, 0x001C($sp) -/* 005B0 80ABD160 AFA30018 */ sw $v1, 0x0018($sp) -/* 005B4 80ABD164 0C2AF361 */ jal func_80ABCD84 -/* 005B8 80ABD168 AFA40020 */ sw $a0, 0x0020($sp) -/* 005BC 80ABD16C 8FA2001C */ lw $v0, 0x001C($sp) -/* 005C0 80ABD170 8FA30018 */ lw $v1, 0x0018($sp) -/* 005C4 80ABD174 8FA40020 */ lw $a0, 0x0020($sp) -.L80ABD178: -/* 005C8 80ABD178 AC8201D4 */ sw $v0, 0x01D4($a0) ## 000001D4 -/* 005CC 80ABD17C AC8301D8 */ sw $v1, 0x01D8($a0) ## 000001D8 -/* 005D0 80ABD180 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005D4 80ABD184 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 005D8 80ABD188 03E00008 */ jr $ra -/* 005DC 80ABD18C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s deleted file mode 100644 index 16617a9984..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s +++ /dev/null @@ -1,151 +0,0 @@ -glabel func_80ABD190 -/* 005E0 80ABD190 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005E4 80ABD194 AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E8 80ABD198 AFB00020 */ sw $s0, 0x0020($sp) -/* 005EC 80ABD19C AFA50044 */ sw $a1, 0x0044($sp) -/* 005F0 80ABD1A0 A3A0003F */ sb $zero, 0x003F($sp) -/* 005F4 80ABD1A4 90830160 */ lbu $v1, 0x0160($a0) ## 00000160 -/* 005F8 80ABD1A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005FC 80ABD1AC A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC -/* 00600 80ABD1B0 306E0004 */ andi $t6, $v1, 0x0004 ## $t6 = 00000000 -/* 00604 80ABD1B4 11C0000C */ beq $t6, $zero, .L80ABD1E8 -/* 00608 80ABD1B8 30680002 */ andi $t0, $v1, 0x0002 ## $t0 = 00000000 -/* 0060C 80ABD1BC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00610 80ABD1C0 8499008A */ lh $t9, 0x008A($a0) ## 0000008A -/* 00614 80ABD1C4 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 00618 80ABD1C8 306FFFFB */ andi $t7, $v1, 0xFFFB ## $t7 = 00000000 -/* 0061C 80ABD1CC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00620 80ABD1D0 A08F0160 */ sb $t7, 0x0160($a0) ## 00000160 -/* 00624 80ABD1D4 A49801CC */ sh $t8, 0x01CC($a0) ## 000001CC -/* 00628 80ABD1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0062C 80ABD1DC A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00630 80ABD1E0 10000070 */ beq $zero, $zero, .L80ABD3A4 -/* 00634 80ABD1E4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -.L80ABD1E8: -/* 00638 80ABD1E8 11000006 */ beq $t0, $zero, .L80ABD204 -/* 0063C 80ABD1EC 3069FFFD */ andi $t1, $v1, 0xFFFD ## $t1 = 00000000 -/* 00640 80ABD1F0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00644 80ABD1F4 A2090160 */ sb $t1, 0x0160($s0) ## 00000160 -/* 00648 80ABD1F8 A60A01CC */ sh $t2, 0x01CC($s0) ## 000001CC -/* 0064C 80ABD1FC 10000069 */ beq $zero, $zero, .L80ABD3A4 -/* 00650 80ABD200 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ABD204: -/* 00654 80ABD204 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 -/* 00658 80ABD208 304B0002 */ andi $t3, $v0, 0x0002 ## $t3 = 00000000 -/* 0065C 80ABD20C 51600065 */ beql $t3, $zero, .L80ABD3A4 -/* 00660 80ABD210 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00664 80ABD214 8E0D016C */ lw $t5, 0x016C($s0) ## 0000016C -/* 00668 80ABD218 304CFFFD */ andi $t4, $v0, 0xFFFD ## $t4 = 00000000 -/* 0066C 80ABD21C A20C0161 */ sb $t4, 0x0161($s0) ## 00000161 -/* 00670 80ABD220 85AE000E */ lh $t6, 0x000E($t5) ## 0000000E -/* 00674 80ABD224 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00678 80ABD228 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 0067C 80ABD22C 00000000 */ nop -/* 00680 80ABD230 46803220 */ cvt.s.w $f8, $f6 -/* 00684 80ABD234 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 00688 80ABD238 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 0068C 80ABD23C 8E0F016C */ lw $t7, 0x016C($s0) ## 0000016C -/* 00690 80ABD240 85F80010 */ lh $t8, 0x0010($t7) ## 00000010 -/* 00694 80ABD244 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00698 80ABD248 00000000 */ nop -/* 0069C 80ABD24C 46805420 */ cvt.s.w $f16, $f10 -/* 006A0 80ABD250 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 006A4 80ABD254 8E19016C */ lw $t9, 0x016C($s0) ## 0000016C -/* 006A8 80ABD258 87280012 */ lh $t0, 0x0012($t9) ## 00000012 -/* 006AC 80ABD25C 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 006B0 80ABD260 00000000 */ nop -/* 006B4 80ABD264 46809120 */ cvt.s.w $f4, $f18 -/* 006B8 80ABD268 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 006BC 80ABD26C C60801E0 */ lwc1 $f8, 0x01E0($s0) ## 000001E0 -/* 006C0 80ABD270 46083032 */ c.eq.s $f6, $f8 -/* 006C4 80ABD274 00000000 */ nop -/* 006C8 80ABD278 45020035 */ bc1fl .L80ABD350 -/* 006CC 80ABD27C 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 006D0 80ABD280 8E0901D4 */ lw $t1, 0x01D4($s0) ## 000001D4 -/* 006D4 80ABD284 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 006D8 80ABD288 55210031 */ bnel $t1, $at, .L80ABD350 -/* 006DC 80ABD28C 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 006E0 80ABD290 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 006E4 80ABD294 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006E8 80ABD298 10410017 */ beq $v0, $at, .L80ABD2F8 -/* 006EC 80ABD29C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006F0 80ABD2A0 10410020 */ beq $v0, $at, .L80ABD324 -/* 006F4 80ABD2A4 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 006F8 80ABD2A8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 006FC 80ABD2AC 10410006 */ beq $v0, $at, .L80ABD2C8 -/* 00700 80ABD2B0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00704 80ABD2B4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00708 80ABD2B8 10410004 */ beq $v0, $at, .L80ABD2CC -/* 0070C 80ABD2BC 00000000 */ nop -/* 00710 80ABD2C0 10000023 */ beq $zero, $zero, .L80ABD350 -/* 00714 80ABD2C4 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -.L80ABD2C8: -/* 00718 80ABD2C8 A3AA003F */ sb $t2, 0x003F($sp) -.L80ABD2CC: -/* 0071C 80ABD2CC 0C00D58A */ jal Actor_ApplyDamage - -/* 00720 80ABD2D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00724 80ABD2D4 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 -/* 00728 80ABD2D8 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0072C 80ABD2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00730 80ABD2E0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00734 80ABD2E4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00738 80ABD2E8 0C00D09B */ jal func_8003426C -/* 0073C 80ABD2EC 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 -/* 00740 80ABD2F0 10000017 */ beq $zero, $zero, .L80ABD350 -/* 00744 80ABD2F4 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -.L80ABD2F8: -/* 00748 80ABD2F8 0C00D58A */ jal Actor_ApplyDamage - -/* 0074C 80ABD2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00750 80ABD300 240C0050 */ addiu $t4, $zero, 0x0050 ## $t4 = 00000050 -/* 00754 80ABD304 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00758 80ABD308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0075C 80ABD30C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00760 80ABD310 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00764 80ABD314 0C00D09B */ jal func_8003426C -/* 00768 80ABD318 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 -/* 0076C 80ABD31C 1000000C */ beq $zero, $zero, .L80ABD350 -/* 00770 80ABD320 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -.L80ABD324: -/* 00774 80ABD324 A60D01CA */ sh $t5, 0x01CA($s0) ## 000001CA -/* 00778 80ABD328 0C00D58A */ jal Actor_ApplyDamage - -/* 0077C 80ABD32C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00780 80ABD330 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 00784 80ABD334 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00788 80ABD338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0078C 80ABD33C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00790 80ABD340 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00794 80ABD344 0C00D09B */ jal func_8003426C -/* 00798 80ABD348 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 -/* 0079C 80ABD34C 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -.L80ABD350: -/* 007A0 80ABD350 AE0001DC */ sw $zero, 0x01DC($s0) ## 000001DC -/* 007A4 80ABD354 8FA40044 */ lw $a0, 0x0044($sp) -/* 007A8 80ABD358 15E0000D */ bne $t7, $zero, .L80ABD390 -/* 007AC 80ABD35C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007B0 80ABD360 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 007B4 80ABD364 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 007B8 80ABD368 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 007BC 80ABD36C 0301C824 */ and $t9, $t8, $at -/* 007C0 80ABD370 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 007C4 80ABD374 93A8003F */ lbu $t0, 0x003F($sp) -/* 007C8 80ABD378 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007CC 80ABD37C A20801D0 */ sb $t0, 0x01D0($s0) ## 000001D0 -/* 007D0 80ABD380 0C00CB1F */ jal func_80032C7C -/* 007D4 80ABD384 8FA40044 */ lw $a0, 0x0044($sp) -/* 007D8 80ABD388 10000006 */ beq $zero, $zero, .L80ABD3A4 -/* 007DC 80ABD38C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ABD390: -/* 007E0 80ABD390 0C00A729 */ jal EffectSsHitMark_SpawnFixedScale -/* 007E4 80ABD394 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 -/* 007E8 80ABD398 10000002 */ beq $zero, $zero, .L80ABD3A4 -/* 007EC 80ABD39C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 007F0 80ABD3A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ABD3A4: -/* 007F4 80ABD3A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007F8 80ABD3A8 8FB00020 */ lw $s0, 0x0020($sp) -/* 007FC 80ABD3AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00800 80ABD3B0 03E00008 */ jr $ra -/* 00804 80ABD3B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s deleted file mode 100644 index a24a0b9652..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80ABE4C0 - .word 0xBECCCCCD -glabel D_80ABE4C4 - .word 0xBECCCCCD -glabel D_80ABE4C8 - .float 0.4 - -glabel D_80ABE4CC - .float 0.4 - -.text -glabel func_80ABD3B8 -/* 00808 80ABD3B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0080C 80ABD3BC C48601E8 */ lwc1 $f6, 0x01E8($a0) ## 000001E8 -/* 00810 80ABD3C0 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 00814 80ABD3C4 44867000 */ mtc1 $a2, $f14 ## $f14 = 0.00 -/* 00818 80ABD3C8 46062032 */ c.eq.s $f4, $f6 -/* 0081C 80ABD3CC 3C0180AC */ lui $at, %hi(D_80ABE4C0) ## $at = 80AC0000 -/* 00820 80ABD3D0 45020005 */ bc1fl .L80ABD3E8 -/* 00824 80ABD3D4 C4800084 */ lwc1 $f0, 0x0084($a0) ## 00000084 -/* 00828 80ABD3D8 C428E4C0 */ lwc1 $f8, %lo(D_80ABE4C0)($at) -/* 0082C 80ABD3DC 03E00008 */ jr $ra -/* 00830 80ABD3E0 E488006C */ swc1 $f8, 0x006C($a0) ## 0000006C -.L80ABD3E4: -/* 00834 80ABD3E4 C4800084 */ lwc1 $f0, 0x0084($a0) ## 00000084 -.L80ABD3E8: -/* 00838 80ABD3E8 3C0180AC */ lui $at, %hi(D_80ABE4C4) ## $at = 80AC0000 -/* 0083C 80ABD3EC 4600603C */ c.lt.s $f12, $f0 -/* 00840 80ABD3F0 00000000 */ nop -/* 00844 80ABD3F4 45030005 */ bc1tl .L80ABD40C -/* 00848 80ABD3F8 4600703C */ c.lt.s $f14, $f0 -/* 0084C 80ABD3FC C42AE4C4 */ lwc1 $f10, %lo(D_80ABE4C4)($at) -/* 00850 80ABD400 03E00008 */ jr $ra -/* 00854 80ABD404 E48A006C */ swc1 $f10, 0x006C($a0) ## 0000006C -.L80ABD408: -/* 00858 80ABD408 4600703C */ c.lt.s $f14, $f0 -.L80ABD40C: -/* 0085C 80ABD40C 00000000 */ nop -/* 00860 80ABD410 45000020 */ bc1f .L80ABD494 -/* 00864 80ABD414 00000000 */ nop -/* 00868 80ABD418 C48001EC */ lwc1 $f0, 0x01EC($a0) ## 000001EC -/* 0086C 80ABD41C C4820060 */ lwc1 $f2, 0x0060($a0) ## 00000060 -/* 00870 80ABD420 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00874 80ABD424 3C0180AC */ lui $at, %hi(D_80ABE4C8) ## $at = 80AC0000 -/* 00878 80ABD428 4602003C */ c.lt.s $f0, $f2 -/* 0087C 80ABD42C E490006C */ swc1 $f16, 0x006C($a0) ## 0000006C -/* 00880 80ABD430 4502000C */ bc1fl .L80ABD464 -/* 00884 80ABD434 4600103C */ c.lt.s $f2, $f0 -/* 00888 80ABD438 C432E4C8 */ lwc1 $f18, %lo(D_80ABE4C8)($at) -/* 0088C 80ABD43C 46121101 */ sub.s $f4, $f2, $f18 -/* 00890 80ABD440 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -/* 00894 80ABD444 C4860060 */ lwc1 $f6, 0x0060($a0) ## 00000060 -/* 00898 80ABD448 4600303C */ c.lt.s $f6, $f0 -/* 0089C 80ABD44C 00000000 */ nop -/* 008A0 80ABD450 45000010 */ bc1f .L80ABD494 -/* 008A4 80ABD454 00000000 */ nop -/* 008A8 80ABD458 03E00008 */ jr $ra -/* 008AC 80ABD45C E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80ABD460: -/* 008B0 80ABD460 4600103C */ c.lt.s $f2, $f0 -.L80ABD464: -/* 008B4 80ABD464 3C0180AC */ lui $at, %hi(D_80ABE4CC) ## $at = 80AC0000 -/* 008B8 80ABD468 4500000A */ bc1f .L80ABD494 -/* 008BC 80ABD46C 00000000 */ nop -/* 008C0 80ABD470 C428E4CC */ lwc1 $f8, %lo(D_80ABE4CC)($at) -/* 008C4 80ABD474 46081280 */ add.s $f10, $f2, $f8 -/* 008C8 80ABD478 E48A0060 */ swc1 $f10, 0x0060($a0) ## 00000060 -/* 008CC 80ABD47C C4900060 */ lwc1 $f16, 0x0060($a0) ## 00000060 -/* 008D0 80ABD480 4610003C */ c.lt.s $f0, $f16 -/* 008D4 80ABD484 00000000 */ nop -/* 008D8 80ABD488 45000002 */ bc1f .L80ABD494 -/* 008DC 80ABD48C 00000000 */ nop -/* 008E0 80ABD490 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80ABD494: -/* 008E4 80ABD494 03E00008 */ jr $ra -/* 008E8 80ABD498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s deleted file mode 100644 index 02e80f7c1f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s +++ /dev/null @@ -1,182 +0,0 @@ -glabel func_80ABD728 -/* 00B78 80ABD728 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00B7C 80ABD72C 3C0E80AC */ lui $t6, %hi(D_80ABE390) ## $t6 = 80AC0000 -/* 00B80 80ABD730 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00B84 80ABD734 AFB50050 */ sw $s5, 0x0050($sp) -/* 00B88 80ABD738 AFB4004C */ sw $s4, 0x004C($sp) -/* 00B8C 80ABD73C AFB30048 */ sw $s3, 0x0048($sp) -/* 00B90 80ABD740 AFB20044 */ sw $s2, 0x0044($sp) -/* 00B94 80ABD744 AFB10040 */ sw $s1, 0x0040($sp) -/* 00B98 80ABD748 AFB0003C */ sw $s0, 0x003C($sp) -/* 00B9C 80ABD74C F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00BA0 80ABD750 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00BA4 80ABD754 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 00BA8 80ABD758 25CEE390 */ addiu $t6, $t6, %lo(D_80ABE390) ## $t6 = 80ABE390 -/* 00BAC 80ABD75C 8DD80000 */ lw $t8, 0x0000($t6) ## 80ABE390 -/* 00BB0 80ABD760 27B30068 */ addiu $s3, $sp, 0x0068 ## $s3 = FFFFFFE0 -/* 00BB4 80ABD764 3C1980AC */ lui $t9, %hi(D_80ABE39C) ## $t9 = 80AC0000 -/* 00BB8 80ABD768 AE780000 */ sw $t8, 0x0000($s3) ## FFFFFFE0 -/* 00BBC 80ABD76C 8DCF0004 */ lw $t7, 0x0004($t6) ## 80ABE394 -/* 00BC0 80ABD770 2739E39C */ addiu $t9, $t9, %lo(D_80ABE39C) ## $t9 = 80ABE39C -/* 00BC4 80ABD774 27B4005C */ addiu $s4, $sp, 0x005C ## $s4 = FFFFFFD4 -/* 00BC8 80ABD778 AE6F0004 */ sw $t7, 0x0004($s3) ## FFFFFFE4 -/* 00BCC 80ABD77C 8DD80008 */ lw $t8, 0x0008($t6) ## 80ABE398 -/* 00BD0 80ABD780 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00BD4 80ABD784 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 00BD8 80ABD788 AE780008 */ sw $t8, 0x0008($s3) ## FFFFFFE8 -/* 00BDC 80ABD78C 8F290000 */ lw $t1, 0x0000($t9) ## 80ABE39C -/* 00BE0 80ABD790 AE890000 */ sw $t1, 0x0000($s4) ## FFFFFFD4 -/* 00BE4 80ABD794 8F280004 */ lw $t0, 0x0004($t9) ## 80ABE3A0 -/* 00BE8 80ABD798 AE880004 */ sw $t0, 0x0004($s4) ## FFFFFFD8 -/* 00BEC 80ABD79C 8F290008 */ lw $t1, 0x0008($t9) ## 80ABE3A4 -/* 00BF0 80ABD7A0 AE890008 */ sw $t1, 0x0008($s4) ## FFFFFFDC -/* 00BF4 80ABD7A4 848A01C8 */ lh $t2, 0x01C8($a0) ## 000001C8 -/* 00BF8 80ABD7A8 29410002 */ slti $at, $t2, 0x0002 -/* 00BFC 80ABD7AC 54200074 */ bnel $at, $zero, .L80ABD980 -/* 00C00 80ABD7B0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00C04 80ABD7B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C08 80ABD7B8 C4860084 */ lwc1 $f6, 0x0084($a0) ## 00000084 -/* 00C0C 80ABD7BC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00C10 80ABD7C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00C14 80ABD7C4 4606203C */ c.lt.s $f4, $f6 -/* 00C18 80ABD7C8 00000000 */ nop -/* 00C1C 80ABD7CC 45020044 */ bc1fl .L80ABD8E0 -/* 00C20 80ABD7D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C24 80ABD7D4 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 00C28 80ABD7D8 27B00074 */ addiu $s0, $sp, 0x0074 ## $s0 = FFFFFFEC -.L80ABD7DC: -/* 00C2C 80ABD7DC 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00C30 80ABD7E0 4600A306 */ mov.s $f12, $f20 -/* 00C34 80ABD7E4 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 -/* 00C38 80ABD7E8 4600A306 */ mov.s $f12, $f20 -/* 00C3C 80ABD7EC 46080280 */ add.s $f10, $f0, $f8 -/* 00C40 80ABD7F0 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00C44 80ABD7F4 E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 00C48 80ABD7F8 C6500028 */ lwc1 $f16, 0x0028($s2) ## 00000028 -/* 00C4C 80ABD7FC 4600A306 */ mov.s $f12, $f20 -/* 00C50 80ABD800 46100480 */ add.s $f18, $f0, $f16 -/* 00C54 80ABD804 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00C58 80ABD808 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 00C5C 80ABD80C C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C -/* 00C60 80ABD810 24040050 */ addiu $a0, $zero, 0x0050 ## $a0 = 00000050 -/* 00C64 80ABD814 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 00C68 80ABD818 46040180 */ add.s $f6, $f0, $f4 -/* 00C6C 80ABD81C 0C01DF64 */ jal Rand_S16Offset - -/* 00C70 80ABD820 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00C74 80ABD824 240B0019 */ addiu $t3, $zero, 0x0019 ## $t3 = 00000019 -/* 00C78 80ABD828 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00C7C 80ABD82C AFAC001C */ sw $t4, 0x001C($sp) -/* 00C80 80ABD830 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00C84 80ABD834 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00C88 80ABD838 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFEC -/* 00C8C 80ABD83C 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFE0 -/* 00C90 80ABD840 02803825 */ or $a3, $s4, $zero ## $a3 = FFFFFFD4 -/* 00C94 80ABD844 AFA20010 */ sw $v0, 0x0010($sp) -/* 00C98 80ABD848 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile -/* 00C9C 80ABD84C AFA00018 */ sw $zero, 0x0018($sp) -/* 00CA0 80ABD850 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00CA4 80ABD854 2A21000A */ slti $at, $s1, 0x000A -/* 00CA8 80ABD858 1420FFE0 */ bne $at, $zero, .L80ABD7DC -/* 00CAC 80ABD85C 00000000 */ nop -/* 00CB0 80ABD860 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00CB4 80ABD864 4481C000 */ mtc1 $at, $f24 ## $f24 = 0.25 -/* 00CB8 80ABD868 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00CBC 80ABD86C 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 00CC0 80ABD870 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00CC4 80ABD874 24130014 */ addiu $s3, $zero, 0x0014 ## $s3 = 00000014 -.L80ABD878: -/* 00CC8 80ABD878 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00CCC 80ABD87C 4600A306 */ mov.s $f12, $f20 -/* 00CD0 80ABD880 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 -/* 00CD4 80ABD884 4600A306 */ mov.s $f12, $f20 -/* 00CD8 80ABD888 46080280 */ add.s $f10, $f0, $f8 -/* 00CDC 80ABD88C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00CE0 80ABD890 E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 00CE4 80ABD894 C6500028 */ lwc1 $f16, 0x0028($s2) ## 00000028 -/* 00CE8 80ABD898 4600A306 */ mov.s $f12, $f20 -/* 00CEC 80ABD89C 46100480 */ add.s $f18, $f0, $f16 -/* 00CF0 80ABD8A0 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00CF4 80ABD8A4 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 00CF8 80ABD8A8 C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C -/* 00CFC 80ABD8AC 4406B000 */ mfc1 $a2, $f22 -/* 00D00 80ABD8B0 4407B000 */ mfc1 $a3, $f22 -/* 00D04 80ABD8B4 46040180 */ add.s $f6, $f0, $f4 -/* 00D08 80ABD8B8 E7B80014 */ swc1 $f24, 0x0014($sp) -/* 00D0C 80ABD8BC E7B40010 */ swc1 $f20, 0x0010($sp) -/* 00D10 80ABD8C0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00D14 80ABD8C4 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00D18 80ABD8C8 0C00A4F9 */ jal EffectSsBubble_Spawn -/* 00D1C 80ABD8CC 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFEC -/* 00D20 80ABD8D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00D24 80ABD8D4 1633FFE8 */ bne $s1, $s3, .L80ABD878 -/* 00D28 80ABD8D8 00000000 */ nop -/* 00D2C 80ABD8DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80ABD8E0: -/* 00D30 80ABD8E0 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 00D34 80ABD8E4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00D38 80ABD8E8 4481A000 */ mtc1 $at, $f20 ## $f20 = 4.00 -/* 00D3C 80ABD8EC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00D40 80ABD8F0 02408025 */ or $s0, $s2, $zero ## $s0 = 00000000 -/* 00D44 80ABD8F4 24130008 */ addiu $s3, $zero, 0x0008 ## $s3 = 00000008 -.L80ABD8F8: -/* 00D48 80ABD8F8 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00D4C 80ABD8FC 4600B306 */ mov.s $f12, $f22 -/* 00D50 80ABD900 E6000258 */ swc1 $f0, 0x0258($s0) ## 00000258 -/* 00D54 80ABD904 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00D58 80ABD908 4600B306 */ mov.s $f12, $f22 -/* 00D5C 80ABD90C E6000260 */ swc1 $f0, 0x0260($s0) ## 00000260 -/* 00D60 80ABD910 0C00CFBE */ jal Rand_ZeroFloat - -/* 00D64 80ABD914 4600A306 */ mov.s $f12, $f20 -/* 00D68 80ABD918 46140200 */ add.s $f8, $f0, $f20 -/* 00D6C 80ABD91C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00D70 80ABD920 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 00D74 80ABD924 1633FFF4 */ bne $s1, $s3, .L80ABD8F8 -/* 00D78 80ABD928 E6080250 */ swc1 $f8, 0x0250($s0) ## 0000025C -/* 00D7C 80ABD92C 924D01D0 */ lbu $t5, 0x01D0($s2) ## 000001D0 -/* 00D80 80ABD930 A64001C8 */ sh $zero, 0x01C8($s2) ## 000001C8 -/* 00D84 80ABD934 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00D88 80ABD938 15A00008 */ bne $t5, $zero, .L80ABD95C -/* 00D8C 80ABD93C 26450024 */ addiu $a1, $s2, 0x0024 ## $a1 = 00000024 -/* 00D90 80ABD940 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00D94 80ABD944 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00D98 80ABD948 26460024 */ addiu $a2, $s2, 0x0024 ## $a2 = 00000024 -/* 00D9C 80ABD94C 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00DA0 80ABD950 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 00DA4 80ABD954 10000004 */ beq $zero, $zero, .L80ABD968 -/* 00DA8 80ABD958 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -.L80ABD95C: -/* 00DAC 80ABD95C 0C007D52 */ jal Item_DropCollectible - -/* 00DB0 80ABD960 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00DB4 80ABD964 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -.L80ABD968: -/* 00DB8 80ABD968 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DBC 80ABD96C 2405394B */ addiu $a1, $zero, 0x394B ## $a1 = 0000394B -/* 00DC0 80ABD970 3C0E80AC */ lui $t6, %hi(func_80ABD9AC) ## $t6 = 80AC0000 -/* 00DC4 80ABD974 25CED9AC */ addiu $t6, $t6, %lo(func_80ABD9AC) ## $t6 = 80ABD9AC -/* 00DC8 80ABD978 AE4E014C */ sw $t6, 0x014C($s2) ## 0000014C -/* 00DCC 80ABD97C 8FBF0054 */ lw $ra, 0x0054($sp) -.L80ABD980: -/* 00DD0 80ABD980 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00DD4 80ABD984 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 00DD8 80ABD988 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 00DDC 80ABD98C 8FB0003C */ lw $s0, 0x003C($sp) -/* 00DE0 80ABD990 8FB10040 */ lw $s1, 0x0040($sp) -/* 00DE4 80ABD994 8FB20044 */ lw $s2, 0x0044($sp) -/* 00DE8 80ABD998 8FB30048 */ lw $s3, 0x0048($sp) -/* 00DEC 80ABD99C 8FB4004C */ lw $s4, 0x004C($sp) -/* 00DF0 80ABD9A0 8FB50050 */ lw $s5, 0x0050($sp) -/* 00DF4 80ABD9A4 03E00008 */ jr $ra -/* 00DF8 80ABD9A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s deleted file mode 100644 index 05bd1c6ed7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s +++ /dev/null @@ -1,158 +0,0 @@ -.late_rodata -glabel D_80ABE4D4 - .float 0.4 - -glabel D_80ABE4D8 - .float 0.1 - -glabel D_80ABE4DC - .float 0.6 - -glabel D_80ABE4E0 - .float 0.15 - -.text -glabel func_80ABD9AC -/* 00DFC 80ABD9AC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00E00 80ABD9B0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00E04 80ABD9B4 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00E08 80ABD9B8 AFB60050 */ sw $s6, 0x0050($sp) -/* 00E0C 80ABD9BC AFB5004C */ sw $s5, 0x004C($sp) -/* 00E10 80ABD9C0 AFB40048 */ sw $s4, 0x0048($sp) -/* 00E14 80ABD9C4 AFB30044 */ sw $s3, 0x0044($sp) -/* 00E18 80ABD9C8 AFB20040 */ sw $s2, 0x0040($sp) -/* 00E1C 80ABD9CC AFB1003C */ sw $s1, 0x003C($sp) -/* 00E20 80ABD9D0 AFB00038 */ sw $s0, 0x0038($sp) -/* 00E24 80ABD9D4 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 00E28 80ABD9D8 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00E2C 80ABD9DC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00E30 80ABD9E0 AFA5005C */ sw $a1, 0x005C($sp) -/* 00E34 80ABD9E4 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00E38 80ABD9E8 C4840084 */ lwc1 $f4, 0x0084($a0) ## 00000084 -/* 00E3C 80ABD9EC 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 -/* 00E40 80ABD9F0 02C08025 */ or $s0, $s6, $zero ## $s0 = 00000000 -/* 00E44 80ABD9F4 4604A03C */ c.lt.s $f20, $f4 -/* 00E48 80ABD9F8 26D20258 */ addiu $s2, $s6, 0x0258 ## $s2 = 00000258 -/* 00E4C 80ABD9FC 26D3025C */ addiu $s3, $s6, 0x025C ## $s3 = 0000025C -/* 00E50 80ABDA00 26D40260 */ addiu $s4, $s6, 0x0260 ## $s4 = 00000260 -/* 00E54 80ABDA04 45000033 */ bc1f .L80ABDAD4 -/* 00E58 80ABDA08 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00E5C 80ABDA0C 3C0180AC */ lui $at, %hi(D_80ABE4D4) ## $at = 80AC0000 -/* 00E60 80ABDA10 C43AE4D4 */ lwc1 $f26, %lo(D_80ABE4D4)($at) -/* 00E64 80ABDA14 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00E68 80ABDA18 4481C000 */ mtc1 $at, $f24 ## $f24 = -1.00 -/* 00E6C 80ABDA1C 3C0180AC */ lui $at, %hi(D_80ABE4D8) ## $at = 80AC0000 -/* 00E70 80ABDA20 C436E4D8 */ lwc1 $f22, %lo(D_80ABE4D8)($at) -/* 00E74 80ABDA24 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00E78 80ABDA28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E7C 80ABDA2C 24920258 */ addiu $s2, $a0, 0x0258 ## $s2 = 00000258 -/* 00E80 80ABDA30 2493025C */ addiu $s3, $a0, 0x025C ## $s3 = 0000025C -/* 00E84 80ABDA34 24940260 */ addiu $s4, $a0, 0x0260 ## $s4 = 00000260 -/* 00E88 80ABDA38 24150060 */ addiu $s5, $zero, 0x0060 ## $s5 = 00000060 -.L80ABDA3C: -/* 00E8C 80ABDA3C C60601F8 */ lwc1 $f6, 0x01F8($s0) ## 000001F8 -/* 00E90 80ABDA40 C6080258 */ lwc1 $f8, 0x0258($s0) ## 00000258 -/* 00E94 80ABDA44 C61001FC */ lwc1 $f16, 0x01FC($s0) ## 000001FC -/* 00E98 80ABDA48 C612025C */ lwc1 $f18, 0x025C($s0) ## 0000025C -/* 00E9C 80ABDA4C 46083280 */ add.s $f10, $f6, $f8 -/* 00EA0 80ABDA50 C6080260 */ lwc1 $f8, 0x0260($s0) ## 00000260 -/* 00EA4 80ABDA54 C6060200 */ lwc1 $f6, 0x0200($s0) ## 00000200 -/* 00EA8 80ABDA58 46128100 */ add.s $f4, $f16, $f18 -/* 00EAC 80ABDA5C E60A01F8 */ swc1 $f10, 0x01F8($s0) ## 000001F8 -/* 00EB0 80ABDA60 4405A000 */ mfc1 $a1, $f20 -/* 00EB4 80ABDA64 46083280 */ add.s $f10, $f6, $f8 -/* 00EB8 80ABDA68 4406B000 */ mfc1 $a2, $f22 -/* 00EBC 80ABDA6C E60401FC */ swc1 $f4, 0x01FC($s0) ## 000001FC -/* 00EC0 80ABDA70 02402025 */ or $a0, $s2, $zero ## $a0 = 00000258 -/* 00EC4 80ABDA74 0C01DE80 */ jal Math_StepToF - -/* 00EC8 80ABDA78 E60A0200 */ swc1 $f10, 0x0200($s0) ## 00000200 -/* 00ECC 80ABDA7C 4405C000 */ mfc1 $a1, $f24 -/* 00ED0 80ABDA80 4406D000 */ mfc1 $a2, $f26 -/* 00ED4 80ABDA84 0C01DE80 */ jal Math_StepToF - -/* 00ED8 80ABDA88 02602025 */ or $a0, $s3, $zero ## $a0 = 0000025C -/* 00EDC 80ABDA8C 4405A000 */ mfc1 $a1, $f20 -/* 00EE0 80ABDA90 4406B000 */ mfc1 $a2, $f22 -/* 00EE4 80ABDA94 0C01DE80 */ jal Math_StepToF - -/* 00EE8 80ABDA98 02802025 */ or $a0, $s4, $zero ## $a0 = 00000260 -/* 00EEC 80ABDA9C 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 0000000C -/* 00EF0 80ABDAA0 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 00EF4 80ABDAA4 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000264 -/* 00EF8 80ABDAA8 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 00000268 -/* 00EFC 80ABDAAC 1635FFE3 */ bne $s1, $s5, .L80ABDA3C -/* 00F00 80ABDAB0 2694000C */ addiu $s4, $s4, 0x000C ## $s4 = 0000026C -/* 00F04 80ABDAB4 86CE01C8 */ lh $t6, 0x01C8($s6) ## 000001C8 -/* 00F08 80ABDAB8 29C1001F */ slti $at, $t6, 0x001F -/* 00F0C 80ABDABC 54200031 */ bnel $at, $zero, .L80ABDB84 -/* 00F10 80ABDAC0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00F14 80ABDAC4 0C00B55C */ jal Actor_Kill - -/* 00F18 80ABDAC8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00F1C 80ABDACC 1000002D */ beq $zero, $zero, .L80ABDB84 -/* 00F20 80ABDAD0 8FBF0054 */ lw $ra, 0x0054($sp) -.L80ABDAD4: -/* 00F24 80ABDAD4 3C0180AC */ lui $at, %hi(D_80ABE4DC) ## $at = 80AC0000 -/* 00F28 80ABDAD8 C43AE4DC */ lwc1 $f26, %lo(D_80ABE4DC)($at) -/* 00F2C 80ABDADC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00F30 80ABDAE0 4481C000 */ mtc1 $at, $f24 ## $f24 = -1.00 -/* 00F34 80ABDAE4 3C0180AC */ lui $at, %hi(D_80ABE4E0) ## $at = 80AC0000 -/* 00F38 80ABDAE8 C436E4E0 */ lwc1 $f22, %lo(D_80ABE4E0)($at) -/* 00F3C 80ABDAEC 24150060 */ addiu $s5, $zero, 0x0060 ## $s5 = 00000060 -.L80ABDAF0: -/* 00F40 80ABDAF0 C61001F8 */ lwc1 $f16, 0x01F8($s0) ## 00000204 -/* 00F44 80ABDAF4 C6120258 */ lwc1 $f18, 0x0258($s0) ## 00000264 -/* 00F48 80ABDAF8 C60601FC */ lwc1 $f6, 0x01FC($s0) ## 00000208 -/* 00F4C 80ABDAFC C608025C */ lwc1 $f8, 0x025C($s0) ## 00000268 -/* 00F50 80ABDB00 46128100 */ add.s $f4, $f16, $f18 -/* 00F54 80ABDB04 C6120260 */ lwc1 $f18, 0x0260($s0) ## 0000026C -/* 00F58 80ABDB08 C6100200 */ lwc1 $f16, 0x0200($s0) ## 0000020C -/* 00F5C 80ABDB0C 46083280 */ add.s $f10, $f6, $f8 -/* 00F60 80ABDB10 E60401F8 */ swc1 $f4, 0x01F8($s0) ## 00000204 -/* 00F64 80ABDB14 4405A000 */ mfc1 $a1, $f20 -/* 00F68 80ABDB18 46128100 */ add.s $f4, $f16, $f18 -/* 00F6C 80ABDB1C 4406B000 */ mfc1 $a2, $f22 -/* 00F70 80ABDB20 E60A01FC */ swc1 $f10, 0x01FC($s0) ## 00000208 -/* 00F74 80ABDB24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000264 -/* 00F78 80ABDB28 0C01DE80 */ jal Math_StepToF - -/* 00F7C 80ABDB2C E6040200 */ swc1 $f4, 0x0200($s0) ## 0000020C -/* 00F80 80ABDB30 4405C000 */ mfc1 $a1, $f24 -/* 00F84 80ABDB34 4406D000 */ mfc1 $a2, $f26 -/* 00F88 80ABDB38 0C01DE80 */ jal Math_StepToF - -/* 00F8C 80ABDB3C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000268 -/* 00F90 80ABDB40 4405A000 */ mfc1 $a1, $f20 -/* 00F94 80ABDB44 4406B000 */ mfc1 $a2, $f22 -/* 00F98 80ABDB48 0C01DE80 */ jal Math_StepToF - -/* 00F9C 80ABDB4C 02802025 */ or $a0, $s4, $zero ## $a0 = 0000026C -/* 00FA0 80ABDB50 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000018 -/* 00FA4 80ABDB54 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000018 -/* 00FA8 80ABDB58 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000270 -/* 00FAC 80ABDB5C 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 00000274 -/* 00FB0 80ABDB60 1635FFE3 */ bne $s1, $s5, .L80ABDAF0 -/* 00FB4 80ABDB64 2694000C */ addiu $s4, $s4, 0x000C ## $s4 = 00000278 -/* 00FB8 80ABDB68 86CF01C8 */ lh $t7, 0x01C8($s6) ## 000001C8 -/* 00FBC 80ABDB6C 29E10010 */ slti $at, $t7, 0x0010 -/* 00FC0 80ABDB70 54200004 */ bnel $at, $zero, .L80ABDB84 -/* 00FC4 80ABDB74 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00FC8 80ABDB78 0C00B55C */ jal Actor_Kill - -/* 00FCC 80ABDB7C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00FD0 80ABDB80 8FBF0054 */ lw $ra, 0x0054($sp) -.L80ABDB84: -/* 00FD4 80ABDB84 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00FD8 80ABDB88 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00FDC 80ABDB8C D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 00FE0 80ABDB90 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 00FE4 80ABDB94 8FB00038 */ lw $s0, 0x0038($sp) -/* 00FE8 80ABDB98 8FB1003C */ lw $s1, 0x003C($sp) -/* 00FEC 80ABDB9C 8FB20040 */ lw $s2, 0x0040($sp) -/* 00FF0 80ABDBA0 8FB30044 */ lw $s3, 0x0044($sp) -/* 00FF4 80ABDBA4 8FB40048 */ lw $s4, 0x0048($sp) -/* 00FF8 80ABDBA8 8FB5004C */ lw $s5, 0x004C($sp) -/* 00FFC 80ABDBAC 8FB60050 */ lw $s6, 0x0050($sp) -/* 01000 80ABDBB0 03E00008 */ jr $ra -/* 01004 80ABDBB4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s deleted file mode 100644 index 0e2983b301..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80ABDBB8 -/* 01008 80ABDBB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0100C 80ABDBBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01010 80ABDBC0 848E01C8 */ lh $t6, 0x01C8($a0) ## 000001C8 -/* 01014 80ABDBC4 848201CA */ lh $v0, 0x01CA($a0) ## 000001CA -/* 01018 80ABDBC8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0101C 80ABDBCC 10400003 */ beq $v0, $zero, .L80ABDBDC -/* 01020 80ABDBD0 A48F01C8 */ sh $t7, 0x01C8($a0) ## 000001C8 -/* 01024 80ABDBD4 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 01028 80ABDBD8 A49801CA */ sh $t8, 0x01CA($a0) ## 000001CA -.L80ABDBDC: -/* 0102C 80ABDBDC 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 01030 80ABDBE0 0320F809 */ jalr $ra, $t9 -/* 01034 80ABDBE4 00000000 */ nop -/* 01038 80ABDBE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0103C 80ABDBEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01040 80ABDBF0 03E00008 */ jr $ra -/* 01044 80ABDBF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s deleted file mode 100644 index 85faf285f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_80ABDBF8 -/* 01048 80ABDBF8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0104C 80ABDBFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01050 80ABDC00 AFB10020 */ sw $s1, 0x0020($sp) -/* 01054 80ABDC04 AFB0001C */ sw $s0, 0x001C($sp) -/* 01058 80ABDC08 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 0105C 80ABDC0C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 01060 80ABDC10 C48401E0 */ lwc1 $f4, 0x01E0($a0) ## 000001E0 -/* 01064 80ABDC14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01068 80ABDC18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0106C 80ABDC1C 46062201 */ sub.s $f8, $f4, $f6 -/* 01070 80ABDC20 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01074 80ABDC24 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 01078 80ABDC28 848E01C8 */ lh $t6, 0x01C8($a0) ## 000001C8 -/* 0107C 80ABDC2C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01080 80ABDC30 0C00B56E */ jal Actor_SetFocus - -/* 01084 80ABDC34 A48F01C8 */ sh $t7, 0x01C8($a0) ## 000001C8 -/* 01088 80ABDC38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0108C 80ABDC3C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 01090 80ABDC40 0C00B58B */ jal Actor_SetScale - -/* 01094 80ABDC44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01098 80ABDC48 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0109C 80ABDC4C 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 010A0 80ABDC50 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 010A4 80ABDC54 44815000 */ mtc1 $at, $f10 ## $f10 = 24.00 -/* 010A8 80ABDC58 C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 010AC 80ABDC5C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 010B0 80ABDC60 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 010B4 80ABDC64 46105482 */ mul.s $f18, $f10, $f16 -/* 010B8 80ABDC68 C6060104 */ lwc1 $f6, 0x0104($s0) ## 00000104 -/* 010BC 80ABDC6C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 010C0 80ABDC70 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 010C4 80ABDC74 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 010C8 80ABDC78 44061000 */ mfc1 $a2, $f2 -/* 010CC 80ABDC7C 44071000 */ mfc1 $a3, $f2 -/* 010D0 80ABDC80 46049000 */ add.s $f0, $f18, $f4 -/* 010D4 80ABDC84 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 -/* 010D8 80ABDC88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010DC 80ABDC8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010E0 80ABDC90 46003201 */ sub.s $f8, $f6, $f0 -/* 010E4 80ABDC94 46005401 */ sub.s $f16, $f10, $f0 -/* 010E8 80ABDC98 E6080104 */ swc1 $f8, 0x0104($s0) ## 00000104 -/* 010EC 80ABDC9C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 010F0 80ABDCA0 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 010F4 80ABDCA4 AFB80014 */ sw $t8, 0x0014($sp) -/* 010F8 80ABDCA8 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 010FC 80ABDCAC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01100 80ABDCB0 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 01104 80ABDCB4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01108 80ABDCB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0110C 80ABDCBC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01110 80ABDCC0 46002180 */ add.s $f6, $f4, $f0 -/* 01114 80ABDCC4 02212821 */ addu $a1, $s1, $at -/* 01118 80ABDCC8 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -/* 0111C 80ABDCCC E60001F0 */ swc1 $f0, 0x01F0($s0) ## 000001F0 -/* 01120 80ABDCD0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 01124 80ABDCD4 AFA6002C */ sw $a2, 0x002C($sp) -/* 01128 80ABDCD8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0112C 80ABDCDC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01130 80ABDCE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01134 80ABDCE4 8FA50030 */ lw $a1, 0x0030($sp) -/* 01138 80ABDCE8 8FA6002C */ lw $a2, 0x002C($sp) -/* 0113C 80ABDCEC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01140 80ABDCF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01144 80ABDCF4 0C00B638 */ jal Actor_MoveForward - -/* 01148 80ABDCF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0114C 80ABDCFC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01150 80ABDD00 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01154 80ABDD04 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 01158 80ABDD08 0C01DE80 */ jal Math_StepToF - -/* 0115C 80ABDD0C 8E0501E8 */ lw $a1, 0x01E8($s0) ## 000001E8 -/* 01160 80ABDD10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01164 80ABDD14 8FB0001C */ lw $s0, 0x001C($sp) -/* 01168 80ABDD18 8FB10020 */ lw $s1, 0x0020($sp) -/* 0116C 80ABDD1C 03E00008 */ jr $ra -/* 01170 80ABDD20 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s deleted file mode 100644 index b043115d07..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ /dev/null @@ -1,208 +0,0 @@ -.rdata -glabel D_80ABE484 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE494 - .asciz "../z_en_ny.c" - .balign 4 - -glabel D_80ABE4A4 - .asciz "../z_en_ny.c" - .balign 4 - -.late_rodata -glabel D_80ABE4E4 - .float 0.04 - -glabel D_80ABE4E8 - .float 0.4 - -.text -glabel func_80ABE040 -/* 01490 80ABE040 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 01494 80ABE044 AFBF0064 */ sw $ra, 0x0064($sp) -/* 01498 80ABE048 AFBE0060 */ sw $s8, 0x0060($sp) -/* 0149C 80ABE04C AFB7005C */ sw $s7, 0x005C($sp) -/* 014A0 80ABE050 AFB60058 */ sw $s6, 0x0058($sp) -/* 014A4 80ABE054 AFB50054 */ sw $s5, 0x0054($sp) -/* 014A8 80ABE058 AFB40050 */ sw $s4, 0x0050($sp) -/* 014AC 80ABE05C AFB3004C */ sw $s3, 0x004C($sp) -/* 014B0 80ABE060 AFB20048 */ sw $s2, 0x0048($sp) -/* 014B4 80ABE064 AFB10044 */ sw $s1, 0x0044($sp) -/* 014B8 80ABE068 AFB00040 */ sw $s0, 0x0040($sp) -/* 014BC 80ABE06C F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 014C0 80ABE070 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 014C4 80ABE074 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 014C8 80ABE078 AFA500C4 */ sw $a1, 0x00C4($sp) -/* 014CC 80ABE07C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 014D0 80ABE080 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 014D4 80ABE084 3C0680AC */ lui $a2, %hi(D_80ABE484) ## $a2 = 80AC0000 -/* 014D8 80ABE088 24C6E484 */ addiu $a2, $a2, %lo(D_80ABE484) ## $a2 = 80ABE484 -/* 014DC 80ABE08C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC -/* 014E0 80ABE090 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 014E4 80ABE094 0C031AB1 */ jal Graph_OpenDisps -/* 014E8 80ABE098 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 014EC 80ABE09C 8FAF00C4 */ lw $t7, 0x00C4($sp) -/* 014F0 80ABE0A0 0C024F46 */ jal func_80093D18 -/* 014F4 80ABE0A4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 014F8 80ABE0A8 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 014FC 80ABE0AC 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01500 80ABE0B0 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01504 80ABE0B4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01508 80ABE0B8 AE5802C0 */ sw $t8, 0x02C0($s2) ## 000002C0 -/* 0150C 80ABE0BC AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 01510 80ABE0C0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01514 80ABE0C4 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 01518 80ABE0C8 3C0AE200 */ lui $t2, 0xE200 ## $t2 = E2000000 -/* 0151C 80ABE0CC 3C0BC811 */ lui $t3, 0xC811 ## $t3 = C8110000 -/* 01520 80ABE0D0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01524 80ABE0D4 AE4902C0 */ sw $t1, 0x02C0($s2) ## 000002C0 -/* 01528 80ABE0D8 356B2078 */ ori $t3, $t3, 0x2078 ## $t3 = C8112078 -/* 0152C 80ABE0DC 354A001C */ ori $t2, $t2, 0x001C ## $t2 = E200001C -/* 01530 80ABE0E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01534 80ABE0E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01538 80ABE0E8 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 0153C 80ABE0EC 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 01540 80ABE0F0 3C0180AC */ lui $at, %hi(D_80ABE4E4) ## $at = 80AC0000 -/* 01544 80ABE0F4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01548 80ABE0F8 AE4C02C0 */ sw $t4, 0x02C0($s2) ## 000002C0 -/* 0154C 80ABE0FC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01550 80ABE100 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01554 80ABE104 C438E4E4 */ lwc1 $f24, %lo(D_80ABE4E4)($at) -/* 01558 80ABE108 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0155C 80ABE10C 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 01560 80ABE110 3C0180AC */ lui $at, %hi(D_80ABE4E8) ## $at = 80AC0000 -/* 01564 80ABE114 3C1680AC */ lui $s6, %hi(D_80ABE494) ## $s6 = 80AC0000 -/* 01568 80ABE118 3C15DA38 */ lui $s5, 0xDA38 ## $s5 = DA380000 -/* 0156C 80ABE11C 36B50003 */ ori $s5, $s5, 0x0003 ## $s5 = DA380003 -/* 01570 80ABE120 26D6E494 */ addiu $s6, $s6, %lo(D_80ABE494) ## $s6 = 80ABE494 -/* 01574 80ABE124 C434E4E8 */ lwc1 $f20, %lo(D_80ABE4E8)($at) -/* 01578 80ABE128 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0157C 80ABE12C 241E0008 */ addiu $s8, $zero, 0x0008 ## $s8 = 00000008 -/* 01580 80ABE130 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 -/* 01584 80ABE134 868E01C8 */ lh $t6, 0x01C8($s4) ## 000001C8 -.L80ABE138: -/* 01588 80ABE138 260F0016 */ addiu $t7, $s0, 0x0016 ## $t7 = 00000016 -/* 0158C 80ABE13C 0010C080 */ sll $t8, $s0, 2 -/* 01590 80ABE140 01CF082A */ slt $at, $t6, $t7 -/* 01594 80ABE144 10200026 */ beq $at, $zero, .L80ABE1E0 -/* 01598 80ABE148 0310C023 */ subu $t8, $t8, $s0 -/* 0159C 80ABE14C 0018C080 */ sll $t8, $t8, 2 -/* 015A0 80ABE150 02981021 */ addu $v0, $s4, $t8 -/* 015A4 80ABE154 3C130600 */ lui $s3, %hi(D_06001DD0) ## $s3 = 06000000 -/* 015A8 80ABE158 26731DD0 */ addiu $s3, $s3, %lo(D_06001DD0) ## $s3 = 06001DD0 -/* 015AC 80ABE15C C44C01F8 */ lwc1 $f12, 0x01F8($v0) ## 000001F8 -/* 015B0 80ABE160 C44E01FC */ lwc1 $f14, 0x01FC($v0) ## 000001FC -/* 015B4 80ABE164 8C460200 */ lw $a2, 0x0200($v0) ## 00000200 -/* 015B8 80ABE168 0C034261 */ jal Matrix_Translate -/* 015BC 80ABE16C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 015C0 80ABE170 44904000 */ mtc1 $s0, $f8 ## $f8 = 0.00 -/* 015C4 80ABE174 C6840050 */ lwc1 $f4, 0x0050($s4) ## 00000050 -/* 015C8 80ABE178 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015CC 80ABE17C 468042A0 */ cvt.s.w $f10, $f8 -/* 015D0 80ABE180 46142182 */ mul.s $f6, $f4, $f20 -/* 015D4 80ABE184 00000000 */ nop -/* 015D8 80ABE188 46185402 */ mul.s $f16, $f10, $f24 -/* 015DC 80ABE18C 4610B480 */ add.s $f18, $f22, $f16 -/* 015E0 80ABE190 46123302 */ mul.s $f12, $f6, $f18 -/* 015E4 80ABE194 44066000 */ mfc1 $a2, $f12 -/* 015E8 80ABE198 0C0342A3 */ jal Matrix_Scale -/* 015EC 80ABE19C 46006386 */ mov.s $f14, $f12 -/* 015F0 80ABE1A0 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 015F4 80ABE1A4 02C02825 */ or $a1, $s6, $zero ## $a1 = 80ABE494 -/* 015F8 80ABE1A8 24060390 */ addiu $a2, $zero, 0x0390 ## $a2 = 00000390 -/* 015FC 80ABE1AC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01600 80ABE1B0 AE5902C0 */ sw $t9, 0x02C0($s2) ## 000002C0 -/* 01604 80ABE1B4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 01608 80ABE1B8 8FA800C4 */ lw $t0, 0x00C4($sp) -/* 0160C 80ABE1BC 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 01610 80ABE1C0 0C0346A2 */ jal Matrix_NewMtx -/* 01614 80ABE1C4 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 01618 80ABE1C8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 0161C 80ABE1CC 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 -/* 01620 80ABE1D0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01624 80ABE1D4 AE4902C0 */ sw $t1, 0x02C0($s2) ## 000002C0 -/* 01628 80ABE1D8 AC530004 */ sw $s3, 0x0004($v0) ## 00000004 -/* 0162C 80ABE1DC AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -.L80ABE1E0: -/* 01630 80ABE1E0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01634 80ABE1E4 561EFFD4 */ bnel $s0, $s8, .L80ABE138 -/* 01638 80ABE1E8 868E01C8 */ lh $t6, 0x01C8($s4) ## 000001C8 -/* 0163C 80ABE1EC 8FAA00C4 */ lw $t2, 0x00C4($sp) -/* 01640 80ABE1F0 3C0680AC */ lui $a2, %hi(D_80ABE4A4) ## $a2 = 80AC0000 -/* 01644 80ABE1F4 24C6E4A4 */ addiu $a2, $a2, %lo(D_80ABE4A4) ## $a2 = 80ABE4A4 -/* 01648 80ABE1F8 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC -/* 0164C 80ABE1FC 24070397 */ addiu $a3, $zero, 0x0397 ## $a3 = 00000397 -/* 01650 80ABE200 0C031AD5 */ jal Graph_CloseDisps -/* 01654 80ABE204 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 01658 80ABE208 868201CA */ lh $v0, 0x01CA($s4) ## 000001CA -/* 0165C 80ABE20C 1040002F */ beq $v0, $zero, .L80ABE2CC -/* 01660 80ABE210 2451FFFF */ addiu $s1, $v0, 0xFFFF ## $s1 = FFFFFFFF -/* 01664 80ABE214 928B0114 */ lbu $t3, 0x0114($s4) ## 00000114 -/* 01668 80ABE218 00118C00 */ sll $s1, $s1, 16 -/* 0166C 80ABE21C 00118C03 */ sra $s1, $s1, 16 -/* 01670 80ABE220 322D0001 */ andi $t5, $s1, 0x0001 ## $t5 = 00000001 -/* 01674 80ABE224 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 01678 80ABE228 15A00028 */ bne $t5, $zero, .L80ABE2CC -/* 0167C 80ABE22C A28C0114 */ sb $t4, 0x0114($s4) ## 00000114 -/* 01680 80ABE230 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01684 80ABE234 4481A000 */ mtc1 $at, $f20 ## $f20 = 5.00 -/* 01688 80ABE238 0C00CFC8 */ jal Rand_CenteredFloat - -/* 0168C 80ABE23C 4600A306 */ mov.s $f12, $f20 -/* 01690 80ABE240 322E0003 */ andi $t6, $s1, 0x0003 ## $t6 = 00000003 -/* 01694 80ABE244 000E7880 */ sll $t7, $t6, 2 -/* 01698 80ABE248 01EE7823 */ subu $t7, $t7, $t6 -/* 0169C 80ABE24C 3C1880AC */ lui $t8, %hi(D_80ABE3A8) ## $t8 = 80AC0000 -/* 016A0 80ABE250 2718E3A8 */ addiu $t8, $t8, %lo(D_80ABE3A8) ## $t8 = 80ABE3A8 -/* 016A4 80ABE254 000F7880 */ sll $t7, $t7, 2 -/* 016A8 80ABE258 01F88021 */ addu $s0, $t7, $t8 -/* 016AC 80ABE25C C6080000 */ lwc1 $f8, 0x0000($s0) ## 00000001 -/* 016B0 80ABE260 C6840024 */ lwc1 $f4, 0x0024($s4) ## 00000024 -/* 016B4 80ABE264 4600A306 */ mov.s $f12, $f20 -/* 016B8 80ABE268 46082280 */ add.s $f10, $f4, $f8 -/* 016BC 80ABE26C 460A0400 */ add.s $f16, $f0, $f10 -/* 016C0 80ABE270 0C00CFC8 */ jal Rand_CenteredFloat - -/* 016C4 80ABE274 E7B0007C */ swc1 $f16, 0x007C($sp) -/* 016C8 80ABE278 C6860028 */ lwc1 $f6, 0x0028($s4) ## 00000028 -/* 016CC 80ABE27C C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000005 -/* 016D0 80ABE280 4600A306 */ mov.s $f12, $f20 -/* 016D4 80ABE284 46123100 */ add.s $f4, $f6, $f18 -/* 016D8 80ABE288 46040200 */ add.s $f8, $f0, $f4 -/* 016DC 80ABE28C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 016E0 80ABE290 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 016E4 80ABE294 C68A002C */ lwc1 $f10, 0x002C($s4) ## 0000002C -/* 016E8 80ABE298 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000009 -/* 016EC 80ABE29C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 016F0 80ABE2A0 AFB90018 */ sw $t9, 0x0018($sp) -/* 016F4 80ABE2A4 46105180 */ add.s $f6, $f10, $f16 -/* 016F8 80ABE2A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 016FC 80ABE2AC AFA00010 */ sw $zero, 0x0010($sp) -/* 01700 80ABE2B0 8FA400C4 */ lw $a0, 0x00C4($sp) -/* 01704 80ABE2B4 46060480 */ add.s $f18, $f0, $f6 -/* 01708 80ABE2B8 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 0170C 80ABE2BC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFBC -/* 01710 80ABE2C0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01714 80ABE2C4 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 01718 80ABE2C8 E7B20084 */ swc1 $f18, 0x0084($sp) -.L80ABE2CC: -/* 0171C 80ABE2CC 8FBF0064 */ lw $ra, 0x0064($sp) -/* 01720 80ABE2D0 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 01724 80ABE2D4 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 01728 80ABE2D8 D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 0172C 80ABE2DC 8FB00040 */ lw $s0, 0x0040($sp) -/* 01730 80ABE2E0 8FB10044 */ lw $s1, 0x0044($sp) -/* 01734 80ABE2E4 8FB20048 */ lw $s2, 0x0048($sp) -/* 01738 80ABE2E8 8FB3004C */ lw $s3, 0x004C($sp) -/* 0173C 80ABE2EC 8FB40050 */ lw $s4, 0x0050($sp) -/* 01740 80ABE2F0 8FB50054 */ lw $s5, 0x0054($sp) -/* 01744 80ABE2F4 8FB60058 */ lw $s6, 0x0058($sp) -/* 01748 80ABE2F8 8FB7005C */ lw $s7, 0x005C($sp) -/* 0174C 80ABE2FC 8FBE0060 */ lw $s8, 0x0060($sp) -/* 01750 80ABE300 03E00008 */ jr $ra -/* 01754 80ABE304 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 -/* 01758 80ABE308 00000000 */ nop -/* 0175C 80ABE30C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s deleted file mode 100644 index dd280945af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnSa_Destroy -/* 00EC0 80AF6420 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EC4 80AF6424 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00EC8 80AF6428 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00ECC 80AF642C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00ED0 80AF6430 0C0170EB */ jal Collider_DestroyCylinder - -/* 00ED4 80AF6434 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 00ED8 80AF6438 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EDC 80AF643C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EE0 80AF6440 03E00008 */ jr $ra -/* 00EE4 80AF6444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s deleted file mode 100644 index 9d8baa7a2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s +++ /dev/null @@ -1,196 +0,0 @@ -.rdata -glabel D_80AF7490 - .asciz "../z_en_sa.c" - .balign 4 - -glabel D_80AF74A0 - .asciz "../z_en_sa.c" - .balign 4 - -.text -glabel EnSa_Draw -/* 01A08 80AF6F68 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01A0C 80AF6F6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A10 80AF6F70 AFB00020 */ sw $s0, 0x0020($sp) -/* 01A14 80AF6F74 AFA50064 */ sw $a1, 0x0064($sp) -/* 01A18 80AF6F78 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01A1C 80AF6F7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A20 80AF6F80 3C0680AF */ lui $a2, %hi(D_80AF7490) ## $a2 = 80AF0000 -/* 01A24 80AF6F84 24C67490 */ addiu $a2, $a2, %lo(D_80AF7490) ## $a2 = 80AF7490 -/* 01A28 80AF6F88 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 -/* 01A2C 80AF6F8C 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 -/* 01A30 80AF6F90 0C031AB1 */ jal Graph_OpenDisps -/* 01A34 80AF6F94 AFA50058 */ sw $a1, 0x0058($sp) -/* 01A38 80AF6F98 86020218 */ lh $v0, 0x0218($s0) ## 00000218 -/* 01A3C 80AF6F9C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01A40 80AF6FA0 8FA80058 */ lw $t0, 0x0058($sp) -/* 01A44 80AF6FA4 1441004D */ bne $v0, $at, .L80AF70DC -/* 01A48 80AF6FA8 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 01A4C 80AF6FAC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A50 80AF6FB0 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01A54 80AF6FB4 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01A58 80AF6FB8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01A5C 80AF6FBC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01A60 80AF6FC0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01A64 80AF6FC4 86190212 */ lh $t9, 0x0212($s0) ## 00000212 -/* 01A68 80AF6FC8 3C0980AF */ lui $t1, %hi(D_80AF7474) ## $t1 = 80AF0000 -/* 01A6C 80AF6FCC 25297474 */ addiu $t1, $t1, %lo(D_80AF7474) ## $t1 = 80AF7474 -/* 01A70 80AF6FD0 00195080 */ sll $t2, $t9, 2 -/* 01A74 80AF6FD4 012A5821 */ addu $t3, $t1, $t2 -/* 01A78 80AF6FD8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01A7C 80AF6FDC 3C068016 */ lui $a2, %hi(gSegments) -/* 01A80 80AF6FE0 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 01A84 80AF6FE4 00046900 */ sll $t5, $a0, 4 -/* 01A88 80AF6FE8 000D7702 */ srl $t6, $t5, 28 -/* 01A8C 80AF6FEC 000E7880 */ sll $t7, $t6, 2 -/* 01A90 80AF6FF0 00CFC021 */ addu $t8, $a2, $t7 -/* 01A94 80AF6FF4 8F190000 */ lw $t9, 0x0000($t8) ## DB060020 -/* 01A98 80AF6FF8 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 01A9C 80AF6FFC 00856024 */ and $t4, $a0, $a1 -/* 01AA0 80AF7000 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01AA4 80AF7004 01995021 */ addu $t2, $t4, $t9 -/* 01AA8 80AF7008 01475821 */ addu $t3, $t2, $a3 -/* 01AAC 80AF700C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01AB0 80AF7010 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AB4 80AF7014 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01AB8 80AF7018 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 01ABC 80AF701C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01AC0 80AF7020 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01AC4 80AF7024 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01AC8 80AF7028 860F0214 */ lh $t7, 0x0214($s0) ## 00000214 -/* 01ACC 80AF702C 000FC080 */ sll $t8, $t7, 2 -/* 01AD0 80AF7030 01386021 */ addu $t4, $t1, $t8 -/* 01AD4 80AF7034 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 01AD8 80AF7038 00045100 */ sll $t2, $a0, 4 -/* 01ADC 80AF703C 000A5F02 */ srl $t3, $t2, 28 -/* 01AE0 80AF7040 000B6880 */ sll $t5, $t3, 2 -/* 01AE4 80AF7044 00CD7021 */ addu $t6, $a2, $t5 -/* 01AE8 80AF7048 8DCF0000 */ lw $t7, 0x0000($t6) ## DB060024 -/* 01AEC 80AF704C 0085C824 */ and $t9, $a0, $a1 -/* 01AF0 80AF7050 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01AF4 80AF7054 032FC021 */ addu $t8, $t9, $t7 -/* 01AF8 80AF7058 03076021 */ addu $t4, $t8, $a3 -/* 01AFC 80AF705C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01B00 80AF7060 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B04 80AF7064 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 01B08 80AF7068 3C0480AF */ lui $a0, %hi(D_80AF7460) ## $a0 = 80AF0000 -/* 01B0C 80AF706C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01B10 80AF7070 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01B14 80AF7074 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01B18 80AF7078 860D0216 */ lh $t5, 0x0216($s0) ## 00000216 -/* 01B1C 80AF707C 000D7080 */ sll $t6, $t5, 2 -/* 01B20 80AF7080 008E2021 */ addu $a0, $a0, $t6 -/* 01B24 80AF7084 8C847460 */ lw $a0, %lo(D_80AF7460)($a0) -/* 01B28 80AF7088 00047900 */ sll $t7, $a0, 4 -/* 01B2C 80AF708C 000FC702 */ srl $t8, $t7, 28 -/* 01B30 80AF7090 00186080 */ sll $t4, $t8, 2 -/* 01B34 80AF7094 00CC5021 */ addu $t2, $a2, $t4 -/* 01B38 80AF7098 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000008 -/* 01B3C 80AF709C 0085C824 */ and $t9, $a0, $a1 -/* 01B40 80AF70A0 3C0680AF */ lui $a2, %hi(func_80AF6D6C) ## $a2 = 80AF0000 -/* 01B44 80AF70A4 032B6821 */ addu $t5, $t9, $t3 -/* 01B48 80AF70A8 01A77021 */ addu $t6, $t5, $a3 -/* 01B4C 80AF70AC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01B50 80AF70B0 AFB00010 */ sw $s0, 0x0010($sp) -/* 01B54 80AF70B4 860F0218 */ lh $t7, 0x0218($s0) ## 00000218 -/* 01B58 80AF70B8 3C0780AF */ lui $a3, %hi(func_80AF6F0C) ## $a3 = 80AF0000 -/* 01B5C 80AF70BC 24E76F0C */ addiu $a3, $a3, %lo(func_80AF6F0C) ## $a3 = 80AF6F0C -/* 01B60 80AF70C0 8FA40064 */ lw $a0, 0x0064($sp) -/* 01B64 80AF70C4 24C66D6C */ addiu $a2, $a2, %lo(func_80AF6D6C) ## $a2 = 80AF6D6C -/* 01B68 80AF70C8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01B6C 80AF70CC 0C00D2E8 */ jal func_80034BA0 -/* 01B70 80AF70D0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01B74 80AF70D4 1000004E */ beq $zero, $zero, .L80AF7210 -/* 01B78 80AF70D8 8FAC0064 */ lw $t4, 0x0064($sp) -.L80AF70DC: -/* 01B7C 80AF70DC 1040004B */ beq $v0, $zero, .L80AF720C -/* 01B80 80AF70E0 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 01B84 80AF70E4 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01B88 80AF70E8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 01B8C 80AF70EC 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 01B90 80AF70F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01B94 80AF70F4 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 -/* 01B98 80AF70F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01B9C 80AF70FC 860A0212 */ lh $t2, 0x0212($s0) ## 00000212 -/* 01BA0 80AF7100 3C0980AF */ lui $t1, %hi(D_80AF7474) ## $t1 = 80AF0000 -/* 01BA4 80AF7104 25297474 */ addiu $t1, $t1, %lo(D_80AF7474) ## $t1 = 80AF7474 -/* 01BA8 80AF7108 000AC880 */ sll $t9, $t2, 2 -/* 01BAC 80AF710C 01395821 */ addu $t3, $t1, $t9 -/* 01BB0 80AF7110 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01BB4 80AF7114 3C068016 */ lui $a2, %hi(gSegments) -/* 01BB8 80AF7118 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 01BBC 80AF711C 00047100 */ sll $t6, $a0, 4 -/* 01BC0 80AF7120 000E7F02 */ srl $t7, $t6, 28 -/* 01BC4 80AF7124 000FC080 */ sll $t8, $t7, 2 -/* 01BC8 80AF7128 00D86021 */ addu $t4, $a2, $t8 -/* 01BCC 80AF712C 8D8A0000 */ lw $t2, 0x0000($t4) ## DB060020 -/* 01BD0 80AF7130 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 01BD4 80AF7134 00856824 */ and $t5, $a0, $a1 -/* 01BD8 80AF7138 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01BDC 80AF713C 01AAC821 */ addu $t9, $t5, $t2 -/* 01BE0 80AF7140 03275821 */ addu $t3, $t9, $a3 -/* 01BE4 80AF7144 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01BE8 80AF7148 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01BEC 80AF714C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01BF0 80AF7150 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 01BF4 80AF7154 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01BF8 80AF7158 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 -/* 01BFC 80AF715C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01C00 80AF7160 86180214 */ lh $t8, 0x0214($s0) ## 00000214 -/* 01C04 80AF7164 00186080 */ sll $t4, $t8, 2 -/* 01C08 80AF7168 012C6821 */ addu $t5, $t1, $t4 -/* 01C0C 80AF716C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01C10 80AF7170 0004C900 */ sll $t9, $a0, 4 -/* 01C14 80AF7174 00195F02 */ srl $t3, $t9, 28 -/* 01C18 80AF7178 000B7080 */ sll $t6, $t3, 2 -/* 01C1C 80AF717C 00CE7821 */ addu $t7, $a2, $t6 -/* 01C20 80AF7180 8DF80000 */ lw $t8, 0x0000($t7) ## DB060024 -/* 01C24 80AF7184 00855024 */ and $t2, $a0, $a1 -/* 01C28 80AF7188 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01C2C 80AF718C 01586021 */ addu $t4, $t2, $t8 -/* 01C30 80AF7190 01876821 */ addu $t5, $t4, $a3 -/* 01C34 80AF7194 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01C38 80AF7198 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 01C3C 80AF719C 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 01C40 80AF71A0 3C0480AF */ lui $a0, %hi(D_80AF7460) ## $a0 = 80AF0000 -/* 01C44 80AF71A4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01C48 80AF71A8 AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 -/* 01C4C 80AF71AC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01C50 80AF71B0 860E0216 */ lh $t6, 0x0216($s0) ## 00000216 -/* 01C54 80AF71B4 000E7880 */ sll $t7, $t6, 2 -/* 01C58 80AF71B8 008F2021 */ addu $a0, $a0, $t7 -/* 01C5C 80AF71BC 8C847460 */ lw $a0, %lo(D_80AF7460)($a0) -/* 01C60 80AF71C0 0004C100 */ sll $t8, $a0, 4 -/* 01C64 80AF71C4 00186702 */ srl $t4, $t8, 28 -/* 01C68 80AF71C8 000C6880 */ sll $t5, $t4, 2 -/* 01C6C 80AF71CC 00CDC821 */ addu $t9, $a2, $t5 -/* 01C70 80AF71D0 8F2B0000 */ lw $t3, 0x0000($t9) ## 00000008 -/* 01C74 80AF71D4 00855024 */ and $t2, $a0, $a1 -/* 01C78 80AF71D8 3C0680AF */ lui $a2, %hi(func_80AF6D6C) ## $a2 = 80AF0000 -/* 01C7C 80AF71DC 014B7021 */ addu $t6, $t2, $t3 -/* 01C80 80AF71E0 01C77821 */ addu $t7, $t6, $a3 -/* 01C84 80AF71E4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01C88 80AF71E8 AFB00010 */ sw $s0, 0x0010($sp) -/* 01C8C 80AF71EC 86180218 */ lh $t8, 0x0218($s0) ## 00000218 -/* 01C90 80AF71F0 3C0780AF */ lui $a3, %hi(func_80AF6F0C) ## $a3 = 80AF0000 -/* 01C94 80AF71F4 24E76F0C */ addiu $a3, $a3, %lo(func_80AF6F0C) ## $a3 = 80AF6F0C -/* 01C98 80AF71F8 8FA40064 */ lw $a0, 0x0064($sp) -/* 01C9C 80AF71FC 24C66D6C */ addiu $a2, $a2, %lo(func_80AF6D6C) ## $a2 = 80AF6D6C -/* 01CA0 80AF7200 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01CA4 80AF7204 0C00D331 */ jal func_80034CC4 -/* 01CA8 80AF7208 AFB80014 */ sw $t8, 0x0014($sp) -.L80AF720C: -/* 01CAC 80AF720C 8FAC0064 */ lw $t4, 0x0064($sp) -.L80AF7210: -/* 01CB0 80AF7210 3C0680AF */ lui $a2, %hi(D_80AF74A0) ## $a2 = 80AF0000 -/* 01CB4 80AF7214 24C674A0 */ addiu $a2, $a2, %lo(D_80AF74A0) ## $a2 = 80AF74A0 -/* 01CB8 80AF7218 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 -/* 01CBC 80AF721C 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 01CC0 80AF7220 0C031AD5 */ jal Graph_CloseDisps -/* 01CC4 80AF7224 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01CC8 80AF7228 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01CCC 80AF722C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01CD0 80AF7230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01CD4 80AF7234 03E00008 */ jr $ra -/* 01CD8 80AF7238 00000000 */ nop -/* 01CDC 80AF723C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s deleted file mode 100644 index 496f2ea3ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel jtbl_80AF74F4 -.word L80AF637C -.word L80AF62B4 -.word L80AF627C -.word L80AF6350 -.word L80AF62DC -.word L80AF6298 - -.text -glabel EnSa_Init -/* 00C50 80AF61B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) -/* 00C58 80AF61B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C5C 80AF61BC AFB10038 */ sw $s1, 0x0038($sp) -/* 00C60 80AF61C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00C68 80AF61C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00C6C 80AF61CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00C70 80AF61D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) -/* 00C78 80AF61D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00C7C 80AF61DC 0C00AC78 */ jal ActorShape_Init - -/* 00C80 80AF61E0 3C074140 */ lui $a3, 0x4140 ## $a3 = 41400000 -/* 00C84 80AF61E4 3C060601 */ lui $a2, %hi(D_0600B1A0) ## $a2 = 06010000 -/* 00C88 80AF61E8 260E0220 */ addiu $t6, $s0, 0x0220 ## $t6 = 00000220 -/* 00C8C 80AF61EC 260F0286 */ addiu $t7, $s0, 0x0286 ## $t7 = 00000286 -/* 00C90 80AF61F0 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00CA0 80AF6200 24C6B1A0 */ addiu $a2, $a2, %lo(D_0600B1A0) ## $a2 = 0600B1A0 -/* 00CA4 80AF6204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CA8 80AF6208 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00CAC 80AF620C 0C0291BE */ jal SkelAnime_InitFlex -/* 00CB0 80AF6210 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00CB4 80AF6214 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) -/* 00CBC 80AF621C 0C0170D9 */ jal Collider_InitCylinder - -/* 00CC0 80AF6220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CC4 80AF6224 3C0780AF */ lui $a3, %hi(D_80AF7260) ## $a3 = 80AF0000 -/* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) -/* 00CCC 80AF622C 24E77260 */ addiu $a3, $a3, %lo(D_80AF7260) ## $a3 = 80AF7260 -/* 00CD0 80AF6230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CD4 80AF6234 0C01712B */ jal Collider_SetCylinder - -/* 00CD8 80AF6238 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00CDC 80AF623C 3C0680AF */ lui $a2, %hi(D_80AF728C) ## $a2 = 80AF0000 -/* 00CE0 80AF6240 24C6728C */ addiu $a2, $a2, %lo(D_80AF728C) ## $a2 = 80AF728C -/* 00CE4 80AF6244 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00CE8 80AF6248 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 00CEC 80AF624C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CF0 80AF6250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF4 80AF6254 0C2BD77F */ jal func_80AF5DFC -/* 00CF8 80AF6258 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00CFC 80AF625C 2C410006 */ sltiu $at, $v0, 0x0006 -/* 00D00 80AF6260 1020004A */ beq $at, $zero, .L80AF638C -/* 00D04 80AF6264 0002C880 */ sll $t9, $v0, 2 -/* 00D08 80AF6268 3C0180AF */ lui $at, %hi(jtbl_80AF74F4) ## $at = 80AF0000 -/* 00D0C 80AF626C 00390821 */ addu $at, $at, $t9 -/* 00D10 80AF6270 8C3974F4 */ lw $t9, %lo(jtbl_80AF74F4)($at) -/* 00D14 80AF6274 03200008 */ jr $t9 -/* 00D18 80AF6278 00000000 */ nop -glabel L80AF627C -/* 00D1C 80AF627C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D20 80AF6280 0C2BD763 */ jal func_80AF5D8C -/* 00D24 80AF6284 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 00D28 80AF6288 3C0880AF */ lui $t0, %hi(func_80AF6448) ## $t0 = 80AF0000 -/* 00D2C 80AF628C 25086448 */ addiu $t0, $t0, %lo(func_80AF6448) ## $t0 = 80AF6448 -/* 00D30 80AF6290 1000003E */ beq $zero, $zero, .L80AF638C -/* 00D34 80AF6294 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -glabel L80AF6298 -/* 00D38 80AF6298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D3C 80AF629C 0C2BD763 */ jal func_80AF5D8C -/* 00D40 80AF62A0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 00D44 80AF62A4 3C0980AF */ lui $t1, %hi(func_80AF683C) ## $t1 = 80AF0000 -/* 00D48 80AF62A8 2529683C */ addiu $t1, $t1, %lo(func_80AF683C) ## $t1 = 80AF683C -/* 00D4C 80AF62AC 10000037 */ beq $zero, $zero, .L80AF638C -/* 00D50 80AF62B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -glabel L80AF62B4 -/* 00D54 80AF62B4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00D58 80AF62B8 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00D5C 80AF62BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D60 80AF62C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D64 80AF62C4 0C2BD763 */ jal func_80AF5D8C -/* 00D68 80AF62C8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00D6C 80AF62CC 3C0A80AF */ lui $t2, %hi(func_80AF6448) ## $t2 = 80AF0000 -/* 00D70 80AF62D0 254A6448 */ addiu $t2, $t2, %lo(func_80AF6448) ## $t2 = 80AF6448 -/* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C -/* 00D78 80AF62D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -glabel L80AF62DC -/* 00D7C 80AF62DC 3C020201 */ lui $v0, %hi(D_02010E20) ## $v0 = 02010000 -/* 00D80 80AF62E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00D84 80AF62E4 24420E20 */ addiu $v0, $v0, %lo(D_02010E20) ## $v0 = 02010E20 -/* 00D88 80AF62E8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 -/* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 -/* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 -/* 00D98 80AF62F8 3C0E8016 */ lui $t6, %hi(gSegments) -/* 00D9C 80AF62FC A6000210 */ sh $zero, 0x0210($s0) ## 00000210 -/* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 -/* 00DA4 80AF6304 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00DA8 80AF6308 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00DAC 80AF630C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00DB0 80AF6310 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at -/* 00DB8 80AF6318 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 -/* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at -/* 00DC4 80AF6324 AE391D68 */ sw $t9, 0x1D68($s1) ## 00001D68 -/* 00DC8 80AF6328 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 00DCC 80AF632C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00DD0 80AF6330 A028FA74 */ sb $t0, %lo(gSaveContext+0x1414)($at) -/* 00DD4 80AF6334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C -/* 00DDC 80AF633C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00DE0 80AF6340 3C0980AF */ lui $t1, %hi(func_80AF68E4) ## $t1 = 80AF0000 -/* 00DE4 80AF6344 252968E4 */ addiu $t1, $t1, %lo(func_80AF68E4) ## $t1 = 80AF68E4 -/* 00DE8 80AF6348 10000010 */ beq $zero, $zero, .L80AF638C -/* 00DEC 80AF634C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -glabel L80AF6350 -/* 00DF0 80AF6350 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00DF4 80AF6354 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 00DF8 80AF6358 A6000210 */ sh $zero, 0x0210($s0) ## 00000210 -/* 00DFC 80AF635C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80AF6360 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E04 80AF6364 0C2BD763 */ jal func_80AF5D8C -/* 00E08 80AF6368 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 00E0C 80AF636C 3C0A80AF */ lui $t2, %hi(func_80AF68E4) ## $t2 = 80AF0000 -/* 00E10 80AF6370 254A68E4 */ addiu $t2, $t2, %lo(func_80AF68E4) ## $t2 = 80AF68E4 -/* 00E14 80AF6374 10000005 */ beq $zero, $zero, .L80AF638C -/* 00E18 80AF6378 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -glabel L80AF637C -/* 00E1C 80AF637C 0C00B55C */ jal Actor_Kill - -/* 00E20 80AF6380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E24 80AF6384 10000022 */ beq $zero, $zero, .L80AF6410 -/* 00E28 80AF6388 8FBF003C */ lw $ra, 0x003C($sp) -.L80AF638C: -/* 00E2C 80AF638C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00E30 80AF6390 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00E34 80AF6394 0C00B58B */ jal Actor_SetScale - -/* 00E38 80AF6398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E3C 80AF639C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 00E40 80AF63A0 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00E44 80AF63A4 A20B001F */ sb $t3, 0x001F($s0) ## 0000001F -/* 00E48 80AF63A8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 00E4C 80AF63AC A60C0218 */ sh $t4, 0x0218($s0) ## 00000218 -/* 00E50 80AF63B0 8FAD0044 */ lw $t5, 0x0044($sp) -/* 00E54 80AF63B4 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00E58 80AF63B8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00E5C 80AF63BC 89AF0000 */ lwl $t7, 0x0000($t5) ## 00000000 -/* 00E60 80AF63C0 99AF0003 */ lwr $t7, 0x0003($t5) ## 00000003 -/* 00E64 80AF63C4 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00E68 80AF63C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E6C 80AF63CC AA0F021A */ swl $t7, 0x021A($s0) ## 0000021A -/* 00E70 80AF63D0 BA0F021D */ swr $t7, 0x021D($s0) ## 0000021D -/* 00E74 80AF63D4 95AF0004 */ lhu $t7, 0x0004($t5) ## 00000004 -/* 00E78 80AF63D8 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00E7C 80AF63DC 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 00E80 80AF63E0 A60F021E */ sh $t7, 0x021E($s0) ## 0000021E -/* 00E84 80AF63E4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00E88 80AF63E8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00E8C 80AF63EC E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00E90 80AF63F0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00E94 80AF63F4 AFB80028 */ sw $t8, 0x0028($sp) -/* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) -/* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) -/* 00EA4 80AF6404 0C00C916 */ jal Actor_SpawnAsChild - -/* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) -.L80AF6410: -/* 00EB0 80AF6410 8FB00034 */ lw $s0, 0x0034($sp) -/* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EB8 80AF6418 03E00008 */ jr $ra -/* 00EBC 80AF641C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s deleted file mode 100644 index 6820b585ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel EnSa_Update -/* 01680 80AF6BE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01684 80AF6BE4 AFB0001C */ sw $s0, 0x001C($sp) -/* 01688 80AF6BE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0168C 80AF6BEC AFB10020 */ sw $s1, 0x0020($sp) -/* 01690 80AF6BF0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01694 80AF6BF4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01698 80AF6BF8 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 0169C 80AF6BFC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 016A0 80AF6C00 0C0189B7 */ jal Collider_UpdateCylinder - -/* 016A4 80AF6C04 AFA6002C */ sw $a2, 0x002C($sp) -/* 016A8 80AF6C08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 016AC 80AF6C0C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 016B0 80AF6C10 8FA6002C */ lw $a2, 0x002C($sp) -/* 016B4 80AF6C14 02212821 */ addu $a1, $s1, $at -/* 016B8 80AF6C18 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 016BC 80AF6C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 016C0 80AF6C20 0C02927F */ jal SkelAnime_Update - -/* 016C4 80AF6C24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 016C8 80AF6C28 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 -/* 016CC 80AF6C2C 3C040600 */ lui $a0, %hi(D_06001D50) ## $a0 = 06000000 -/* 016D0 80AF6C30 24841D50 */ addiu $a0, $a0, %lo(D_06001D50) ## $a0 = 06001D50 -/* 016D4 80AF6C34 548E000E */ bnel $a0, $t6, .L80AF6C70 -/* 016D8 80AF6C38 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -/* 016DC 80AF6C3C 0C028800 */ jal Animation_GetLastFrame - -/* 016E0 80AF6C40 00000000 */ nop -/* 016E4 80AF6C44 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 016E8 80AF6C48 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 016EC 80AF6C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F0 80AF6C50 46803220 */ cvt.s.w $f8, $f6 -/* 016F4 80AF6C54 4604403E */ c.le.s $f8, $f4 -/* 016F8 80AF6C58 00000000 */ nop -/* 016FC 80AF6C5C 45020004 */ bc1fl .L80AF6C70 -/* 01700 80AF6C60 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -/* 01704 80AF6C64 0C2BD763 */ jal func_80AF5D8C -/* 01708 80AF6C68 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 0170C 80AF6C6C 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -.L80AF6C70: -/* 01710 80AF6C70 3C0380AF */ lui $v1, %hi(func_80AF68E4) ## $v1 = 80AF0000 -/* 01714 80AF6C74 246368E4 */ addiu $v1, $v1, %lo(func_80AF68E4) ## $v1 = 80AF68E4 -/* 01718 80AF6C78 106F000A */ beq $v1, $t7, .L80AF6CA4 -/* 0171C 80AF6C7C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01720 80AF6C80 86060218 */ lh $a2, 0x0218($s0) ## 00000218 -/* 01724 80AF6C84 AFA3002C */ sw $v1, 0x002C($sp) -/* 01728 80AF6C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0172C 80AF6C8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01730 80AF6C90 0C00D375 */ jal func_80034DD4 -/* 01734 80AF6C94 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 01738 80AF6C98 8FA3002C */ lw $v1, 0x002C($sp) -/* 0173C 80AF6C9C 10000002 */ beq $zero, $zero, .L80AF6CA8 -/* 01740 80AF6CA0 A6020218 */ sh $v0, 0x0218($s0) ## 00000218 -.L80AF6CA4: -/* 01744 80AF6CA4 A6180218 */ sh $t8, 0x0218($s0) ## 00000218 -.L80AF6CA8: -/* 01748 80AF6CA8 8E080190 */ lw $t0, 0x0190($s0) ## 00000190 -/* 0174C 80AF6CAC 86190218 */ lh $t9, 0x0218($s0) ## 00000218 -/* 01750 80AF6CB0 1468000E */ bne $v1, $t0, .L80AF6CEC -/* 01754 80AF6CB4 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 01758 80AF6CB8 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 0175C 80AF6CBC C610005C */ lwc1 $f16, 0x005C($s0) ## 0000005C -/* 01760 80AF6CC0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01764 80AF6CC4 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 01768 80AF6CC8 46105480 */ add.s $f18, $f10, $f16 -/* 0176C 80AF6CCC C6100064 */ lwc1 $f16, 0x0064($s0) ## 00000064 -/* 01770 80AF6CD0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01774 80AF6CD4 46043200 */ add.s $f8, $f6, $f4 -/* 01778 80AF6CD8 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 0177C 80AF6CDC 46105480 */ add.s $f18, $f10, $f16 -/* 01780 80AF6CE0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 01784 80AF6CE4 10000003 */ beq $zero, $zero, .L80AF6CF4 -/* 01788 80AF6CE8 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -.L80AF6CEC: -/* 0178C 80AF6CEC 0C00B5FB */ jal func_8002D7EC -/* 01790 80AF6CF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AF6CF4: -/* 01794 80AF6CF4 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -/* 01798 80AF6CF8 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 0179C 80AF6CFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 017A0 80AF6D00 11210008 */ beq $t1, $at, .L80AF6D24 -/* 017A4 80AF6D04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 017A8 80AF6D08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 017AC 80AF6D0C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 017B0 80AF6D10 AFAA0014 */ sw $t2, 0x0014($sp) -/* 017B4 80AF6D14 44060000 */ mfc1 $a2, $f0 -/* 017B8 80AF6D18 44070000 */ mfc1 $a3, $f0 -/* 017BC 80AF6D1C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 017C0 80AF6D20 E7A00010 */ swc1 $f0, 0x0010($sp) -.L80AF6D24: -/* 017C4 80AF6D24 0C2BD827 */ jal func_80AF609C -/* 017C8 80AF6D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017CC 80AF6D2C 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 017D0 80AF6D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017D4 80AF6D34 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017D8 80AF6D38 0320F809 */ jalr $ra, $t9 -/* 017DC 80AF6D3C 00000000 */ nop -/* 017E0 80AF6D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E4 80AF6D44 0C2BD5F6 */ jal func_80AF57D8 -/* 017E8 80AF6D48 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017EC 80AF6D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017F0 80AF6D50 0C2BD7CD */ jal func_80AF5F34 -/* 017F4 80AF6D54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017F8 80AF6D58 8FBF0024 */ lw $ra, 0x0024($sp) -/* 017FC 80AF6D5C 8FB0001C */ lw $s0, 0x001C($sp) -/* 01800 80AF6D60 8FB10020 */ lw $s1, 0x0020($sp) -/* 01804 80AF6D64 03E00008 */ jr $ra -/* 01808 80AF6D68 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s deleted file mode 100644 index 8b18645c8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF5560 -/* 00000 80AF5560 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80AF5564 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AF5568 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0000C 80AF556C AFA60018 */ sw $a2, 0x0018($sp) -/* 00010 80AF5570 0C042F6F */ jal func_8010BDBC -/* 00014 80AF5574 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00018 80AF5578 8FA60018 */ lw $a2, 0x0018($sp) -/* 0001C 80AF557C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00020 80AF5580 00022400 */ sll $a0, $v0, 16 -/* 00024 80AF5584 90C30209 */ lbu $v1, 0x0209($a2) ## 00000209 -/* 00028 80AF5588 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0002C 80AF558C 00042403 */ sra $a0, $a0, 16 -/* 00030 80AF5590 10610007 */ beq $v1, $at, .L80AF55B0 -/* 00034 80AF5594 00057400 */ sll $t6, $a1, 16 -/* 00038 80AF5598 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0003C 80AF559C 10610004 */ beq $v1, $at, .L80AF55B0 -/* 00040 80AF55A0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00044 80AF55A4 10610002 */ beq $v1, $at, .L80AF55B0 -/* 00048 80AF55A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0004C 80AF55AC 14610006 */ bne $v1, $at, .L80AF55C8 -.L80AF55B0: -/* 00050 80AF55B0 000E7C03 */ sra $t7, $t6, 16 -/* 00054 80AF55B4 51E30005 */ beql $t7, $v1, .L80AF55CC -/* 00058 80AF55B8 A0C40209 */ sb $a0, 0x0209($a2) ## 00000209 -/* 0005C 80AF55BC 90D80208 */ lbu $t8, 0x0208($a2) ## 00000208 -/* 00060 80AF55C0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00064 80AF55C4 A0D90208 */ sb $t9, 0x0208($a2) ## 00000208 -.L80AF55C8: -/* 00068 80AF55C8 A0C40209 */ sb $a0, 0x0209($a2) ## 00000209 -.L80AF55CC: -/* 0006C 80AF55CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00070 80AF55D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00074 80AF55D4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 00078 80AF55D8 03E00008 */ jr $ra -/* 0007C 80AF55DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s deleted file mode 100644 index 411c9b6c87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80AF55E0 -/* 00080 80AF55E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00084 80AF55E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00088 80AF55E8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0008C 80AF55EC AFA6001C */ sw $a2, 0x001C($sp) -/* 00090 80AF55F0 0C01B0D8 */ jal Text_GetFaceReaction -/* 00094 80AF55F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 00098 80AF55F8 8FA6001C */ lw $a2, 0x001C($sp) -/* 0009C 80AF55FC 10400003 */ beq $v0, $zero, .L80AF560C -/* 000A0 80AF5600 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 000A4 80AF5604 10000037 */ beq $zero, $zero, .L80AF56E4 -/* 000A8 80AF5608 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AF560C: -/* 000AC 80AF560C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 000B0 80AF5610 3C048012 */ lui $a0, %hi(gBitFlags) -/* 000B4 80AF5614 24847120 */ addiu $a0, %lo(gBitFlags) -/* 000B8 80AF5618 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 000BC 80AF561C 8C4300A4 */ lw $v1, 0x00A4($v0) ## 8015E704 -/* 000C0 80AF5620 8C8E0038 */ lw $t6, 0x0038($a0) ## 80127158 -/* 000C4 80AF5624 01C37824 */ and $t7, $t6, $v1 -/* 000C8 80AF5628 51E00004 */ beql $t7, $zero, .L80AF563C -/* 000CC 80AF562C 8C980048 */ lw $t8, 0x0048($a0) ## 80127168 -/* 000D0 80AF5630 1000002C */ beq $zero, $zero, .L80AF56E4 -/* 000D4 80AF5634 240210AD */ addiu $v0, $zero, 0x10AD ## $v0 = 000010AD -/* 000D8 80AF5638 8C980048 */ lw $t8, 0x0048($a0) ## 80127168 -.L80AF563C: -/* 000DC 80AF563C 0303C824 */ and $t9, $t8, $v1 -/* 000E0 80AF5640 5320000C */ beql $t9, $zero, .L80AF5674 -/* 000E4 80AF5644 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 00001F81 -/* 000E8 80AF5648 A0C00208 */ sb $zero, 0x0208($a2) ## 00000208 -/* 000EC 80AF564C A0C00209 */ sb $zero, 0x0209($a2) ## 00000209 -/* 000F0 80AF5650 94480EF8 */ lhu $t0, 0x0EF8($v0) ## 00001FA5 -/* 000F4 80AF5654 31090020 */ andi $t1, $t0, 0x0020 ## $t1 = 00000000 -/* 000F8 80AF5658 11200003 */ beq $t1, $zero, .L80AF5668 -/* 000FC 80AF565C 00000000 */ nop -/* 00100 80AF5660 10000020 */ beq $zero, $zero, .L80AF56E4 -/* 00104 80AF5664 24021048 */ addiu $v0, $zero, 0x1048 ## $v0 = 00001048 -.L80AF5668: -/* 00108 80AF5668 1000001E */ beq $zero, $zero, .L80AF56E4 -/* 0010C 80AF566C 24021047 */ addiu $v0, $zero, 0x1047 ## $v0 = 00001047 -/* 00110 80AF5670 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 00001F1B -.L80AF5674: -/* 00114 80AF5674 314B0004 */ andi $t3, $t2, 0x0004 ## $t3 = 00000000 -/* 00118 80AF5678 5160000C */ beql $t3, $zero, .L80AF56AC -/* 0011C 80AF567C 944E0EF8 */ lhu $t6, 0x0EF8($v0) ## 00001F3F -/* 00120 80AF5680 A0C00208 */ sb $zero, 0x0208($a2) ## 00000208 -/* 00124 80AF5684 A0C00209 */ sb $zero, 0x0209($a2) ## 00000209 -/* 00128 80AF5688 944C0EF8 */ lhu $t4, 0x0EF8($v0) ## 00001F3F -/* 0012C 80AF568C 318D0008 */ andi $t5, $t4, 0x0008 ## $t5 = 00000000 -/* 00130 80AF5690 11A00003 */ beq $t5, $zero, .L80AF56A0 -/* 00134 80AF5694 00000000 */ nop -/* 00138 80AF5698 10000012 */ beq $zero, $zero, .L80AF56E4 -/* 0013C 80AF569C 24021032 */ addiu $v0, $zero, 0x1032 ## $v0 = 00001032 -.L80AF56A0: -/* 00140 80AF56A0 10000010 */ beq $zero, $zero, .L80AF56E4 -/* 00144 80AF56A4 24021031 */ addiu $v0, $zero, 0x1031 ## $v0 = 00001031 -/* 00148 80AF56A8 944E0EF8 */ lhu $t6, 0x0EF8($v0) ## 00001F29 -.L80AF56AC: -/* 0014C 80AF56AC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00150 80AF56B0 51E0000C */ beql $t7, $zero, .L80AF56E4 -/* 00154 80AF56B4 24021001 */ addiu $v0, $zero, 0x1001 ## $v0 = 00001001 -/* 00158 80AF56B8 A0C00208 */ sb $zero, 0x0208($a2) ## 00000208 -/* 0015C 80AF56BC A0C00209 */ sb $zero, 0x0209($a2) ## 00000209 -/* 00160 80AF56C0 94580EF8 */ lhu $t8, 0x0EF8($v0) ## 00001EF9 -/* 00164 80AF56C4 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 00168 80AF56C8 13200003 */ beq $t9, $zero, .L80AF56D8 -/* 0016C 80AF56CC 00000000 */ nop -/* 00170 80AF56D0 10000004 */ beq $zero, $zero, .L80AF56E4 -/* 00174 80AF56D4 24021003 */ addiu $v0, $zero, 0x1003 ## $v0 = 00001003 -.L80AF56D8: -/* 00178 80AF56D8 10000002 */ beq $zero, $zero, .L80AF56E4 -/* 0017C 80AF56DC 24021002 */ addiu $v0, $zero, 0x1002 ## $v0 = 00001002 -/* 00180 80AF56E0 24021001 */ addiu $v0, $zero, 0x1001 ## $v0 = 00001001 -.L80AF56E4: -/* 00184 80AF56E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00188 80AF56E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0018C 80AF56EC 03E00008 */ jr $ra -/* 00190 80AF56F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s deleted file mode 100644 index ccae7c6f4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel jtbl_80AF74B0 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF573C -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 -.word L80AF57C4 - -.text -glabel func_80AF56F4 -/* 00194 80AF56F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00198 80AF56F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0019C 80AF56FC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001A0 80AF5700 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 80AF5704 AFA40020 */ sw $a0, 0x0020($sp) -/* 001A8 80AF5708 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 001AC 80AF570C A7A3001E */ sh $v1, 0x001E($sp) -/* 001B0 80AF5710 0C2BD558 */ jal func_80AF5560 -/* 001B4 80AF5714 8FA40024 */ lw $a0, 0x0024($sp) -/* 001B8 80AF5718 2C41000A */ sltiu $at, $v0, 0x000A -/* 001BC 80AF571C 10200029 */ beq $at, $zero, .L80AF57C4 -/* 001C0 80AF5720 87A3001E */ lh $v1, 0x001E($sp) -/* 001C4 80AF5724 00027080 */ sll $t6, $v0, 2 -/* 001C8 80AF5728 3C0180AF */ lui $at, %hi(jtbl_80AF74B0) ## $at = 80AF0000 -/* 001CC 80AF572C 002E0821 */ addu $at, $at, $t6 -/* 001D0 80AF5730 8C2E74B0 */ lw $t6, %lo(jtbl_80AF74B0)($at) -/* 001D4 80AF5734 01C00008 */ jr $t6 -/* 001D8 80AF5738 00000000 */ nop -glabel L80AF573C -/* 001DC 80AF573C 8FAF0024 */ lw $t7, 0x0024($sp) -/* 001E0 80AF5740 24011002 */ addiu $at, $zero, 0x1002 ## $at = 00001002 -/* 001E4 80AF5744 95E2010E */ lhu $v0, 0x010E($t7) ## 0000010E -/* 001E8 80AF5748 10410007 */ beq $v0, $at, .L80AF5768 -/* 001EC 80AF574C 24011031 */ addiu $at, $zero, 0x1031 ## $at = 00001031 -/* 001F0 80AF5750 1041000C */ beq $v0, $at, .L80AF5784 -/* 001F4 80AF5754 24011047 */ addiu $at, $zero, 0x1047 ## $at = 00001047 -/* 001F8 80AF5758 10410014 */ beq $v0, $at, .L80AF57AC -/* 001FC 80AF575C 00000000 */ nop -/* 00200 80AF5760 10000018 */ beq $zero, $zero, .L80AF57C4 -/* 00204 80AF5764 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80AF5768: -/* 00208 80AF5768 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0020C 80AF576C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00210 80AF5770 94580EF8 */ lhu $t8, 0x0EF8($v0) ## 8015F558 -/* 00214 80AF5774 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00218 80AF5778 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 0021C 80AF577C 10000011 */ beq $zero, $zero, .L80AF57C4 -/* 00220 80AF5780 A4590EF8 */ sh $t9, 0x0EF8($v0) ## 8015F558 -.L80AF5784: -/* 00224 80AF5784 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00228 80AF5788 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0022C 80AF578C 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 8015F534 -/* 00230 80AF5790 944A0EF8 */ lhu $t2, 0x0EF8($v0) ## 8015F558 -/* 00234 80AF5794 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00238 80AF5798 35090008 */ ori $t1, $t0, 0x0008 ## $t1 = 00000008 -/* 0023C 80AF579C 354B0008 */ ori $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 00240 80AF57A0 A4490ED4 */ sh $t1, 0x0ED4($v0) ## 8015F534 -/* 00244 80AF57A4 10000007 */ beq $zero, $zero, .L80AF57C4 -/* 00248 80AF57A8 A44B0EF8 */ sh $t3, 0x0EF8($v0) ## 8015F558 -.L80AF57AC: -/* 0024C 80AF57AC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00250 80AF57B0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00254 80AF57B4 944C0EF8 */ lhu $t4, 0x0EF8($v0) ## 8015F558 -/* 00258 80AF57B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0025C 80AF57BC 358D0020 */ ori $t5, $t4, 0x0020 ## $t5 = 00000020 -/* 00260 80AF57C0 A44D0EF8 */ sh $t5, 0x0EF8($v0) ## 8015F558 -glabel L80AF57C4 -.L80AF57C4: -/* 00264 80AF57C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00268 80AF57C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0026C 80AF57CC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00270 80AF57D0 03E00008 */ jr $ra -/* 00274 80AF57D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s deleted file mode 100644 index 4114449fef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AF57D8 -/* 00278 80AF57D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0027C 80AF57DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00280 80AF57E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00284 80AF57E4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00288 80AF57E8 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 -/* 0028C 80AF57EC 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00290 80AF57F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00294 80AF57F4 55E10011 */ bnel $t7, $at, .L80AF583C -/* 00298 80AF57F8 860901D4 */ lh $t1, 0x01D4($s0) ## 000001D4 -/* 0029C 80AF57FC 8498008A */ lh $t8, 0x008A($a0) ## 0000008A -/* 002A0 80AF5800 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 002A4 80AF5804 03191023 */ subu $v0, $t8, $t9 -/* 002A8 80AF5808 00021400 */ sll $v0, $v0, 16 -/* 002AC 80AF580C 00021403 */ sra $v0, $v0, 16 -/* 002B0 80AF5810 04400003 */ bltz $v0, .L80AF5820 -/* 002B4 80AF5814 00021823 */ subu $v1, $zero, $v0 -/* 002B8 80AF5818 10000001 */ beq $zero, $zero, .L80AF5820 -/* 002BC 80AF581C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80AF5820: -/* 002C0 80AF5820 28611555 */ slti $at, $v1, 0x1555 -/* 002C4 80AF5824 54200005 */ bnel $at, $zero, .L80AF583C -/* 002C8 80AF5828 860901D4 */ lh $t1, 0x01D4($s0) ## 000001D4 -/* 002CC 80AF582C 860801E0 */ lh $t0, 0x01E0($s0) ## 000001E0 -/* 002D0 80AF5830 51000014 */ beql $t0, $zero, .L80AF5884 -/* 002D4 80AF5834 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002D8 80AF5838 860901D4 */ lh $t1, 0x01D4($s0) ## 000001D4 -.L80AF583C: -/* 002DC 80AF583C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 002E0 80AF5840 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 002E4 80AF5844 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 002E8 80AF5848 3C0A80AF */ lui $t2, %hi(func_80AF55E0) ## $t2 = 80AF0000 -/* 002EC 80AF584C 3C0B80AF */ lui $t3, %hi(func_80AF56F4) ## $t3 = 80AF0000 -/* 002F0 80AF5850 468021A0 */ cvt.s.w $f6, $f4 -/* 002F4 80AF5854 256B56F4 */ addiu $t3, $t3, %lo(func_80AF56F4) ## $t3 = 80AF56F4 -/* 002F8 80AF5858 254A55E0 */ addiu $t2, $t2, %lo(func_80AF55E0) ## $t2 = 80AF55E0 -/* 002FC 80AF585C AFAA0010 */ sw $t2, 0x0010($sp) -/* 00300 80AF5860 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00304 80AF5864 8FA4002C */ lw $a0, 0x002C($sp) -/* 00308 80AF5868 46083280 */ add.s $f10, $f6, $f8 -/* 0030C 80AF586C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00310 80AF5870 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 00314 80AF5874 44075000 */ mfc1 $a3, $f10 -/* 00318 80AF5878 0C00D0F3 */ jal func_800343CC -/* 0031C 80AF587C 00000000 */ nop -/* 00320 80AF5880 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF5884: -/* 00324 80AF5884 8FB00020 */ lw $s0, 0x0020($sp) -/* 00328 80AF5888 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0032C 80AF588C 03E00008 */ jr $ra -/* 00330 80AF5890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s deleted file mode 100644 index 282145d9e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AF5894 -/* 00334 80AF5894 C482015C */ lwc1 $f2, 0x015C($a0) ## 0000015C -/* 00338 80AF5898 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0033C 80AF589C C4800158 */ lwc1 $f0, 0x0158($a0) ## 00000158 -/* 00340 80AF58A0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00344 80AF58A4 E4820158 */ swc1 $f2, 0x0158($a0) ## 00000158 -/* 00348 80AF58A8 E4820164 */ swc1 $f2, 0x0164($a0) ## 00000164 -/* 0034C 80AF58AC E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C -/* 00350 80AF58B0 03E00008 */ jr $ra -/* 00354 80AF58B4 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s deleted file mode 100644 index 8ffcaf0f91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF58B8 -/* 00358 80AF58B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0035C 80AF58BC AFBF001C */ sw $ra, 0x001C($sp) -/* 00360 80AF58C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00364 80AF58C4 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00368 80AF58C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0036C 80AF58CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00370 80AF58D0 10400006 */ beq $v0, $zero, .L80AF58EC -/* 00374 80AF58D4 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00378 80AF58D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0037C 80AF58DC 5041000A */ beql $v0, $at, .L80AF5908 -/* 00380 80AF58E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00384 80AF58E4 10000015 */ beq $zero, $zero, .L80AF593C -/* 00388 80AF58E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF58EC: -/* 0038C 80AF58EC 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 00390 80AF58F0 0C00D3B0 */ jal func_80034EC0 -/* 00394 80AF58F4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00398 80AF58F8 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 0039C 80AF58FC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 003A0 80AF5900 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 003A4 80AF5904 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5908: -/* 003A8 80AF5908 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 003AC 80AF590C 0C0295B2 */ jal Animation_OnFrame -/* 003B0 80AF5910 AFA40020 */ sw $a0, 0x0020($sp) -/* 003B4 80AF5914 10400008 */ beq $v0, $zero, .L80AF5938 -/* 003B8 80AF5918 8FA40020 */ lw $a0, 0x0020($sp) -/* 003BC 80AF591C 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 003C0 80AF5920 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 003C4 80AF5924 0C00D3B0 */ jal func_80034EC0 -/* 003C8 80AF5928 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 003CC 80AF592C 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 003D0 80AF5930 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 003D4 80AF5934 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5938: -/* 003D8 80AF5938 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF593C: -/* 003DC 80AF593C 8FB00018 */ lw $s0, 0x0018($sp) -/* 003E0 80AF5940 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003E4 80AF5944 03E00008 */ jr $ra -/* 003E8 80AF5948 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s deleted file mode 100644 index 84ed09a968..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF594C -/* 003EC 80AF594C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003F0 80AF5950 AFBF001C */ sw $ra, 0x001C($sp) -/* 003F4 80AF5954 AFB00018 */ sw $s0, 0x0018($sp) -/* 003F8 80AF5958 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 003FC 80AF595C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00400 80AF5960 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00404 80AF5964 10400006 */ beq $v0, $zero, .L80AF5980 -/* 00408 80AF5968 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 0040C 80AF596C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00410 80AF5970 5041000A */ beql $v0, $at, .L80AF599C -/* 00414 80AF5974 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00418 80AF5978 10000015 */ beq $zero, $zero, .L80AF59D0 -/* 0041C 80AF597C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5980: -/* 00420 80AF5980 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 00424 80AF5984 0C00D3B0 */ jal func_80034EC0 -/* 00428 80AF5988 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 0042C 80AF598C 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00430 80AF5990 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00434 80AF5994 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00438 80AF5998 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF599C: -/* 0043C 80AF599C 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00440 80AF59A0 0C0295B2 */ jal Animation_OnFrame -/* 00444 80AF59A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00448 80AF59A8 10400008 */ beq $v0, $zero, .L80AF59CC -/* 0044C 80AF59AC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00450 80AF59B0 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00454 80AF59B4 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 00458 80AF59B8 0C00D3B0 */ jal func_80034EC0 -/* 0045C 80AF59BC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00460 80AF59C0 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00464 80AF59C4 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00468 80AF59C8 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF59CC: -/* 0046C 80AF59CC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF59D0: -/* 00470 80AF59D0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00474 80AF59D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00478 80AF59D8 03E00008 */ jr $ra -/* 0047C 80AF59DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s deleted file mode 100644 index a8f5d83315..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF59E0 -/* 00480 80AF59E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00484 80AF59E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00488 80AF59E8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0048C 80AF59EC 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00490 80AF59F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00494 80AF59F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00498 80AF59F8 10400006 */ beq $v0, $zero, .L80AF5A14 -/* 0049C 80AF59FC 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 004A0 80AF5A00 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 004A4 80AF5A04 5041000A */ beql $v0, $at, .L80AF5A30 -/* 004A8 80AF5A08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 004AC 80AF5A0C 10000015 */ beq $zero, $zero, .L80AF5A64 -/* 004B0 80AF5A10 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5A14: -/* 004B4 80AF5A14 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 004B8 80AF5A18 0C00D3B0 */ jal func_80034EC0 -/* 004BC 80AF5A1C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 004C0 80AF5A20 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 004C4 80AF5A24 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 004C8 80AF5A28 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 004CC 80AF5A2C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5A30: -/* 004D0 80AF5A30 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 004D4 80AF5A34 0C0295B2 */ jal Animation_OnFrame -/* 004D8 80AF5A38 AFA40020 */ sw $a0, 0x0020($sp) -/* 004DC 80AF5A3C 10400008 */ beq $v0, $zero, .L80AF5A60 -/* 004E0 80AF5A40 8FA40020 */ lw $a0, 0x0020($sp) -/* 004E4 80AF5A44 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 004E8 80AF5A48 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 004EC 80AF5A4C 0C00D3B0 */ jal func_80034EC0 -/* 004F0 80AF5A50 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 004F4 80AF5A54 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 004F8 80AF5A58 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 004FC 80AF5A5C A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5A60: -/* 00500 80AF5A60 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5A64: -/* 00504 80AF5A64 8FB00018 */ lw $s0, 0x0018($sp) -/* 00508 80AF5A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0050C 80AF5A6C 03E00008 */ jr $ra -/* 00510 80AF5A70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s deleted file mode 100644 index 276501f74b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AF5A74 -/* 00514 80AF5A74 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00518 80AF5A78 AFBF001C */ sw $ra, 0x001C($sp) -/* 0051C 80AF5A7C AFB00018 */ sw $s0, 0x0018($sp) -/* 00520 80AF5A80 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00524 80AF5A84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00528 80AF5A88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0052C 80AF5A8C 10400006 */ beq $v0, $zero, .L80AF5AA8 -/* 00530 80AF5A90 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00534 80AF5A94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00538 80AF5A98 5041000C */ beql $v0, $at, .L80AF5ACC -/* 0053C 80AF5A9C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00540 80AF5AA0 10000017 */ beq $zero, $zero, .L80AF5B00 -/* 00544 80AF5AA4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5AA8: -/* 00548 80AF5AA8 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 0054C 80AF5AAC 0C00D3B0 */ jal func_80034EC0 -/* 00550 80AF5AB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00554 80AF5AB4 0C2BD625 */ jal func_80AF5894 -/* 00558 80AF5AB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0055C 80AF5ABC 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00560 80AF5AC0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00564 80AF5AC4 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00568 80AF5AC8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5ACC: -/* 0056C 80AF5ACC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00570 80AF5AD0 0C0295B2 */ jal Animation_OnFrame -/* 00574 80AF5AD4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00578 80AF5AD8 10400008 */ beq $v0, $zero, .L80AF5AFC -/* 0057C 80AF5ADC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00580 80AF5AE0 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00584 80AF5AE4 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 00588 80AF5AE8 0C00D3B0 */ jal func_80034EC0 -/* 0058C 80AF5AEC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00590 80AF5AF0 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00594 80AF5AF4 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00598 80AF5AF8 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5AFC: -/* 0059C 80AF5AFC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5B00: -/* 005A0 80AF5B00 8FB00018 */ lw $s0, 0x0018($sp) -/* 005A4 80AF5B04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005A8 80AF5B08 03E00008 */ jr $ra -/* 005AC 80AF5B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s deleted file mode 100644 index ef7514791d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF5B10 -/* 005B0 80AF5B10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005B4 80AF5B14 AFBF001C */ sw $ra, 0x001C($sp) -/* 005B8 80AF5B18 AFB00018 */ sw $s0, 0x0018($sp) -/* 005BC 80AF5B1C 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 005C0 80AF5B20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005C4 80AF5B24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005C8 80AF5B28 10400006 */ beq $v0, $zero, .L80AF5B44 -/* 005CC 80AF5B2C 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 005D0 80AF5B30 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 005D4 80AF5B34 5041000A */ beql $v0, $at, .L80AF5B60 -/* 005D8 80AF5B38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005DC 80AF5B3C 10000015 */ beq $zero, $zero, .L80AF5B94 -/* 005E0 80AF5B40 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5B44: -/* 005E4 80AF5B44 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 005E8 80AF5B48 0C00D3B0 */ jal func_80034EC0 -/* 005EC 80AF5B4C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 005F0 80AF5B50 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 005F4 80AF5B54 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 005F8 80AF5B58 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 005FC 80AF5B5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5B60: -/* 00600 80AF5B60 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00604 80AF5B64 0C0295B2 */ jal Animation_OnFrame -/* 00608 80AF5B68 AFA40020 */ sw $a0, 0x0020($sp) -/* 0060C 80AF5B6C 10400008 */ beq $v0, $zero, .L80AF5B90 -/* 00610 80AF5B70 8FA40020 */ lw $a0, 0x0020($sp) -/* 00614 80AF5B74 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00618 80AF5B78 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 0061C 80AF5B7C 0C00D3B0 */ jal func_80034EC0 -/* 00620 80AF5B80 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00624 80AF5B84 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00628 80AF5B88 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0062C 80AF5B8C A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5B90: -/* 00630 80AF5B90 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5B94: -/* 00634 80AF5B94 8FB00018 */ lw $s0, 0x0018($sp) -/* 00638 80AF5B98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0063C 80AF5B9C 03E00008 */ jr $ra -/* 00640 80AF5BA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s deleted file mode 100644 index 86f12c81c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AF5BA4 -/* 00644 80AF5BA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00648 80AF5BA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0064C 80AF5BAC AFB00018 */ sw $s0, 0x0018($sp) -/* 00650 80AF5BB0 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00654 80AF5BB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00658 80AF5BB8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0065C 80AF5BBC 10400006 */ beq $v0, $zero, .L80AF5BD8 -/* 00660 80AF5BC0 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00664 80AF5BC4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00668 80AF5BC8 5041000C */ beql $v0, $at, .L80AF5BFC -/* 0066C 80AF5BCC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00670 80AF5BD0 10000017 */ beq $zero, $zero, .L80AF5C30 -/* 00674 80AF5BD4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5BD8: -/* 00678 80AF5BD8 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 0067C 80AF5BDC 0C00D3B0 */ jal func_80034EC0 -/* 00680 80AF5BE0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00684 80AF5BE4 0C2BD625 */ jal func_80AF5894 -/* 00688 80AF5BE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0068C 80AF5BEC 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00690 80AF5BF0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00694 80AF5BF4 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00698 80AF5BF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5BFC: -/* 0069C 80AF5BFC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 006A0 80AF5C00 0C0295B2 */ jal Animation_OnFrame -/* 006A4 80AF5C04 AFA40020 */ sw $a0, 0x0020($sp) -/* 006A8 80AF5C08 10400008 */ beq $v0, $zero, .L80AF5C2C -/* 006AC 80AF5C0C 8FA40020 */ lw $a0, 0x0020($sp) -/* 006B0 80AF5C10 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 006B4 80AF5C14 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 006B8 80AF5C18 0C00D3B0 */ jal func_80034EC0 -/* 006BC 80AF5C1C 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 006C0 80AF5C20 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 006C4 80AF5C24 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 006C8 80AF5C28 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5C2C: -/* 006CC 80AF5C2C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5C30: -/* 006D0 80AF5C30 8FB00018 */ lw $s0, 0x0018($sp) -/* 006D4 80AF5C34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006D8 80AF5C38 03E00008 */ jr $ra -/* 006DC 80AF5C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s deleted file mode 100644 index f468843284..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF5C40 -/* 006E0 80AF5C40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006E4 80AF5C44 AFBF001C */ sw $ra, 0x001C($sp) -/* 006E8 80AF5C48 AFB00018 */ sw $s0, 0x0018($sp) -/* 006EC 80AF5C4C 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 006F0 80AF5C50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006F4 80AF5C54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006F8 80AF5C58 10400006 */ beq $v0, $zero, .L80AF5C74 -/* 006FC 80AF5C5C 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00700 80AF5C60 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00704 80AF5C64 5041000A */ beql $v0, $at, .L80AF5C90 -/* 00708 80AF5C68 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0070C 80AF5C6C 10000015 */ beq $zero, $zero, .L80AF5CC4 -/* 00710 80AF5C70 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5C74: -/* 00714 80AF5C74 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 00718 80AF5C78 0C00D3B0 */ jal func_80034EC0 -/* 0071C 80AF5C7C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00720 80AF5C80 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00724 80AF5C84 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00728 80AF5C88 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 0072C 80AF5C8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AF5C90: -/* 00730 80AF5C90 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00734 80AF5C94 0C0295B2 */ jal Animation_OnFrame -/* 00738 80AF5C98 AFA40020 */ sw $a0, 0x0020($sp) -/* 0073C 80AF5C9C 10400008 */ beq $v0, $zero, .L80AF5CC0 -/* 00740 80AF5CA0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00744 80AF5CA4 3C0580AF */ lui $a1, %hi(D_80AF7358) ## $a1 = 80AF0000 -/* 00748 80AF5CA8 24A57358 */ addiu $a1, $a1, %lo(D_80AF7358) ## $a1 = 80AF7358 -/* 0074C 80AF5CAC 0C00D3B0 */ jal func_80034EC0 -/* 00750 80AF5CB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00754 80AF5CB4 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00758 80AF5CB8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0075C 80AF5CBC A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AF5CC0: -/* 00760 80AF5CC0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF5CC4: -/* 00764 80AF5CC4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00768 80AF5CC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0076C 80AF5CCC 03E00008 */ jr $ra -/* 00770 80AF5CD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s deleted file mode 100644 index 24f09b7742..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AF5CD4 -/* 00774 80AF5CD4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00778 80AF5CD8 A085020B */ sb $a1, 0x020B($a0) ## 0000020B -/* 0077C 80AF5CDC 03E00008 */ jr $ra -/* 00780 80AF5CE0 A080020A */ sb $zero, 0x020A($a0) ## 0000020A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s deleted file mode 100644 index 7c1f60e86d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s +++ /dev/null @@ -1,63 +0,0 @@ -.late_rodata -glabel jtbl_80AF74D8 -.word L80AF5D14 -.word L80AF5D24 -.word L80AF5D34 -.word L80AF5D44 -.word L80AF5D54 -.word L80AF5D64 -.word L80AF5D74 - -.text -glabel func_80AF5CE4 -/* 00784 80AF5CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80AF5CE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80AF5CEC 908E020B */ lbu $t6, 0x020B($a0) ## 0000020B -/* 00790 80AF5CF0 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00794 80AF5CF4 2DE10007 */ sltiu $at, $t7, 0x0007 -/* 00798 80AF5CF8 10200020 */ beq $at, $zero, .L80AF5D7C -/* 0079C 80AF5CFC 000F7880 */ sll $t7, $t7, 2 -/* 007A0 80AF5D00 3C0180AF */ lui $at, %hi(jtbl_80AF74D8) ## $at = 80AF0000 -/* 007A4 80AF5D04 002F0821 */ addu $at, $at, $t7 -/* 007A8 80AF5D08 8C2F74D8 */ lw $t7, %lo(jtbl_80AF74D8)($at) -/* 007AC 80AF5D0C 01E00008 */ jr $t7 -/* 007B0 80AF5D10 00000000 */ nop -glabel L80AF5D14 -/* 007B4 80AF5D14 0C2BD62E */ jal func_80AF58B8 -/* 007B8 80AF5D18 00000000 */ nop -/* 007BC 80AF5D1C 10000018 */ beq $zero, $zero, .L80AF5D80 -/* 007C0 80AF5D20 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D24 -/* 007C4 80AF5D24 0C2BD653 */ jal func_80AF594C -/* 007C8 80AF5D28 00000000 */ nop -/* 007CC 80AF5D2C 10000014 */ beq $zero, $zero, .L80AF5D80 -/* 007D0 80AF5D30 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D34 -/* 007D4 80AF5D34 0C2BD678 */ jal func_80AF59E0 -/* 007D8 80AF5D38 00000000 */ nop -/* 007DC 80AF5D3C 10000010 */ beq $zero, $zero, .L80AF5D80 -/* 007E0 80AF5D40 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D44 -/* 007E4 80AF5D44 0C2BD69D */ jal func_80AF5A74 -/* 007E8 80AF5D48 00000000 */ nop -/* 007EC 80AF5D4C 1000000C */ beq $zero, $zero, .L80AF5D80 -/* 007F0 80AF5D50 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D54 -/* 007F4 80AF5D54 0C2BD6C4 */ jal func_80AF5B10 -/* 007F8 80AF5D58 00000000 */ nop -/* 007FC 80AF5D5C 10000008 */ beq $zero, $zero, .L80AF5D80 -/* 00800 80AF5D60 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D64 -/* 00804 80AF5D64 0C2BD6E9 */ jal func_80AF5BA4 -/* 00808 80AF5D68 00000000 */ nop -/* 0080C 80AF5D6C 10000004 */ beq $zero, $zero, .L80AF5D80 -/* 00810 80AF5D70 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AF5D74 -/* 00814 80AF5D74 0C2BD710 */ jal func_80AF5C40 -/* 00818 80AF5D78 00000000 */ nop -.L80AF5D7C: -/* 0081C 80AF5D7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF5D80: -/* 00820 80AF5D80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00824 80AF5D84 03E00008 */ jr $ra -/* 00828 80AF5D88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s deleted file mode 100644 index b3109502ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AF5D8C -/* 0082C 80AF5D8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00830 80AF5D90 3C0F80AF */ lui $t7, %hi(D_80AF7298) ## $t7 = 80AF0000 -/* 00834 80AF5D94 25EF7298 */ addiu $t7, $t7, %lo(D_80AF7298) ## $t7 = 80AF7298 -/* 00838 80AF5D98 00057100 */ sll $t6, $a1, 4 -/* 0083C 80AF5D9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00840 80AF5DA0 AFA40030 */ sw $a0, 0x0030($sp) -/* 00844 80AF5DA4 01CF1821 */ addu $v1, $t6, $t7 -/* 00848 80AF5DA8 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 0084C 80AF5DAC 0C028800 */ jal Animation_GetLastFrame - -/* 00850 80AF5DB0 AFA30028 */ sw $v1, 0x0028($sp) -/* 00854 80AF5DB4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00858 80AF5DB8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0085C 80AF5DBC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00860 80AF5DC0 468021A0 */ cvt.s.w $f6, $f4 -/* 00864 80AF5DC4 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 -/* 00868 80AF5DC8 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C -/* 0086C 80AF5DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00870 80AF5DD0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00874 80AF5DD4 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00878 80AF5DD8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0087C 80AF5DDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00880 80AF5DE0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00884 80AF5DE4 0C029468 */ jal Animation_Change - -/* 00888 80AF5DE8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0088C 80AF5DEC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00890 80AF5DF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00894 80AF5DF4 03E00008 */ jr $ra -/* 00898 80AF5DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s deleted file mode 100644 index eeea78f4d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AF5DFC -/* 0089C 80AF5DFC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 008A0 80AF5E00 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 008A4 80AF5E04 8C620008 */ lw $v0, 0x0008($v1) ## 8015E668 -/* 008A8 80AF5E08 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 -/* 008AC 80AF5E0C AFA40000 */ sw $a0, 0x0000($sp) -/* 008B0 80AF5E10 0041082A */ slt $at, $v0, $at -/* 008B4 80AF5E14 1420000E */ bne $at, $zero, .L80AF5E50 -/* 008B8 80AF5E18 3401FFFD */ ori $at, $zero, 0xFFFD ## $at = 0000FFFD -/* 008BC 80AF5E1C 5041000D */ beql $v0, $at, .L80AF5E54 -/* 008C0 80AF5E20 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 008C4 80AF5E24 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 008C8 80AF5E28 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 008CC 80AF5E2C 54410004 */ bnel $v0, $at, .L80AF5E40 -/* 008D0 80AF5E30 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 008D4 80AF5E34 03E00008 */ jr $ra -/* 008D8 80AF5E38 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80AF5E3C: -/* 008DC 80AF5E3C 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -.L80AF5E40: -/* 008E0 80AF5E40 54410004 */ bnel $v0, $at, .L80AF5E54 -/* 008E4 80AF5E44 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 008E8 80AF5E48 03E00008 */ jr $ra -/* 008EC 80AF5E4C 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AF5E50: -/* 008F0 80AF5E50 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -.L80AF5E54: -/* 008F4 80AF5E54 24010029 */ addiu $at, $zero, 0x0029 ## $at = 00000029 -/* 008F8 80AF5E58 54410012 */ bnel $v0, $at, .L80AF5EA4 -/* 008FC 80AF5E5C 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00900 80AF5E60 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00904 80AF5E64 3C0F8012 */ lui $t7, %hi(gItemSlots+7) -/* 00908 80AF5E68 51C0000E */ beql $t6, $zero, .L80AF5EA4 -/* 0090C 80AF5E6C 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00910 80AF5E70 91EF746B */ lbu $t7, %lo(gItemSlots+7)($t7) -/* 00914 80AF5E74 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00918 80AF5E78 006FC021 */ addu $t8, $v1, $t7 -/* 0091C 80AF5E7C 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 -/* 00920 80AF5E80 57210008 */ bnel $t9, $at, .L80AF5EA4 -/* 00924 80AF5E84 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00928 80AF5E88 94680EDC */ lhu $t0, 0x0EDC($v1) ## 8015F53C -/* 0092C 80AF5E8C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00930 80AF5E90 55200004 */ bnel $t1, $zero, .L80AF5EA4 -/* 00934 80AF5E94 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 00938 80AF5E98 03E00008 */ jr $ra -/* 0093C 80AF5E9C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF5EA0: -/* 00940 80AF5EA0 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -.L80AF5EA4: -/* 00944 80AF5EA4 54410011 */ bnel $v0, $at, .L80AF5EEC -/* 00948 80AF5EA8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 0094C 80AF5EAC 946A0EDC */ lhu $t2, 0x0EDC($v1) ## 8015F53C -/* 00950 80AF5EB0 3C0C8012 */ lui $t4, %hi(gBitFlags+0x38) -/* 00954 80AF5EB4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 00958 80AF5EB8 5160000C */ beql $t3, $zero, .L80AF5EEC -/* 0095C 80AF5EBC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00960 80AF5EC0 8D8C7158 */ lw $t4, %lo(gBitFlags+0x38)($t4) -/* 00964 80AF5EC4 8C6D00A4 */ lw $t5, 0x00A4($v1) ## 8015E704 -/* 00968 80AF5EC8 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -/* 0096C 80AF5ECC 018D7024 */ and $t6, $t4, $t5 -/* 00970 80AF5ED0 11C00003 */ beq $t6, $zero, .L80AF5EE0 -/* 00974 80AF5ED4 00000000 */ nop -/* 00978 80AF5ED8 03E00008 */ jr $ra -/* 0097C 80AF5EDC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80AF5EE0: -/* 00980 80AF5EE0 03E00008 */ jr $ra -/* 00984 80AF5EE4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000005 -.L80AF5EE8: -/* 00988 80AF5EE8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -.L80AF5EEC: -/* 0098C 80AF5EEC 1441000E */ bne $v0, $at, .L80AF5F28 -/* 00990 80AF5EF0 3C0F8012 */ lui $t7, %hi(gBitFlags+0x48) -/* 00994 80AF5EF4 8DEF7168 */ lw $t7, %lo(gBitFlags+0x48)($t7) -/* 00998 80AF5EF8 8C7800A4 */ lw $t8, 0x00A4($v1) ## 000000A9 -/* 0099C 80AF5EFC 01F8C824 */ and $t9, $t7, $t8 -/* 009A0 80AF5F00 5720000A */ bnel $t9, $zero, .L80AF5F2C -/* 009A4 80AF5F04 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 009A8 80AF5F08 94680EF8 */ lhu $t0, 0x0EF8($v1) ## 00000EFD -/* 009AC 80AF5F0C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 009B0 80AF5F10 11200003 */ beq $t1, $zero, .L80AF5F20 -/* 009B4 80AF5F14 00000000 */ nop -/* 009B8 80AF5F18 03E00008 */ jr $ra -/* 009BC 80AF5F1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF5F20: -/* 009C0 80AF5F20 03E00008 */ jr $ra -/* 009C4 80AF5F24 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80AF5F28: -/* 009C8 80AF5F28 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF5F2C: -/* 009CC 80AF5F2C 03E00008 */ jr $ra -/* 009D0 80AF5F30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s deleted file mode 100644 index 5d3a6160f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80AF5F34 -/* 009D4 80AF5F34 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009D8 80AF5F38 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009DC 80AF5F3C 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 009E0 80AF5F40 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 009E4 80AF5F44 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 009E8 80AF5F48 14410008 */ bne $v0, $at, .L80AF5F6C -/* 009EC 80AF5F4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009F0 80AF5F50 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 009F4 80AF5F54 3C0E80AF */ lui $t6, %hi(func_80AF68E4) ## $t6 = 80AF0000 -/* 009F8 80AF5F58 25CE68E4 */ addiu $t6, $t6, %lo(func_80AF68E4) ## $t6 = 80AF68E4 -/* 009FC 80AF5F5C 15CF0003 */ bne $t6, $t7, .L80AF5F6C -/* 00A00 80AF5F60 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00A04 80AF5F64 10000001 */ beq $zero, $zero, .L80AF5F6C -/* 00A08 80AF5F68 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AF5F6C: -/* 00A0C 80AF5F6C 24030056 */ addiu $v1, $zero, 0x0056 ## $v1 = 00000056 -/* 00A10 80AF5F70 14620008 */ bne $v1, $v0, .L80AF5F94 -/* 00A14 80AF5F74 00000000 */ nop -/* 00A18 80AF5F78 8C990154 */ lw $t9, 0x0154($a0) ## 00000154 -/* 00A1C 80AF5F7C 3C180601 */ lui $t8, %hi(D_0600BAEC) ## $t8 = 06010000 -/* 00A20 80AF5F80 2718BAEC */ addiu $t8, $t8, %lo(D_0600BAEC) ## $t8 = 0600BAEC -/* 00A24 80AF5F84 17190003 */ bne $t8, $t9, .L80AF5F94 -/* 00A28 80AF5F88 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00A2C 80AF5F8C 10000001 */ beq $zero, $zero, .L80AF5F94 -/* 00A30 80AF5F90 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AF5F94: -/* 00A34 80AF5F94 1462000C */ bne $v1, $v0, .L80AF5FC8 -/* 00A38 80AF5F98 00000000 */ nop -/* 00A3C 80AF5F9C 8C8A0190 */ lw $t2, 0x0190($a0) ## 00000190 -/* 00A40 80AF5FA0 3C0980AF */ lui $t1, %hi(func_80AF6448) ## $t1 = 80AF0000 -/* 00A44 80AF5FA4 25296448 */ addiu $t1, $t1, %lo(func_80AF6448) ## $t1 = 80AF6448 -/* 00A48 80AF5FA8 152A0007 */ bne $t1, $t2, .L80AF5FC8 -/* 00A4C 80AF5FAC 00000000 */ nop -/* 00A50 80AF5FB0 8C8C0154 */ lw $t4, 0x0154($a0) ## 00000154 -/* 00A54 80AF5FB4 3C0B0601 */ lui $t3, %hi(D_0600C500) ## $t3 = 06010000 -/* 00A58 80AF5FB8 256BC500 */ addiu $t3, $t3, %lo(D_0600C500) ## $t3 = 0600C500 -/* 00A5C 80AF5FBC 156C0002 */ bne $t3, $t4, .L80AF5FC8 -/* 00A60 80AF5FC0 00000000 */ nop -/* 00A64 80AF5FC4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AF5FC8: -/* 00A68 80AF5FC8 5462000D */ bnel $v1, $v0, .L80AF6000 -/* 00A6C 80AF5FCC 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 -/* 00A70 80AF5FD0 8C8E0190 */ lw $t6, 0x0190($a0) ## 00000190 -/* 00A74 80AF5FD4 3C0D80AF */ lui $t5, %hi(func_80AF68E4) ## $t5 = 80AF0000 -/* 00A78 80AF5FD8 25AD68E4 */ addiu $t5, $t5, %lo(func_80AF68E4) ## $t5 = 80AF68E4 -/* 00A7C 80AF5FDC 55AE0008 */ bnel $t5, $t6, .L80AF6000 -/* 00A80 80AF5FE0 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 -/* 00A84 80AF5FE4 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 00A88 80AF5FE8 3C0F0600 */ lui $t7, %hi(D_06001D50) ## $t7 = 06000000 -/* 00A8C 80AF5FEC 25EF1D50 */ addiu $t7, $t7, %lo(D_06001D50) ## $t7 = 06001D50 -/* 00A90 80AF5FF0 55F80003 */ bnel $t7, $t8, .L80AF6000 -/* 00A94 80AF5FF4 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 -/* 00A98 80AF5FF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A9C 80AF5FFC 8D090024 */ lw $t1, 0x0024($t0) ## 00000024 -.L80AF6000: -/* 00AA0 80AF6000 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00AA4 80AF6004 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00AA8 80AF6008 AC8901F8 */ sw $t1, 0x01F8($a0) ## 000001F8 -/* 00AAC 80AF600C 8D190028 */ lw $t9, 0x0028($t0) ## 00000028 -/* 00AB0 80AF6010 248501E0 */ addiu $a1, $a0, 0x01E0 ## $a1 = 000001E0 -/* 00AB4 80AF6014 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00AB8 80AF6018 AC9901FC */ sw $t9, 0x01FC($a0) ## 000001FC -/* 00ABC 80AF601C 8D09002C */ lw $t1, 0x002C($t0) ## 0000002C -/* 00AC0 80AF6020 E48401F4 */ swc1 $f4, 0x01F4($a0) ## 000001F4 -/* 00AC4 80AF6024 0C00D285 */ jal func_80034A14 -/* 00AC8 80AF6028 AC890200 */ sw $t1, 0x0200($a0) ## 00000200 -/* 00ACC 80AF602C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AD0 80AF6030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AD4 80AF6034 03E00008 */ jr $ra -/* 00AD8 80AF6038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s deleted file mode 100644 index 0383d0dd6b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AF603C -/* 00ADC 80AF603C 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 00AE0 80AF6040 3C0E0601 */ lui $t6, %hi(D_0600BAEC) ## $t6 = 06010000 -/* 00AE4 80AF6044 25CEBAEC */ addiu $t6, $t6, %lo(D_0600BAEC) ## $t6 = 0600BAEC -/* 00AE8 80AF6048 11C20006 */ beq $t6, $v0, .L80AF6064 -/* 00AEC 80AF604C 3C0F0600 */ lui $t7, %hi(D_06001D50) ## $t7 = 06000000 -/* 00AF0 80AF6050 25EF1D50 */ addiu $t7, $t7, %lo(D_06001D50) ## $t7 = 06001D50 -/* 00AF4 80AF6054 51E20004 */ beql $t7, $v0, .L80AF6068 -/* 00AF8 80AF6058 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 -/* 00AFC 80AF605C 03E00008 */ jr $ra -/* 00B00 80AF6060 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF6064: -/* 00B04 80AF6064 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 -.L80AF6068: -/* 00B08 80AF6068 53000004 */ beql $t8, $zero, .L80AF607C -/* 00B0C 80AF606C 84990212 */ lh $t9, 0x0212($a0) ## 00000212 -/* 00B10 80AF6070 03E00008 */ jr $ra -/* 00B14 80AF6074 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF6078: -/* 00B18 80AF6078 84990212 */ lh $t9, 0x0212($a0) ## 00000212 -.L80AF607C: -/* 00B1C 80AF607C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00B20 80AF6080 A480020E */ sh $zero, 0x020E($a0) ## 0000020E -/* 00B24 80AF6084 13210003 */ beq $t9, $at, .L80AF6094 -/* 00B28 80AF6088 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B2C 80AF608C 03E00008 */ jr $ra -/* 00B30 80AF6090 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF6094: -/* 00B34 80AF6094 03E00008 */ jr $ra -/* 00B38 80AF6098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s deleted file mode 100644 index 64f06bbd5a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AF609C -/* 00B3C 80AF609C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B40 80AF60A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B44 80AF60A4 0C2BD80F */ jal func_80AF603C -/* 00B48 80AF60A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B4C 80AF60AC 1440001C */ bne $v0, $zero, .L80AF6120 -/* 00B50 80AF60B0 8FA60018 */ lw $a2, 0x0018($sp) -/* 00B54 80AF60B4 84C2020E */ lh $v0, 0x020E($a2) ## 0000020E -/* 00B58 80AF60B8 14400003 */ bne $v0, $zero, .L80AF60C8 -/* 00B5C 80AF60BC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00B60 80AF60C0 10000003 */ beq $zero, $zero, .L80AF60D0 -/* 00B64 80AF60C4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80AF60C8: -/* 00B68 80AF60C8 A4CE020E */ sh $t6, 0x020E($a2) ## 0000020E -/* 00B6C 80AF60CC 84C3020E */ lh $v1, 0x020E($a2) ## 0000020E -.L80AF60D0: -/* 00B70 80AF60D0 54600014 */ bnel $v1, $zero, .L80AF6124 -/* 00B74 80AF60D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B78 80AF60D8 84CF0212 */ lh $t7, 0x0212($a2) ## 00000212 -/* 00B7C 80AF60DC 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00B80 80AF60E0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00B84 80AF60E4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00B88 80AF60E8 A4D80212 */ sh $t8, 0x0212($a2) ## 00000212 -/* 00B8C 80AF60EC 84C20212 */ lh $v0, 0x0212($a2) ## 00000212 -/* 00B90 80AF60F0 28410003 */ slti $at, $v0, 0x0003 -/* 00B94 80AF60F4 10200003 */ beq $at, $zero, .L80AF6104 -/* 00B98 80AF60F8 00000000 */ nop -/* 00B9C 80AF60FC 10000008 */ beq $zero, $zero, .L80AF6120 -/* 00BA0 80AF6100 A4C20214 */ sh $v0, 0x0214($a2) ## 00000214 -.L80AF6104: -/* 00BA4 80AF6104 0C01DF64 */ jal Rand_S16Offset - -/* 00BA8 80AF6108 AFA60018 */ sw $a2, 0x0018($sp) -/* 00BAC 80AF610C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00BB0 80AF6110 A4C00214 */ sh $zero, 0x0214($a2) ## 00000214 -/* 00BB4 80AF6114 84D90214 */ lh $t9, 0x0214($a2) ## 00000214 -/* 00BB8 80AF6118 A4C2020E */ sh $v0, 0x020E($a2) ## 0000020E -/* 00BBC 80AF611C A4D90212 */ sh $t9, 0x0212($a2) ## 00000212 -.L80AF6120: -/* 00BC0 80AF6120 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF6124: -/* 00BC4 80AF6124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BC8 80AF6128 03E00008 */ jr $ra -/* 00BCC 80AF612C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s deleted file mode 100644 index 1b97d03927..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF6130 -/* 00BD0 80AF6130 8C8E000C */ lw $t6, 0x000C($a0) ## 0000000C -/* 00BD4 80AF6134 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00BD8 80AF6138 00000000 */ nop -/* 00BDC 80AF613C 468021A0 */ cvt.s.w $f6, $f4 -/* 00BE0 80AF6140 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 00BE4 80AF6144 8C8F0010 */ lw $t7, 0x0010($a0) ## 00000010 -/* 00BE8 80AF6148 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00BEC 80AF614C 00000000 */ nop -/* 00BF0 80AF6150 468042A0 */ cvt.s.w $f10, $f8 -/* 00BF4 80AF6154 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 00BF8 80AF6158 8C980014 */ lw $t8, 0x0014($a0) ## 00000014 -/* 00BFC 80AF615C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00C00 80AF6160 00000000 */ nop -/* 00C04 80AF6164 468084A0 */ cvt.s.w $f18, $f16 -/* 00C08 80AF6168 03E00008 */ jr $ra -/* 00C0C 80AF616C E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s deleted file mode 100644 index 969eeeae07..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF6170 -/* 00C10 80AF6170 8C8E0018 */ lw $t6, 0x0018($a0) ## 00000018 -/* 00C14 80AF6174 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00C18 80AF6178 00000000 */ nop -/* 00C1C 80AF617C 468021A0 */ cvt.s.w $f6, $f4 -/* 00C20 80AF6180 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 00C24 80AF6184 8C8F001C */ lw $t7, 0x001C($a0) ## 0000001C -/* 00C28 80AF6188 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00C2C 80AF618C 00000000 */ nop -/* 00C30 80AF6190 468042A0 */ cvt.s.w $f10, $f8 -/* 00C34 80AF6194 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 00C38 80AF6198 8C980020 */ lw $t8, 0x0020($a0) ## 00000020 -/* 00C3C 80AF619C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00C40 80AF61A0 00000000 */ nop -/* 00C44 80AF61A4 468084A0 */ cvt.s.w $f18, $f16 -/* 00C48 80AF61A8 03E00008 */ jr $ra -/* 00C4C 80AF61AC E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s deleted file mode 100644 index e7588ad988..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s +++ /dev/null @@ -1,247 +0,0 @@ -glabel func_80AF6448 -/* 00EE8 80AF6448 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00EEC 80AF644C AFBF002C */ sw $ra, 0x002C($sp) -/* 00EF0 80AF6450 AFB00028 */ sw $s0, 0x0028($sp) -/* 00EF4 80AF6454 AFA50034 */ sw $a1, 0x0034($sp) -/* 00EF8 80AF6458 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 -/* 00EFC 80AF645C 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00F00 80AF6460 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F04 80AF6464 55E100AD */ bnel $t7, $at, .L80AF671C -/* 00F08 80AF6468 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 -/* 00F0C 80AF646C 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 -/* 00F10 80AF6470 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00F14 80AF6474 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00F18 80AF6478 1300008E */ beq $t8, $zero, .L80AF66B4 -/* 00F1C 80AF647C 3C198012 */ lui $t9, %hi(gBitFlags+0x48) -/* 00F20 80AF6480 9482010E */ lhu $v0, 0x010E($a0) ## 0000010E -/* 00F24 80AF6484 24011002 */ addiu $at, $zero, 0x1002 ## $at = 00001002 -/* 00F28 80AF6488 1041000D */ beq $v0, $at, .L80AF64C0 -/* 00F2C 80AF648C 24011003 */ addiu $at, $zero, 0x1003 ## $at = 00001003 -/* 00F30 80AF6490 10410029 */ beq $v0, $at, .L80AF6538 -/* 00F34 80AF6494 24011031 */ addiu $at, $zero, 0x1031 ## $at = 00001031 -/* 00F38 80AF6498 10410033 */ beq $v0, $at, .L80AF6568 -/* 00F3C 80AF649C 24011032 */ addiu $at, $zero, 0x1032 ## $at = 00001032 -/* 00F40 80AF64A0 1041005B */ beq $v0, $at, .L80AF6610 -/* 00F44 80AF64A4 24011047 */ addiu $at, $zero, 0x1047 ## $at = 00001047 -/* 00F48 80AF64A8 10410069 */ beq $v0, $at, .L80AF6650 -/* 00F4C 80AF64AC 24011048 */ addiu $at, $zero, 0x1048 ## $at = 00001048 -/* 00F50 80AF64B0 50410075 */ beql $v0, $at, .L80AF6688 -/* 00F54 80AF64B4 920F0208 */ lbu $t7, 0x0208($s0) ## 00000208 -/* 00F58 80AF64B8 10000095 */ beq $zero, $zero, .L80AF6710 -/* 00F5C 80AF64BC 00000000 */ nop -.L80AF64C0: -/* 00F60 80AF64C0 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00F64 80AF64C4 5440000C */ bnel $v0, $zero, .L80AF64F8 -/* 00F68 80AF64C8 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00F6C 80AF64CC 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B -/* 00F70 80AF64D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F74 80AF64D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F78 80AF64D8 53210007 */ beql $t9, $at, .L80AF64F8 -/* 00F7C 80AF64DC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00F80 80AF64E0 0C2BD735 */ jal func_80AF5CD4 -/* 00F84 80AF64E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00F88 80AF64E8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00F8C 80AF64EC A6080216 */ sh $t0, 0x0216($s0) ## 00000216 -/* 00F90 80AF64F0 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00F94 80AF64F4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80AF64F8: -/* 00F98 80AF64F8 5462000B */ bnel $v1, $v0, .L80AF6528 -/* 00F9C 80AF64FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00FA0 80AF6500 9209020B */ lbu $t1, 0x020B($s0) ## 0000020B -/* 00FA4 80AF6504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FA8 80AF6508 50690007 */ beql $v1, $t1, .L80AF6528 -/* 00FAC 80AF650C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00FB0 80AF6510 0C2BD735 */ jal func_80AF5CD4 -/* 00FB4 80AF6514 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00FB8 80AF6518 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00FBC 80AF651C A60A0216 */ sh $t2, 0x0216($s0) ## 00000216 -/* 00FC0 80AF6520 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00FC4 80AF6524 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80AF6528: -/* 00FC8 80AF6528 14410079 */ bne $v0, $at, .L80AF6710 -/* 00FCC 80AF652C 00000000 */ nop -/* 00FD0 80AF6530 10000077 */ beq $zero, $zero, .L80AF6710 -/* 00FD4 80AF6534 A6000216 */ sh $zero, 0x0216($s0) ## 00000216 -.L80AF6538: -/* 00FD8 80AF6538 920B0208 */ lbu $t3, 0x0208($s0) ## 00000208 -/* 00FDC 80AF653C 15600074 */ bne $t3, $zero, .L80AF6710 -/* 00FE0 80AF6540 00000000 */ nop -/* 00FE4 80AF6544 920C020B */ lbu $t4, 0x020B($s0) ## 0000020B -/* 00FE8 80AF6548 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00FEC 80AF654C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF0 80AF6550 1181006F */ beq $t4, $at, .L80AF6710 -/* 00FF4 80AF6554 00000000 */ nop -/* 00FF8 80AF6558 0C2BD735 */ jal func_80AF5CD4 -/* 00FFC 80AF655C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01000 80AF6560 1000006B */ beq $zero, $zero, .L80AF6710 -/* 01004 80AF6564 00000000 */ nop -.L80AF6568: -/* 01008 80AF6568 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 0100C 80AF656C 54400010 */ bnel $v0, $zero, .L80AF65B0 -/* 01010 80AF6570 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 01014 80AF6574 920D020B */ lbu $t5, 0x020B($s0) ## 0000020B -/* 01018 80AF6578 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0101C 80AF657C 51A1000C */ beql $t5, $at, .L80AF65B0 -/* 01020 80AF6580 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 01024 80AF6584 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 -/* 01028 80AF6588 3C0E0601 */ lui $t6, %hi(D_06012100) ## $t6 = 06010000 -/* 0102C 80AF658C 25CE2100 */ addiu $t6, $t6, %lo(D_06012100) ## $t6 = 06012100 -/* 01030 80AF6590 15CF0006 */ bne $t6, $t7, .L80AF65AC -/* 01034 80AF6594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01038 80AF6598 0C2BD735 */ jal func_80AF5CD4 -/* 0103C 80AF659C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01040 80AF65A0 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01044 80AF65A4 A6180216 */ sh $t8, 0x0216($s0) ## 00000216 -/* 01048 80AF65A8 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -.L80AF65AC: -/* 0104C 80AF65AC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80AF65B0: -/* 01050 80AF65B0 5462000C */ bnel $v1, $v0, .L80AF65E4 -/* 01054 80AF65B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01058 80AF65B8 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B -/* 0105C 80AF65BC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01060 80AF65C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 80AF65C4 53210007 */ beql $t9, $at, .L80AF65E4 -/* 01068 80AF65C8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0106C 80AF65CC 0C2BD735 */ jal func_80AF5CD4 -/* 01070 80AF65D0 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01074 80AF65D4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 01078 80AF65D8 A6030216 */ sh $v1, 0x0216($s0) ## 00000216 -/* 0107C 80AF65DC 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 01080 80AF65E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80AF65E4: -/* 01084 80AF65E4 1441004A */ bne $v0, $at, .L80AF6710 -/* 01088 80AF65E8 00000000 */ nop -/* 0108C 80AF65EC 9208020B */ lbu $t0, 0x020B($s0) ## 0000020B -/* 01090 80AF65F0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01094 80AF65F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01098 80AF65F8 11010045 */ beq $t0, $at, .L80AF6710 -/* 0109C 80AF65FC 00000000 */ nop -/* 010A0 80AF6600 0C2BD735 */ jal func_80AF5CD4 -/* 010A4 80AF6604 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 010A8 80AF6608 10000041 */ beq $zero, $zero, .L80AF6710 -/* 010AC 80AF660C A6000216 */ sh $zero, 0x0216($s0) ## 00000216 -.L80AF6610: -/* 010B0 80AF6610 92090208 */ lbu $t1, 0x0208($s0) ## 00000208 -/* 010B4 80AF6614 1520003E */ bne $t1, $zero, .L80AF6710 -/* 010B8 80AF6618 00000000 */ nop -/* 010BC 80AF661C 920A020B */ lbu $t2, 0x020B($s0) ## 0000020B -/* 010C0 80AF6620 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 010C4 80AF6624 1141003A */ beq $t2, $at, .L80AF6710 -/* 010C8 80AF6628 00000000 */ nop -/* 010CC 80AF662C 8E0C0154 */ lw $t4, 0x0154($s0) ## 00000154 -/* 010D0 80AF6630 3C0B0601 */ lui $t3, %hi(D_06012100) ## $t3 = 06010000 -/* 010D4 80AF6634 256B2100 */ addiu $t3, $t3, %lo(D_06012100) ## $t3 = 06012100 -/* 010D8 80AF6638 156C0035 */ bne $t3, $t4, .L80AF6710 -/* 010DC 80AF663C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010E0 80AF6640 0C2BD735 */ jal func_80AF5CD4 -/* 010E4 80AF6644 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 010E8 80AF6648 10000031 */ beq $zero, $zero, .L80AF6710 -/* 010EC 80AF664C 00000000 */ nop -.L80AF6650: -/* 010F0 80AF6650 920D0208 */ lbu $t5, 0x0208($s0) ## 00000208 -/* 010F4 80AF6654 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 010F8 80AF6658 15A1002D */ bne $t5, $at, .L80AF6710 -/* 010FC 80AF665C 00000000 */ nop -/* 01100 80AF6660 920E020B */ lbu $t6, 0x020B($s0) ## 0000020B -/* 01104 80AF6664 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01108 80AF6668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0110C 80AF666C 11C10028 */ beq $t6, $at, .L80AF6710 -/* 01110 80AF6670 00000000 */ nop -/* 01114 80AF6674 0C2BD735 */ jal func_80AF5CD4 -/* 01118 80AF6678 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 0111C 80AF667C 10000024 */ beq $zero, $zero, .L80AF6710 -/* 01120 80AF6680 00000000 */ nop -/* 01124 80AF6684 920F0208 */ lbu $t7, 0x0208($s0) ## 00000208 -.L80AF6688: -/* 01128 80AF6688 15E00021 */ bne $t7, $zero, .L80AF6710 -/* 0112C 80AF668C 00000000 */ nop -/* 01130 80AF6690 9218020B */ lbu $t8, 0x020B($s0) ## 0000020B -/* 01134 80AF6694 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01138 80AF6698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0113C 80AF669C 1301001C */ beq $t8, $at, .L80AF6710 -/* 01140 80AF66A0 00000000 */ nop -/* 01144 80AF66A4 0C2BD735 */ jal func_80AF5CD4 -/* 01148 80AF66A8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 0114C 80AF66AC 10000018 */ beq $zero, $zero, .L80AF6710 -/* 01150 80AF66B0 00000000 */ nop -.L80AF66B4: -/* 01154 80AF66B4 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) -/* 01158 80AF66B8 8C6800A4 */ lw $t0, 0x00A4($v1) ## 000000A4 -/* 0115C 80AF66BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 80AF66C0 03284824 */ and $t1, $t9, $t0 -/* 01164 80AF66C4 15200010 */ bne $t1, $zero, .L80AF6708 -/* 01168 80AF66C8 00000000 */ nop -/* 0116C 80AF66CC 94620EF8 */ lhu $v0, 0x0EF8($v1) ## 00000EF8 -/* 01170 80AF66D0 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 01174 80AF66D4 15400003 */ bne $t2, $zero, .L80AF66E4 -/* 01178 80AF66D8 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0117C 80AF66DC 1160000A */ beq $t3, $zero, .L80AF6708 -/* 01180 80AF66E0 00000000 */ nop -.L80AF66E4: -/* 01184 80AF66E4 920C020B */ lbu $t4, 0x020B($s0) ## 0000020B -/* 01188 80AF66E8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0118C 80AF66EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01190 80AF66F0 11810007 */ beq $t4, $at, .L80AF6710 -/* 01194 80AF66F4 00000000 */ nop -/* 01198 80AF66F8 0C2BD735 */ jal func_80AF5CD4 -/* 0119C 80AF66FC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 011A0 80AF6700 10000003 */ beq $zero, $zero, .L80AF6710 -/* 011A4 80AF6704 00000000 */ nop -.L80AF6708: -/* 011A8 80AF6708 0C2BD735 */ jal func_80AF5CD4 -/* 011AC 80AF670C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80AF6710: -/* 011B0 80AF6710 0C2BD739 */ jal func_80AF5CE4 -/* 011B4 80AF6714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011B8 80AF6718 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 -.L80AF671C: -/* 011BC 80AF671C 3C0D0601 */ lui $t5, %hi(D_0600C500) ## $t5 = 06010000 -/* 011C0 80AF6720 25ADC500 */ addiu $t5, $t5, %lo(D_0600C500) ## $t5 = 0600C500 -/* 011C4 80AF6724 55AE000E */ bnel $t5, $t6, .L80AF6760 -/* 011C8 80AF6728 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 -/* 011CC 80AF672C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 011D0 80AF6730 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 011D4 80AF6734 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 011D8 80AF6738 4600320D */ trunc.w.s $f8, $f6 -/* 011DC 80AF673C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E0 80AF6740 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 011E4 80AF6744 44184000 */ mfc1 $t8, $f8 -/* 011E8 80AF6748 00000000 */ nop -/* 011EC 80AF674C 57000004 */ bnel $t8, $zero, .L80AF6760 -/* 011F0 80AF6750 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 -/* 011F4 80AF6754 0C2BD763 */ jal func_80AF5D8C -/* 011F8 80AF6758 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 011FC 80AF675C 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 -.L80AF6760: -/* 01200 80AF6760 8FA80034 */ lw $t0, 0x0034($sp) -/* 01204 80AF6764 53200016 */ beql $t9, $zero, .L80AF67C0 -/* 01208 80AF6768 8FBF002C */ lw $ra, 0x002C($sp) -/* 0120C 80AF676C 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 01210 80AF6770 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 01214 80AF6774 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01218 80AF6778 15210010 */ bne $t1, $at, .L80AF67BC -/* 0121C 80AF677C 3C050601 */ lui $a1, %hi(D_0600C500) ## $a1 = 06010000 -/* 01220 80AF6780 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01224 80AF6784 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01228 80AF6788 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0122C 80AF678C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 01230 80AF6790 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01234 80AF6794 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01238 80AF6798 24A5C500 */ addiu $a1, $a1, %lo(D_0600C500) ## $a1 = 0600C500 -/* 0123C 80AF679C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01240 80AF67A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01244 80AF67A4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01248 80AF67A8 0C029468 */ jal Animation_Change - -/* 0124C 80AF67AC E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01250 80AF67B0 3C0B80AF */ lui $t3, %hi(func_80AF67D0) ## $t3 = 80AF0000 -/* 01254 80AF67B4 256B67D0 */ addiu $t3, $t3, %lo(func_80AF67D0) ## $t3 = 80AF67D0 -/* 01258 80AF67B8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -.L80AF67BC: -/* 0125C 80AF67BC 8FBF002C */ lw $ra, 0x002C($sp) -.L80AF67C0: -/* 01260 80AF67C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01264 80AF67C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01268 80AF67C8 03E00008 */ jr $ra -/* 0126C 80AF67CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s deleted file mode 100644 index 3bf8a2a21b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AF67D0 -/* 01270 80AF67D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01274 80AF67D4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01278 80AF67D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0127C 80AF67DC AFA5002C */ sw $a1, 0x002C($sp) -/* 01280 80AF67E0 848F01E0 */ lh $t7, 0x01E0($a0) ## 000001E0 -/* 01284 80AF67E4 3C050601 */ lui $a1, %hi(D_0600C500) ## $a1 = 06010000 -/* 01288 80AF67E8 24A5C500 */ addiu $a1, $a1, %lo(D_0600C500) ## $a1 = 0600C500 -/* 0128C 80AF67EC 15E0000F */ bne $t7, $zero, .L80AF682C -/* 01290 80AF67F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01294 80AF67F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01298 80AF67F8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0129C 80AF67FC 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 012A0 80AF6800 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 012A4 80AF6804 44060000 */ mfc1 $a2, $f0 -/* 012A8 80AF6808 AFB80014 */ sw $t8, 0x0014($sp) -/* 012AC 80AF680C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 012B0 80AF6810 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 012B4 80AF6814 0C029468 */ jal Animation_Change - -/* 012B8 80AF6818 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 012BC 80AF681C 8FA80028 */ lw $t0, 0x0028($sp) -/* 012C0 80AF6820 3C1980AF */ lui $t9, %hi(func_80AF6448) ## $t9 = 80AF0000 -/* 012C4 80AF6824 27396448 */ addiu $t9, $t9, %lo(func_80AF6448) ## $t9 = 80AF6448 -/* 012C8 80AF6828 AD190190 */ sw $t9, 0x0190($t0) ## 00000190 -.L80AF682C: -/* 012CC 80AF682C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012D0 80AF6830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012D4 80AF6834 03E00008 */ jr $ra -/* 012D8 80AF6838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s deleted file mode 100644 index 69ab2c0233..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_80AF750C - .float -2220.0 - -.text -glabel func_80AF683C -/* 012DC 80AF683C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012E0 80AF6840 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012E4 80AF6844 AFA40018 */ sw $a0, 0x0018($sp) -/* 012E8 80AF6848 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 012EC 80AF684C 3C0180AF */ lui $at, %hi(D_80AF750C) ## $at = 80AF0000 -/* 012F0 80AF6850 C426750C */ lwc1 $f6, %lo(D_80AF750C)($at) -/* 012F4 80AF6854 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 012F8 80AF6858 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012FC 80AF685C 4604303E */ c.le.s $f6, $f4 -/* 01300 80AF6860 00000000 */ nop -/* 01304 80AF6864 4503001C */ bc1tl .L80AF68D8 -/* 01308 80AF6868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0130C 80AF686C 0C02FF21 */ jal Gameplay_InCsMode -/* 01310 80AF6870 AFA5001C */ sw $a1, 0x001C($sp) -/* 01314 80AF6874 14400017 */ bne $v0, $zero, .L80AF68D4 -/* 01318 80AF6878 8FA5001C */ lw $a1, 0x001C($sp) -/* 0131C 80AF687C 3C020200 */ lui $v0, %hi(D_02005730) ## $v0 = 02000000 -/* 01320 80AF6880 24425730 */ addiu $v0, $v0, %lo(D_02005730) ## $v0 = 02005730 -/* 01324 80AF6884 00027100 */ sll $t6, $v0, 4 -/* 01328 80AF6888 000E7F02 */ srl $t7, $t6, 28 -/* 0132C 80AF688C 000FC080 */ sll $t8, $t7, 2 -/* 01330 80AF6890 3C198016 */ lui $t9, %hi(gSegments) -/* 01334 80AF6894 0338C821 */ addu $t9, $t9, $t8 -/* 01338 80AF6898 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0133C 80AF689C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 01340 80AF68A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01344 80AF68A4 00414024 */ and $t0, $v0, $at -/* 01348 80AF68A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0134C 80AF68AC 03284821 */ addu $t1, $t9, $t0 -/* 01350 80AF68B0 01215021 */ addu $t2, $t1, $at -/* 01354 80AF68B4 ACAA1D68 */ sw $t2, 0x1D68($a1) ## 00001D68 -/* 01358 80AF68B8 8FAD0018 */ lw $t5, 0x0018($sp) -/* 0135C 80AF68BC 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 01360 80AF68C0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01364 80AF68C4 3C0C80AF */ lui $t4, %hi(func_80AF68E4) ## $t4 = 80AF0000 -/* 01368 80AF68C8 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) -/* 0136C 80AF68CC 258C68E4 */ addiu $t4, $t4, %lo(func_80AF68E4) ## $t4 = 80AF68E4 -/* 01370 80AF68D0 ADAC0190 */ sw $t4, 0x0190($t5) ## 00000190 -.L80AF68D4: -/* 01374 80AF68D4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF68D8: -/* 01378 80AF68D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0137C 80AF68DC 03E00008 */ jr $ra -/* 01380 80AF68E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s deleted file mode 100644 index 3629276a24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s +++ /dev/null @@ -1,159 +0,0 @@ -glabel func_80AF68E4 -/* 01384 80AF68E4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01388 80AF68E8 3C0F80AF */ lui $t7, %hi(D_80AF7448) ## $t7 = 80AF0000 -/* 0138C 80AF68EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01390 80AF68F0 AFB10020 */ sw $s1, 0x0020($sp) -/* 01394 80AF68F4 AFB0001C */ sw $s0, 0x001C($sp) -/* 01398 80AF68F8 25EF7448 */ addiu $t7, $t7, %lo(D_80AF7448) ## $t7 = 80AF7448 -/* 0139C 80AF68FC 8DF90000 */ lw $t9, 0x0000($t7) ## 80AF7448 -/* 013A0 80AF6900 27AE0040 */ addiu $t6, $sp, 0x0040 ## $t6 = FFFFFFD8 -/* 013A4 80AF6904 8DF80004 */ lw $t8, 0x0004($t7) ## 80AF744C -/* 013A8 80AF6908 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFD8 -/* 013AC 80AF690C 8DF90008 */ lw $t9, 0x0008($t7) ## 80AF7450 -/* 013B0 80AF6910 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFDC -/* 013B4 80AF6914 3C0980AF */ lui $t1, %hi(func_80AF6B20) ## $t1 = 80AF0000 -/* 013B8 80AF6918 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFE0 -/* 013BC 80AF691C 90A81D6C */ lbu $t0, 0x1D6C($a1) ## 00001D6C -/* 013C0 80AF6920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013C4 80AF6924 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 013C8 80AF6928 15000003 */ bne $t0, $zero, .L80AF6938 -/* 013CC 80AF692C 25296B20 */ addiu $t1, $t1, %lo(func_80AF6B20) ## $t1 = 80AF6B20 -/* 013D0 80AF6930 10000076 */ beq $zero, $zero, .L80AF6B0C -/* 013D4 80AF6934 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 -.L80AF6938: -/* 013D8 80AF6938 8CD11D90 */ lw $s1, 0x1D90($a2) ## 00001D90 -/* 013DC 80AF693C 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFF0 -/* 013E0 80AF6940 12200072 */ beq $s1, $zero, .L80AF6B0C -/* 013E4 80AF6944 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013E8 80AF6948 0C2BD84C */ jal func_80AF6130 -/* 013EC 80AF694C AFA6006C */ sw $a2, 0x006C($sp) -/* 013F0 80AF6950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013F4 80AF6954 0C2BD85C */ jal func_80AF6170 -/* 013F8 80AF6958 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFE4 -/* 013FC 80AF695C 86020210 */ lh $v0, 0x0210($s0) ## 00000210 -/* 01400 80AF6960 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFF0 -/* 01404 80AF6964 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01408 80AF6968 14400008 */ bne $v0, $zero, .L80AF698C -/* 0140C 80AF696C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01410 80AF6970 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFF0 -/* 01414 80AF6974 86020210 */ lh $v0, 0x0210($s0) ## 00000210 -/* 01418 80AF6978 AE0C0024 */ sw $t4, 0x0024($s0) ## 00000024 -/* 0141C 80AF697C 8D4B0004 */ lw $t3, 0x0004($t2) ## FFFFFFF4 -/* 01420 80AF6980 AE0B0028 */ sw $t3, 0x0028($s0) ## 00000028 -/* 01424 80AF6984 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFF8 -/* 01428 80AF6988 AE0C002C */ sw $t4, 0x002C($s0) ## 0000002C -.L80AF698C: -/* 0142C 80AF698C 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -/* 01430 80AF6990 50620011 */ beql $v1, $v0, .L80AF69D8 -/* 01434 80AF6994 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01438 80AF6998 10610006 */ beq $v1, $at, .L80AF69B4 -/* 0143C 80AF699C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01440 80AF69A0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01444 80AF69A4 10610005 */ beq $v1, $at, .L80AF69BC -/* 01448 80AF69A8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0144C 80AF69AC 10000004 */ beq $zero, $zero, .L80AF69C0 -/* 01450 80AF69B0 A6000216 */ sh $zero, 0x0216($s0) ## 00000216 -.L80AF69B4: -/* 01454 80AF69B4 10000002 */ beq $zero, $zero, .L80AF69C0 -/* 01458 80AF69B8 A60D0216 */ sh $t5, 0x0216($s0) ## 00000216 -.L80AF69BC: -/* 0145C 80AF69BC A60E0216 */ sh $t6, 0x0216($s0) ## 00000216 -.L80AF69C0: -/* 01460 80AF69C0 0C2BD763 */ jal func_80AF5D8C -/* 01464 80AF69C4 96250000 */ lhu $a1, 0x0000($s1) ## 00000000 -/* 01468 80AF69C8 962F0000 */ lhu $t7, 0x0000($s1) ## 00000000 -/* 0146C 80AF69CC A60F0210 */ sh $t7, 0x0210($s0) ## 00000210 -/* 01470 80AF69D0 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -/* 01474 80AF69D4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80AF69D8: -/* 01478 80AF69D8 54610016 */ bnel $v1, $at, .L80AF6A34 -/* 0147C 80AF69DC 96290006 */ lhu $t1, 0x0006($s1) ## 00000006 -/* 01480 80AF69E0 8603020C */ lh $v1, 0x020C($s0) ## 0000020C -/* 01484 80AF69E4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01488 80AF69E8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0148C 80AF69EC 14600003 */ bne $v1, $zero, .L80AF69FC -/* 01490 80AF69F0 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 01494 80AF69F4 10000003 */ beq $zero, $zero, .L80AF6A04 -/* 01498 80AF69F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF69FC: -/* 0149C 80AF69FC A618020C */ sh $t8, 0x020C($s0) ## 0000020C -/* 014A0 80AF6A00 8602020C */ lh $v0, 0x020C($s0) ## 0000020C -.L80AF6A04: -/* 014A4 80AF6A04 1440000A */ bne $v0, $zero, .L80AF6A30 -/* 014A8 80AF6A08 24040800 */ addiu $a0, $zero, 0x0800 ## $a0 = 00000800 -/* 014AC 80AF6A0C 3C198013 */ lui $t9, %hi(D_801333E8) -/* 014B0 80AF6A10 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 014B4 80AF6A14 AFB90014 */ sw $t9, 0x0014($sp) -/* 014B8 80AF6A18 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 014BC 80AF6A1C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 014C0 80AF6A20 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 014C4 80AF6A24 AFA70010 */ sw $a3, 0x0010($sp) -/* 014C8 80AF6A28 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 014CC 80AF6A2C A608020C */ sh $t0, 0x020C($s0) ## 0000020C -.L80AF6A30: -/* 014D0 80AF6A30 96290006 */ lhu $t1, 0x0006($s1) ## 00000006 -.L80AF6A34: -/* 014D4 80AF6A34 8FA3006C */ lw $v1, 0x006C($sp) -/* 014D8 80AF6A38 27AC0040 */ addiu $t4, $sp, 0x0040 ## $t4 = FFFFFFD8 -/* 014DC 80AF6A3C A60900B4 */ sh $t1, 0x00B4($s0) ## 000000B4 -/* 014E0 80AF6A40 962A0008 */ lhu $t2, 0x0008($s1) ## 00000008 -/* 014E4 80AF6A44 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 014E8 80AF6A48 962B000A */ lhu $t3, 0x000A($s1) ## 0000000A -/* 014EC 80AF6A4C A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 -/* 014F0 80AF6A50 8D8E0000 */ lw $t6, 0x0000($t4) ## FFFFFFD8 -/* 014F4 80AF6A54 AE0E005C */ sw $t6, 0x005C($s0) ## 0000005C -/* 014F8 80AF6A58 8D8D0004 */ lw $t5, 0x0004($t4) ## FFFFFFDC -/* 014FC 80AF6A5C AE0D0060 */ sw $t5, 0x0060($s0) ## 00000060 -/* 01500 80AF6A60 8D8E0008 */ lw $t6, 0x0008($t4) ## FFFFFFE0 -/* 01504 80AF6A64 AE0E0064 */ sw $t6, 0x0064($s0) ## 00000064 -/* 01508 80AF6A68 96220004 */ lhu $v0, 0x0004($s1) ## 00000004 -/* 0150C 80AF6A6C 946F1D74 */ lhu $t7, 0x1D74($v1) ## 00001D74 -/* 01510 80AF6A70 01E2082A */ slt $at, $t7, $v0 -/* 01514 80AF6A74 50200026 */ beql $at, $zero, .L80AF6B10 -/* 01518 80AF6A78 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0151C 80AF6A7C 96380002 */ lhu $t8, 0x0002($s1) ## 00000002 -/* 01520 80AF6A80 C7A6004C */ lwc1 $f6, 0x004C($sp) -/* 01524 80AF6A84 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 01528 80AF6A88 0058C823 */ subu $t9, $v0, $t8 -/* 0152C 80AF6A8C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01530 80AF6A90 46083281 */ sub.s $f10, $f6, $f8 -/* 01534 80AF6A94 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 01538 80AF6A98 C602006C */ lwc1 $f2, 0x006C($s0) ## 0000006C -/* 0153C 80AF6A9C 46802020 */ cvt.s.w $f0, $f4 -/* 01540 80AF6AA0 46005403 */ div.s $f16, $f10, $f0 -/* 01544 80AF6AA4 E610005C */ swc1 $f16, 0x005C($s0) ## 0000005C -/* 01548 80AF6AA8 C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 0154C 80AF6AAC C7B20050 */ lwc1 $f18, 0x0050($sp) -/* 01550 80AF6AB0 46049181 */ sub.s $f6, $f18, $f4 -/* 01554 80AF6AB4 46003203 */ div.s $f8, $f6, $f0 -/* 01558 80AF6AB8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 0155C 80AF6ABC 846800A4 */ lh $t0, 0x00A4($v1) ## 000000A4 -/* 01560 80AF6AC0 55010004 */ bnel $t0, $at, .L80AF6AD4 -/* 01564 80AF6AC4 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 01568 80AF6AC8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0156C 80AF6ACC 00000000 */ nop -/* 01570 80AF6AD0 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -.L80AF6AD4: -/* 01574 80AF6AD4 C60C0070 */ lwc1 $f12, 0x0070($s0) ## 00000070 -/* 01578 80AF6AD8 46025400 */ add.s $f16, $f10, $f2 -/* 0157C 80AF6ADC E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 01580 80AF6AE0 C6120060 */ lwc1 $f18, 0x0060($s0) ## 00000060 -/* 01584 80AF6AE4 460C903C */ c.lt.s $f18, $f12 -/* 01588 80AF6AE8 00000000 */ nop -/* 0158C 80AF6AEC 45020003 */ bc1fl .L80AF6AFC -/* 01590 80AF6AF0 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 01594 80AF6AF4 E60C0060 */ swc1 $f12, 0x0060($s0) ## 00000060 -/* 01598 80AF6AF8 C7A40054 */ lwc1 $f4, 0x0054($sp) -.L80AF6AFC: -/* 0159C 80AF6AFC C7A60060 */ lwc1 $f6, 0x0060($sp) -/* 015A0 80AF6B00 46062201 */ sub.s $f8, $f4, $f6 -/* 015A4 80AF6B04 46004283 */ div.s $f10, $f8, $f0 -/* 015A8 80AF6B08 E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 -.L80AF6B0C: -/* 015AC 80AF6B0C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF6B10: -/* 015B0 80AF6B10 8FB0001C */ lw $s0, 0x001C($sp) -/* 015B4 80AF6B14 8FB10020 */ lw $s1, 0x0020($sp) -/* 015B8 80AF6B18 03E00008 */ jr $ra -/* 015BC 80AF6B1C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s deleted file mode 100644 index abe3672684..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AF6B20 -/* 015C0 80AF6B20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015C4 80AF6B24 AFBF001C */ sw $ra, 0x001C($sp) -/* 015C8 80AF6B28 AFB00018 */ sw $s0, 0x0018($sp) -/* 015CC 80AF6B2C 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 015D0 80AF6B30 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 015D4 80AF6B34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015D8 80AF6B38 1441000A */ bne $v0, $at, .L80AF6B64 -/* 015DC 80AF6B3C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 015E0 80AF6B40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015E4 80AF6B44 24050062 */ addiu $a1, $zero, 0x0062 ## $a1 = 00000062 -/* 015E8 80AF6B48 0C021344 */ jal Item_Give -/* 015EC 80AF6B4C AFA60024 */ sw $a2, 0x0024($sp) -/* 015F0 80AF6B50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015F4 80AF6B54 0C2BD763 */ jal func_80AF5D8C -/* 015F8 80AF6B58 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 015FC 80AF6B5C 8FAE0024 */ lw $t6, 0x0024($sp) -/* 01600 80AF6B60 85C200A4 */ lh $v0, 0x00A4($t6) ## 000000A4 -.L80AF6B64: -/* 01604 80AF6B64 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01608 80AF6B68 14410015 */ bne $v0, $at, .L80AF6BC0 -/* 0160C 80AF6B6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01610 80AF6B70 0C2BD763 */ jal func_80AF5D8C -/* 01614 80AF6B74 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01618 80AF6B78 8A08021A */ lwl $t0, 0x021A($s0) ## 0000021A -/* 0161C 80AF6B7C 9A08021D */ lwr $t0, 0x021D($s0) ## 0000021D -/* 01620 80AF6B80 8E180008 */ lw $t8, 0x0008($s0) ## 00000008 -/* 01624 80AF6B84 8E0F000C */ lw $t7, 0x000C($s0) ## 0000000C -/* 01628 80AF6B88 AA080030 */ swl $t0, 0x0030($s0) ## 00000030 -/* 0162C 80AF6B8C BA080033 */ swr $t0, 0x0033($s0) ## 00000033 -/* 01630 80AF6B90 AE180024 */ sw $t8, 0x0024($s0) ## 00000024 -/* 01634 80AF6B94 8E180010 */ lw $t8, 0x0010($s0) ## 00000010 -/* 01638 80AF6B98 9608021E */ lhu $t0, 0x021E($s0) ## 0000021E -/* 0163C 80AF6B9C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01640 80AF6BA0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01644 80AF6BA4 A6000216 */ sh $zero, 0x0216($s0) ## 00000216 -/* 01648 80AF6BA8 AE0F0028 */ sw $t7, 0x0028($s0) ## 00000028 -/* 0164C 80AF6BAC AE18002C */ sw $t8, 0x002C($s0) ## 0000002C -/* 01650 80AF6BB0 A6080034 */ sh $t0, 0x0034($s0) ## 00000034 -/* 01654 80AF6BB4 94490EF8 */ lhu $t1, 0x0EF8($v0) ## 8015F558 -/* 01658 80AF6BB8 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 0165C 80AF6BBC A44A0EF8 */ sh $t2, 0x0EF8($v0) ## 8015F558 -.L80AF6BC0: -/* 01660 80AF6BC0 3C0B80AF */ lui $t3, %hi(func_80AF6448) ## $t3 = 80AF0000 -/* 01664 80AF6BC4 256B6448 */ addiu $t3, $t3, %lo(func_80AF6448) ## $t3 = 80AF6448 -/* 01668 80AF6BC8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0166C 80AF6BCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01670 80AF6BD0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01674 80AF6BD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01678 80AF6BD8 03E00008 */ jr $ra -/* 0167C 80AF6BDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s deleted file mode 100644 index f51051bdbe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s +++ /dev/null @@ -1,122 +0,0 @@ -.late_rodata -glabel D_80AF7510 - .float 3.14159274101 - -glabel D_80AF7514 - .float 3.14159274101 - -glabel D_80AF7518 - .float 3.14159274101 - -glabel D_80AF751C - .float 3.14159274101 - -.text -glabel func_80AF6D6C -/* 0180C 80AF6D6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01810 80AF6D70 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01814 80AF6D74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01818 80AF6D78 AFA40028 */ sw $a0, 0x0028($sp) -/* 0181C 80AF6D7C AFA5002C */ sw $a1, 0x002C($sp) -/* 01820 80AF6D80 AFA60030 */ sw $a2, 0x0030($sp) -/* 01824 80AF6D84 14A1002D */ bne $a1, $at, .L80AF6E3C -/* 01828 80AF6D88 AFA70034 */ sw $a3, 0x0034($sp) -/* 0182C 80AF6D8C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01830 80AF6D90 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 01834 80AF6D94 44816000 */ mtc1 $at, $f12 ## $f12 = 900.00 -/* 01838 80AF6D98 44067000 */ mfc1 $a2, $f14 -/* 0183C 80AF6D9C 0C034261 */ jal Matrix_Translate -/* 01840 80AF6DA0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01844 80AF6DA4 8FB8003C */ lw $t8, 0x003C($sp) -/* 01848 80AF6DA8 27AF0018 */ addiu $t7, $sp, 0x0018 ## $t7 = FFFFFFF0 -/* 0184C 80AF6DAC 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01850 80AF6DB0 8B0801E8 */ lwl $t0, 0x01E8($t8) ## 000001E8 -/* 01854 80AF6DB4 9B0801EB */ lwr $t0, 0x01EB($t8) ## 000001EB -/* 01858 80AF6DB8 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 0185C 80AF6DBC 3C0180AF */ lui $at, %hi(D_80AF7510) ## $at = 80AF0000 -/* 01860 80AF6DC0 ADE80000 */ sw $t0, 0x0000($t7) ## FFFFFFF0 -/* 01864 80AF6DC4 970801EC */ lhu $t0, 0x01EC($t8) ## 000001EC -/* 01868 80AF6DC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0186C 80AF6DCC A5E80004 */ sh $t0, 0x0004($t7) ## FFFFFFF4 -/* 01870 80AF6DD0 87A9001A */ lh $t1, 0x001A($sp) -/* 01874 80AF6DD4 C4307510 */ lwc1 $f16, %lo(D_80AF7510)($at) -/* 01878 80AF6DD8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0187C 80AF6DDC 00000000 */ nop -/* 01880 80AF6DE0 468021A0 */ cvt.s.w $f6, $f4 -/* 01884 80AF6DE4 46083283 */ div.s $f10, $f6, $f8 -/* 01888 80AF6DE8 46105302 */ mul.s $f12, $f10, $f16 -/* 0188C 80AF6DEC 0C0342DC */ jal Matrix_RotateX -/* 01890 80AF6DF0 00000000 */ nop -/* 01894 80AF6DF4 87AA0018 */ lh $t2, 0x0018($sp) -/* 01898 80AF6DF8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 0189C 80AF6DFC 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 018A0 80AF6E00 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 018A4 80AF6E04 3C0180AF */ lui $at, %hi(D_80AF7514) ## $at = 80AF0000 -/* 018A8 80AF6E08 C42A7514 */ lwc1 $f10, %lo(D_80AF7514)($at) -/* 018AC 80AF6E0C 46809120 */ cvt.s.w $f4, $f18 -/* 018B0 80AF6E10 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 018B4 80AF6E14 46062203 */ div.s $f8, $f4, $f6 -/* 018B8 80AF6E18 460A4302 */ mul.s $f12, $f8, $f10 -/* 018BC 80AF6E1C 0C0343B5 */ jal Matrix_RotateZ -/* 018C0 80AF6E20 00000000 */ nop -/* 018C4 80AF6E24 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 018C8 80AF6E28 3C01C461 */ lui $at, 0xC461 ## $at = C4610000 -/* 018CC 80AF6E2C 44816000 */ mtc1 $at, $f12 ## $f12 = -900.00 -/* 018D0 80AF6E30 44067000 */ mfc1 $a2, $f14 -/* 018D4 80AF6E34 0C034261 */ jal Matrix_Translate -/* 018D8 80AF6E38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AF6E3C: -/* 018DC 80AF6E3C 8FAB002C */ lw $t3, 0x002C($sp) -/* 018E0 80AF6E40 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 018E4 80AF6E44 8FAD003C */ lw $t5, 0x003C($sp) -/* 018E8 80AF6E48 55610021 */ bnel $t3, $at, .L80AF6ED0 -/* 018EC 80AF6E4C 8FA80028 */ lw $t0, 0x0028($sp) -/* 018F0 80AF6E50 89AF01EE */ lwl $t7, 0x01EE($t5) ## 000001EE -/* 018F4 80AF6E54 99AF01F1 */ lwr $t7, 0x01F1($t5) ## 000001F1 -/* 018F8 80AF6E58 27AC0018 */ addiu $t4, $sp, 0x0018 ## $t4 = FFFFFFF0 -/* 018FC 80AF6E5C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01900 80AF6E60 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFF0 -/* 01904 80AF6E64 95AF01F2 */ lhu $t7, 0x01F2($t5) ## 000001F2 -/* 01908 80AF6E68 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0190C 80AF6E6C 3C0180AF */ lui $at, %hi(D_80AF7518) ## $at = 80AF0000 -/* 01910 80AF6E70 A58F0004 */ sh $t7, 0x0004($t4) ## FFFFFFF4 -/* 01914 80AF6E74 87B8001A */ lh $t8, 0x001A($sp) -/* 01918 80AF6E78 C4287518 */ lwc1 $f8, %lo(D_80AF7518)($at) -/* 0191C 80AF6E7C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01920 80AF6E80 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 01924 80AF6E84 00000000 */ nop -/* 01928 80AF6E88 468084A0 */ cvt.s.w $f18, $f16 -/* 0192C 80AF6E8C 46049183 */ div.s $f6, $f18, $f4 -/* 01930 80AF6E90 46083302 */ mul.s $f12, $f6, $f8 -/* 01934 80AF6E94 0C034348 */ jal Matrix_RotateY -/* 01938 80AF6E98 00000000 */ nop -/* 0193C 80AF6E9C 87B90018 */ lh $t9, 0x0018($sp) -/* 01940 80AF6EA0 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01944 80AF6EA4 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 01948 80AF6EA8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0194C 80AF6EAC 3C0180AF */ lui $at, %hi(D_80AF751C) ## $at = 80AF0000 -/* 01950 80AF6EB0 C426751C */ lwc1 $f6, %lo(D_80AF751C)($at) -/* 01954 80AF6EB4 46805420 */ cvt.s.w $f16, $f10 -/* 01958 80AF6EB8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0195C 80AF6EBC 46128103 */ div.s $f4, $f16, $f18 -/* 01960 80AF6EC0 46062302 */ mul.s $f12, $f4, $f6 -/* 01964 80AF6EC4 0C0342DC */ jal Matrix_RotateX -/* 01968 80AF6EC8 00000000 */ nop -/* 0196C 80AF6ECC 8FA80028 */ lw $t0, 0x0028($sp) -.L80AF6ED0: -/* 01970 80AF6ED0 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 -/* 01974 80AF6ED4 8FAA002C */ lw $t2, 0x002C($sp) -/* 01978 80AF6ED8 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 0197C 80AF6EDC 15210006 */ bne $t1, $at, .L80AF6EF8 -/* 01980 80AF6EE0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01984 80AF6EE4 15410004 */ bne $t2, $at, .L80AF6EF8 -/* 01988 80AF6EE8 8FAC0030 */ lw $t4, 0x0030($sp) -/* 0198C 80AF6EEC 3C0B0600 */ lui $t3, %hi(D_06007B80) ## $t3 = 06000000 -/* 01990 80AF6EF0 256B7B80 */ addiu $t3, $t3, %lo(D_06007B80) ## $t3 = 06007B80 -/* 01994 80AF6EF4 AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 -.L80AF6EF8: -/* 01998 80AF6EF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0199C 80AF6EFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 019A0 80AF6F00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 019A4 80AF6F04 03E00008 */ jr $ra -/* 019A8 80AF6F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s deleted file mode 100644 index 29c9fd05ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF6F0C -/* 019AC 80AF6F0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019B0 80AF6F10 3C0E80AF */ lui $t6, %hi(D_80AF7454) ## $t6 = 80AF0000 -/* 019B4 80AF6F14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 019B8 80AF6F18 AFA40028 */ sw $a0, 0x0028($sp) -/* 019BC 80AF6F1C AFA60030 */ sw $a2, 0x0030($sp) -/* 019C0 80AF6F20 AFA70034 */ sw $a3, 0x0034($sp) -/* 019C4 80AF6F24 25CE7454 */ addiu $t6, $t6, %lo(D_80AF7454) ## $t6 = 80AF7454 -/* 019C8 80AF6F28 8DD80000 */ lw $t8, 0x0000($t6) ## 80AF7454 -/* 019CC 80AF6F2C 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 019D0 80AF6F30 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 019D4 80AF6F34 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 019D8 80AF6F38 8DCF0004 */ lw $t7, 0x0004($t6) ## 80AF7458 -/* 019DC 80AF6F3C AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 019E0 80AF6F40 8DD80008 */ lw $t8, 0x0008($t6) ## 80AF745C -/* 019E4 80AF6F44 14A10004 */ bne $a1, $at, .L80AF6F58 -/* 019E8 80AF6F48 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 019EC 80AF6F4C 8FA50038 */ lw $a1, 0x0038($sp) -/* 019F0 80AF6F50 0C0346BD */ jal Matrix_MultVec3f -/* 019F4 80AF6F54 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80AF6F58: -/* 019F8 80AF6F58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019FC 80AF6F5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A00 80AF6F60 03E00008 */ jr $ra -/* 01A04 80AF6F64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s deleted file mode 100644 index 93a63e2ccb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnTr_Destroy -/* 00170 80B22E60 AFA40000 */ sw $a0, 0x0000($sp) -/* 00174 80B22E64 03E00008 */ jr $ra -/* 00178 80B22E68 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s deleted file mode 100644 index 77878828b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ /dev/null @@ -1,92 +0,0 @@ -.rdata -glabel D_80B24414 - .asciz "../z_en_tr.c" - .balign 4 - -glabel D_80B24424 - .asciz "../z_en_tr.c" - .balign 4 - -.text -glabel EnTr_Draw -/* 011B4 80B23EA4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 011BC 80B23EAC AFB10028 */ sw $s1, 0x0028($sp) -/* 011C0 80B23EB0 AFB00024 */ sw $s0, 0x0024($sp) -/* 011C4 80B23EB4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 011C8 80B23EB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011CC 80B23EBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 -/* 011D4 80B23EC4 00000000 */ nop -/* 011D8 80B23EC8 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 -/* 011DC 80B23ECC 3C098003 */ lui $t1, %hi(ActorShadow_DrawCircle) -/* 011E0 80B23ED0 3C0680B2 */ lui $a2, %hi(D_80B24414) ## $a2 = 80B20000 -/* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 -/* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 -/* 011EC 80B23EDC 8F281D8C */ lw $t0, 0x1D8C($t9) ## 00001D8C -/* 011F0 80B23EE0 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawCircle) -/* 011F4 80B23EE4 24C64414 */ addiu $a2, $a2, %lo(D_80B24414) ## $a2 = 80B24414 -/* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 -/* 011FC 80B23EEC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -.L80B23EF0: -/* 01200 80B23EF0 10000035 */ beq $zero, $zero, .L80B23FC8 -/* 01204 80B23EF4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -.L80B23EF8: -/* 01208 80B23EF8 AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 -/* 0120C 80B23EFC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01210 80B23F00 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 -/* 01214 80B23F04 0C031AB1 */ jal Graph_OpenDisps -/* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) -/* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 -/* 01220 80B23F10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01224 80B23F14 8FA5004C */ lw $a1, 0x004C($sp) -/* 01228 80B23F18 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 0122C 80B23F1C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01230 80B23F20 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 01234 80B23F24 3C0480B2 */ lui $a0, %hi(D_80B243D0) ## $a0 = 80B20000 -/* 01238 80B23F28 3C088016 */ lui $t0, %hi(gSegments) -/* 0123C 80B23F2C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 01240 80B23F30 ACAA02C0 */ sw $t2, 0x02C0($a1) ## 000002C0 -/* 01244 80B23F34 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 01248 80B23F38 860C02E0 */ lh $t4, 0x02E0($s0) ## 000002E0 -/* 0124C 80B23F3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01250 80B23F40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01254 80B23F44 000C6880 */ sll $t5, $t4, 2 -/* 01258 80B23F48 008D2021 */ addu $a0, $a0, $t5 -/* 0125C 80B23F4C 8C8443D0 */ lw $a0, %lo(D_80B243D0)($a0) -/* 01260 80B23F50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01264 80B23F54 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01268 80B23F58 00047900 */ sll $t7, $a0, 4 -/* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 -/* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 -/* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 -/* 01278 80B23F68 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at -/* 01280 80B23F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 -/* 01288 80B23F78 01215021 */ addu $t2, $t1, $at -/* 0128C 80B23F7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01290 80B23F80 0C00BAF3 */ jal func_8002EBCC -/* 01294 80B23F84 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 01298 80B23F88 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0129C 80B23F8C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 012A0 80B23F90 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 012A4 80B23F94 3C0B80B2 */ lui $t3, %hi(func_80B23D74) ## $t3 = 80B20000 -/* 012A8 80B23F98 256B3D74 */ addiu $t3, $t3, %lo(func_80B23D74) ## $t3 = 80B23D74 -/* 012AC 80B23F9C AFAB0010 */ sw $t3, 0x0010($sp) -/* 012B0 80B23FA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 012B4 80B23FA4 AFA00014 */ sw $zero, 0x0014($sp) -/* 012B8 80B23FA8 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 012BC 80B23FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012C0 80B23FB0 3C0680B2 */ lui $a2, %hi(D_80B24424) ## $a2 = 80B20000 -/* 012C4 80B23FB4 24C64424 */ addiu $a2, $a2, %lo(D_80B24424) ## $a2 = 80B24424 -/* 012C8 80B23FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 012CC 80B23FBC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 012D0 80B23FC0 0C031AD5 */ jal Graph_CloseDisps -/* 012D4 80B23FC4 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 -.L80B23FC8: -/* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 012DC 80B23FCC 8FB00024 */ lw $s0, 0x0024($sp) -/* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) -/* 012E4 80B23FD4 03E00008 */ jr $ra -/* 012E8 80B23FD8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s deleted file mode 100644 index 8d903be913..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -.rdata -glabel D_80B24400 - .asciz "0" - .balign 4 - -glabel D_80B24404 - .asciz "../z_en_tr.c" - .balign 4 - -.text -glabel EnTr_Init -/* 00008 80B22CF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) -/* 00010 80B22D00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) -/* 0001C 80B22D0C 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) -/* 00024 80B22D14 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00028 80B22D18 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0002C 80B22D1C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80B22D20 0C00AC78 */ jal ActorShape_Init - -/* 00034 80B22D24 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00038 80B22D28 3C0580B2 */ lui $a1, %hi(func_80B22F1C) ## $a1 = 80B20000 -/* 0003C 80B22D2C 24A52F1C */ addiu $a1, $a1, %lo(func_80B22F1C) ## $a1 = 80B22F1C -/* 00040 80B22D30 0C2C8B3C */ jal func_80B22CF0 -/* 00044 80B22D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00048 80B22D38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0004C 80B22D3C A60002D4 */ sh $zero, 0x02D4($s0) ## 000002D4 -/* 00050 80B22D40 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 00054 80B22D44 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00058 80B22D48 0C00B58B */ jal Actor_SetScale - -/* 0005C 80B22D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00060 80B22D50 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00064 80B22D54 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C -/* 00068 80B22D58 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 0006C 80B22D5C 10400006 */ beq $v0, $zero, .L80B22D78 -/* 00070 80B22D60 8FA40034 */ lw $a0, 0x0034($sp) -/* 00074 80B22D64 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00078 80B22D68 1041001A */ beq $v0, $at, .L80B22DD4 -/* 0007C 80B22D6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 -/* 00084 80B22D74 3C0480B2 */ lui $a0, %hi(D_80B24400) ## $a0 = 80B20000 -.L80B22D78: -/* 00088 80B22D78 3C060601 */ lui $a2, %hi(D_06011688) ## $a2 = 06010000 -/* 0008C 80B22D7C 3C070600 */ lui $a3, %hi(D_06003FC8) ## $a3 = 06000000 -/* 00090 80B22D80 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 00094 80B22D84 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 -/* 00098 80B22D88 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) -/* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) -/* 000A8 80B22D98 24E73FC8 */ addiu $a3, $a3, %lo(D_06003FC8) ## $a3 = 06003FC8 -/* 000AC 80B22D9C 0C0291BE */ jal SkelAnime_InitFlex -/* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, %lo(D_06011688) ## $a2 = 06011688 -/* 000B4 80B22DA4 3C050600 */ lui $a1, %hi(D_06003FC8) ## $a1 = 06000000 -/* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, %lo(D_06003FC8) ## $a1 = 06003FC8 -/* 000BC 80B22DAC 0C02947A */ jal Animation_PlayOnce -/* 000C0 80B22DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 000C4 80B22DB4 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 -/* 000C8 80B22DB8 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 000CC 80B22DBC 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 000D0 80B22DC0 0C2C8B3C */ jal func_80B22CF0 -/* 000D4 80B22DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D8 80B22DC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 000DC 80B22DCC 1000001F */ beq $zero, $zero, .L80B22E4C -/* 000E0 80B22DD0 A61902D8 */ sh $t9, 0x02D8($s0) ## 000002D8 -.L80B22DD4: -/* 000E4 80B22DD4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C -/* 000E8 80B22DD8 3C060601 */ lui $a2, %hi(D_0600C530) ## $a2 = 06010000 -/* 000EC 80B22DDC 3C070600 */ lui $a3, %hi(D_06001CDC) ## $a3 = 06000000 -/* 000F0 80B22DE0 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 -/* 000F4 80B22DE4 26090232 */ addiu $t1, $s0, 0x0232 ## $t1 = 00000232 -/* 000F8 80B22DE8 240A001B */ addiu $t2, $zero, 0x001B ## $t2 = 0000001B -/* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) -/* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) -/* 00108 80B22DF8 24E71CDC */ addiu $a3, $a3, %lo(D_06001CDC) ## $a3 = 06001CDC -/* 0010C 80B22DFC 24C6C530 */ addiu $a2, $a2, %lo(D_0600C530) ## $a2 = 0600C530 -/* 00110 80B22E00 0C0291BE */ jal SkelAnime_InitFlex -/* 00114 80B22E04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 00118 80B22E08 3C050600 */ lui $a1, %hi(D_06001CDC) ## $a1 = 06000000 -/* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, %lo(D_06001CDC) ## $a1 = 06001CDC -/* 00120 80B22E10 0C02947A */ jal Animation_PlayOnce -/* 00124 80B22E14 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00128 80B22E18 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 -/* 0012C 80B22E1C AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00130 80B22E20 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 00134 80B22E24 0C2C8B3C */ jal func_80B22CF0 -/* 00138 80B22E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 80B22E2C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00140 80B22E30 10000006 */ beq $zero, $zero, .L80B22E4C -/* 00144 80B22E34 A60B02D8 */ sh $t3, 0x02D8($s0) ## 000002D8 -.L80B22E38: -/* 00148 80B22E38 3C0580B2 */ lui $a1, %hi(D_80B24404) ## $a1 = 80B20000 -/* 0014C 80B22E3C 24A54404 */ addiu $a1, $a1, %lo(D_80B24404) ## $a1 = 80B24404 -/* 00150 80B22E40 24844400 */ addiu $a0, $a0, %lo(D_80B24400) ## $a0 = 00004400 -/* 00154 80B22E44 0C0007FC */ jal __assert - -/* 00158 80B22E48 24060115 */ addiu $a2, $zero, 0x0115 ## $a2 = 00000115 -.L80B22E4C: -/* 0015C 80B22E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00160 80B22E50 8FB00024 */ lw $s0, 0x0024($sp) -/* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) -/* 00168 80B22E58 03E00008 */ jr $ra -/* 0016C 80B22E5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s deleted file mode 100644 index bc2c0f7cfb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ /dev/null @@ -1,131 +0,0 @@ -glabel EnTr_Update -/* 00ECC 80B23BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00ED0 80B23BC0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00ED4 80B23BC4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00ED8 80B23BC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80B23BCC AFBF002C */ sw $ra, 0x002C($sp) -/* 00EE0 80B23BD0 AFA5004C */ sw $a1, 0x004C($sp) -/* 00EE4 80B23BD4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00EE8 80B23BD8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00EEC 80B23BDC 44060000 */ mfc1 $a2, $f0 -/* 00EF0 80B23BE0 44070000 */ mfc1 $a3, $f0 -/* 00EF4 80B23BE4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00EF8 80B23BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00EFC 80B23BEC 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 00F00 80B23BF0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00F04 80B23BF4 8E1902DC */ lw $t9, 0x02DC($s0) ## 000002DC -/* 00F08 80B23BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 80B23BFC 8FA5004C */ lw $a1, 0x004C($sp) -/* 00F10 80B23C00 0320F809 */ jalr $ra, $t9 -/* 00F14 80B23C04 00000000 */ nop -/* 00F18 80B23C08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F1C 80B23C0C 0C02927F */ jal SkelAnime_Update - -/* 00F20 80B23C10 AFA40034 */ sw $a0, 0x0034($sp) -/* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 -/* 00F28 80B23C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F2C 80B23C1C 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 00F30 80B23C20 3C0F0600 */ lui $t7, %hi(D_060035CC) ## $t7 = 06000000 -/* 00F34 80B23C24 25EF35CC */ addiu $t7, $t7, %lo(D_060035CC) ## $t7 = 060035CC -/* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 -/* 00F3C 80B23C2C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 -/* 00F44 80B23C34 3C180600 */ lui $t8, %hi(D_060013CC) ## $t8 = 06000000 -/* 00F48 80B23C38 271813CC */ addiu $t8, $t8, %lo(D_060013CC) ## $t8 = 060013CC -/* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 -/* 00F50 80B23C40 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -.L80B23C44: -/* 00F54 80B23C44 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00F58 80B23C48 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 -/* 00F5C 80B23C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F60 80B23C50 11000005 */ beq $t0, $zero, .L80B23C68 -/* 00F64 80B23C54 00000000 */ nop -/* 00F68 80B23C58 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F6C 80B23C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F70 80B23C60 10000004 */ beq $zero, $zero, .L80B23C74 -/* 00F74 80B23C64 8FA40034 */ lw $a0, 0x0034($sp) -.L80B23C68: -/* 00F78 80B23C68 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F7C 80B23C6C 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 -/* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) -.L80B23C74: -/* 00F84 80B23C74 0C0294BE */ jal Animation_PlayLoop -/* 00F88 80B23C78 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC -/* 00F90 80B23C80 00000000 */ nop -.L80B23C84: -/* 00F94 80B23C84 252949C8 */ addiu $t1, $t1, 0x49C8 ## $t1 = 000049C8 -/* 00F98 80B23C88 15250016 */ bne $t1, $a1, .L80B23CE4 -/* 00F9C 80B23C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FA0 80B23C90 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 -/* 00FA8 80B23C98 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00FAC 80B23C9C 3C040600 */ lui $a0, %hi(D_060049C8) ## $a0 = 06000000 -/* 00FB0 80B23CA0 0C028800 */ jal Animation_GetLastFrame - -/* 00FB4 80B23CA4 248449C8 */ addiu $a0, $a0, %lo(D_060049C8) ## $a0 = 060049C8 -/* 00FB8 80B23CA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00FBC 80B23CAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00FC0 80B23CB0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00FC8 80B23CB8 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 -/* 00FCC 80B23CBC 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 -/* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FD4 80B23CC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FD8 80B23CC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FDC 80B23CCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FE0 80B23CD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00FE4 80B23CD4 0C029468 */ jal Animation_Change - -/* 00FE8 80B23CD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC -/* 00FF0 80B23CE0 00000000 */ nop -.L80B23CE4: -/* 00FF4 80B23CE4 0C0294BE */ jal Animation_PlayLoop -/* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) -.L80B23CEC: -/* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 -/* 01000 80B23CF0 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 01004 80B23CF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80B23CF8: -/* 01008 80B23CF8 00000000 */ nop -/* 0100C 80B23CFC E60A0164 */ swc1 $f10, 0x0164($s0) ## 00000164 -.L80B23D00: -/* 01010 80B23D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B23D04: -/* 01014 80B23D04 0C00B56E */ jal Actor_SetFocus - -/* 01018 80B23D08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0101C 80B23D0C 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 -/* 01020 80B23D10 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 01024 80B23D14 14600003 */ bne $v1, $zero, .L80B23D24 -/* 01028 80B23D18 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 0102C 80B23D1C 10000004 */ beq $zero, $zero, .L80B23D30 -/* 01030 80B23D20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B23D24: -/* 01034 80B23D24 A60A02E2 */ sh $t2, 0x02E2($s0) ## 000002E2 -/* 01038 80B23D28 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 -/* 0103C 80B23D2C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B23D30: -/* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C -/* 01044 80B23D34 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 -/* 01048 80B23D38 0C01DF64 */ jal Rand_S16Offset - -/* 0104C 80B23D3C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 01050 80B23D40 A60202E2 */ sh $v0, 0x02E2($s0) ## 000002E2 -/* 01054 80B23D44 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 -/* 01058 80B23D48 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 -.L80B23D4C: -/* 0105C 80B23D4C 860B02E0 */ lh $t3, 0x02E0($s0) ## 000002E0 -/* 01060 80B23D50 29610003 */ slti $at, $t3, 0x0003 -/* 01064 80B23D54 54200003 */ bnel $at, $zero, .L80B23D64 -/* 01068 80B23D58 8FBF002C */ lw $ra, 0x002C($sp) -/* 0106C 80B23D5C A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 -/* 01070 80B23D60 8FBF002C */ lw $ra, 0x002C($sp) -.L80B23D64: -/* 01074 80B23D64 8FB00028 */ lw $s0, 0x0028($sp) -/* 01078 80B23D68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0107C 80B23D6C 03E00008 */ jr $ra -/* 01080 80B23D70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s deleted file mode 100644 index d657bbb18e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80B22CF0 -/* 00000 80B22CF0 03E00008 */ jr $ra -/* 00004 80B22CF4 AC8502DC */ sw $a1, 0x02DC($a0) ## 000002DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s deleted file mode 100644 index bc7d99b86e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B22E6C -/* 0017C 80B22E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00180 80B22E70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00184 80B22E74 AFB00020 */ sw $s0, 0x0020($sp) -/* 00188 80B22E78 AFA5002C */ sw $a1, 0x002C($sp) -/* 0018C 80B22E7C 948302D6 */ lhu $v1, 0x02D6($a0) ## 000002D6 -/* 00190 80B22E80 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00194 80B22E84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00198 80B22E88 14610014 */ bne $v1, $at, .L80B22EDC -/* 0019C 80B22E8C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 001A0 80B22E90 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 001A4 80B22E94 3C078013 */ lui $a3, %hi(D_801333E0) -/* 001A8 80B22E98 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 001AC 80B22E9C 15C00004 */ bne $t6, $zero, .L80B22EB0 -/* 001B0 80B22EA0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) -/* 001B4 80B22EA4 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) -/* 001B8 80B22EA8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 001BC 80B22EAC 15E1000B */ bne $t7, $at, .L80B22EDC -.L80B22EB0: -/* 001C0 80B22EB0 3C188013 */ lui $t8, %hi(D_801333E8) -/* 001C4 80B22EB4 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 001C8 80B22EB8 3C058013 */ lui $a1, %hi(D_801333D4) -/* 001CC 80B22EBC 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 001D0 80B22EC0 AFB80014 */ sw $t8, 0x0014($sp) -/* 001D4 80B22EC4 240439B3 */ addiu $a0, $zero, 0x39B3 ## $a0 = 000039B3 -/* 001D8 80B22EC8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 001DC 80B22ECC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 001E0 80B22ED0 AFA70010 */ sw $a3, 0x0010($sp) -/* 001E4 80B22ED4 960302D6 */ lhu $v1, 0x02D6($s0) ## 000002D6 -/* 001E8 80B22ED8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B22EDC: -/* 001EC 80B22EDC 18400004 */ blez $v0, .L80B22EF0 -/* 001F0 80B22EE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001F4 80B22EE4 2479FFFF */ addiu $t9, $v1, 0xFFFF ## $t9 = FFFFFFFF -/* 001F8 80B22EE8 10000005 */ beq $zero, $zero, .L80B22F00 -/* 001FC 80B22EEC A61902D6 */ sh $t9, 0x02D6($s0) ## 000002D6 -.L80B22EF0: -/* 00200 80B22EF0 8E08011C */ lw $t0, 0x011C($s0) ## 0000011C -/* 00204 80B22EF4 11000002 */ beq $t0, $zero, .L80B22F00 -/* 00208 80B22EF8 00000000 */ nop -/* 0020C 80B22EFC AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -.L80B22F00: -/* 00210 80B22F00 0C00BE5D */ jal func_8002F974 -/* 00214 80B22F04 2405317B */ addiu $a1, $zero, 0x317B ## $a1 = 0000317B -/* 00218 80B22F08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0021C 80B22F0C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00220 80B22F10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00224 80B22F14 03E00008 */ jr $ra -/* 00228 80B22F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s deleted file mode 100644 index be3002c0e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B22F1C -/* 0022C 80B22F1C AFA40000 */ sw $a0, 0x0000($sp) -/* 00230 80B22F20 03E00008 */ jr $ra -/* 00234 80B22F24 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s deleted file mode 100644 index d4331558a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s +++ /dev/null @@ -1,120 +0,0 @@ -glabel func_80B22F28 -/* 00238 80B22F28 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0023C 80B22F2C AFBF003C */ sw $ra, 0x003C($sp) -/* 00240 80B22F30 AFB10038 */ sw $s1, 0x0038($sp) -/* 00244 80B22F34 AFB00034 */ sw $s0, 0x0034($sp) -/* 00248 80B22F38 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0024C 80B22F3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00250 80B22F40 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00254 80B22F44 51C00060 */ beql $t6, $zero, .L80B230C8 -/* 00258 80B22F48 8FBF003C */ lw $ra, 0x003C($sp) -/* 0025C 80B22F4C 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 00260 80B22F50 00067880 */ sll $t7, $a2, 2 -/* 00264 80B22F54 00AFC021 */ addu $t8, $a1, $t7 -/* 00268 80B22F58 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 0026C 80B22F5C 5040005A */ beql $v0, $zero, .L80B230C8 -/* 00270 80B22F60 8FBF003C */ lw $ra, 0x003C($sp) -/* 00274 80B22F64 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 -/* 00278 80B22F68 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0027C 80B22F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 80B22F70 10610006 */ beq $v1, $at, .L80B22F8C -/* 00284 80B22F74 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00288 80B22F78 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0028C 80B22F7C 10610010 */ beq $v1, $at, .L80B22FC0 -/* 00290 80B22F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00294 80B22F84 10000046 */ beq $zero, $zero, .L80B230A0 -/* 00298 80B22F88 00000000 */ nop -.L80B22F8C: -/* 0029C 80B22F8C 0C00B58B */ jal Actor_SetScale - -/* 002A0 80B22F90 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 002A4 80B22F94 3C0580B2 */ lui $a1, %hi(func_80B234D4) ## $a1 = 80B20000 -/* 002A8 80B22F98 24A534D4 */ addiu $a1, $a1, %lo(func_80B234D4) ## $a1 = 80B234D4 -/* 002AC 80B22F9C 0C2C8B3C */ jal func_80B22CF0 -/* 002B0 80B22FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B4 80B22FA4 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 -/* 002B8 80B22FA8 A61902D6 */ sh $t9, 0x02D6($s0) ## 000002D6 -/* 002BC 80B22FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C0 80B22FB0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002C4 80B22FB4 24053877 */ addiu $a1, $zero, 0x3877 ## $a1 = 00003877 -/* 002C8 80B22FB8 10000040 */ beq $zero, $zero, .L80B230BC -/* 002CC 80B22FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B22FC0: -/* 002D0 80B22FC0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 002D4 80B22FC4 3C0480B2 */ lui $a0, %hi(D_80B24380) ## $a0 = 80B20000 -/* 002D8 80B22FC8 00084880 */ sll $t1, $t0, 2 -/* 002DC 80B22FCC 00892021 */ addu $a0, $a0, $t1 -/* 002E0 80B22FD0 0C028800 */ jal Animation_GetLastFrame - -/* 002E4 80B22FD4 8C844380 */ lw $a0, %lo(D_80B24380)($a0) -/* 002E8 80B22FD8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 002EC 80B22FDC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 002F0 80B22FE0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 002F4 80B22FE4 468021A0 */ cvt.s.w $f6, $f4 -/* 002F8 80B22FE8 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 002FC 80B22FEC 3C0580B2 */ lui $a1, %hi(D_80B24380) ## $a1 = 80B20000 -/* 00300 80B22FF0 000A5880 */ sll $t3, $t2, 2 -/* 00304 80B22FF4 00AB2821 */ addu $a1, $a1, $t3 -/* 00308 80B22FF8 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0030C 80B22FFC AFAC0014 */ sw $t4, 0x0014($sp) -/* 00310 80B23000 8CA54380 */ lw $a1, %lo(D_80B24380)($a1) -/* 00314 80B23004 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00318 80B23008 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0031C 80B2300C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00320 80B23010 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00324 80B23014 0C029468 */ jal Animation_Change - -/* 00328 80B23018 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0032C 80B2301C 3C0580B2 */ lui $a1, %hi(func_80B22E6C) ## $a1 = 80B20000 -/* 00330 80B23020 24A52E6C */ addiu $a1, $a1, %lo(func_80B22E6C) ## $a1 = 80B22E6C -/* 00334 80B23024 0C2C8B3C */ jal func_80B22CF0 -/* 00338 80B23028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0033C 80B2302C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00340 80B23030 3C0E80B2 */ lui $t6, %hi(D_80B24378) ## $t6 = 80B20000 -/* 00344 80B23034 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00348 80B23038 00026880 */ sll $t5, $v0, 2 -/* 0034C 80B2303C 01CD7021 */ addu $t6, $t6, $t5 -/* 00350 80B23040 8DCE4378 */ lw $t6, %lo(D_80B24378)($t6) -/* 00354 80B23044 240F0027 */ addiu $t7, $zero, 0x0027 ## $t7 = 00000027 -/* 00358 80B23048 A60F02D6 */ sh $t7, 0x02D6($s0) ## 000002D6 -/* 0035C 80B2304C AE0E02E4 */ sw $t6, 0x02E4($s0) ## 000002E4 -/* 00360 80B23050 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00364 80B23054 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00368 80B23058 24580009 */ addiu $t8, $v0, 0x0009 ## $t8 = 00000009 -/* 0036C 80B2305C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00370 80B23060 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00374 80B23064 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00378 80B23068 AFB80028 */ sw $t8, 0x0028($sp) -/* 0037C 80B2306C AFA00024 */ sw $zero, 0x0024($sp) -/* 00380 80B23070 AFA00020 */ sw $zero, 0x0020($sp) -/* 00384 80B23074 AFA0001C */ sw $zero, 0x001C($sp) -/* 00388 80B23078 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 80B2307C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00390 80B23080 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00394 80B23084 0C00C916 */ jal Actor_SpawnAsChild - -/* 00398 80B23088 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0039C 80B2308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003A0 80B23090 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 003A4 80B23094 240538A5 */ addiu $a1, $zero, 0x38A5 ## $a1 = 000038A5 -/* 003A8 80B23098 10000008 */ beq $zero, $zero, .L80B230BC -/* 003AC 80B2309C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B230A0: -/* 003B0 80B230A0 0C2C900E */ jal func_80B24038 -/* 003B4 80B230A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003B8 80B230A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003BC 80B230AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003C0 80B230B0 0C2C908C */ jal func_80B24230 -/* 003C4 80B230B4 860602D8 */ lh $a2, 0x02D8($s0) ## 000002D8 -/* 003C8 80B230B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B230BC: -/* 003CC 80B230BC 0C00BE5D */ jal func_8002F974 -/* 003D0 80B230C0 2405317B */ addiu $a1, $zero, 0x317B ## $a1 = 0000317B -/* 003D4 80B230C4 8FBF003C */ lw $ra, 0x003C($sp) -.L80B230C8: -/* 003D8 80B230C8 8FB00034 */ lw $s0, 0x0034($sp) -/* 003DC 80B230CC 8FB10038 */ lw $s1, 0x0038($sp) -/* 003E0 80B230D0 03E00008 */ jr $ra -/* 003E4 80B230D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s deleted file mode 100644 index b4f23888b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80B230D8 -/* 003E8 80B230D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 003EC 80B230DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 003F0 80B230E0 AFB10020 */ sw $s1, 0x0020($sp) -/* 003F4 80B230E4 AFB0001C */ sw $s0, 0x001C($sp) -/* 003F8 80B230E8 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 -/* 003FC 80B230EC 27AE0034 */ addiu $t6, $sp, 0x0034 ## $t6 = FFFFFFF4 -/* 00400 80B230F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00404 80B230F4 ADD80000 */ sw $t8, 0x0000($t6) ## FFFFFFF4 -/* 00408 80B230F8 8C8F0028 */ lw $t7, 0x0028($a0) ## 00000028 -/* 0040C 80B230FC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00410 80B23100 ADCF0004 */ sw $t7, 0x0004($t6) ## FFFFFFF8 -/* 00414 80B23104 8C98002C */ lw $t8, 0x002C($a0) ## 0000002C -/* 00418 80B23108 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFFC -/* 0041C 80B2310C 90B91D6C */ lbu $t9, 0x1D6C($a1) ## 00001D6C -/* 00420 80B23110 5320004C */ beql $t9, $zero, .L80B23244 -/* 00424 80B23114 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00428 80B23118 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 0042C 80B2311C 00064080 */ sll $t0, $a2, 2 -/* 00430 80B23120 00A84821 */ addu $t1, $a1, $t0 -/* 00434 80B23124 8D221D8C */ lw $v0, 0x1D8C($t1) ## 00001D8C -/* 00438 80B23128 50400046 */ beql $v0, $zero, .L80B23244 -/* 0043C 80B2312C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00440 80B23130 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 -/* 00444 80B23134 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00448 80B23138 55410012 */ bnel $t2, $at, .L80B23184 -/* 0044C 80B2313C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00450 80B23140 0C2C900E */ jal func_80B24038 -/* 00454 80B23144 00000000 */ nop -/* 00458 80B23148 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 0045C 80B2314C 0C034199 */ jal Math_Atan2S - -/* 00460 80B23150 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 00464 80B23154 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00468 80B23158 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 0046C 80B2315C 240B0100 */ addiu $t3, $zero, 0x0100 ## $t3 = 00000100 -/* 00470 80B23160 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00474 80B23164 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00478 80B23168 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0047C 80B2316C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00480 80B23170 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 00484 80B23174 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00488 80B23178 1000002A */ beq $zero, $zero, .L80B23224 -/* 0048C 80B2317C A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 00490 80B23180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B23184: -/* 00494 80B23184 0C2C90AD */ jal func_80B242B4 -/* 00498 80B23188 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0049C 80B2318C 0C01DE1C */ jal Math_SinS - ## sins? -/* 004A0 80B23190 860402D6 */ lh $a0, 0x02D6($s0) ## 000002D6 -/* 004A4 80B23194 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 004A8 80B23198 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 004AC 80B2319C 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 004B0 80B231A0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 004B4 80B231A4 46060202 */ mul.s $f8, $f0, $f6 -/* 004B8 80B231A8 44819000 */ mtc1 $at, $f18 ## $f18 = -100.00 -/* 004BC 80B231AC C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 004C0 80B231B0 860402D6 */ lh $a0, 0x02D6($s0) ## 000002D6 -/* 004C4 80B231B4 46128180 */ add.s $f6, $f16, $f18 -/* 004C8 80B231B8 46082280 */ add.s $f10, $f4, $f8 -/* 004CC 80B231BC E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 004D0 80B231C0 0C01DE0D */ jal Math_CosS - ## coss? -/* 004D4 80B231C4 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 004D8 80B231C8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 004DC 80B231CC 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 004E0 80B231D0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 004E4 80B231D4 960E02D6 */ lhu $t6, 0x02D6($s0) ## 000002D6 -/* 004E8 80B231D8 46080282 */ mul.s $f10, $f0, $f8 -/* 004EC 80B231DC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 004F0 80B231E0 25CF4000 */ addiu $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 004F4 80B231E4 25D80400 */ addiu $t8, $t6, 0x0400 ## $t8 = 00000400 -/* 004F8 80B231E8 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 004FC 80B231EC A61802D6 */ sh $t8, 0x02D6($s0) ## 000002D6 -/* 00500 80B231F0 460A2400 */ add.s $f16, $f4, $f10 -/* 00504 80B231F4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00508 80B231F8 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 0050C 80B231FC C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00510 80B23200 46069201 */ sub.s $f8, $f18, $f6 -/* 00514 80B23204 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00518 80B23208 E608005C */ swc1 $f8, 0x005C($s0) ## 0000005C -/* 0051C 80B2320C C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 00520 80B23210 460A2401 */ sub.s $f16, $f4, $f10 -/* 00524 80B23214 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 00528 80B23218 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 0052C 80B2321C 46069201 */ sub.s $f8, $f18, $f6 -/* 00530 80B23220 E6080064 */ swc1 $f8, 0x0064($s0) ## 00000064 -.L80B23224: -/* 00534 80B23224 96391D74 */ lhu $t9, 0x1D74($s1) ## 00001D74 -/* 00538 80B23228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0053C 80B2322C 2B21029E */ slti $at, $t9, 0x029E -/* 00540 80B23230 50200004 */ beql $at, $zero, .L80B23244 -/* 00544 80B23234 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00548 80B23238 0C00BE5D */ jal func_8002F974 -/* 0054C 80B2323C 2405317B */ addiu $a1, $zero, 0x317B ## $a1 = 0000317B -/* 00550 80B23240 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B23244: -/* 00554 80B23244 8FB0001C */ lw $s0, 0x001C($sp) -/* 00558 80B23248 8FB10020 */ lw $s1, 0x0020($sp) -/* 0055C 80B2324C 03E00008 */ jr $ra -/* 00560 80B23250 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s deleted file mode 100644 index d913cd97a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s +++ /dev/null @@ -1,170 +0,0 @@ -glabel func_80B23254 -/* 00564 80B23254 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00568 80B23258 AFBF002C */ sw $ra, 0x002C($sp) -/* 0056C 80B2325C AFB00028 */ sw $s0, 0x0028($sp) -/* 00570 80B23260 AFA40088 */ sw $a0, 0x0088($sp) -/* 00574 80B23264 AFA5008C */ sw $a1, 0x008C($sp) -/* 00578 80B23268 AFA60090 */ sw $a2, 0x0090($sp) -/* 0057C 80B2326C AFA70094 */ sw $a3, 0x0094($sp) -/* 00580 80B23270 84AE07A0 */ lh $t6, 0x07A0($a1) ## 000007A0 -/* 00584 80B23274 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC -/* 00588 80B23278 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0058C 80B2327C 000E7880 */ sll $t7, $t6, 2 -/* 00590 80B23280 00AFC021 */ addu $t8, $a1, $t7 -/* 00594 80B23284 8F190790 */ lw $t9, 0x0790($t8) ## 00000790 -/* 00598 80B23288 8F29005C */ lw $t1, 0x005C($t9) ## 0000005C -/* 0059C 80B2328C AC890000 */ sw $t1, 0x0000($a0) ## FFFFFFBC -/* 005A0 80B23290 8F280060 */ lw $t0, 0x0060($t9) ## 00000060 -/* 005A4 80B23294 AC880004 */ sw $t0, 0x0004($a0) ## FFFFFFC0 -/* 005A8 80B23298 8F290064 */ lw $t1, 0x0064($t9) ## 00000064 -/* 005AC 80B2329C AC890008 */ sw $t1, 0x0008($a0) ## FFFFFFC4 -/* 005B0 80B232A0 8FA50088 */ lw $a1, 0x0088($sp) -/* 005B4 80B232A4 AFA7008C */ sw $a3, 0x008C($sp) -/* 005B8 80B232A8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 005BC 80B232AC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 005C0 80B232B0 AFA50038 */ sw $a1, 0x0038($sp) -/* 005C4 80B232B4 00028400 */ sll $s0, $v0, 16 -/* 005C8 80B232B8 00108403 */ sra $s0, $s0, 16 -/* 005CC 80B232BC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC -/* 005D0 80B232C0 0C01E027 */ jal Math_Vec3f_Pitch - -/* 005D4 80B232C4 8FA50038 */ lw $a1, 0x0038($sp) -/* 005D8 80B232C8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005DC 80B232CC 00025023 */ subu $t2, $zero, $v0 -/* 005E0 80B232D0 00102400 */ sll $a0, $s0, 16 -/* 005E4 80B232D4 A7AA0040 */ sh $t2, 0x0040($sp) -/* 005E8 80B232D8 00042403 */ sra $a0, $a0, 16 -/* 005EC 80B232DC E7A0006C */ swc1 $f0, 0x006C($sp) -/* 005F0 80B232E0 0C01DE1C */ jal Math_SinS - ## sins? -/* 005F4 80B232E4 E7A00064 */ swc1 $f0, 0x0064($sp) -/* 005F8 80B232E8 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 005FC 80B232EC 0C01DE0D */ jal Math_CosS - ## coss? -/* 00600 80B232F0 87A40040 */ lh $a0, 0x0040($sp) -/* 00604 80B232F4 C7A40094 */ lwc1 $f4, 0x0094($sp) -/* 00608 80B232F8 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 0060C 80B232FC 87A40040 */ lh $a0, 0x0040($sp) -/* 00610 80B23300 46062202 */ mul.s $f8, $f4, $f6 -/* 00614 80B23304 00000000 */ nop -/* 00618 80B23308 46080282 */ mul.s $f10, $f0, $f8 -/* 0061C 80B2330C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00620 80B23310 E7AA0070 */ swc1 $f10, 0x0070($sp) -/* 00624 80B23314 C7B00094 */ lwc1 $f16, 0x0094($sp) -/* 00628 80B23318 00102400 */ sll $a0, $s0, 16 -/* 0062C 80B2331C 00042403 */ sra $a0, $a0, 16 -/* 00630 80B23320 46100482 */ mul.s $f18, $f0, $f16 -/* 00634 80B23324 0C01DE0D */ jal Math_CosS - ## coss? -/* 00638 80B23328 E7B20074 */ swc1 $f18, 0x0074($sp) -/* 0063C 80B2332C E7A0003C */ swc1 $f0, 0x003C($sp) -/* 00640 80B23330 0C01DE0D */ jal Math_CosS - ## coss? -/* 00644 80B23334 87A40040 */ lh $a0, 0x0040($sp) -/* 00648 80B23338 C7A40094 */ lwc1 $f4, 0x0094($sp) -/* 0064C 80B2333C C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 00650 80B23340 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00654 80B23344 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00658 80B23348 46062202 */ mul.s $f8, $f4, $f6 -/* 0065C 80B2334C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00660 80B23350 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00664 80B23354 8FAB0088 */ lw $t3, 0x0088($sp) -/* 00668 80B23358 3C0F80B2 */ lui $t7, %hi(D_80B243C0) ## $t7 = 80B20000 -/* 0066C 80B2335C E7B00068 */ swc1 $f16, 0x0068($sp) -/* 00670 80B23360 25EF43C0 */ addiu $t7, $t7, %lo(D_80B243C0) ## $t7 = 80B243C0 -/* 00674 80B23364 46080282 */ mul.s $f10, $f0, $f8 -/* 00678 80B23368 8FA80038 */ lw $t0, 0x0038($sp) -/* 0067C 80B2336C 27B90058 */ addiu $t9, $sp, 0x0058 ## $t9 = FFFFFFD0 -/* 00680 80B23370 00102400 */ sll $a0, $s0, 16 -/* 00684 80B23374 00042403 */ sra $a0, $a0, 16 -/* 00688 80B23378 E7AA0078 */ swc1 $f10, 0x0078($sp) -/* 0068C 80B2337C 856D001C */ lh $t5, 0x001C($t3) ## 0000001C -/* 00690 80B23380 000D70C0 */ sll $t6, $t5, 3 -/* 00694 80B23384 01CF1021 */ addu $v0, $t6, $t7 -/* 00698 80B23388 24580004 */ addiu $t8, $v0, 0x0004 ## $t8 = 00000004 -/* 0069C 80B2338C AFA20054 */ sw $v0, 0x0054($sp) -/* 006A0 80B23390 AFB80050 */ sw $t8, 0x0050($sp) -/* 006A4 80B23394 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 -/* 006A8 80B23398 AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFFD0 -/* 006AC 80B2339C 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 -/* 006B0 80B233A0 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFD4 -/* 006B4 80B233A4 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 -/* 006B8 80B233A8 AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFD8 -/* 006BC 80B233AC C7A40070 */ lwc1 $f4, 0x0070($sp) -/* 006C0 80B233B0 C7B20058 */ lwc1 $f18, 0x0058($sp) -/* 006C4 80B233B4 C7B00074 */ lwc1 $f16, 0x0074($sp) -/* 006C8 80B233B8 46022182 */ mul.s $f6, $f4, $f2 -/* 006CC 80B233BC C7AA005C */ lwc1 $f10, 0x005C($sp) -/* 006D0 80B233C0 46028102 */ mul.s $f4, $f16, $f2 -/* 006D4 80B233C4 46069201 */ sub.s $f8, $f18, $f6 -/* 006D8 80B233C8 C7A60060 */ lwc1 $f6, 0x0060($sp) -/* 006DC 80B233CC 46045481 */ sub.s $f18, $f10, $f4 -/* 006E0 80B233D0 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 006E4 80B233D4 C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 006E8 80B233D8 E7B2005C */ swc1 $f18, 0x005C($sp) -/* 006EC 80B233DC 46024402 */ mul.s $f16, $f8, $f2 -/* 006F0 80B233E0 46103281 */ sub.s $f10, $f6, $f16 -/* 006F4 80B233E4 0C01DE0D */ jal Math_CosS - ## coss? -/* 006F8 80B233E8 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 006FC 80B233EC 8FA20090 */ lw $v0, 0x0090($sp) -/* 00700 80B233F0 3C0B80B2 */ lui $t3, %hi(D_80B24388) ## $t3 = 80B20000 -/* 00704 80B233F4 256B4388 */ addiu $t3, $t3, %lo(D_80B24388) ## $t3 = 80B24388 -/* 00708 80B233F8 00021080 */ sll $v0, $v0, 2 -/* 0070C 80B233FC 004B1821 */ addu $v1, $v0, $t3 -/* 00710 80B23400 C4640000 */ lwc1 $f4, 0x0000($v1) ## 00000000 -/* 00714 80B23404 C7A20098 */ lwc1 $f2, 0x0098($sp) -/* 00718 80B23408 3C0180B2 */ lui $at, %hi(D_80B243A4) ## $at = 80B20000 -/* 0071C 80B2340C 00220821 */ addu $at, $at, $v0 -/* 00720 80B23410 46022482 */ mul.s $f18, $f4, $f2 -/* 00724 80B23414 C42A43A4 */ lwc1 $f10, %lo(D_80B243A4)($at) -/* 00728 80B23418 C7A60058 */ lwc1 $f6, 0x0058($sp) -/* 0072C 80B2341C 00102400 */ sll $a0, $s0, 16 -/* 00730 80B23420 00042403 */ sra $a0, $a0, 16 -/* 00734 80B23424 AFA30038 */ sw $v1, 0x0038($sp) -/* 00738 80B23428 46120202 */ mul.s $f8, $f0, $f18 -/* 0073C 80B2342C C7B2005C */ lwc1 $f18, 0x005C($sp) -/* 00740 80B23430 46025102 */ mul.s $f4, $f10, $f2 -/* 00744 80B23434 46064400 */ add.s $f16, $f8, $f6 -/* 00748 80B23438 46122200 */ add.s $f8, $f4, $f18 -/* 0074C 80B2343C E7B0007C */ swc1 $f16, 0x007C($sp) -/* 00750 80B23440 0C01DE1C */ jal Math_SinS - ## sins? -/* 00754 80B23444 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 00758 80B23448 8FA30038 */ lw $v1, 0x0038($sp) -/* 0075C 80B2344C C7A20098 */ lwc1 $f2, 0x0098($sp) -/* 00760 80B23450 C7A60060 */ lwc1 $f6, 0x0060($sp) -/* 00764 80B23454 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00768 80B23458 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 0076C 80B2345C 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 00770 80B23460 46028282 */ mul.s $f10, $f16, $f2 -/* 00774 80B23464 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00778 80B23468 8FAC0054 */ lw $t4, 0x0054($sp) -/* 0077C 80B2346C 8FAD0050 */ lw $t5, 0x0050($sp) -/* 00780 80B23470 8FA4008C */ lw $a0, 0x008C($sp) -/* 00784 80B23474 27A5007C */ addiu $a1, $sp, 0x007C ## $a1 = FFFFFFF4 -/* 00788 80B23478 27A60070 */ addiu $a2, $sp, 0x0070 ## $a2 = FFFFFFE8 -/* 0078C 80B2347C 460A0102 */ mul.s $f4, $f0, $f10 -/* 00790 80B23480 27A70064 */ addiu $a3, $sp, 0x0064 ## $a3 = FFFFFFDC -/* 00794 80B23484 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00798 80B23488 46024402 */ mul.s $f16, $f8, $f2 -/* 0079C 80B2348C AFAD0014 */ sw $t5, 0x0014($sp) -/* 007A0 80B23490 46043481 */ sub.s $f18, $f6, $f4 -/* 007A4 80B23494 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 007A8 80B23498 4600828D */ trunc.w.s $f10, $f16 -/* 007AC 80B2349C 46023102 */ mul.s $f4, $f6, $f2 -/* 007B0 80B234A0 E7B20084 */ swc1 $f18, 0x0084($sp) -/* 007B4 80B234A4 440F5000 */ mfc1 $t7, $f10 -/* 007B8 80B234A8 00000000 */ nop -/* 007BC 80B234AC AFAF0018 */ sw $t7, 0x0018($sp) -/* 007C0 80B234B0 4600248D */ trunc.w.s $f18, $f4 -/* 007C4 80B234B4 44199000 */ mfc1 $t9, $f18 -/* 007C8 80B234B8 0C00A0A7 */ jal func_8002829C -/* 007CC 80B234BC AFB9001C */ sw $t9, 0x001C($sp) -/* 007D0 80B234C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 007D4 80B234C4 8FB00028 */ lw $s0, 0x0028($sp) -/* 007D8 80B234C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 007DC 80B234CC 03E00008 */ jr $ra -/* 007E0 80B234D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s deleted file mode 100644 index b8ce13bf72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s +++ /dev/null @@ -1,135 +0,0 @@ -.late_rodata -glabel D_80B24434 - .float 0.9 - -glabel D_80B24438 - .float 0.2 - -glabel D_80B2443C - .float 0.2 - -glabel D_80B24440 - .float 0.9 - -.text -glabel func_80B234D4 -/* 007E4 80B234D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007E8 80B234D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 007EC 80B234DC AFB00020 */ sw $s0, 0x0020($sp) -/* 007F0 80B234E0 AFA50034 */ sw $a1, 0x0034($sp) -/* 007F4 80B234E4 948202D6 */ lhu $v0, 0x02D6($a0) ## 000002D6 -/* 007F8 80B234E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007FC 80B234EC 28410011 */ slti $at, $v0, 0x0011 -/* 00800 80B234F0 1420000C */ bne $at, $zero, .L80B23524 -/* 00804 80B234F4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00808 80B234F8 00027880 */ sll $t7, $v0, 2 -/* 0080C 80B234FC 01E27821 */ addu $t7, $t7, $v0 -/* 00810 80B23500 000F78C0 */ sll $t7, $t7, 3 -/* 00814 80B23504 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 00818 80B23508 01E27821 */ addu $t7, $t7, $v0 -/* 0081C 80B2350C 000F7900 */ sll $t7, $t7, 4 -/* 00820 80B23510 01E27823 */ subu $t7, $t7, $v0 -/* 00824 80B23514 01CFC023 */ subu $t8, $t6, $t7 -/* 00828 80B23518 27193D68 */ addiu $t9, $t8, 0x3D68 ## $t9 = 00003D68 -/* 0082C 80B2351C 1000004D */ beq $zero, $zero, .L80B23654 -/* 00830 80B23520 A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -.L80B23524: -/* 00834 80B23524 28610005 */ slti $at, $v1, 0x0005 -/* 00838 80B23528 14200015 */ bne $at, $zero, .L80B23580 -/* 0083C 80B2352C 3C0180B2 */ lui $at, %hi(D_80B24434) ## $at = 80B20000 -/* 00840 80B23530 C4264434 */ lwc1 $f6, %lo(D_80B24434)($at) -/* 00844 80B23534 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 00848 80B23538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0084C 80B2353C 46062202 */ mul.s $f8, $f4, $f6 -/* 00850 80B23540 44054000 */ mfc1 $a1, $f8 -/* 00854 80B23544 0C00B58B */ jal Actor_SetScale - -/* 00858 80B23548 00000000 */ nop -/* 0085C 80B2354C 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 00860 80B23550 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00864 80B23554 00024880 */ sll $t1, $v0, 2 -/* 00868 80B23558 01224821 */ addu $t1, $t1, $v0 -/* 0086C 80B2355C 000948C0 */ sll $t1, $t1, 3 -/* 00870 80B23560 01224821 */ addu $t1, $t1, $v0 -/* 00874 80B23564 00094900 */ sll $t1, $t1, 4 -/* 00878 80B23568 01224823 */ subu $t1, $t1, $v0 -/* 0087C 80B2356C 01095023 */ subu $t2, $t0, $t1 -/* 00880 80B23570 254B3D68 */ addiu $t3, $t2, 0x3D68 ## $t3 = 00003D68 -/* 00884 80B23574 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 00888 80B23578 10000036 */ beq $zero, $zero, .L80B23654 -/* 0088C 80B2357C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B23580: -/* 00890 80B23580 1860002E */ blez $v1, .L80B2363C -/* 00894 80B23584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00898 80B23588 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0089C 80B2358C 00033040 */ sll $a2, $v1, 1 -/* 008A0 80B23590 00C1001A */ div $zero, $a2, $at -/* 008A4 80B23594 3C0180B2 */ lui $at, %hi(D_80B24438) ## $at = 80B20000 -/* 008A8 80B23598 C42A4438 */ lwc1 $f10, %lo(D_80B24438)($at) -/* 008AC 80B2359C 00003010 */ mfhi $a2 -/* 008B0 80B235A0 AFA6002C */ sw $a2, 0x002C($sp) -/* 008B4 80B235A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008B8 80B235A8 8FA50034 */ lw $a1, 0x0034($sp) -/* 008BC 80B235AC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 008C0 80B235B0 0C2C8C95 */ jal func_80B23254 -/* 008C4 80B235B4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 008C8 80B235B8 8FA6002C */ lw $a2, 0x002C($sp) -/* 008CC 80B235BC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 008D0 80B235C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008D4 80B235C4 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 008D8 80B235C8 00C1001A */ div $zero, $a2, $at -/* 008DC 80B235CC 3C0180B2 */ lui $at, %hi(D_80B2443C) ## $at = 80B20000 -/* 008E0 80B235D0 C430443C */ lwc1 $f16, %lo(D_80B2443C)($at) -/* 008E4 80B235D4 00003010 */ mfhi $a2 -/* 008E8 80B235D8 8FA50034 */ lw $a1, 0x0034($sp) -/* 008EC 80B235DC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 008F0 80B235E0 0C2C8C95 */ jal func_80B23254 -/* 008F4 80B235E4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 008F8 80B235E8 3C0180B2 */ lui $at, %hi(D_80B24440) ## $at = 80B20000 -/* 008FC 80B235EC C4244440 */ lwc1 $f4, %lo(D_80B24440)($at) -/* 00900 80B235F0 C6120050 */ lwc1 $f18, 0x0050($s0) ## 00000050 -/* 00904 80B235F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00908 80B235F8 46049182 */ mul.s $f6, $f18, $f4 -/* 0090C 80B235FC 44053000 */ mfc1 $a1, $f6 -/* 00910 80B23600 0C00B58B */ jal Actor_SetScale - -/* 00914 80B23604 00000000 */ nop -/* 00918 80B23608 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 0091C 80B2360C 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00920 80B23610 00026880 */ sll $t5, $v0, 2 -/* 00924 80B23614 01A26821 */ addu $t5, $t5, $v0 -/* 00928 80B23618 000D68C0 */ sll $t5, $t5, 3 -/* 0092C 80B2361C 01A26821 */ addu $t5, $t5, $v0 -/* 00930 80B23620 000D6900 */ sll $t5, $t5, 4 -/* 00934 80B23624 01A26823 */ subu $t5, $t5, $v0 -/* 00938 80B23628 018D7023 */ subu $t6, $t4, $t5 -/* 0093C 80B2362C 25CF3D68 */ addiu $t7, $t6, 0x3D68 ## $t7 = 00003D68 -/* 00940 80B23630 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00944 80B23634 10000007 */ beq $zero, $zero, .L80B23654 -/* 00948 80B23638 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B2363C: -/* 0094C 80B2363C 3C0580B2 */ lui $a1, %hi(func_80B23820) ## $a1 = 80B20000 -/* 00950 80B23640 0C2C8B3C */ jal func_80B22CF0 -/* 00954 80B23644 24A53820 */ addiu $a1, $a1, %lo(func_80B23820) ## $a1 = 80B23820 -/* 00958 80B23648 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 0095C 80B2364C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 00960 80B23650 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B23654: -/* 00964 80B23654 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00968 80B23658 14610005 */ bne $v1, $at, .L80B23670 -/* 0096C 80B2365C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00970 80B23660 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00974 80B23664 240538CD */ addiu $a1, $zero, 0x38CD ## $a1 = 000038CD -/* 00978 80B23668 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 0097C 80B2366C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B23670: -/* 00980 80B23670 18600002 */ blez $v1, .L80B2367C -/* 00984 80B23674 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 00988 80B23678 A61802D6 */ sh $t8, 0x02D6($s0) ## 000002D6 -.L80B2367C: -/* 0098C 80B2367C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00990 80B23680 8FB00020 */ lw $s0, 0x0020($sp) -/* 00994 80B23684 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00998 80B23688 03E00008 */ jr $ra -/* 0099C 80B2368C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s deleted file mode 100644 index c396c91f24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s +++ /dev/null @@ -1,116 +0,0 @@ -.late_rodata -glabel D_80B24444 - .float 0.8 - -glabel D_80B24448 - .float 0.002 - -.text -glabel func_80B23690 -/* 009A0 80B23690 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009A4 80B23694 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009A8 80B23698 AFB00020 */ sw $s0, 0x0020($sp) -/* 009AC 80B2369C AFA50034 */ sw $a1, 0x0034($sp) -/* 009B0 80B236A0 948202D6 */ lhu $v0, 0x02D6($a0) ## 000002D6 -/* 009B4 80B236A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009B8 80B236A8 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 009BC 80B236AC 2841001F */ slti $at, $v0, 0x001F -/* 009C0 80B236B0 14200019 */ bne $at, $zero, .L80B23718 -/* 009C4 80B236B4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 009C8 80B236B8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 009CC 80B236BC 00033040 */ sll $a2, $v1, 1 -/* 009D0 80B236C0 00C1001A */ div $zero, $a2, $at -/* 009D4 80B236C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 009D8 80B236C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 009DC 80B236CC 00003010 */ mfhi $a2 -/* 009E0 80B236D0 AFA6002C */ sw $a2, 0x002C($sp) -/* 009E4 80B236D4 0C2C8C95 */ jal func_80B23254 -/* 009E8 80B236D8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009EC 80B236DC 8FA6002C */ lw $a2, 0x002C($sp) -/* 009F0 80B236E0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 009F4 80B236E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009F8 80B236E8 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 009FC 80B236EC 00C1001A */ div $zero, $a2, $at -/* 00A00 80B236F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A04 80B236F4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A08 80B236F8 00003010 */ mfhi $a2 -/* 00A0C 80B236FC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00A10 80B23700 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00A14 80B23704 0C2C8C95 */ jal func_80B23254 -/* 00A18 80B23708 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00A1C 80B2370C 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 00A20 80B23710 10000038 */ beq $zero, $zero, .L80B237F4 -/* 00A24 80B23714 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B23718: -/* 00A28 80B23718 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00A2C 80B2371C 14610010 */ bne $v1, $at, .L80B23760 -/* 00A30 80B23720 3C0E80B2 */ lui $t6, %hi(EnTr_Draw) ## $t6 = 80B20000 -/* 00A34 80B23724 0003C080 */ sll $t8, $v1, 2 -/* 00A38 80B23728 0303C023 */ subu $t8, $t8, $v1 -/* 00A3C 80B2372C 0018C080 */ sll $t8, $t8, 2 -/* 00A40 80B23730 0303C021 */ addu $t8, $t8, $v1 -/* 00A44 80B23734 0018C080 */ sll $t8, $t8, 2 -/* 00A48 80B23738 0303C021 */ addu $t8, $t8, $v1 -/* 00A4C 80B2373C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00A50 80B23740 0018C080 */ sll $t8, $t8, 2 -/* 00A54 80B23744 0303C023 */ subu $t8, $t8, $v1 -/* 00A58 80B23748 0018C040 */ sll $t8, $t8, 1 -/* 00A5C 80B2374C 25CE3EA4 */ addiu $t6, $t6, %lo(EnTr_Draw) ## $t6 = 80B23EA4 -/* 00A60 80B23750 01F8C821 */ addu $t9, $t7, $t8 -/* 00A64 80B23754 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 00A68 80B23758 10000026 */ beq $zero, $zero, .L80B237F4 -/* 00A6C 80B2375C A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -.L80B23760: -/* 00A70 80B23760 1860001B */ blez $v1, .L80B237D0 -/* 00A74 80B23764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A78 80B23768 00034880 */ sll $t1, $v1, 2 -/* 00A7C 80B2376C 01234823 */ subu $t1, $t1, $v1 -/* 00A80 80B23770 00094880 */ sll $t1, $t1, 2 -/* 00A84 80B23774 01234821 */ addu $t1, $t1, $v1 -/* 00A88 80B23778 00094880 */ sll $t1, $t1, 2 -/* 00A8C 80B2377C 01234821 */ addu $t1, $t1, $v1 -/* 00A90 80B23780 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00A94 80B23784 00094880 */ sll $t1, $t1, 2 -/* 00A98 80B23788 01234823 */ subu $t1, $t1, $v1 -/* 00A9C 80B2378C 00094840 */ sll $t1, $t1, 1 -/* 00AA0 80B23790 01095021 */ addu $t2, $t0, $t1 -/* 00AA4 80B23794 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 00AA8 80B23798 3C0180B2 */ lui $at, %hi(D_80B24444) ## $at = 80B20000 -/* 00AAC 80B2379C C42A4444 */ lwc1 $f10, %lo(D_80B24444)($at) -/* 00AB0 80B237A0 C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 00AB4 80B237A4 3C0180B2 */ lui $at, %hi(D_80B24448) ## $at = 80B20000 -/* 00AB8 80B237A8 C4324448 */ lwc1 $f18, %lo(D_80B24448)($at) -/* 00ABC 80B237AC 460A4402 */ mul.s $f16, $f8, $f10 -/* 00AC0 80B237B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC4 80B237B4 46128100 */ add.s $f4, $f16, $f18 -/* 00AC8 80B237B8 44052000 */ mfc1 $a1, $f4 -/* 00ACC 80B237BC 0C00B58B */ jal Actor_SetScale - -/* 00AD0 80B237C0 00000000 */ nop -/* 00AD4 80B237C4 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 00AD8 80B237C8 1000000A */ beq $zero, $zero, .L80B237F4 -/* 00ADC 80B237CC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B237D0: -/* 00AE0 80B237D0 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00AE4 80B237D4 0C2C8B3C */ jal func_80B22CF0 -/* 00AE8 80B237D8 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00AEC 80B237DC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00AF0 80B237E0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00AF4 80B237E4 0C00B58B */ jal Actor_SetScale - -/* 00AF8 80B237E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AFC 80B237EC 960202D6 */ lhu $v0, 0x02D6($s0) ## 000002D6 -/* 00B00 80B237F0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B237F4: -/* 00B04 80B237F4 18600003 */ blez $v1, .L80B23804 -/* 00B08 80B237F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B0C 80B237FC 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 00B10 80B23800 A60B02D6 */ sh $t3, 0x02D6($s0) ## 000002D6 -.L80B23804: -/* 00B14 80B23804 0C00BE5D */ jal func_8002F974 -/* 00B18 80B23808 2405317B */ addiu $a1, $zero, 0x317B ## $a1 = 0000317B -/* 00B1C 80B2380C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B20 80B23810 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B24 80B23814 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B28 80B23818 03E00008 */ jr $ra -/* 00B2C 80B2381C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s deleted file mode 100644 index 50d0afe6c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80B23820 -/* 00B30 80B23820 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B34 80B23824 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B38 80B23828 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B3C 80B2382C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00B40 80B23830 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B44 80B23834 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00B48 80B23838 51C00025 */ beql $t6, $zero, .L80B238D0 -/* 00B4C 80B2383C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B50 80B23840 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 -/* 00B54 80B23844 000FC080 */ sll $t8, $t7, 2 -/* 00B58 80B23848 00B8C821 */ addu $t9, $a1, $t8 -/* 00B5C 80B2384C 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 00B60 80B23850 5040001F */ beql $v0, $zero, .L80B238D0 -/* 00B64 80B23854 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B68 80B23858 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 -/* 00B6C 80B2385C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00B70 80B23860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B74 80B23864 10610004 */ beq $v1, $at, .L80B23878 -/* 00B78 80B23868 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 00B7C 80B2386C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B80 80B23870 54610017 */ bnel $v1, $at, .L80B238D0 -/* 00B84 80B23874 8FBF001C */ lw $ra, 0x001C($sp) -.L80B23878: -/* 00B88 80B23878 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B8C 80B2387C AFA70024 */ sw $a3, 0x0024($sp) -/* 00B90 80B23880 8FA50024 */ lw $a1, 0x0024($sp) -/* 00B94 80B23884 24080022 */ addiu $t0, $zero, 0x0022 ## $t0 = 00000022 -/* 00B98 80B23888 A60802D6 */ sh $t0, 0x02D6($s0) ## 000002D6 -/* 00B9C 80B2388C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA0 80B23890 0C2C90AD */ jal func_80B242B4 -/* 00BA4 80B23894 860602D8 */ lh $a2, 0x02D8($s0) ## 000002D8 -/* 00BA8 80B23898 3C0580B2 */ lui $a1, %hi(func_80B23690) ## $a1 = 80B20000 -/* 00BAC 80B2389C 24A53690 */ addiu $a1, $a1, %lo(func_80B23690) ## $a1 = 80B23690 -/* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 -/* 00BB4 80B238A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB8 80B238A8 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 -/* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 -/* 00BC0 80B238B0 0C0294BE */ jal Animation_PlayLoop -/* 00BC4 80B238B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00BC8 80B238B8 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 -/* 00BCC 80B238BC AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00BD0 80B238C0 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3B449BA6 -/* 00BD4 80B238C4 0C00B58B */ jal Actor_SetScale - -/* 00BD8 80B238C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BDC 80B238CC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B238D0: -/* 00BE0 80B238D0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00BE4 80B238D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BE8 80B238D8 03E00008 */ jr $ra -/* 00BEC 80B238DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s deleted file mode 100644 index 58a370f9a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B238E0 -/* 00BF0 80B238E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00BF4 80B238E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00BF8 80B238E8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00BFC 80B238EC AFA50034 */ sw $a1, 0x0034($sp) -/* 00C00 80B238F0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00C04 80B238F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C08 80B238F8 3C0480B2 */ lui $a0, %hi(D_80B24378) ## $a0 = 80B20000 -/* 00C0C 80B238FC 000E7880 */ sll $t7, $t6, 2 -/* 00C10 80B23900 008F2021 */ addu $a0, $a0, $t7 -/* 00C14 80B23904 0C028800 */ jal Animation_GetLastFrame - -/* 00C18 80B23908 8C844378 */ lw $a0, %lo(D_80B24378)($a0) -/* 00C1C 80B2390C 8FA30034 */ lw $v1, 0x0034($sp) -/* 00C20 80B23910 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C24 80B23914 90781D6C */ lbu $t8, 0x1D6C($v1) ## 00001D6C -/* 00C28 80B23918 46802020 */ cvt.s.w $f0, $f4 -/* 00C2C 80B2391C 5300001E */ beql $t8, $zero, .L80B23998 -/* 00C30 80B23920 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C34 80B23924 861902D8 */ lh $t9, 0x02D8($s0) ## 000002D8 -/* 00C38 80B23928 00194080 */ sll $t0, $t9, 2 -/* 00C3C 80B2392C 00684821 */ addu $t1, $v1, $t0 -/* 00C40 80B23930 8D221D8C */ lw $v0, 0x1D8C($t1) ## 00001D8C -/* 00C44 80B23934 50400018 */ beql $v0, $zero, .L80B23998 -/* 00C48 80B23938 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C4C 80B2393C 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 -/* 00C50 80B23940 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00C54 80B23944 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C58 80B23948 15410012 */ bne $t2, $at, .L80B23994 -/* 00C5C 80B2394C 3C0580B2 */ lui $a1, %hi(D_80B24378) ## $a1 = 80B20000 -/* 00C60 80B23950 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00C64 80B23954 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00C68 80B23958 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00C6C 80B2395C 000B6080 */ sll $t4, $t3, 2 -/* 00C70 80B23960 00AC2821 */ addu $a1, $a1, $t4 -/* 00C74 80B23964 8CA54378 */ lw $a1, %lo(D_80B24378)($a1) -/* 00C78 80B23968 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C7C 80B2396C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00C80 80B23970 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C84 80B23974 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C88 80B23978 0C029468 */ jal Animation_Change - -/* 00C8C 80B2397C E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00C90 80B23980 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00C94 80B23984 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00C98 80B23988 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00C9C 80B2398C 0C2C8B3C */ jal func_80B22CF0 -/* 00CA0 80B23990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B23994: -/* 00CA4 80B23994 8FBF002C */ lw $ra, 0x002C($sp) -.L80B23998: -/* 00CA8 80B23998 8FB00028 */ lw $s0, 0x0028($sp) -/* 00CAC 80B2399C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00CB0 80B239A0 03E00008 */ jr $ra -/* 00CB4 80B239A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s deleted file mode 100644 index ae73cec546..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80B239A8 -/* 00CB8 80B239A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00CBC 80B239AC AFBF002C */ sw $ra, 0x002C($sp) -/* 00CC0 80B239B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CC4 80B239B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00CC8 80B239B8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00CCC 80B239BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CD0 80B239C0 3C0480B2 */ lui $a0, %hi(D_80B24368) ## $a0 = 80B20000 -/* 00CD4 80B239C4 000E7880 */ sll $t7, $t6, 2 -/* 00CD8 80B239C8 008F2021 */ addu $a0, $a0, $t7 -/* 00CDC 80B239CC 0C028800 */ jal Animation_GetLastFrame - -/* 00CE0 80B239D0 8C844368 */ lw $a0, %lo(D_80B24368)($a0) -/* 00CE4 80B239D4 8FA30034 */ lw $v1, 0x0034($sp) -/* 00CE8 80B239D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00CEC 80B239DC 90781D6C */ lbu $t8, 0x1D6C($v1) ## 00001D6C -/* 00CF0 80B239E0 46802020 */ cvt.s.w $f0, $f4 -/* 00CF4 80B239E4 53000024 */ beql $t8, $zero, .L80B23A78 -/* 00CF8 80B239E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00CFC 80B239EC 861902D8 */ lh $t9, 0x02D8($s0) ## 000002D8 -/* 00D00 80B239F0 00194080 */ sll $t0, $t9, 2 -/* 00D04 80B239F4 00684821 */ addu $t1, $v1, $t0 -/* 00D08 80B239F8 8D221D8C */ lw $v0, 0x1D8C($t1) ## 00001D8C -/* 00D0C 80B239FC 5040001E */ beql $v0, $zero, .L80B23A78 -/* 00D10 80B23A00 8FBF002C */ lw $ra, 0x002C($sp) -/* 00D14 80B23A04 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 -/* 00D18 80B23A08 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00D1C 80B23A0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D20 80B23A10 15410018 */ bne $t2, $at, .L80B23A74 -/* 00D24 80B23A14 3C0580B2 */ lui $a1, %hi(D_80B24368) ## $a1 = 80B20000 -/* 00D28 80B23A18 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00D2C 80B23A1C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00D30 80B23A20 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00D34 80B23A24 000B6080 */ sll $t4, $t3, 2 -/* 00D38 80B23A28 00AC2821 */ addu $a1, $a1, $t4 -/* 00D3C 80B23A2C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00D40 80B23A30 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00D44 80B23A34 8CA54368 */ lw $a1, %lo(D_80B24368)($a1) -/* 00D48 80B23A38 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00D4C 80B23A3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00D50 80B23A40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D54 80B23A44 0C029468 */ jal Animation_Change - -/* 00D58 80B23A48 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00D5C 80B23A4C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00D60 80B23A50 3C1880B2 */ lui $t8, %hi(D_80B24370) ## $t8 = 80B20000 -/* 00D64 80B23A54 3C0580B2 */ lui $a1, %hi(func_80B238E0) ## $a1 = 80B20000 -/* 00D68 80B23A58 000E7880 */ sll $t7, $t6, 2 -/* 00D6C 80B23A5C 030FC021 */ addu $t8, $t8, $t7 -/* 00D70 80B23A60 8F184370 */ lw $t8, %lo(D_80B24370)($t8) -/* 00D74 80B23A64 24A538E0 */ addiu $a1, $a1, %lo(func_80B238E0) ## $a1 = 80B238E0 -/* 00D78 80B23A68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D7C 80B23A6C 0C2C8B3C */ jal func_80B22CF0 -/* 00D80 80B23A70 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -.L80B23A74: -/* 00D84 80B23A74 8FBF002C */ lw $ra, 0x002C($sp) -.L80B23A78: -/* 00D88 80B23A78 8FB00028 */ lw $s0, 0x0028($sp) -/* 00D8C 80B23A7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D90 80B23A80 03E00008 */ jr $ra -/* 00D94 80B23A84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s deleted file mode 100644 index 2ee9c42d1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80B23A88 -/* 00D98 80B23A88 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D9C 80B23A8C AFBF001C */ sw $ra, 0x001C($sp) -/* 00DA0 80B23A90 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DA4 80B23A94 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00DA8 80B23A98 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00DAC 80B23A9C 00E53821 */ addu $a3, $a3, $a1 -/* 00DB0 80B23AA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DB4 80B23AA4 11C00040 */ beq $t6, $zero, .L80B23BA8 -/* 00DB8 80B23AA8 8CE71DE4 */ lw $a3, 0x1DE4($a3) ## 00011DE4 -/* 00DBC 80B23AAC 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 00DC0 80B23AB0 00067880 */ sll $t7, $a2, 2 -/* 00DC4 80B23AB4 00AFC021 */ addu $t8, $a1, $t7 -/* 00DC8 80B23AB8 8F031D8C */ lw $v1, 0x1D8C($t8) ## 00001D8C -/* 00DCC 80B23ABC 5060003B */ beql $v1, $zero, .L80B23BAC -/* 00DD0 80B23AC0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DD4 80B23AC4 94620000 */ lhu $v0, 0x0000($v1) ## 00000000 -/* 00DD8 80B23AC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00DDC 80B23ACC 1041000A */ beq $v0, $at, .L80B23AF8 -/* 00DE0 80B23AD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DE4 80B23AD4 10410010 */ beq $v0, $at, .L80B23B18 -/* 00DE8 80B23AD8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00DEC 80B23ADC 1041001A */ beq $v0, $at, .L80B23B48 -/* 00DF0 80B23AE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DF4 80B23AE4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00DF8 80B23AE8 1041001C */ beq $v0, $at, .L80B23B5C -/* 00DFC 80B23AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80B23AF0 1000002E */ beq $zero, $zero, .L80B23BAC -/* 00E04 80B23AF4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B23AF8: -/* 00E08 80B23AF8 0C2C90AD */ jal func_80B242B4 -/* 00E0C 80B23AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E10 80B23B00 3C0580B2 */ lui $a1, %hi(func_80B239A8) ## $a1 = 80B20000 -/* 00E14 80B23B04 24A539A8 */ addiu $a1, $a1, %lo(func_80B239A8) ## $a1 = 80B239A8 -/* 00E18 80B23B08 0C2C8B3C */ jal func_80B22CF0 -/* 00E1C 80B23B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E20 80B23B10 10000026 */ beq $zero, $zero, .L80B23BAC -/* 00E24 80B23B14 8FBF001C */ lw $ra, 0x001C($sp) -.L80B23B18: -/* 00E28 80B23B18 0C2C90AD */ jal func_80B242B4 -/* 00E2C 80B23B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E30 80B23B20 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00E34 80B23B24 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 -/* 00E3C 80B23B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E40 80B23B30 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 -/* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 -/* 00E48 80B23B38 0C0294BE */ jal Animation_PlayLoop -/* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 -/* 00E54 80B23B44 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -.L80B23B48: -/* 00E58 80B23B48 3C0580B2 */ lui $a1, %hi(func_80B23820) ## $a1 = 80B20000 -/* 00E5C 80B23B4C 0C2C8B3C */ jal func_80B22CF0 -/* 00E60 80B23B50 24A53820 */ addiu $a1, $a1, %lo(func_80B23820) ## $a1 = 80B23820 -/* 00E64 80B23B54 10000014 */ beq $zero, $zero, .L80B23BA8 -/* 00E68 80B23B58 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -.L80B23B5C: -/* 00E6C 80B23B5C 3C0580B2 */ lui $a1, %hi(func_80B230D8) ## $a1 = 80B20000 -/* 00E70 80B23B60 24A530D8 */ addiu $a1, $a1, %lo(func_80B230D8) ## $a1 = 80B230D8 -/* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 -/* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) -/* 00E7C 80B23B6C 3C050600 */ lui $a1, %hi(D_060049C8) ## $a1 = 06000000 -/* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, %lo(D_060049C8) ## $a1 = 060049C8 -/* 00E84 80B23B74 0C0294BE */ jal Animation_PlayLoop -/* 00E88 80B23B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E8C 80B23B7C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) -/* 00E94 80B23B84 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00E98 80B23B88 13200006 */ beq $t9, $zero, .L80B23BA4 -/* 00E9C 80B23B8C 00076280 */ sll $t4, $a3, 10 -/* 00EA0 80B23B90 00074A80 */ sll $t1, $a3, 10 -/* 00EA4 80B23B94 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00EA8 80B23B98 01215021 */ addu $t2, $t1, $at -/* 00EAC 80B23B9C 10000002 */ beq $zero, $zero, .L80B23BA8 -/* 00EB0 80B23BA0 A60A02D6 */ sh $t2, 0x02D6($s0) ## 000002D6 -.L80B23BA4: -/* 00EB4 80B23BA4 A60C02D6 */ sh $t4, 0x02D6($s0) ## 000002D6 -.L80B23BA8: -/* 00EB8 80B23BA8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B23BAC: -/* 00EBC 80B23BAC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EC0 80B23BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00EC4 80B23BB4 03E00008 */ jr $ra -/* 00EC8 80B23BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s deleted file mode 100644 index 0c19dc463a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80B23D74 -/* 01084 80B23D74 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01088 80B23D78 3C0E80B2 */ lui $t6, %hi(D_80B243DC) ## $t6 = 80B20000 -/* 0108C 80B23D7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01090 80B23D80 AFA40040 */ sw $a0, 0x0040($sp) -/* 01094 80B23D84 AFA60048 */ sw $a2, 0x0048($sp) -/* 01098 80B23D88 AFA7004C */ sw $a3, 0x004C($sp) -/* 0109C 80B23D8C 25CE43DC */ addiu $t6, $t6, %lo(D_80B243DC) ## $t6 = 80B243DC -/* 010A0 80B23D90 8DD80000 */ lw $t8, 0x0000($t6) ## 80B243DC -/* 010A4 80B23D94 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 010A8 80B23D98 3C1980B2 */ lui $t9, %hi(D_80B243E8) ## $t9 = 80B20000 -/* 010AC 80B23D9C ACD80000 */ sw $t8, 0x0000($a2) ## FFFFFFF4 -/* 010B0 80B23DA0 8DCF0004 */ lw $t7, 0x0004($t6) ## 80B243E0 -/* 010B4 80B23DA4 273943E8 */ addiu $t9, $t9, %lo(D_80B243E8) ## $t9 = 80B243E8 -/* 010B8 80B23DA8 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFE8 -/* 010BC 80B23DAC ACCF0004 */ sw $t7, 0x0004($a2) ## FFFFFFF8 -/* 010C0 80B23DB0 8DD80008 */ lw $t8, 0x0008($t6) ## 80B243E4 -/* 010C4 80B23DB4 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 010C8 80B23DB8 ACD80008 */ sw $t8, 0x0008($a2) ## FFFFFFFC -/* 010CC 80B23DBC 8F290000 */ lw $t1, 0x0000($t9) ## 80B243E8 -/* 010D0 80B23DC0 ACE90000 */ sw $t1, 0x0000($a3) ## FFFFFFE8 -/* 010D4 80B23DC4 8F280004 */ lw $t0, 0x0004($t9) ## 80B243EC -/* 010D8 80B23DC8 ACE80004 */ sw $t0, 0x0004($a3) ## FFFFFFEC -/* 010DC 80B23DCC 8F290008 */ lw $t1, 0x0008($t9) ## 80B243F0 -/* 010E0 80B23DD0 ACE90008 */ sw $t1, 0x0008($a3) ## FFFFFFF0 -/* 010E4 80B23DD4 8FAA0054 */ lw $t2, 0x0054($sp) -/* 010E8 80B23DD8 8D42011C */ lw $v0, 0x011C($t2) ## 0000011C -/* 010EC 80B23DDC 5040002D */ beql $v0, $zero, .L80B23E94 -/* 010F0 80B23DE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010F4 80B23DE4 14A1002A */ bne $a1, $at, .L80B23E90 -/* 010F8 80B23DE8 00C02025 */ or $a0, $a2, $zero ## $a0 = FFFFFFF4 -/* 010FC 80B23DEC 00E02825 */ or $a1, $a3, $zero ## $a1 = FFFFFFE8 -/* 01100 80B23DF0 0C0346BD */ jal Matrix_MultVec3f -/* 01104 80B23DF4 AFA20020 */ sw $v0, 0x0020($sp) -/* 01108 80B23DF8 8FA20040 */ lw $v0, 0x0040($sp) -/* 0110C 80B23DFC 844B07A0 */ lh $t3, 0x07A0($v0) ## 000007A0 -/* 01110 80B23E00 000B6080 */ sll $t4, $t3, 2 -/* 01114 80B23E04 004C6821 */ addu $t5, $v0, $t4 -/* 01118 80B23E08 0C016A7D */ jal Camera_GetCamDirYaw -/* 0111C 80B23E0C 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -/* 01120 80B23E10 00022400 */ sll $a0, $v0, 16 -/* 01124 80B23E14 0C01DE1C */ jal Math_SinS - ## sins? -/* 01128 80B23E18 00042403 */ sra $a0, $a0, 16 -/* 0112C 80B23E1C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01130 80B23E20 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01134 80B23E24 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 01138 80B23E28 8FA20040 */ lw $v0, 0x0040($sp) -/* 0113C 80B23E2C 46003202 */ mul.s $f8, $f6, $f0 -/* 01140 80B23E30 46082281 */ sub.s $f10, $f4, $f8 -/* 01144 80B23E34 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 01148 80B23E38 844E07A0 */ lh $t6, 0x07A0($v0) ## 000007A0 -/* 0114C 80B23E3C 000E7880 */ sll $t7, $t6, 2 -/* 01150 80B23E40 004FC021 */ addu $t8, $v0, $t7 -/* 01154 80B23E44 0C016A7D */ jal Camera_GetCamDirYaw -/* 01158 80B23E48 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 0115C 80B23E4C 00022400 */ sll $a0, $v0, 16 -/* 01160 80B23E50 0C01DE0D */ jal Math_CosS - ## coss? -/* 01164 80B23E54 00042403 */ sra $a0, $a0, 16 -/* 01168 80B23E58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0116C 80B23E5C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01170 80B23E60 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 01174 80B23E64 27A80028 */ addiu $t0, $sp, 0x0028 ## $t0 = FFFFFFE8 -/* 01178 80B23E68 46009182 */ mul.s $f6, $f18, $f0 -/* 0117C 80B23E6C 8FB90020 */ lw $t9, 0x0020($sp) -/* 01180 80B23E70 46068101 */ sub.s $f4, $f16, $f6 -/* 01184 80B23E74 E7A40030 */ swc1 $f4, 0x0030($sp) -/* 01188 80B23E78 8D0A0000 */ lw $t2, 0x0000($t0) ## FFFFFFE8 -/* 0118C 80B23E7C AF2A0024 */ sw $t2, 0x0024($t9) ## 00000024 -/* 01190 80B23E80 8D090004 */ lw $t1, 0x0004($t0) ## FFFFFFEC -/* 01194 80B23E84 AF290028 */ sw $t1, 0x0028($t9) ## 00000028 -/* 01198 80B23E88 8D0A0008 */ lw $t2, 0x0008($t0) ## FFFFFFF0 -/* 0119C 80B23E8C AF2A002C */ sw $t2, 0x002C($t9) ## 0000002C -.L80B23E90: -/* 011A0 80B23E90 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B23E94: -/* 011A4 80B23E94 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 011A8 80B23E98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011AC 80B23E9C 03E00008 */ jr $ra -/* 011B0 80B23EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s deleted file mode 100644 index 9ede7115d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B23FDC -/* 012EC 80B23FDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012F0 80B23FE0 00057880 */ sll $t7, $a1, 2 -/* 012F4 80B23FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012F8 80B23FE8 AFA5001C */ sw $a1, 0x001C($sp) -/* 012FC 80B23FEC 008FC021 */ addu $t8, $a0, $t7 -/* 01300 80B23FF0 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 01304 80B23FF4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01308 80B23FF8 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 0130C 80B23FFC 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 01310 80B24000 0C01BE4F */ jal func_8006F93C -/* 01314 80B24004 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 01318 80B24008 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0131C 80B2400C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01320 80B24010 46000086 */ mov.s $f2, $f0 -/* 01324 80B24014 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01328 80B24018 4600603C */ c.lt.s $f12, $f0 -/* 0132C 80B2401C 00000000 */ nop -/* 01330 80B24020 45020003 */ bc1fl .L80B24030 -/* 01334 80B24024 46001006 */ mov.s $f0, $f2 -/* 01338 80B24028 46006086 */ mov.s $f2, $f12 -/* 0133C 80B2402C 46001006 */ mov.s $f0, $f2 -.L80B24030: -/* 01340 80B24030 03E00008 */ jr $ra -/* 01344 80B24034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s deleted file mode 100644 index 7bb66c8534..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s +++ /dev/null @@ -1,41 +0,0 @@ -.late_rodata -glabel D_80B24458 - .float 0.1 - -.text -glabel func_80B24230 -/* 01540 80B24230 00067080 */ sll $t6, $a2, 2 -/* 01544 80B24234 00AE7821 */ addu $t7, $a1, $t6 -/* 01548 80B24238 8DF81D8C */ lw $t8, 0x1D8C($t7) ## 00001D8C -/* 0154C 80B2423C 84870032 */ lh $a3, 0x0032($a0) ## 00000032 -/* 01550 80B24240 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01554 80B24244 87020008 */ lh $v0, 0x0008($t8) ## 00000008 -/* 01558 80B24248 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 0155C 80B2424C 00E21823 */ subu $v1, $a3, $v0 -/* 01560 80B24250 04610004 */ bgez $v1, .L80B24264 -/* 01564 80B24254 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 01568 80B24258 00031823 */ subu $v1, $zero, $v1 -/* 0156C 80B2425C 10000001 */ beq $zero, $zero, .L80B24264 -/* 01570 80B24260 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B24264: -/* 01574 80B24264 0061082A */ slt $at, $v1, $at -/* 01578 80B24268 54200004 */ bnel $at, $zero, .L80B2427C -/* 0157C 80B2426C 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 01580 80B24270 00021023 */ subu $v0, $zero, $v0 -/* 01584 80B24274 03231823 */ subu $v1, $t9, $v1 -/* 01588 80B24278 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -.L80B2427C: -/* 0158C 80B2427C 3C0180B2 */ lui $at, %hi(D_80B24458) ## $at = 80B20000 -/* 01590 80B24280 C4284458 */ lwc1 $f8, %lo(D_80B24458)($at) -/* 01594 80B24284 468021A0 */ cvt.s.w $f6, $f4 -/* 01598 80B24288 46083282 */ mul.s $f10, $f6, $f8 -/* 0159C 80B2428C 4600540D */ trunc.w.s $f16, $f10 -/* 015A0 80B24290 44038000 */ mfc1 $v1, $f16 -/* 015A4 80B24294 00000000 */ nop -/* 015A8 80B24298 00620019 */ multu $v1, $v0 -/* 015AC 80B2429C 00004812 */ mflo $t1 -/* 015B0 80B242A0 00E95021 */ addu $t2, $a3, $t1 -/* 015B4 80B242A4 A48A0032 */ sh $t2, 0x0032($a0) ## 00000032 -/* 015B8 80B242A8 848B0032 */ lh $t3, 0x0032($a0) ## 00000032 -/* 015BC 80B242AC 03E00008 */ jr $ra -/* 015C0 80B242B0 A48B00B6 */ sh $t3, 0x00B6($a0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s deleted file mode 100644 index 2e65a4beb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B242B4 -/* 015C4 80B242B4 00067080 */ sll $t6, $a2, 2 -/* 015C8 80B242B8 00AE1021 */ addu $v0, $a1, $t6 -/* 015CC 80B242BC 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 015D0 80B242C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015D4 80B242C4 27AB000C */ addiu $t3, $sp, 0x000C ## $t3 = FFFFFFF4 -/* 015D8 80B242C8 8DF8000C */ lw $t8, 0x000C($t7) ## 0000000C -/* 015DC 80B242CC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 015E0 80B242D0 00000000 */ nop -/* 015E4 80B242D4 468021A0 */ cvt.s.w $f6, $f4 -/* 015E8 80B242D8 E7A6000C */ swc1 $f6, 0x000C($sp) -/* 015EC 80B242DC 8C591D8C */ lw $t9, 0x1D8C($v0) ## 00001D8C -/* 015F0 80B242E0 8F280010 */ lw $t0, 0x0010($t9) ## 00000010 -/* 015F4 80B242E4 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 015F8 80B242E8 00000000 */ nop -/* 015FC 80B242EC 468042A0 */ cvt.s.w $f10, $f8 -/* 01600 80B242F0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01604 80B242F4 8C491D8C */ lw $t1, 0x1D8C($v0) ## 00001D8C -/* 01608 80B242F8 8D2A0014 */ lw $t2, 0x0014($t1) ## 00000014 -/* 0160C 80B242FC 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 01610 80B24300 00000000 */ nop -/* 01614 80B24304 468084A0 */ cvt.s.w $f18, $f16 -/* 01618 80B24308 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 0161C 80B2430C 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFF4 -/* 01620 80B24310 AC8D0024 */ sw $t5, 0x0024($a0) ## 00000024 -/* 01624 80B24314 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFF8 -/* 01628 80B24318 AC8C0028 */ sw $t4, 0x0028($a0) ## 00000028 -/* 0162C 80B2431C 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFFC -/* 01630 80B24320 AC8D002C */ sw $t5, 0x002C($a0) ## 0000002C -/* 01634 80B24324 8C4E1D8C */ lw $t6, 0x1D8C($v0) ## 00001D8C -/* 01638 80B24328 85C30008 */ lh $v1, 0x0008($t6) ## 00000008 -/* 0163C 80B2432C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01640 80B24330 A48300B6 */ sh $v1, 0x00B6($a0) ## 000000B6 -/* 01644 80B24334 03E00008 */ jr $ra -/* 01648 80B24338 A4830032 */ sh $v1, 0x0032($a0) ## 00000032 -/* 0164C 80B2433C 00000000 */ nop diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml new file mode 100644 index 0000000000..8be377a5e6 --- /dev/null +++ b/assets/xml/objects/object_ny.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/data/overlays/actors/z_bg_spot00_hanebasi.data.s b/data/overlays/actors/z_bg_spot00_hanebasi.data.s deleted file mode 100644 index 40cb3654d0..0000000000 --- a/data/overlays/actors/z_bg_spot00_hanebasi.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 Bg_Spot00_Hanebasi_InitVars - .word 0x004A0100, 0x00000010, 0x002F0000, 0x00000180 -.word BgSpot00Hanebasi_Init -.word BgSpot00Hanebasi_Destroy -.word BgSpot00Hanebasi_Update -.word BgSpot00Hanebasi_Draw -glabel D_808AA7B0 - .word 0x00000000 -glabel D_808AA7B4 - .word 0xB0F80226, 0xB0FC07D0, 0xB0F41388, 0x485003E8 -glabel D_808AA7C4 - .word 0x431E0000, 0x41200000, 0x43C80000 - diff --git a/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s b/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s deleted file mode 100644 index ab058daa6d..0000000000 --- a/data/overlays/actors/z_bg_spot00_hanebasi.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_808AA8A0 - .incbin "baserom/ovl_Bg_Spot00_Hanebasi", 0x1120, 0x00000120 diff --git a/data/overlays/actors/z_demo_ik.data.s b/data/overlays/actors/z_demo_ik.data.s deleted file mode 100644 index d8f7b880ba..0000000000 --- a/data/overlays/actors/z_demo_ik.data.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809846D0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809846DC - .word 0xC1600000, 0x40A00000, 0x40A00000, 0xC1A00000, 0x41400000, 0x00000000, 0xC0A00000, 0x41200000, 0xBF800000, 0xC1200000, 0x41000000, 0x41600000, 0xC0400000, 0x41200000, 0x40E00000, 0xC1200000, 0x41300000, 0x00000000, 0x41100000, 0x41200000, 0xC1000000, 0x40800000, 0x41200000, 0x40400000, 0xC0C00000, 0x41500000, 0xC0A00000, 0x3F800000, 0x41100000, 0x40400000, 0xC1200000, 0x41100000, 0x3F800000 -glabel D_80984760 - .word func_80983AA4 -.word func_80983AC4 -.word func_80983AF4 -.word func_80984124 -.word func_80984144 -.word func_80984164 -glabel D_80984778 - .word func_80984610 -.word func_80983C9C -.word func_8098441C -glabel Demo_Ik_InitVars - .word 0x01140400, 0x00000010, 0x01060000, 0x000001B4 -.word DemoIk_Init -.word DemoIk_Destroy -.word DemoIk_Update -.word DemoIk_Draw -.word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_ik.reloc.s b/data/overlays/actors/z_demo_ik.reloc.s deleted file mode 100644 index 9e837f7086..0000000000 --- a/data/overlays/actors/z_demo_ik.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_80984A00 - .incbin "baserom/ovl_Demo_Ik", 0x1700, 0x000001E0 diff --git a/data/overlays/actors/z_demo_kankyo.bss.s b/data/overlays/actors/z_demo_kankyo.bss.s deleted file mode 100644 index b7dbe6bf46..0000000000 --- a/data/overlays/actors/z_demo_kankyo.bss.s +++ /dev/null @@ -1,38 +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 .bss - -.balign 16 - -glabel D_8098CF80 - .space 0x02 -glabel D_8098CF82 - .space 0x02 -glabel D_8098CF84 - .space 0x04 -glabel D_8098CF88 - .space 0x04 -glabel D_8098CF8C - .space 0x0C -glabel D_8098CF98 - .space 0x04 -glabel D_8098CF9C - .space 0x04 -glabel D_8098CFA0 - .space 0x04 -glabel D_8098CFA4 - .space 0x04 -glabel D_8098CFA8 - .space 0x10 -glabel D_8098CFB8 - .space 0x04 -glabel D_8098CFBC - .space 0x04 -glabel D_8098CFC0 - .space 0x10 - diff --git a/data/overlays/actors/z_demo_kankyo.data.s b/data/overlays/actors/z_demo_kankyo.data.s deleted file mode 100644 index 69c5e43c9e..0000000000 --- a/data/overlays/actors/z_demo_kankyo.data.s +++ /dev/null @@ -1,46 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_8098B910 - .word 0x00000002, 0x000000A4, 0x00000005, 0x00010000, 0x00870000, 0x00000000, 0x42714CA7, 0x001F004F, 0x003B010F, 0x00000000, 0x42714CA7, 0x001F004E, 0x003C0120, 0x00000000, 0x42714CA7, 0x0020004E, 0x003C0131, 0x00000000, 0x42714CA7, 0x001E004F, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C01F6, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C0207, 0xFF000000, 0x42714CA7, 0x001E004E, 0x003C0000, 0x00000006, 0x00010000, 0x00A40000, 0x0000001E, 0x42714CA7, 0x000B0032, 0x0017010F, 0x0000001E, 0x42714CA7, 0x000B0030, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0030, 0x00160131, 0x00000007, 0x42714CA7, 0x00390065, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390065, 0x001501F6, 0x0000001E, 0x42714CA7, 0x00390065, 0x00150207, 0xFF00001E, 0x42714CA7, 0x00390065, 0x00150000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BA20 - .word 0x00000005, 0x0000048F, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5CB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA5EB, 0x00000000, 0x42714CA8, 0x001F0052, 0x003D20BA, 0x00000000, 0x42714CA8, 0x001F0052, 0x003DA1BC, 0xFF000000, 0x42714CA8, 0x001F0052, 0x003DA5E1, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x00370063, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x00370063, 0x001FA1BC, 0x0000000A, 0x42714CA8, 0x00370063, 0x001FA5E1, 0x00000007, 0x42714CA8, 0x0011003B, 0x001FA5CB, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA5EB, 0x000003E8, 0x42714CA8, 0x0011003B, 0x001F20BA, 0x0000001E, 0x42714CA8, 0x0011003B, 0x001FA1BC, 0xFF00001E, 0x42714CA8, 0x0011003B, 0x001FA5E1, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000003, 0x00000001, 0x000C005F, 0x00610000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098BBA0 - .word 0x00000002, 0x00000076, 0x00000005, 0x00010000, 0x00590000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F4, 0x00000000, 0x428D3328, 0x003A0066, 0x003001F6, 0x00000000, 0x428D3328, 0x003A0066, 0x00300207, 0xFF000000, 0x428D3328, 0x003A0066, 0x00300047, 0x00000006, 0x00010000, 0x00760000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D0047, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D0047, 0x001901F6, 0x0000001E, 0x428D3328, 0x001D0047, 0x00190207, 0xFF00001E, 0x428D3328, 0x001D0047, 0x00190047, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BCB0 - .word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0x00000000, 0x42714CA8, 0x002A0059, 0x00320000, 0xFF000000, 0x42714CA8, 0x002A0059, 0x003229D0, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0x000003E8, 0x42714CA8, 0x00180042, 0x001D0000, 0x0000001E, 0x42714CA8, 0x00180042, 0x001D0000, 0xFF00001E, 0x42714CA8, 0x00180042, 0x001D29D0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098BDD0 - .word 0x00000002, 0x0000048C, 0x00000005, 0x00010000, 0x046F0000, 0x00000000, 0x42714CA7, 0x001F0044, 0x003B010F, 0x00000000, 0x42714CA7, 0x00200044, 0x003C0120, 0x00000000, 0x42714CA7, 0x001F0045, 0x003B0131, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B01F6, 0x00000000, 0x42714CA7, 0x001F0040, 0x003B0207, 0x00000000, 0x42714CA7, 0x001F0040, 0x003BB46C, 0xFF000000, 0x42714CA7, 0x001F0040, 0x003B05BC, 0x00000006, 0x00010000, 0x048C0000, 0x0000001E, 0x42714CA7, 0x000C0028, 0x0016010F, 0x0000001E, 0x42714CA7, 0x000B0026, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0027, 0x00160131, 0x00000007, 0x42714CA7, 0x00390056, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390056, 0x001501F6, 0x000003E8, 0x42714CA7, 0x00390056, 0x00150207, 0x0000001E, 0x42714CA7, 0x00390056, 0x0015B46C, 0xFF00001E, 0x42714CA7, 0x00390056, 0x001505BC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098BF00 - .word 0x00000005, 0x0000048F, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04720000, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA8A5, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DA3D9, 0x00000000, 0x42714CA8, 0x001E003F, 0x003DF3A5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5D5, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5E7, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BA5EC, 0x00000000, 0x42714CA9, 0x001D003D, 0x003BBCA5, 0xFF000000, 0x42714CA9, 0x001D003D, 0x003BEEC0, 0x00000006, 0x00010000, 0x048F0000, 0x0000001E, 0x42714CA8, 0x0036004F, 0x001FA8A5, 0x0000001E, 0x42714CA8, 0x00360050, 0x001FA3D9, 0x0000000A, 0x42714CA8, 0x0036004F, 0x001FF3A5, 0x00000007, 0x42714CA9, 0x000F002A, 0x001EA5D5, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EA5E7, 0x000003E8, 0x42714CA9, 0x000F002A, 0x001EA5EC, 0x0000001E, 0x42714CA9, 0x000F002A, 0x001EBCA5, 0xFF00001E, 0x42714CA9, 0x000F002A, 0x001EEEC0, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_8098C080 - .word 0x00000002, 0x0000045E, 0x00000005, 0x00010000, 0x04410000, 0x00000000, 0x428EA647, 0x00350035, 0x0028010F, 0x00000000, 0x42700000, 0x00350035, 0x00280120, 0x00000000, 0x42700000, 0x00350035, 0x00280131, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F4, 0x00000000, 0x428D3328, 0x003A0059, 0x002F01F6, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0207, 0x00000000, 0x428D3328, 0x003A0059, 0x002F0000, 0xFF000000, 0x428D3328, 0x003A0059, 0x002F0000, 0x00000006, 0x00010000, 0x045E0000, 0x00000007, 0x428D0CAF, 0x000B001D, 0x000A010F, 0x00000007, 0x428CCCC2, 0x000B001D, 0x000A0120, 0x00000007, 0x428D3328, 0x000B001D, 0x000A0131, 0x00000007, 0x428D3328, 0x001D003A, 0x001901F4, 0x0000001E, 0x428D3328, 0x001D003A, 0x001901F6, 0x000003E8, 0x428D3328, 0x001D003A, 0x00190207, 0x0000001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFF00001E, 0x428D3328, 0x001D003A, 0x00190000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_8098C1B0 - .word 0x00000005, 0x00000460, 0x0000002D, 0x00000001, 0x00050024, 0x002E002E, 0x0000002D, 0x00000001, 0x0001001E, 0x00230023, 0x00000005, 0x00010000, 0x04430000, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F1C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311F8C, 0x00000000, 0x42714CAA, 0x0029004B, 0x00311FFC, 0x00000000, 0x42714CAA, 0x0029004B, 0x0031206C, 0xFF000000, 0x42714CAA, 0x0029004B, 0x003120DC, 0x00000006, 0x00010000, 0x04600000, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F1C, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D1F8C, 0x000003E8, 0x42714CAA, 0x00180034, 0x001D1FFC, 0x0000001E, 0x42714CAA, 0x00180034, 0x001D206C, 0xFF00001E, 0x42714CAA, 0x00180034, 0x001D20DC, 0x00000003, 0x00000001, 0x000C005F, 0x00600000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel Demo_Kankyo_InitVars - .word 0x008C0100, 0x00000030, 0x00010000, 0x00000604 -.word DemoKankyo_Init -.word DemoKankyo_Destroy -.word DemoKankyo_Update -.word DemoKankyo_Draw -glabel D_8098C2F0 - .word 0x00920092, 0x00920092, 0x00920092, 0x00920001, 0x00B600B6, 0x00B600B6, 0x00B6005E, 0x005E0001, 0x00010001, 0x00000000, 0x43160000 -glabel D_8098C31C - .word 0x00C800FF, 0x32000096, 0xFFFF9600, 0xC832FFC8, 0xFF000000 -glabel D_8098C330 - .word 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000 -glabel D_8098C410 - .word 0x00000005, 0x42340000, 0x019F0245, 0xFE350000, 0x00000005, 0x42340000, 0x010D015A, 0xFF4C0000, 0x00000008, 0x42340000, 0x00A600AD, 0x00060000, 0x00000008, 0x42340000, 0x004F0066, 0x00290000, 0x00000008, 0x42340000, 0x00000025, 0x00370000, 0x00000008, 0x42340000, 0xFFE6FFFA, 0x00030000, 0x00000008, 0x42340000, 0x00010018, 0xFFD90000, 0x00000008, 0x42340000, 0x001C0032, 0xFFFF0000, 0x00000008, 0x42340000, 0x00000017, 0x00240000, 0x00000008, 0x42340000, 0xFFE60000, 0x00000000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0x00000008, 0x42340000, 0x00000000, 0xFFE50000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000, 0xFF000005, 0x42340000, 0x01CE036F, 0xFCC20000 -glabel D_8098C4F0 - .word 0x00C800FF, 0x32000096, 0xFFFF9600, 0x00FFFFC8, 0xFF000000 -glabel D_8098C504 - .word 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFF70000, 0xFFD00000, 0x00000002, 0x42340000, 0xFFD70000, 0xFFE90000, 0x00000002, 0x42340000, 0xFFD30000, 0x000A0000, 0x00000002, 0x42340000, 0xFFE80001, 0x00270000, 0x00000002, 0x42340000, 0x00150000, 0x002B0000, 0x00000002, 0x42340000, 0x002F0005, 0x000E0000, 0x00000002, 0x42340000, 0x00310005, 0xFFF50000, 0x00000002, 0x42340000, 0x00200005, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFF50005, 0xFFD10000, 0x00000002, 0x42340000, 0xFFD70006, 0xFFEA0000, 0x00000002, 0x42340000, 0xFFD50009, 0x000D0000, 0x00000002, 0x42340000, 0xFFE90009, 0x00270000, 0x00000002, 0x42340000, 0x0014000B, 0x00290000, 0x00000002, 0x42340000, 0x002D000B, 0x000F0000, 0x00000002, 0x42340000, 0x002E000B, 0xFFF00000, 0x00000002, 0x42340000, 0x001E000B, 0xFFDA0000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD30000, 0x00000002, 0x42340000, 0xFFDA000E, 0xFFEB0000, 0x00000002, 0x42340000, 0xFFD70010, 0x00080000, 0x00000002, 0x42340000, 0xFFE90010, 0x00240000, 0x00000002, 0x42340000, 0x00110010, 0x00280000, 0x00000002, 0x42340000, 0x002C0010, 0x000D0000, 0x00000002, 0x42340000, 0x002C0012, 0xFFF50000, 0x00000002, 0x42340000, 0x001F0011, 0xFFDE0000, 0x00000002, 0x42340000, 0xFFFB0014, 0xFFD50000, 0x00000002, 0x42340000, 0xFFDD0014, 0xFFEC0000, 0x00000002, 0x42340000, 0xFFDA0017, 0x00080000, 0x00000002, 0x42340000, 0xFFE80014, 0x001F0000, 0x00000002, 0x42340000, 0x000C0018, 0x00260000, 0x00000002, 0x42340000, 0x00270018, 0x000D0000, 0x00000002, 0x42340000, 0x0027001B, 0xFFF60000, 0x00000002, 0x42340000, 0x001C001A, 0xFFE20000, 0x00000002, 0x42340000, 0xFFFA000E, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD9001B, 0xFFEF0000, 0x00000002, 0x42340000, 0xFFD7001B, 0x000A0000, 0x00000002, 0x42340000, 0xFFE6001B, 0x00220000, 0x00000002, 0x42340000, 0x000F001F, 0x002C0000, 0x00000002, 0x42340000, 0x00320020, 0x00090000, 0x00000002, 0x42340000, 0x00300021, 0xFFF00000, 0x00000002, 0x42340000, 0x001C0025, 0xFFD90000, 0x00000002, 0x42340000, 0xFFFA0028, 0xFFD40000, 0x00000002, 0x42340000, 0xFFD8002B, 0xFFF50000, 0x00000002, 0x42340000, 0xFFD7002B, 0x00060000, 0x00000002, 0x42340000, 0xFFDF002B, 0x00190000, 0x00000002, 0x42340000, 0x000E002E, 0x002C0000, 0x00000002, 0x42340000, 0x0032002E, 0x00030000, 0x00000002, 0x42340000, 0x002A0030, 0xFFE70000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0xFF000002, 0x42340000, 0xFFF6002B, 0xFFD40000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_kankyo.reloc.s b/data/overlays/actors/z_demo_kankyo.reloc.s deleted file mode 100644 index 427c0db769..0000000000 --- a/data/overlays/actors/z_demo_kankyo.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_8098CB60 - .incbin "baserom/ovl_Demo_Kankyo", 0x3CE0, 0x00000420 diff --git a/data/overlays/actors/z_en_cs.data.s b/data/overlays/actors/z_en_cs.data.s deleted file mode 100644 index 80c334366d..0000000000 --- a/data/overlays/actors/z_en_cs.data.s +++ /dev/null @@ -1,32 +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_Cs_InitVars - .word 0x016C0400, 0x00000009, 0x01450000, 0x00000344 -.word EnCs_Init -.word EnCs_Destroy -.word EnCs_Update -.word EnCs_Draw -glabel D_809E28C0 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0012003F, 0x00000000, 0x00000000 -glabel D_809E28EC - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_809E28F8 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_809E2918 - .word 0x06000700, 0x3F800000, 0x02000000, 0xC1200000, 0x06000E10, 0x3F800000, 0x02000000, 0xC1200000, 0x06001588, 0x3F800000, 0x02000000, 0xC1200000, 0x0600195C, 0x3F800000, 0x02000000, 0xC1200000 -glabel D_809E2958 - .word 0x00000046, 0x00000001, 0x00000001 -glabel D_809E2964 - .word 0x06002130, 0x06002930, 0x06003130 -glabel D_809E2970 - .word 0x43FA0000, 0x44480000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_cs.reloc.s b/data/overlays/actors/z_en_cs.reloc.s deleted file mode 100644 index 0a135ddf34..0000000000 --- a/data/overlays/actors/z_en_cs.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_809E29E0 - .incbin "baserom/ovl_En_Cs", 0x1130, 0x00000150 diff --git a/data/overlays/actors/z_en_daiku_kakariko.data.s b/data/overlays/actors/z_en_daiku_kakariko.data.s deleted file mode 100644 index b166990f1c..0000000000 --- a/data/overlays/actors/z_en_daiku_kakariko.data.s +++ /dev/null @@ -1,34 +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_Daiku_Kakariko_InitVars - .word 0x01BC0400, 0x00000019, 0x01220000, 0x00000308 -.word EnDaikuKakariko_Init -.word EnDaikuKakariko_Destroy -.word EnDaikuKakariko_Update -.word EnDaikuKakariko_Draw -glabel D_809E54B0 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00120042, 0x00000000, 0x00000000 -glabel D_809E54DC - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_809E54E8 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_809E5508 - .word 0x06001AB0, 0x3F800000, 0x02000000, 0xC0E00000, 0x06007DE0, 0x3F800000, 0x00000000, 0xC0E00000, 0x0600885C, 0x3F800000, 0x00000000, 0xC0E00000, 0x06000C44, 0x3F800000, 0x00000000, 0xC0E00000, 0x06000600, 0x3F800000, 0x00000000, 0xC0E00000, 0x06008164, 0x3F800000, 0x00000000, 0xC0E00000 -glabel D_809E5568 - .word 0x008000B0, 0x00700470 -glabel D_809E5570 - .word 0x00000001, 0x00000002, 0x00000003, 0x00000004 -glabel D_809E5580 - .word 0x06005BD0, 0x06005AC0, 0x06005990, 0x06005880 -glabel D_809E5590 - .word 0x442F0000, 0x44898000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_daiku_kakariko.reloc.s b/data/overlays/actors/z_en_daiku_kakariko.reloc.s deleted file mode 100644 index 269a6bbfb8..0000000000 --- a/data/overlays/actors/z_en_daiku_kakariko.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_809E5640 - .incbin "baserom/ovl_En_Daiku_Kakariko", 0x1320, 0x00000190 diff --git a/data/overlays/actors/z_en_dodojr.data.s b/data/overlays/actors/z_en_dodojr.data.s deleted file mode 100644 index 3ccf6fc73f..0000000000 --- a/data/overlays/actors/z_en_dodojr.data.s +++ /dev/null @@ -1,44 +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_Dodojr_InitVars - .word 0x002F0500, 0x00000005, 0x001F0000, 0x000002C0 -.word EnDodojr_Init -.word EnDodojr_Destroy -.word EnDodojr_Update -.word EnDodojr_Draw -glabel D_809F7EB0 - .word 0x06110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFC5FFFF, 0x00000000, 0x01010100, 0x00120014, 0x00000000, 0x00000000 -glabel D_809F7EDC - .word 0x01000002, 0x00190019, 0xFF000000 -glabel D_809F7EE8 - .word 0xAA825AFF -glabel D_809F7EEC - .word 0x643C1400 -glabel D_809F7EF0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7EFC - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F08 - .word 0xAA825AFF -glabel D_809F7F0C - .word 0x643C1400 -glabel D_809F7F10 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7F1C - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F28 - .word 0x47C34F80, 0x47C34F80, 0x47C34F80 -glabel D_809F7F34 - .word 0x00000000, 0x43520000, 0x42700000, 0x43870000, 0x42F00000, 0x43A50000, 0x43340000, 0x41F00000, 0x43700000, 0x42B40000, 0x43960000, 0x43160000 -glabel D_809F7F64 - .word 0x43F00000, 0x441B0000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dodojr.reloc.s b/data/overlays/actors/z_en_dodojr.reloc.s deleted file mode 100644 index 6941af72dd..0000000000 --- a/data/overlays/actors/z_en_dodojr.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_809F7FA0 - .incbin "baserom/ovl_En_Dodojr", 0x1BE0, 0x000002B0 diff --git a/data/overlays/actors/z_en_du.data.s b/data/overlays/actors/z_en_du.data.s deleted file mode 100644 index 5423aac4ce..0000000000 --- a/data/overlays/actors/z_en_du.data.s +++ /dev/null @@ -1,38 +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_Du_InitVars - .word 0x00980400, 0x02000009, 0x009D0000, 0x0000021C -.word EnDu_Init -.word EnDu_Destroy -.word EnDu_Update -.word EnDu_Draw -glabel D_809FF230 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0014002E, 0x00000000, 0x00000000 -glabel D_809FF25C - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_809FF268 - .word 0x06006EB0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06006EB0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x06000800, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x06000D00, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x06001D70, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x06002374, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x0600288C, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x06002D94, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC1200000, 0x06002D94, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0x00000000, 0x06003D48, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0x00000000, 0x06004C04, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0x00000000, 0x06003A30, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0x00000000, 0x060046F4, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06004ED8, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0x00000000, 0x060041F4, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC0C00000 -glabel D_809FF3D0 - .word 0x00000008, 0x00000008, 0x00000008, 0x00000008, 0x00000009, 0x0000000A, 0x0000000A, 0x0000000D -glabel D_809FF3F0 - .word 0x00000008, 0x00000008, 0x0000000B, 0x0000000C -glabel D_809FF400 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809FF40C - .word 0x00000000, 0xC47A0000, 0x00000000 -glabel D_809FF418 - .word 0x06008080, 0x06008480, 0x06008880, 0x0600A540 -glabel D_809FF428 - .word 0x06008C80, 0x06009D40, 0x0600A940, 0x0600B180 -glabel D_809FF438 - .word 0x06007FC0, 0x0600B140 - diff --git a/data/overlays/actors/z_en_du.reloc.s b/data/overlays/actors/z_en_du.reloc.s deleted file mode 100644 index 9f197bec60..0000000000 --- a/data/overlays/actors/z_en_du.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_809FF4A0 - .incbin "baserom/ovl_En_Du", 0x1870, 0x00000250 diff --git a/data/overlays/actors/z_en_fz.data.s b/data/overlays/actors/z_en_fz.data.s deleted file mode 100644 index 8ba44e7ba2..0000000000 --- a/data/overlays/actors/z_en_fz.data.s +++ /dev/null @@ -1,35 +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_Fz_InitVars - .word 0x01210500, 0x00000415, 0x01140000, 0x00000BD4 -.word EnFz_Init -.word EnFz_Destroy -.word EnFz_Update -.word EnFz_Draw -glabel D_80A21B90 - .word 0x0A110939, 0x01000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCE0FDB, 0x00000000, 0x01050100, 0x001E0050, 0x00000000, 0x00000000 -glabel D_80A21BBC - .word 0x09000D00, 0x01000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x0001F024, 0x00000000, 0x00010000, 0x00230050, 0x00000000, 0x00000000 -glabel D_80A21BE8 - .word 0x0A110000, 0x01000000, 0x00000000, 0x20000000, 0x02080000, 0x00000000, 0x00000000, 0x01000000, 0x0014001E, 0xFFF10000, 0x00000000 -glabel D_80A21C14 - .word 0x00F0F0F2, 0xF0F0F2F2, 0xF0F2F424, 0xF0F0F0F0, 0xF0240000, 0x0000F0F4, 0xF2F0F8F4, 0x00000000 -glabel D_80A21C34 - .word 0x8917003B, 0x801F0002, 0x304C001E -glabel jtbl_80A21C40 -.word L80A202F4 -.word func_80A202FC -.word func_80A203DC -.word func_80A203DC -glabel D_80A21C50 - .word 0x06001130, 0x060021A0, 0x06002CA0, 0x00000000 - diff --git a/data/overlays/actors/z_en_fz.reloc.s b/data/overlays/actors/z_en_fz.reloc.s deleted file mode 100644 index 51653421d5..0000000000 --- a/data/overlays/actors/z_en_fz.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_80A21CF0 - .incbin "baserom/ovl_En_Fz", 0x1F30, 0x000001D0 diff --git a/data/overlays/actors/z_en_ge3.data.s b/data/overlays/actors/z_en_ge3.data.s deleted file mode 100644 index 4cdd41abd3..0000000000 --- a/data/overlays/actors/z_en_ge3.data.s +++ /dev/null @@ -1,30 +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_Ge3_InitVars - .word 0x01D00400, 0x00000019, 0x01690000, 0x00000314 -.word EnGe3_Init -.word EnGe3_Destroy -.word EnGe3_Update -.word EnGe3_Draw -glabel D_80A35190 - .word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000722, 0x00000000, 0x00010100, 0x00140032, 0x00000000, 0x00000000 -glabel D_80A351BC - .word func_80A34A80 -glabel D_80A351C0 - .word 0x0600B07C -glabel D_80A351C4 - .word 0x00000000 -glabel D_80A351C8 - .word 0x44160000, 0x442F0000, 0x00000000 -glabel D_80A351D4 - .word 0x06005FE8, 0x060065A8, 0x06006D28 - diff --git a/data/overlays/actors/z_en_ge3.reloc.s b/data/overlays/actors/z_en_ge3.reloc.s deleted file mode 100644 index 70a8f96e37..0000000000 --- a/data/overlays/actors/z_en_ge3.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_80A35220 - .incbin "baserom/ovl_En_Ge3", 0xC00, 0x000000F0 diff --git a/data/overlays/actors/z_en_go.data.s b/data/overlays/actors/z_en_go.data.s deleted file mode 100644 index b4c4d85576..0000000000 --- a/data/overlays/actors/z_en_go.data.s +++ /dev/null @@ -1,42 +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_Go_InitVars - .word 0x01520400, 0x00000039, 0x00C90000, 0x000006C8 -.word EnGo_Init -.word EnGo_Destroy -.word EnGo_Update -.word EnGo_Draw -glabel D_80A41B00 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0014002E, 0x00000000, 0x00000000 -glabel D_80A41B2C - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_80A41B38 - .word 0x06004930, 0x00000000, 0x01000000, 0x00000000, 0x06004930, 0x00000000, 0x01000000, 0xC1200000, 0x060029A8, 0x3F800000, 0x01000000, 0xC1200000, 0x06010590, 0x3F800000, 0x01000000, 0xC1200000 -glabel D_80A41B78 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41B84 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41B90 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80A41B9C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41BA8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41BB4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41BC0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A41BCC - .word 0x44160000, 0x00000000, 0x00000000 -glabel D_80A41BD8 - .word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_go.reloc.s b/data/overlays/actors/z_en_go.reloc.s deleted file mode 100644 index d5725ad277..0000000000 --- a/data/overlays/actors/z_en_go.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_80A422E0 - .incbin "baserom/ovl_En_Go", 0x3D70, 0x00000A50 diff --git a/data/overlays/actors/z_en_go.rodata.s b/data/overlays/actors/z_en_go.rodata.s deleted file mode 100644 index d7fd38f369..0000000000 --- a/data/overlays/actors/z_en_go.rodata.s +++ /dev/null @@ -1,502 +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_80A41C00 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C10 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C20 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C30 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C40 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C50 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C60 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C70 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C80 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41C90 - .asciz "../z_en_go.c" - .balign 4 - -glabel D_80A41CA0 - .asciz "../z_en_go.c" - .balign 4 - -glabel jtbl_80A41CB0 - .word L80A3E658 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E70C - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E72C - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E78C - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E7D4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E81C - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E864 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8F4 - .word L80A3E8AC - -glabel jtbl_80A41E74 - .word L80A3ED10 - .word L80A3ED10 - .word L80A3E970 - .word L80A3ED10 - .word L80A3EAE0 - .word L80A3EC88 - .word L80A3ECF8 - .word L80A3ED10 - .word L80A3ED10 - .word L80A3ED10 - -glabel jtbl_80A41E9C - .word L80A3EA54 - .word L80A3EA88 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAA4 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAC8 - .word L80A3EAD8 - .word L80A3EAC8 - .word L80A3EAC8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAC0 - .word L80A3EAC8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD0 - -glabel jtbl_80A41F40 - .word L80A3E9C8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3E9E4 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EAD8 - .word L80A3EA00 - .word L80A3EAD8 - .word L80A3EA1C - .word L80A3EAD8 - .word L80A3EA38 - -glabel jtbl_80A41F84 - .word L80A3F02C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F02C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F03C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F02C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F02C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F04C - .word L80A3F02C - -glabel D_80A420C8 - .float 10920.0 - -glabel D_80A420CC - .float 0.01 - -glabel D_80A420D0 - .float 10000.0 - -glabel D_80A420D4 - .float 4.8 - -glabel D_80A420D8 - .float 10430.3779 - -glabel D_80A420DC - .float 0.01 - -glabel D_80A420E0 - .float 4.8 - -glabel jtbl_80A420E4 - .word L80A3FCC8 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FD50 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE38 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FDD8 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FD90 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE38 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE38 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE60 - .word L80A3FE38 - -glabel D_80A422A8 - .float 1440000.0 - -glabel D_80A422AC - .float 0.1 - -glabel D_80A422B0 - .float 0.1 - -glabel D_80A422B4 - .float 0.1 - -glabel D_80A422B8 - .float 0.1 - -glabel D_80A422BC - .float -0.1 - -glabel D_80A422C0 - .float 0.1 - -glabel D_80A422C4 - .float 3.14159274101 - -glabel D_80A422C8 - .float 3.14159274101 - -glabel D_80A422CC - .float 3.14159274101 - -glabel D_80A422D0 - .float 3.14159274101 - -glabel D_80A422D4 - .float 0.2 - -glabel D_80A422D8 - .float 0.4 - diff --git a/data/overlays/actors/z_en_go2.data.s b/data/overlays/actors/z_en_go2.data.s deleted file mode 100644 index d4e8e31557..0000000000 --- a/data/overlays/actors/z_en_go2.data.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80A480D0 - .word gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex -glabel D_80A480F0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A480FC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A48108 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80A48114 - .word 0x0A000939, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00000100, 0x00280041, 0x00000000, 0x00000000 -glabel D_80A48140 - .word 0x00000000, 0x00000000, 0xFF000000 -glabel En_Go2_InitVars - .word 0x01AE0400, 0x00000039, 0x00C90000, 0x000005A0 -.word EnGo2_Init -.word EnGo2_Destroy -.word EnGo2_Update -.word EnGo2_Draw -glabel D_80A4816C - .byte 0x00, 0x00 -glabel D_80A4816E - .byte 0x00, 0x00 -glabel D_80A48170 - .word 0x00000044 -glabel D_80A48174 - .word 0x00940000, 0x00000000, 0x00180034, 0x00000140, 0x017C0190, 0x00780000, 0x00000000, 0x001E0044, 0x00000000, 0x0000002E, 0x005A0000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044, 0x00000000, 0x0000001E, 0x00440000, 0x00000000, 0x001E0044 -glabel D_80A481F8 - .word 0x41F00000, 0x3CD4FDF4, 0x06000000, 0x42700000, 0x41C00000, 0x3C03126F, 0x06000000, 0x41F00000, 0x41E00000, 0x3E23D70A, 0x05000000, 0x43BE0000, 0x41E00000, 0x3C23D70A, 0x07000000, 0x42200000, 0x41F00000, 0x3C75C28F, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000, 0x41E00000, 0x3C23D70A, 0x06000000, 0x41F00000 -glabel D_80A482D8 - .word 0x42A00000, 0x42A00000, 0xC1200000, 0xC1200000, 0x44480000, 0x44480000, 0x00000000, 0x00000000, 0x41A00000, 0x42200000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000, 0x41A00000 -glabel D_80A48348 - .word 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060029A8, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06010590, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06003768, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060038E4, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC1000000, 0x06002D80, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xC1000000, 0x0600161C, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06001A00, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x060021D0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06004930, 0x00000000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000, 0x06000750, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06000D5C, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000 -glabel D_80A48480 - .word 0x0C000000, 0x3E4CCCCD, 0x3E4CCCCD, 0x00000001, 0x41900000, 0x00000000, 0x0C000000, 0x3DCCCCCD, 0x3E4CCCCD, 0x0000000C, 0x41D00000, 0x00000000, 0x0C000000, 0x3DCCCCCD, 0x3E99999A, 0x00000004, 0x41200000, 0x00000000, 0x0C000000, 0x3E4CCCCD, 0x3E4CCCCD, 0x00000001, 0x41900000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x0C000000, 0x3F000000, 0x3ECCCCCD, 0x00000003, 0x42280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80A4854C - .word 0x00000000, 0x00000000 -glabel D_80A48554 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A48560 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A4856C - .word 0x44160000, 0x00000000, 0x00000000 -glabel D_80A48578 - .word 0x0600DA80, 0x0600CE80, 0x0600D280, 0x0600D680 -glabel D_80A48588 - .word 0x0600DE80, 0x0600E680 - diff --git a/data/overlays/actors/z_en_go2.reloc.s b/data/overlays/actors/z_en_go2.reloc.s deleted file mode 100644 index 721d7674c5..0000000000 --- a/data/overlays/actors/z_en_go2.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_80A487E0 - .incbin "baserom/ovl_En_Go2", 0x5AB0, 0x000006E0 diff --git a/data/overlays/actors/z_en_mk.data.s b/data/overlays/actors/z_en_mk.data.s deleted file mode 100644 index 834fa7f19b..0000000000 --- a/data/overlays/actors/z_en_mk.data.s +++ /dev/null @@ -1,22 +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_Mk_InitVars - .word 0x014A0400, 0x00000019, 0x01320000, 0x00000288 -.word EnMk_Init -.word EnMk_Destroy -.word EnMk_Update -.word EnMk_Draw -glabel D_80AAD620 - .word 0x0A001139, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x001E0028, 0x00000000, 0x00000000 -glabel D_80AAD64C - .word 0x447A0000, 0xC2C80000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_mk.reloc.s b/data/overlays/actors/z_en_mk.reloc.s deleted file mode 100644 index 95e713957b..0000000000 --- a/data/overlays/actors/z_en_mk.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_80AAD670 - .incbin "baserom/ovl_En_Mk", 0xD70, 0x00000100 diff --git a/data/overlays/actors/z_en_ny.data.s b/data/overlays/actors/z_en_ny.data.s deleted file mode 100644 index 07eb2a9886..0000000000 --- a/data/overlays/actors/z_en_ny.data.s +++ /dev/null @@ -1,33 +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_Ny_InitVars - .word 0x00EC0500, 0x00000005, 0x00E50000, 0x000002B8 -.word EnNy_Init -.word EnNy_Destroy -.word EnNy_Update -.word EnNy_Draw -glabel D_80ABE330 - .word 0x00000000, 0xFFCFFFFF, 0x04080000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x00000000, 0x00000000, 0x000F0064 -glabel D_80ABE354 - .word 0x0A110939, 0x10000000, 0x00000001 -.word D_80ABE330 -glabel D_80ABE364 - .word 0x000000F2, 0x00F2F212, 0x00F2F424, 0xF2F2E400, 0x00240000, 0x000000F4, 0xF200F8F4, 0x00000000 -glabel D_80ABE384 - .word 0x89170028, 0x801F0002, 0x304C001E -glabel D_80ABE390 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ABE39C - .word 0x00000000, 0x3DCCCCCD, 0x00000000 -glabel D_80ABE3A8 - .word 0x40A00000, 0x00000000, 0x00000000, 0xC0A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40A00000, 0x00000000, 0x00000000, 0xC0A00000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ny.reloc.s b/data/overlays/actors/z_en_ny.reloc.s deleted file mode 100644 index 0503963d1e..0000000000 --- a/data/overlays/actors/z_en_ny.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_80ABE4F0 - .incbin "baserom/ovl_En_Ny", 0x1940, 0x000001B0 diff --git a/data/overlays/actors/z_en_sa.data.s b/data/overlays/actors/z_en_sa.data.s deleted file mode 100644 index 04d9131841..0000000000 --- a/data/overlays/actors/z_en_sa.data.s +++ /dev/null @@ -1,34 +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_Sa_InitVars - .word 0x01460400, 0x02000019, 0x00BC0000, 0x000002EC -.word EnSa_Init -.word EnSa_Destroy -.word EnSa_Update -.word EnSa_Draw -glabel D_80AF7260 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0014002E, 0x00000000, 0x00000000 -glabel D_80AF728C - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_80AF7298 - .word 0x060021D8, 0x3F800000, 0x00000000, 0x00000000, 0x0600E908, 0x3F800000, 0x02000000, 0xC1200000, 0x0600F1D4, 0x3F800000, 0x00000000, 0xC1200000, 0x0600EBB0, 0x3F800000, 0x00000000, 0xC1200000, 0x060021D8, 0x3F800000, 0x00000000, 0xC1200000, 0x06010C44, 0x3F800000, 0x00000000, 0xC1200000, 0x0600BAEC, 0x3F800000, 0x00000000, 0xC1200000, 0x0600C500, 0x3F800000, 0x02000000, 0xC1200000, 0x06001D50, 0x3F800000, 0x02000000, 0xC1200000, 0x0600CFD8, 0x3F800000, 0x02000000, 0xC1200000, 0x0600D7E8, 0x3F800000, 0x02000000, 0xC1200000, 0x0600BAEC, 0x3F800000, 0x00000000, 0x00000000 -glabel D_80AF7358 - .word 0x0601291C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06011580, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0800000, 0x06013008, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x0601186C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06014470, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06014850, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06011C38, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06012100, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06015220, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x060021D8, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000 -glabel D_80AF7448 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AF7454 - .word 0x43C80000, 0x00000000, 0x00000000 -glabel D_80AF7460 - .word 0x06003588, 0x06004448, 0x06004648, 0x06004C48, 0x06003348 -glabel D_80AF7474 - .word 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_sa.reloc.s b/data/overlays/actors/z_en_sa.reloc.s deleted file mode 100644 index 710d1cf897..0000000000 --- a/data/overlays/actors/z_en_sa.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80AF7520 - .incbin "baserom/ovl_En_Sa", 0x1FC0, 0x000002D0 diff --git a/data/overlays/actors/z_en_tr.data.s b/data/overlays/actors/z_en_tr.data.s deleted file mode 100644 index aa4c73bdf5..0000000000 --- a/data/overlays/actors/z_en_tr.data.s +++ /dev/null @@ -1,39 +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_Tr_InitVars - .word 0x00CC0400, 0x00000010, 0x00C10000, 0x000002E8 -.word EnTr_Init -.word EnTr_Destroy -.word EnTr_Update -.word EnTr_Draw -.word 0x06003FC8, 0x06001CDC -glabel D_80B24368 - .word 0x06002BC4, 0x06000BFC -glabel D_80B24370 - .word 0x060035CC, 0x060013CC -glabel D_80B24378 - .word 0x060049C8, 0x060049C8 -glabel D_80B24380 - .word 0x06012E1C, 0x06012E1C -glabel D_80B24388 - .word 0x00000000, 0x41A00000, 0xC1F00000, 0x41A00000, 0xC1A00000, 0xC1A00000, 0x41F00000 -glabel D_80B243A4 - .word 0x00000000, 0x41F00000, 0x00000000, 0xC1F00000, 0x41F00000, 0xC1F00000, 0x00000000 -glabel D_80B243C0 - .word 0xFFC800FF, 0xFF0000FF, 0xFFFFFFFF, 0x0000FFFF -glabel D_80B243D0 - .word 0x060086D8, 0x060094D8, 0x060098D8 -glabel D_80B243DC - .word 0x450FC000, 0x00000000, 0xC4160000 -glabel D_80B243E8 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 06294f143c..3680951e69 100644 --- a/include/functions.h +++ b/include/functions.h @@ -507,7 +507,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha); s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3); -void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2); +void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* animations, s32 index); void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3); void Actor_Noop(Actor* actor, GlobalContext* globalCtx); void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist); @@ -2599,6 +2599,7 @@ void func_8010B720(GlobalContext* globalCtx, u16 textId); // ? func_8010B820(?); // ? func_8010BD58(?); void func_8010BD58(GlobalContext* globalCtx, u16 arg1); +void func_8010BD88(GlobalContext* globalCtx, u16 arg1); u8 func_8010BDBC(MessageContext* msgCtx); // ? func_8010BED8(?); // ? func_8010C358(?); diff --git a/include/z64.h b/include/z64.h index 833994027c..d41e18854f 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1038,9 +1038,9 @@ typedef enum { typedef struct { /* 0x00 */ AnimationHeader* animation; /* 0x04 */ f32 playbackSpeed; - /* 0x08 */ f32 unk_08; + /* 0x08 */ f32 startFrame; /* 0x0C */ f32 frameCount; - /* 0x10 */ u8 unk_10; + /* 0x10 */ u8 mode; /* 0x14 */ f32 transitionRate; } struct_80034EC0_Entry; // size = 0x18 @@ -1048,7 +1048,7 @@ typedef struct { typedef struct { /* 0x00 */ AnimationHeader* animation; /* 0x04 */ f32 frameCount; - /* 0x08 */ u8 unk_08; + /* 0x08 */ u8 mode; /* 0x0C */ f32 transitionRate; } struct_D_80AA1678; // size = 0x10 @@ -1061,7 +1061,7 @@ typedef struct { /* 0x0E */ Vec3s unk_0E; /* 0x14 */ f32 unk_14; /* 0x18 */ Vec3f unk_18; - /* 0x24 */ char unk_24[0x4]; + /* 0x24 */ s16 unk_24; } struct_80034A14_arg1; // size = 0x28 typedef struct { diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index f09810de94..0a6f8a2d0c 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -1,5 +1,5 @@ -#ifndef _Z64CUTSCENE_CMMANDS_H_ -#define _Z64CUTSCENE_CMMANDS_H_ +#ifndef _Z64CUTSCENE_COMMANDS_H_ +#define _Z64CUTSCENE_COMMANDS_H_ #include "command_macros_base.h" #include "z64cutscene.h" diff --git a/progress.py b/progress.py index c7feb32ea4..cdba597df8 100755 --- a/progress.py +++ b/progress.py @@ -98,7 +98,7 @@ boot -= nonMatchingASMBoot ovl -= nonMatchingASMOvl asm += nonMatchingASM -bootSize = 30704 # decompilable code only +bootSize = 31408 # decompilable code only codeSize = 1004128 # .text section except rsp bins (1.00mb) ovlSize = 2812000 # .text sections handwritten = 5840 # boot only diff --git a/spec b/spec index 808e8e487d..2b40418ae4 100644 --- a/spec +++ b/spec @@ -32,7 +32,7 @@ beginseg include "build/src/libultra_boot_O1/osViModePalLan1.o" include "build/src/libultra_boot_O1/osRecvMesg.o" include "build/src/libultra_boot_O1/initialize.o" - include "build/asm/libm.o" + include "build/src/libultra_boot_O1/ll.o" include "build/asm/exceptasm.o" include "build/src/libultra_boot_O1/__osDequeueThread.o" include "build/src/libultra_boot_O1/osDestroyThread.o" @@ -1139,8 +1139,7 @@ endseg beginseg name "ovl_Bg_Spot00_Hanebasi" include "build/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.o" - include "build/data/overlays/actors/z_bg_spot00_hanebasi.data.o" - include "build/data/overlays/actors/z_bg_spot00_hanebasi.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/ovl_Bg_Spot00_Hanebasi_reloc.o" endseg beginseg @@ -1518,8 +1517,7 @@ endseg beginseg name "ovl_Demo_Ik" include "build/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.o" - include "build/data/overlays/actors/z_demo_ik.data.o" - include "build/data/overlays/actors/z_demo_ik.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Ik/ovl_Demo_Ik_reloc.o" endseg beginseg @@ -1530,10 +1528,16 @@ endseg beginseg name "ovl_Demo_Kankyo" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.o" include "build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o" - include "build/data/overlays/actors/z_demo_kankyo.data.o" - include "build/data/overlays/actors/z_demo_kankyo.bss.o" - include "build/data/overlays/actors/z_demo_kankyo.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Kankyo/ovl_Demo_Kankyo_reloc.o" endseg beginseg @@ -2042,8 +2046,7 @@ endseg beginseg name "ovl_En_Cs" include "build/src/overlays/actors/ovl_En_Cs/z_en_cs.o" - include "build/data/overlays/actors/z_en_cs.data.o" - include "build/data/overlays/actors/z_en_cs.reloc.o" + include "build/src/overlays/actors/ovl_En_Cs/ovl_En_Cs_reloc.o" endseg beginseg @@ -2059,8 +2062,7 @@ endseg beginseg name "ovl_En_Daiku_Kakariko" include "build/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.o" - include "build/data/overlays/actors/z_en_daiku_kakariko.data.o" - include "build/data/overlays/actors/z_en_daiku_kakariko.reloc.o" + include "build/src/overlays/actors/ovl_En_Daiku_Kakariko/ovl_En_Daiku_Kakariko_reloc.o" endseg beginseg @@ -2126,8 +2128,7 @@ endseg beginseg name "ovl_En_Dodojr" include "build/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.o" - include "build/data/overlays/actors/z_en_dodojr.data.o" - include "build/data/overlays/actors/z_en_dodojr.reloc.o" + include "build/src/overlays/actors/ovl_En_Dodojr/ovl_En_Dodojr_reloc.o" endseg beginseg @@ -2157,8 +2158,7 @@ endseg beginseg name "ovl_En_Du" include "build/src/overlays/actors/ovl_En_Du/z_en_du.o" - include "build/data/overlays/actors/z_en_du.data.o" - include "build/data/overlays/actors/z_en_du.reloc.o" + include "build/src/overlays/actors/ovl_En_Du/ovl_En_Du_reloc.o" endseg beginseg @@ -2282,8 +2282,7 @@ endseg beginseg name "ovl_En_Fz" include "build/src/overlays/actors/ovl_En_Fz/z_en_fz.o" - include "build/data/overlays/actors/z_en_fz.data.o" - include "build/data/overlays/actors/z_en_fz.reloc.o" + include "build/src/overlays/actors/ovl_En_Fz/ovl_En_Fz_reloc.o" endseg beginseg @@ -2330,8 +2329,7 @@ endseg beginseg name "ovl_En_Ge3" include "build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o" - include "build/data/overlays/actors/z_en_ge3.data.o" - include "build/data/overlays/actors/z_en_ge3.reloc.o" + include "build/src/overlays/actors/ovl_En_Ge3/ovl_En_Ge3_reloc.o" endseg beginseg @@ -2355,16 +2353,13 @@ endseg beginseg name "ovl_En_Go" include "build/src/overlays/actors/ovl_En_Go/z_en_go.o" - include "build/data/overlays/actors/z_en_go.data.o" - include "build/data/overlays/actors/z_en_go.rodata.o" - include "build/data/overlays/actors/z_en_go.reloc.o" + include "build/src/overlays/actors/ovl_En_Go/ovl_En_Go_reloc.o" endseg beginseg name "ovl_En_Go2" include "build/src/overlays/actors/ovl_En_Go2/z_en_go2.o" - include "build/data/overlays/actors/z_en_go2.data.o" - include "build/data/overlays/actors/z_en_go2.reloc.o" + include "build/src/overlays/actors/ovl_En_Go2/ovl_En_Go2_reloc.o" endseg beginseg @@ -2672,8 +2667,7 @@ endseg beginseg name "ovl_En_Mk" include "build/src/overlays/actors/ovl_En_Mk/z_en_mk.o" - include "build/data/overlays/actors/z_en_mk.data.o" - include "build/data/overlays/actors/z_en_mk.reloc.o" + include "build/src/overlays/actors/ovl_En_Mk/ovl_En_Mk_reloc.o" endseg beginseg @@ -2742,8 +2736,7 @@ endseg beginseg name "ovl_En_Ny" include "build/src/overlays/actors/ovl_En_Ny/z_en_ny.o" - include "build/data/overlays/actors/z_en_ny.data.o" - include "build/data/overlays/actors/z_en_ny.reloc.o" + include "build/src/overlays/actors/ovl_En_Ny/ovl_En_Ny_reloc.o" endseg beginseg @@ -2879,8 +2872,7 @@ endseg beginseg name "ovl_En_Sa" include "build/src/overlays/actors/ovl_En_Sa/z_en_sa.o" - include "build/data/overlays/actors/z_en_sa.data.o" - include "build/data/overlays/actors/z_en_sa.reloc.o" + include "build/src/overlays/actors/ovl_En_Sa/ovl_En_Sa_reloc.o" endseg beginseg @@ -3061,8 +3053,11 @@ endseg beginseg name "ovl_En_Tr" include "build/src/overlays/actors/ovl_En_Tr/z_en_tr.o" - include "build/data/overlays/actors/z_en_tr.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Tr/ovl_En_Tr_reloc.o" +#else include "build/data/overlays/actors/z_en_tr.reloc.o" +#endif endseg beginseg @@ -4781,7 +4776,8 @@ endseg beginseg name "object_ny" romalign 0x1000 - include "build/baserom/object_ny.o" + include "build/assets/objects/object_ny/object_ny.o" + number 6 endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c4661629a3..f6ba831ddf 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3859,19 +3859,19 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { return arg2; } -void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) { +void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* animations, s32 index) { f32 frameCount; - arg1 += arg2; + animations += index; - if (arg1->frameCount > 0.0f) { - frameCount = arg1->frameCount; + if (animations->frameCount > 0.0f) { + frameCount = animations->frameCount; } else { - frameCount = Animation_GetLastFrame(arg1->animation); + frameCount = Animation_GetLastFrame(animations->animation); } - Animation_Change(skelAnime, arg1->animation, arg1->playbackSpeed, arg1->unk_08, frameCount, arg1->unk_10, - arg1->transitionRate); + Animation_Change(skelAnime, animations->animation, animations->playbackSpeed, animations->startFrame, frameCount, + animations->mode, animations->transitionRate); } void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3) { diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 3c3666a72d..33ae1a9777 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -7754,7 +7754,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { return -2; } } - if (((setting == CAM_SET_SPOT05A) || (setting == CAM_SET_SPOT05B)) && (gSaveContext.linkAge == 0) && + if (((setting == CAM_SET_SPOT05A) || (setting == CAM_SET_SPOT05B)) && (LINK_IS_ADULT) && (camera->globalCtx->sceneNum == SCENE_SPOT05)) { camera->unk_14A |= 0x10; return -5; diff --git a/src/libultra_boot_O1/ll.c b/src/libultra_boot_O1/ll.c new file mode 100644 index 0000000000..9d87204d1e --- /dev/null +++ b/src/libultra_boot_O1/ll.c @@ -0,0 +1,47 @@ +#include "global.h" + +s64 __ull_rshift(u64 l, s64 r) { + return l >> r; +} + +u64 __ull_rem(u64 l, u64 r) { + return l % r; +} + +u64 __ull_div(u64 l, u64 r) { + return l / r; +} + +s64 __ll_lshift(s64 l, s64 r) { + return l << r; +} + +s64 __ll_rem(s64 l, u64 r) { + return l % r; +} + +s64 __ll_div(s64 l, s64 r) { + return l / r; +} + +s64 __ll_mul(s64 l, s64 r) { + return l * r; +} + +void __ull_divremi(u64* quotient, u64* remainder, u64 dividend, u16 divisor) { + *quotient = dividend / divisor; + *remainder = dividend % divisor; +} + +s64 __ll_mod(s64 l, s64 r) { + s64 remainder = l % r; + + if (((remainder < 0) && (r > 0)) || ((remainder > 0) && (r < 0))) { + remainder += r; + } + return remainder; +} + +s64 __ll_rshift(s64 l, s64 r) { + return l >> r; +} diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index b9888508d7..eed1f4e283 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_spot00_hanebasi.c + * Overlay: ovl_Bg_Spot00_Hanebasi + * Description: Hyrule Field Drawbridge and Torches + */ + #include "z_bg_spot00_hanebasi.h" #include "objects/gameplay_keep/gameplay_keep.h" @@ -5,17 +11,26 @@ #define THIS ((BgSpot00Hanebasi*)thisx) +typedef enum { + /* -1 */ DT_DRAWBRIDGE = -1, + /* 0 */ DT_CHAIN_1, + /* 1 */ DT_CHAIN_2 +} DrawbridgeType; + void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx); void BgSpot00Hanebasi_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgSpot00Hanebasi_Update(Actor* thisx, GlobalContext* globalCtx); void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060000C0; -extern UNK_TYPE D_06000280; -extern UNK_TYPE D_06000430; -extern UNK_TYPE D_060005E0; +void BgSpot00Hanebasi_DrawBridgeWait(BgSpot00Hanebasi* this, GlobalContext* globalCtx); +void BgSpot00Hanebasi_DrawBridgeRiseAndFall(BgSpot00Hanebasi* this, GlobalContext* globalCtx); +void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, GlobalContext* globalCtx); + +extern Gfx D_060000C0[]; // bridge chains +extern CollisionHeader D_06000280; // chains collision +extern Gfx D_06000430[]; // drawbridge +extern CollisionHeader D_060005E0; // drawbridge collision -/* const ActorInit Bg_Spot00_Hanebasi_InitVars = { ACTOR_BG_SPOT00_HANEBASI, ACTORCAT_BG, @@ -27,21 +42,298 @@ const ActorInit Bg_Spot00_Hanebasi_InitVars = { (ActorFunc)BgSpot00Hanebasi_Update, (ActorFunc)BgSpot00Hanebasi_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Destroy.s") +static f32 sTorchFlameScale = 0.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9BE8.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneScale, 550, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D18.s") +void BgSpot00Hanebasi_Init(Actor* thisx, GlobalContext* globalCtx) { + BgSpot00Hanebasi* this = THIS; + s32 pad; + Vec3f chainPos; + CollisionHeader* colHeader = NULL; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9D24.s") + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyActor_Init(&this->dyna.actor, 1); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808A9E58.s") + if (this->dyna.actor.params == DT_DRAWBRIDGE) { + CollisionHeader_GetVirtual(&D_060005E0, &colHeader); + } else { + CollisionHeader_GetVirtual(&D_06000280, &colHeader); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Update.s") + this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s") + if (this->dyna.actor.params == DT_DRAWBRIDGE) { + if ((LINK_IS_ADULT) && (gSaveContext.sceneSetupIndex < 4)) { + Actor_Kill(&this->dyna.actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s") + if ((gSaveContext.sceneSetupIndex != 6) && + ((gSaveContext.sceneSetupIndex == 4) || (gSaveContext.sceneSetupIndex == 5) || + ((LINK_IS_CHILD) && (gSaveContext.nightFlag != 0)))) { + this->dyna.actor.shape.rot.x = -0x4000; + } else { + this->dyna.actor.shape.rot.x = 0; + } + + if (gSaveContext.sceneSetupIndex != 6) { + if ((CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) && (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) && + (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) && (!(gSaveContext.eventChkInf[8] & 1))) { + this->dyna.actor.shape.rot.x = -0x4000; + } + } + + chainPos.y = + (10.0f * Math_CosS(this->dyna.actor.shape.rot.x)) - (Math_SinS(this->dyna.actor.shape.rot.x) * 400.0f); + chainPos.z = + (10.0f * Math_SinS(this->dyna.actor.shape.rot.x)) - (Math_CosS(this->dyna.actor.shape.rot.x) * 400.0f); + chainPos.x = + (158.0f * Math_CosS(this->dyna.actor.shape.rot.y)) + (Math_SinS(this->dyna.actor.shape.rot.y) * chainPos.z); + chainPos.z = (-158.0f * Math_SinS(this->dyna.actor.shape.rot.y)) + + (Math_CosS(this->dyna.actor.shape.rot.y) * chainPos.z); + + if (Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_BG_SPOT00_HANEBASI, + this->dyna.actor.world.pos.x + chainPos.x, this->dyna.actor.world.pos.y + chainPos.y, + this->dyna.actor.world.pos.z + chainPos.z, + ((this->dyna.actor.shape.rot.x == 0) ? 0 : 0xF020), this->dyna.actor.shape.rot.y, 0, + DT_CHAIN_1) == NULL) { + Actor_Kill(&this->dyna.actor); + } + + this->actionFunc = BgSpot00Hanebasi_DrawBridgeWait; + this->destAngle = 40; + } else if (this->dyna.actor.params == DT_CHAIN_1) { + if (Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_BG_SPOT00_HANEBASI, + this->dyna.actor.world.pos.x - (Math_CosS(this->dyna.actor.shape.rot.y) * 316.0f), + this->dyna.actor.world.pos.y, + this->dyna.actor.world.pos.z + (Math_SinS(this->dyna.actor.shape.rot.y) * 316.0f), + this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, 0, DT_CHAIN_2) == NULL) { + Actor_Kill(&this->dyna.actor); + Actor_Kill(this->dyna.actor.parent); + } + + this->actionFunc = BgSpot00Hanebasi_SetTorchLightInfo; + } else { + this->actionFunc = BgSpot00Hanebasi_SetTorchLightInfo; + } + + if (this->dyna.actor.params >= DT_CHAIN_1) { + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointGlowSetInfo(&this->lightInfo, ((this->dyna.actor.params == DT_CHAIN_1) ? 260.0f : -260.0f), 168, + 690, 255, 255, 0, 0); + } +} + +void BgSpot00Hanebasi_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgSpot00Hanebasi* this = THIS; + + DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + + if (this->dyna.actor.params >= DT_CHAIN_1) { + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + } +} + +void BgSpot00Hanebasi_DrawBridgeWait(BgSpot00Hanebasi* this, GlobalContext* globalCtx) { + BgSpot00Hanebasi* child = (BgSpot00Hanebasi*)this->dyna.actor.child; + + if ((gSaveContext.sceneSetupIndex >= 4) || (!(CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD))) || + (!(CHECK_QUEST_ITEM(QUEST_GORON_RUBY))) || (!(CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE))) || + (gSaveContext.eventChkInf[8] & 1)) { + if (this->dyna.actor.shape.rot.x != 0) { + if (Flags_GetEnv(globalCtx, 0) || ((gSaveContext.sceneSetupIndex < 4) && (gSaveContext.nightFlag == 0))) { + this->actionFunc = BgSpot00Hanebasi_DrawBridgeRiseAndFall; + this->destAngle = 0; + child->destAngle = 0; + return; + } + + if (this) {} // required to match + } + + if ((this->dyna.actor.shape.rot.x == 0) && (gSaveContext.sceneSetupIndex < 4) && (LINK_IS_CHILD) && + (gSaveContext.nightFlag != 0)) { + this->actionFunc = BgSpot00Hanebasi_DrawBridgeRiseAndFall; + this->destAngle = -0x4000; + child->destAngle = -0xFE0; + } + } +} + +void BgSpot00Hanebasi_DoNothing(BgSpot00Hanebasi* this, GlobalContext* globalCtx) { +} + +void BgSpot00Hanebasi_DrawBridgeRiseAndFall(BgSpot00Hanebasi* this, GlobalContext* globalCtx) { + BgSpot00Hanebasi* child; + Actor* childsChild; + s16 angle = 80; + + if (Math_ScaledStepToS(&this->dyna.actor.shape, this->destAngle, 80)) { + this->actionFunc = BgSpot00Hanebasi_DrawBridgeWait; + } + + if (this->dyna.actor.shape.rot.x >= -0x27D8) { + child = this->dyna.actor.child; + angle *= 0.4f; + Math_ScaledStepToS(&child->dyna.actor.shape.rot.x, child->destAngle, angle); + childsChild = child->dyna.actor.child; + Math_ScaledStepToS(&childsChild->shape.rot.x, child->destAngle, angle); + } + + if (this->destAngle < 0) { + if (this->actionFunc == BgSpot00Hanebasi_DrawBridgeWait) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE_STOP); + } else { + func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); + } + } else { + if (this->actionFunc == BgSpot00Hanebasi_DrawBridgeWait) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); + } else { + func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); + } + } +} + +void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, GlobalContext* globalCtx) { + u8 lightColor = (u8)(Rand_ZeroOne() * 127.0f) + 128; // intensity of the red and green channels + + Lights_PointGlowSetInfo(&this->lightInfo, (this->dyna.actor.params == DT_CHAIN_1) ? 260.0f : -260.0f, + (5000.0f * sTorchFlameScale) + 128.0f, 690, lightColor, lightColor, 0, + sTorchFlameScale * 37500.0f); +} + +void BgSpot00Hanebasi_Update(Actor* thisx, GlobalContext* globalCtx) { + BgSpot00Hanebasi* this = THIS; + s32 pad; + + this->actionFunc(this, globalCtx); + + if (this->dyna.actor.params == DT_DRAWBRIDGE) { + if (globalCtx->sceneNum == SCENE_SPOT00) { + if ((CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) && (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) && + (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) && (!(gSaveContext.eventChkInf[8] & 1)) && + (gSaveContext.linkAge == 1)) { + Player* player = PLAYER; + + if ((player->actor.world.pos.x > -450.0f) && (player->actor.world.pos.x < 450.0f) && + (player->actor.world.pos.z > 1080.0f) && (player->actor.world.pos.z < 1700.0f) && + (!(Gameplay_InCsMode(globalCtx)))) { + gSaveContext.eventChkInf[8] |= 1; + Flags_SetEventChkInf(0x82); + this->actionFunc = BgSpot00Hanebasi_DoNothing; + func_8002DF54(globalCtx, player, 8); + globalCtx->nextEntranceIndex = 0x00CD; + gSaveContext.nextCutsceneIndex = 0xFFF1; + globalCtx->sceneLoadFlag = 0x14; + globalCtx->fadeTransition = 4; + } else if (func_8002E12C(&this->dyna.actor, 3000.0f, 30000)) { + globalCtx->envCtx.gloomySkyEvent = 1; + } + } + } + + if (gSaveContext.sceneSetupIndex == 5) { + u16 dayTime; + s32 tmp; + + if (D_8011FB40 == 50) { + tmp = 0xD556; + + if (gSaveContext.dayTime >= 0xD557) { + tmp = 0x1D556; + } + + D_8011FB40 = (tmp - gSaveContext.dayTime) * (1.0f / 350.0f); + } + + dayTime = gSaveContext.dayTime; + + if ((dayTime >= 0x2AAC) && (dayTime < 0x3000) && (gSaveContext.sceneSetupIndex == 5)) { + D_8011FB40 = 0; + } + } + } +} + +void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + f32 angle; + s32 i; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 633); + + func_80093D84(globalCtx->state.gfxCtx); + + if (gSaveContext.sceneSetupIndex >= 4) { + sTorchFlameScale = 0.008f; + } else { + sTorchFlameScale = ((thisx->shape.rot.x * -1) - 0x2000) * (1.0f / 1024000.0f); + } + + angle = (s16)(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000) * (M_PI / 32768.0f); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + + for (i = 0; i < 2; i++) { + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, + ((globalCtx->gameplayFrames + i) * -20) & 0x1FF, 32, 128)); + + Matrix_Translate((i == 0) ? 260.0f : -260.0f, 128.0f, 690.0f, MTXMODE_NEW); + Matrix_RotateY(angle, MTXMODE_APPLY); + Matrix_Scale(sTorchFlameScale, sTorchFlameScale, sTorchFlameScale, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 674), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 681); +} + +void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) { + Vec3f basePos = { 158.0f, 10.0f, 400.0f }; + Vec3f newPos; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 698); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 702), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (thisx->params == DT_DRAWBRIDGE) { + gSPDisplayList(POLY_OPA_DISP++, D_06000430); + + Matrix_MultVec3f(&basePos, &newPos); + thisx->child->world.pos.x = newPos.x; + thisx->child->world.pos.y = newPos.y; + thisx->child->world.pos.z = newPos.z; + basePos.x *= -1.0f; + + Matrix_MultVec3f(&basePos, &newPos); + thisx->child->child->world.pos.x = newPos.x; + thisx->child->child->world.pos.y = newPos.y; + thisx->child->child->world.pos.z = newPos.z; + + if (gSaveContext.sceneSetupIndex != 12) { + if ((gSaveContext.sceneSetupIndex >= 4) || ((LINK_IS_CHILD) && (thisx->shape.rot.x < -0x2000))) { + BgSpot00Hanebasi_DrawTorches(thisx, globalCtx); + } else { + sTorchFlameScale = 0.0f; + } + } + } else { + gSPDisplayList(POLY_OPA_DISP++, D_060000C0); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 733); +} diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h index 27a73d3806..ca33e9b3c0 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h @@ -6,9 +6,14 @@ struct BgSpot00Hanebasi; +typedef void (*BgSpot00HanebasiActionFunc)(struct BgSpot00Hanebasi*, GlobalContext*); + typedef struct BgSpot00Hanebasi { /* 0x0000 */ DynaPolyActor dyna; - /* 0x0164 */ char unk_164[0x1C]; + /* 0x0164 */ BgSpot00HanebasiActionFunc actionFunc; + /* 0x0168 */ s16 destAngle; + /* 0x016C */ LightNode* lightNode; + /* 0x0170 */ LightInfo lightInfo; } BgSpot00Hanebasi; // size = 0x0180 extern const ActorInit Bg_Spot00_Hanebasi_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index f974cb2461..29ffe38ed3 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -1,4 +1,5 @@ #include "z_demo_ik.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -9,27 +10,518 @@ void DemoIk_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoIk_Update(Actor* thisx, GlobalContext* globalCtx); void DemoIk_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_0600035C; -extern UNK_TYPE D_06000380; -extern UNK_TYPE D_06000634; -extern UNK_TYPE D_06000660; -extern UNK_TYPE D_060008DC; -extern UNK_TYPE D_06000C6C; -extern UNK_TYPE D_06000C90; -extern UNK_TYPE D_06000F0C; -extern UNK_TYPE D_06016BE0; -extern UNK_TYPE D_06016CD8; -extern UNK_TYPE D_06016F88; -extern UNK_TYPE D_06017028; -extern UNK_TYPE D_06017170; -extern UNK_TYPE D_0601EE60; -extern UNK_TYPE D_06000F30; -extern UNK_TYPE D_0601EB14; -extern UNK_TYPE D_0601EB40; -extern UNK_TYPE D_0601EE34; -extern UNK_TYPE D_06000900; +void DemoIk_Type1Init(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx); + +void DemoIk_Type1Action0(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type1Action1(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type1Action2(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type2Action0(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type2Action1(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type2Action2(DemoIk* this, GlobalContext* globalCtx); + +void DemoIk_DrawNothing(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx); +void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx); + +extern AnimationHeader D_0600035C; +extern SkeletonHeader D_06000380; +extern AnimationHeader D_06000634; +extern SkeletonHeader D_06000660; +extern AnimationHeader D_060008DC; +extern AnimationHeader D_06000C6C; +extern SkeletonHeader D_06000C90; +extern AnimationHeader D_06000F0C; +extern Gfx D_06016BE0[]; +extern Gfx D_06016CD8[]; +extern Gfx D_06016F88[]; +extern Gfx D_06017028[]; +extern Gfx D_06017170[]; +extern FlexSkeletonHeader D_0601EE60; +extern FlexSkeletonHeader D_06000F30; +extern AnimationHeader D_0601EB14; +extern FlexSkeletonHeader D_0601EB40; +extern AnimationHeader D_0601EE34; +extern FlexSkeletonHeader D_06000900; + +void DemoIk_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} + +void DemoIk_BgCheck(DemoIk* this, GlobalContext* globalCtx) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 DemoIk_UpdateSkelAnime(DemoIk* this) { + return SkelAnime_Update(&this->skelAnime); +} + +CsCmdActorAction* DemoIk_GetCue(GlobalContext* globalCtx, s32 index) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[index]; + } + return NULL; +} + +s32 DemoIk_CheckCue(GlobalContext* globalCtx, u16 action, s32 index) { + CsCmdActorAction* cue = DemoIk_GetCue(globalCtx, index); + + if ((cue != NULL) && (cue->action == action)) { + return 1; + } + return 0; +} + +void DemoIk_SetMove(DemoIk* this, GlobalContext* globalCtx) { + this->skelAnime.moveFlags |= 1; + AnimationContext_SetMoveActor(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void DemoIk_EndMove(DemoIk* this) { + this->skelAnime.moveFlags &= ~1; +} + +f32 DemoIk_GetCurFrame(DemoIk* this) { + return this->skelAnime.curFrame; +} + +Gfx* DemoIk_SetColors(GraphicsContext* gfxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB) { + Gfx* head = Graph_Alloc(gfxCtx, 3 * sizeof(Gfx)); + Gfx* entry = head; + + gDPSetPrimColor(entry++, 0x00, 0x00, primR, primG, primB, 255); + gDPSetEnvColor(entry++, envR, envG, envB, 255); + gSPEndDisplayList(entry++); + return head; +} + +s32 DemoIk_GetIndexFromParams(s32 params) { + s32 ret; + + if (params == 0) { + ret = 5; + } else if (params == 1) { + ret = 6; + } else { + ret = 7; + } + return ret; +} + +void DemoIk_Type1PlaySound(DemoIk* this) { + switch (this->actor.params) { + case 0: + if (Animation_OnFrame(&this->skelAnime, 5.0f)) { + Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND1_DEMO, &this->actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + break; + case 1: + if (Animation_OnFrame(&this->skelAnime, 10.0f)) { + Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND3_DEMO, &this->actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + break; + case 2: + if (Animation_OnFrame(&this->skelAnime, 9.0f)) { + Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND2_DEMO, &this->actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + break; + } +} + +void DemoIk_SpawnDeadDb(DemoIk* this, GlobalContext* globalCtx) { + static Vec3f deadDbOffsets[] = { + { -14.0f, 5.0f, 5.0f }, { -20.0f, 12.0f, 0.0f }, { -5.0f, 10.0f, -1.0f }, { -10.0f, 8.0f, 14.0f }, + { -3.0f, 10.0f, 7.0f }, { -10.0f, 11.0f, 0.0f }, { 9.0f, 10.0f, -8.0f }, { 4.0f, 10.0f, 3.0f }, + { -6.0f, 13.0f, -5.0f }, { 1.0f, 9.0f, 3.0f }, { -10.0f, 9.0f, 1.0f }, + }; + s32 i; + s32 index = DemoIk_GetIndexFromParams(this->actor.params); + + if (DemoIk_CheckCue(globalCtx, 5, index)) { + Vec3f pos; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + s32 startIndex; + s32 endIndex; + + if (index == 5) { + startIndex = 0; + endIndex = 4; + } else if (index == 7) { + startIndex = 4; + endIndex = 8; + } else { + startIndex = 8; + endIndex = 11; + } + for (i = startIndex; i < endIndex; i++) { + pos.x = deadDbOffsets[i].x + this->actor.world.pos.x; + pos.y = deadDbOffsets[i].y + this->actor.world.pos.y; + pos.z = deadDbOffsets[i].z + this->actor.world.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 10, 7, 255, 255, 255, 255, 0, 0, 255, 1, 9, true); + } + } +} + +void DemoIk_MoveToStartPos(DemoIk* this, GlobalContext* globalCtx, s32 index) { + CsCmdActorAction* cue = DemoIk_GetCue(globalCtx, index); + + if (cue != NULL) { + this->actor.world.pos.x = cue->startPos.x; + this->actor.world.pos.y = cue->startPos.y; + this->actor.world.pos.z = cue->startPos.z; + this->actor.world.rot.y = this->actor.shape.rot.y = cue->rot.y; + } +} + +void DemoIk_Type1Init(DemoIk* this, GlobalContext* globalCtx) { + s32 pad[3]; + SkeletonHeader* skeleton; + AnimationHeader* animation; + f32 phi_f0; + + switch (this->actor.params) { + case 0: + skeleton = &D_06000C90; + animation = &D_06000C6C; + phi_f0 = 30.0f; + break; + case 1: + skeleton = &D_06000660; + animation = &D_06000634; + phi_f0 = 10.0f; + break; + default: + skeleton = &D_06000380; + animation = &D_0600035C; + phi_f0 = 20.0f; + // No break is required for matching + } + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, phi_f0); + SkelAnime_Init(globalCtx, &this->skelAnime, skeleton, NULL, this->jointTable, this->morphTable, 2); + Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), 2, 0.0f); +} + +void func_8098393C(DemoIk* this) { + this->actionMode = 0; + this->drawMode = 0; + this->actor.shape.shadowAlpha = 0; +} + +void func_8098394C(DemoIk* this, GlobalContext* globalCtx) { + DemoIk_EndMove(this); + DemoIk_MoveToStartPos(this, globalCtx, DemoIk_GetIndexFromParams(this->actor.params)); + this->actionMode = 1; + this->drawMode = 1; + this->actor.shape.shadowAlpha = 255; + this->skelAnime.curFrame = 0.0f; +} + +void func_809839AC(DemoIk* this) { + this->actionMode = 2; + this->drawMode = 1; + this->actor.shape.shadowAlpha = 255; + this->skelAnime.curFrame = 0.0f; +} + +void func_809839D0(DemoIk* this, GlobalContext* globalCtx) { + CsCmdActorAction* cue = DemoIk_GetCue(globalCtx, DemoIk_GetIndexFromParams(this->actor.params)); + + if (cue != NULL) { + s32 nextCsAction = cue->action; + s32 csAction = this->csAction; + + if (nextCsAction != csAction) { + switch (nextCsAction) { + case 1: + func_8098393C(this); + break; + case 2: + func_8098394C(this, globalCtx); + break; + case 3: + func_809839AC(this); + break; + case 4: + Actor_Kill(&this->actor); + break; + case 5: + case 6: + break; + default: + // there is no such action + osSyncPrintf("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->csAction = nextCsAction; + } + } +} + +void DemoIk_Type1Action0(DemoIk* this, GlobalContext* globalCtx) { + func_809839D0(this, globalCtx); +} + +void DemoIk_Type1Action1(DemoIk* this, GlobalContext* globalCtx) { + DemoIk_BgCheck(this, globalCtx); + func_809839D0(this, globalCtx); +} + +void DemoIk_Type1Action2(DemoIk* this, GlobalContext* globalCtx) { + DemoIk_UpdateSkelAnime(this); + DemoIk_Type1PlaySound(this); + DemoIk_SetMove(this, globalCtx); + DemoIk_BgCheck(this, globalCtx); + DemoIk_SpawnDeadDb(this, globalCtx); + func_809839D0(this, globalCtx); +} + +void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + DemoIk* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 385); + if (limbIndex == 1) { + switch (this->actor.params) { + case 0: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 390), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06016BE0); + break; + case 2: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 396), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06016F88); + break; + } + } + CLOSE_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 404); +} + +void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) { + s32 pad[2]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 422); + func_8002EBCC(&this->actor, globalCtx, 0); + func_80093D18(gfxCtx); + func_80093D84(gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, DemoIk_SetColors(gfxCtx, 245, 225, 155, 30, 30, 0)); + gSPSegment(POLY_OPA_DISP++, 0x09, DemoIk_SetColors(gfxCtx, 255, 40, 0, 40, 0, 0)); + gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); + SkelAnime_DrawOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, NULL, DemoIk_Type1PostLimbDraw, this); + CLOSE_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 444); +} + +void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) { + s32 pad[2]; + FlexSkeletonHeader* skeleton; + AnimationHeader* animation; + + switch (this->actor.params) { + case 3: + skeleton = &D_0601EB40; + animation = &D_0601EB14; + break; + case 4: + skeleton = &D_0601EE60; + animation = &D_0601EE34; + break; + case 5: + skeleton = &D_06000F30; + animation = &D_06000F0C; + break; + default: + skeleton = &D_06000900; + animation = &D_060008DC; + } + + SkelAnime_InitFlex(globalCtx, &this->skelAnime, skeleton, NULL, this->jointTable, this->morphTable, 2); + Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), 2, 0.0f); + this->actionMode = 3; + this->drawMode = 0; +} + +void DemoIk_Type2PlaySoundOnFrame(DemoIk* this, f32 frame) { + if (Animation_OnFrame(&this->skelAnime, frame)) { + Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +void DemoIk_Type2PlaySound(DemoIk* this) { + switch (this->actor.params) { + case 3: + DemoIk_Type2PlaySoundOnFrame(this, 33.0f); + break; + case 5: + DemoIk_Type2PlaySoundOnFrame(this, 44.0f); + break; + } +} + +void func_80983FDC(DemoIk* this) { + this->actionMode = 3; + this->drawMode = 0; +} + +void func_80983FEC(DemoIk* this, GlobalContext* globalCtx) { + DemoIk_MoveToStartPos(this, globalCtx, 4); + this->actionMode = 4; + this->drawMode = 2; + this->skelAnime.curFrame = 0.0f; +} + +void func_8098402C(DemoIk* this) { + this->actionMode = 5; + this->drawMode = 2; + this->skelAnime.curFrame = 0.0f; +} + +void func_80984048(DemoIk* this, GlobalContext* globalCtx) { + CsCmdActorAction* cue = DemoIk_GetCue(globalCtx, 4); + + if (cue != NULL) { + s32 nextCsAction = cue->action; + s32 csAction = this->csAction; + + if (nextCsAction != csAction) { + switch (nextCsAction) { + case 1: + func_80983FDC(this); + break; + case 5: + func_80983FEC(this, globalCtx); + break; + case 6: + func_8098402C(this); + break; + case 7: + Actor_Kill(&this->actor); + break; + default: + // there is no such action + osSyncPrintf("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->csAction = nextCsAction; + } + } +} + +void DemoIk_Type2Action0(DemoIk* this, GlobalContext* globalCtx) { + func_80984048(this, globalCtx); +} + +void DemoIk_Type2Action1(DemoIk* this, GlobalContext* globalCtx) { + func_80984048(this, globalCtx); +} + +void DemoIk_Type2Action2(DemoIk* this, GlobalContext* globalCtx) { + DemoIk_UpdateSkelAnime(this); + DemoIk_Type2PlaySound(this); + func_80984048(this, globalCtx); +} + +s32 DemoIk_Type2OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + DemoIk* this = THIS; + + if ((limbIndex == 1) && (DemoIk_GetCurFrame(this) < 30.0f)) { + *dList = NULL; + } + return 0; +} + +void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + DemoIk* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 frame = DemoIk_GetCurFrame(this); + + OPEN_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 268); + if (limbIndex == 1 && (frame >= 30.0f)) { + switch (this->actor.params) { + case 3: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 274), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06017028); + break; + case 4: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 280), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06017170); + break; + case 5: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 286), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06016BE0); + break; + default: + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 292), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06016CD8); + break; + } + } + CLOSE_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 300); +} + +void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { + s32 pad[2]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 318); + func_8002EBCC(&this->actor, globalCtx, 0); + func_80093D18(gfxCtx); + func_80093D84(gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, DemoIk_SetColors(gfxCtx, 245, 225, 155, 30, 30, 0)); + gSPSegment(POLY_OPA_DISP++, 0x09, DemoIk_SetColors(gfxCtx, 255, 40, 0, 40, 0, 0)); + gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, + DemoIk_Type2OverrideLimbDraw, DemoIk_Type2PostLimbDraw, this); + CLOSE_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 341); +} + +static DemoIkActionFunc sActionFuncs[] = { + DemoIk_Type1Action0, DemoIk_Type1Action1, DemoIk_Type1Action2, + DemoIk_Type2Action0, DemoIk_Type2Action1, DemoIk_Type2Action2, +}; + +void DemoIk_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + DemoIk* this = THIS; + + if (this->actionMode < 0 || this->actionMode >= ARRAY_COUNT(sActionFuncs) || + sActionFuncs[this->actionMode] == NULL) { + // The main mode is strange + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->actionMode](this, globalCtx); +} + +void DemoIk_DrawNothing(DemoIk* this, GlobalContext* globalCtx) { +} + +static DemoIkDrawFunc sDrawFuncs[] = { + DemoIk_DrawNothing, + DemoIk_Type1Draw, + DemoIk_Type2Draw, +}; + +void DemoIk_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + DemoIk* this = THIS; + + if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) { + // The draw mode is strange + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawMode](this, globalCtx); +} -/* const ActorInit Demo_Ik_InitVars = { ACTOR_DEMO_IK, ACTORCAT_NPC, @@ -41,83 +533,14 @@ const ActorInit Demo_Ik_InitVars = { (ActorFunc)DemoIk_Update, (ActorFunc)DemoIk_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098330C.s") +void DemoIk_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + DemoIk* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983354.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983398.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983428.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983430.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809834D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983500.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809837A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098393C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098394C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809839D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983AF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983F8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983FEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098402C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984048.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984124.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984164.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098419C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80984610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Draw.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ik/DemoIk_Init.s") + if (this->actor.params == 0 || this->actor.params == 1 || this->actor.params == 2) { + DemoIk_Type1Init(this, globalCtx); + } else { + DemoIk_Type2Init(this, globalCtx); + } +} diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h index 941949cbec..de573b0124 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h @@ -6,9 +6,17 @@ struct DemoIk; +typedef void (*DemoIkActionFunc)(struct DemoIk* this, GlobalContext* globalCtx); +typedef void (*DemoIkDrawFunc)(struct DemoIk* this, GlobalContext* globalCtx); + typedef struct DemoIk { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x68]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[2]; + /* 0x019C */ Vec3s morphTable[2]; + /* 0x01A8 */ s32 actionMode; + /* 0x01AC */ s32 drawMode; + /* 0x01B0 */ s32 csAction; } DemoIk; // size = 0x01B4 extern const ActorInit Demo_Ik_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg index 55ff099e66..1f3ce3e64d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg +++ b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg @@ -1,2 +1,10 @@ ovl_Demo_Kankyo -z_demo_kankyo.c \ No newline at end of file +z_demo_kankyo_cutscene_data1.c +z_demo_kankyo_cutscene_data2.c +z_demo_kankyo_cutscene_data3.c +z_demo_kankyo_cutscene_data4.c +z_demo_kankyo_cutscene_data5.c +z_demo_kankyo_cutscene_data6.c +z_demo_kankyo_cutscene_data7.c +z_demo_kankyo_cutscene_data8.c +z_demo_kankyo.c diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 1125309d50..f85acf6876 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -1,4 +1,5 @@ #include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000030 @@ -10,14 +11,35 @@ void DemoKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx); void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_01000000; -extern UNK_TYPE D_06000080; -extern UNK_TYPE D_06000DE0; -extern UNK_TYPE D_06007440; -extern UNK_TYPE D_06007578; -extern UNK_TYPE D_06008390; +void DemoKankyo_SetupType(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateClouds(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateRock(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_DoNothing2(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_DoNothing(DemoKankyo* this, GlobalContext* globalCtx); +void DemoKankyo_KillDoorOfTimeCollision(DemoKankyo* this, GlobalContext* globalCtx); + +void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx); + +// adult warp songs cutscenes +extern CutsceneData gAdultWarpInCS[]; +extern CutsceneData gAdultWarpOutCS[]; +// adult warp songs cutscenes in temple of time +extern CutsceneData gAdultWarpInToTCS[]; +extern CutsceneData gAdultWarpOutToTCS[]; +// child warp songs cutscenes +extern CutsceneData gChildWarpInCS[]; +extern CutsceneData gChildWarpOutCS[]; +// child warp songs cutscenes in temple of time +extern CutsceneData gChildWarpInToTCS[]; +extern CutsceneData gChildWarpOutToTCS[]; -/* const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORCAT_BG, @@ -29,51 +51,948 @@ const ActorInit Demo_Kankyo_InitVars = { (ActorFunc)DemoKankyo_Update, (ActorFunc)DemoKankyo_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80988E80.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Init.s") +static s16 sObjIds[] = { + OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, + OBJECT_EFC_STAR_FIELD, OBJECT_EFC_STAR_FIELD, OBJECT_GAMEPLAY_KEEP, OBJECT_GI_MELODY, OBJECT_GI_MELODY, + OBJECT_GI_MELODY, OBJECT_GI_MELODY, OBJECT_GI_MELODY, OBJECT_TOKI_OBJECTS, OBJECT_TOKI_OBJECTS, + OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Destroy.s") +// unused, presumed to be floats +static f32 D_8098C314[] = { + 0.0f, + 150.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809892A4.s") +static Color_RGB8 sWarpSparkleEnvColors[] = { + { 0, 200, 0 }, // minuet + { 255, 50, 0 }, // bolero + { 0, 150, 255 }, // serenade + { 255, 150, 0 }, // requiem + { 200, 50, 255 }, // nocturne + { 200, 255, 0 }, // prelude +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896DC.s") +static CutsceneCameraPoint sWarpOutCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0x0000, 0x0000 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0017, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x001C, 0x0032, 0xFFFF } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0001, 0x0018, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0xFFFA, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0025, 0x0037 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x004F, 0x0066, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x00A6, 0x00AD, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x010D, 0x015A, 0xFF4C } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x019F, 0x0245, 0xFE35 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809896E8.s") +static CutsceneCameraPoint sWarpInCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x019F, 0x0245, 0xFE35 } }, + { CS_CMD_CONTINUE, 0, 5, 45.0f, { 0x010D, 0x015A, 0xFF4C } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x00A6, 0x00AD, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x004F, 0x0066, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0025, 0x0037 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0xFFFA, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0001, 0x0018, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x001C, 0x0032, 0xFFFF } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0017, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0xFFE6, 0x0000, 0x0000 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_CONTINUE, 0, 8, 45.0f, { 0x0000, 0x0000, 0xFFE5 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, + { CS_CMD_STOP, 0, 5, 45.0f, { 0x01CE, 0x036F, 0xFCC2 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989710.s") +static Color_RGB8 sSparkleEnvColors[] = { + { 0, 200, 0 }, { 255, 50, 0 }, { 0, 150, 255 }, { 255, 150, 0 }, // only this one is used + { 0, 255, 255 }, { 200, 255, 0 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989800.s") +static CutsceneCameraPoint sSparklesCameraPoints[] = { + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF7, 0x0000, 0xFFD0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0000, 0xFFE9 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD3, 0x0000, 0x000A } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE8, 0x0001, 0x0027 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0015, 0x0000, 0x002B } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002F, 0x0005, 0x000E } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0031, 0x0005, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0020, 0x0005, 0xFFDA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF5, 0x0005, 0xFFD1 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0006, 0xFFEA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD5, 0x0009, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE9, 0x0009, 0x0027 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0014, 0x000B, 0x0029 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002D, 0x000B, 0x000F } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002E, 0x000B, 0xFFF0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001E, 0x000B, 0xFFDA } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x000E, 0xFFD3 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDA, 0x000E, 0xFFEB } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x0010, 0x0008 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE9, 0x0010, 0x0024 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0011, 0x0010, 0x0028 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002C, 0x0010, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002C, 0x0012, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001F, 0x0011, 0xFFDE } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFB, 0x0014, 0xFFD5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDD, 0x0014, 0xFFEC } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDA, 0x0017, 0x0008 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE8, 0x0014, 0x001F } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000C, 0x0018, 0x0026 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0027, 0x0018, 0x000D } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0027, 0x001B, 0xFFF6 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001C, 0x001A, 0xFFE2 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x000E, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD9, 0x001B, 0xFFEF } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x001B, 0x000A } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFE6, 0x001B, 0x0022 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000F, 0x001F, 0x002C } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0032, 0x0020, 0x0009 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0030, 0x0021, 0xFFF0 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x001C, 0x0025, 0xFFD9 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFFA, 0x0028, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD8, 0x002B, 0xFFF5 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFD7, 0x002B, 0x0006 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFDF, 0x002B, 0x0019 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x000E, 0x002E, 0x002C } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x0032, 0x002E, 0x0003 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0x002A, 0x0030, 0xFFE7 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_CONTINUE, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_STOP, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, + { CS_CMD_STOP, 0, 2, 45.0f, { 0xFFF6, 0x002B, 0xFFD4 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098987C.s") +static s16 D_8098CF80; +static s16 sRainScale; +static s16 D_8098CF84; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_809898C8.s") +extern Mtx D_01000000; // perspective mtx -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989960.s") +extern Gfx D_06000080[]; // rain DL +extern Gfx D_06000DE0[]; // rocks DL +extern Gfx D_06007440[]; // DoT DL left +extern Gfx D_06007578[]; // DoT DL right +extern Gfx D_06008390[]; // light plane DL -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Update.s") +void DemoKankyo_SetupAction(DemoKankyo* this, DemoKankyoActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/DemoKankyo_Draw.s") +void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s16 i; + s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjIds[this->actor.params]); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989B54.s") + osSyncPrintf("bank_ID = %d\n", objBankIndex); + if (objBankIndex < 0) { + __assert("0", "../z_demo_kankyo.c", 521); + } else { + this->objBankIndex = objBankIndex; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s") + switch (this->actor.params) { + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_BLUE_RAIN_2: + switch (globalCtx->sceneNum) { + case SCENE_HIRAL_DEMO: + globalCtx->roomCtx.curRoom.segment = NULL; + D_8098CF80 = 10; + sRainScale = 8; + break; + case SCENE_TOKINOMA: + D_8098CF80 = 14; + sRainScale = 8; + break; + case SCENE_SPOT00: + D_8098CF80 = 1; + sRainScale = 5; + break; + default: + Actor_Kill(&this->actor); + break; + } + break; + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + globalCtx->roomCtx.curRoom.segment = NULL; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = Rand_ZeroOne() * 0.5f + 0.5f; + this->unk_150[0].unk_0.x = Rand_ZeroOne() * 3.0f + 1.0f; + this->unk_150[0].unk_0.y = Rand_ZeroOne() * 3.0f + 1.0f; + this->unk_150[0].unk_0.z = Rand_ZeroOne() * 3.0f + 1.0f; + break; + case DEMOKANKYO_CLOUDS: + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_20 = Rand_ZeroOne() * 65535.0f; + this->unk_150[i].unk_18 = Rand_ZeroOne() * 100.0f + 60.0f; + } + break; + case DEMOKANKYO_DOOR_OF_TIME: + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + this->unk_150[0].unk_18 = 0.0f; + if (!(gSaveContext.eventChkInf[4] & 0x800)) { + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_TOKI, + this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, + 0, 0x0000); + } else { + globalCtx->unk_11D30[1] = 0xFF; + Actor_Kill(&this->actor); + } + break; + case DEMOKANKYO_LIGHT_PLANE: + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + this->unk_150[0].unk_18 = 0.0f; + break; + case DEMOKANKYO_WARP_OUT: + case DEMOKANKYO_WARP_IN: + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ITEMACTION); + this->actor.flags |= 0x2000000; + this->actor.room = -1; + this->warpTimer = 35; + this->sparkleCounter = 0; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + break; + case DEMOKANKYO_SPARKLES: + this->warpTimer = 35; + this->sparkleCounter = 0; + this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 1.0f; + break; + default: + break; + } + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_22 = 0; + } + DemoKankyo_SetupAction(this, DemoKankyo_SetupType); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s") +void DemoKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx) { + if (thisx) {} +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s") +void DemoKankyo_SetupType(DemoKankyo* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s") + if (this->actor.objBankIndex == this->objBankIndex) { + switch (this->actor.params) { + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + DemoKankyo_SetupAction(this, DemoKankyo_UpdateRock); + break; + case DEMOKANKYO_CLOUDS: + DemoKankyo_SetupAction(this, DemoKankyo_UpdateClouds); + break; + case DEMOKANKYO_DOOR_OF_TIME: + if (Flags_GetEnv(globalCtx, 2)) { + DemoKankyo_SetupAction(this, DemoKankyo_UpdateDoorOfTime); + } + break; + case DEMOKANKYO_WARP_OUT: + globalCtx->envCtx.unk_E2[0] = 0xFF; + globalCtx->envCtx.unk_E2[1] = 0xFF; + globalCtx->envCtx.unk_E2[2] = 0xFF; + globalCtx->envCtx.unk_E1 = 0; + if (this->warpTimer < 21 && this->warpTimer >= 15) { + temp = (this->warpTimer - 15.0f) / 5.0f; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[3] = 255 - 255 * temp; + } + if (this->warpTimer < 15 && this->warpTimer >= 4) { + temp = (this->warpTimer - 4.0f) / 10.0f; + globalCtx->envCtx.unk_E1 = 1; + globalCtx->envCtx.unk_E2[3] = 255 * temp; + } + if (this->warpTimer == 15) { + player->actor.draw = NULL; + } + if ((u32)this->warpTimer != 0) { + this->warpTimer--; + } + if (this->warpTimer == 1) { + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + D_8098CF84 = 25; + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpInToTCS; + } else { + globalCtx->csCtx.segment = gAdultWarpInToTCS; + } + } else { + D_8098CF84 = 32; + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpInCS; + } else { + globalCtx->csCtx.segment = gAdultWarpInCS; + } + } + if (func_800C0CB8(globalCtx) != 0) { + gSaveContext.cutsceneTrigger = 1; + } + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing); + } + break; + case DEMOKANKYO_WARP_IN: + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpOutToTCS; + } else { + globalCtx->csCtx.segment = gAdultWarpOutToTCS; + } + } else { + if (LINK_IS_CHILD) { + globalCtx->csCtx.segment = gChildWarpOutCS; + } else { + globalCtx->csCtx.segment = gAdultWarpOutCS; + } + } + gSaveContext.cutsceneTrigger = 1; + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing2); + break; + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_SPARKLES: + break; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s") +void DemoKankyo_DoNothing(DemoKankyo* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAC8.s") +void DemoKankyo_DoNothing2(DemoKankyo* this, GlobalContext* globalCtx) { + DemoKankyo_SetupAction(this, DemoKankyo_DoNothing); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s") +void DemoKankyo_SetRockPos(DemoKankyo* this, GlobalContext* globalCtx, s32 params) { + Vec3f startPos; + Vec3f endPos; + CsCmdActorAction* csAction = globalCtx->csCtx.npcActions[params]; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s") + startPos.x = csAction->startPos.x; + startPos.y = csAction->startPos.y; + startPos.z = csAction->startPos.z; + endPos.x = csAction->endPos.x; + endPos.y = csAction->endPos.y; + endPos.z = csAction->endPos.z; + temp_f0 = func_8006F93C(csAction->endFrame, csAction->startFrame, globalCtx->csCtx.frames); + this->actor.world.pos.x = ((endPos.x - startPos.x) * temp_f0) + startPos.x; + this->actor.world.pos.y = ((endPos.y - startPos.y) * temp_f0) + startPos.y; + this->actor.world.pos.z = ((endPos.z - startPos.z) * temp_f0) + startPos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s") +void DemoKankyo_UpdateRock(DemoKankyo* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->actor.params - 2] != NULL) { + DemoKankyo_SetRockPos(this, globalCtx, this->actor.params - 2); + } + this->unk_150[0].unk_C.x += this->unk_150[0].unk_0.x; + this->unk_150[0].unk_C.y += this->unk_150[0].unk_0.y; + this->unk_150[0].unk_C.z += this->unk_150[0].unk_0.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s") +void DemoKankyo_UpdateClouds(DemoKankyo* this, GlobalContext* globalCtx) { + u8 i; + + for (i = 0; i < 30; i++) { + this->unk_150[i].unk_20 += (s16)this->unk_150[i].unk_18; + } +} + +void DemoKankyo_UpdateDoorOfTime(DemoKankyo* this, GlobalContext* globalCtx) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); + this->unk_150[0].unk_18 += 1.0f; + if (this->unk_150[0].unk_18 >= 102.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONEDOOR_STOP); + gSaveContext.eventChkInf[4] |= 0x800; + Actor_Kill(this->actor.child); + DemoKankyo_SetupAction(this, DemoKankyo_KillDoorOfTimeCollision); + } +} + +void DemoKankyo_KillDoorOfTimeCollision(DemoKankyo* this, GlobalContext* globalCtx) { + Actor_Kill(this->actor.child); +} + +void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + this->actionFunc(this, globalCtx); +} + +void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + + if (this->actor.objBankIndex == this->objBankIndex) { + switch (this->actor.params) { + case DEMOKANKYO_BLUE_RAIN: + case DEMOKANKYO_BLUE_RAIN_2: + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + if (!Flags_GetEnv(globalCtx, 1)) { + break; + } else if (!func_8002E12C(&this->actor, 300.0f, 0x7530)) { + break; + } else { + if (LINK_IS_CHILD) { + if (globalCtx->csCtx.frames < 170 || globalCtx->csCtx.state == 0) { + break; + } + } else { + if (globalCtx->csCtx.frames < 120 || globalCtx->csCtx.state == 0) { + break; + } + } + } + } + DemoKankyo_DrawRain(thisx, globalCtx); + break; + case DEMOKANKYO_ROCK_1: + case DEMOKANKYO_ROCK_2: + case DEMOKANKYO_ROCK_3: + case DEMOKANKYO_ROCK_4: + case DEMOKANKYO_ROCK_5: + DemoKankyo_DrawRock(thisx, globalCtx); + break; + case DEMOKANKYO_CLOUDS: + DemoKankyo_DrawClouds(thisx, globalCtx); + break; + case DEMOKANKYO_DOOR_OF_TIME: + DemoKankyo_DrawDoorOfTime(thisx, globalCtx); + break; + case DEMOKANKYO_LIGHT_PLANE: + DemoKankyo_DrawLightPlane(thisx, globalCtx); + break; + case DEMOKANKYO_WARP_OUT: + case DEMOKANKYO_WARP_IN: + DemoKankyo_DrawWarpSparkles(thisx, globalCtx); + break; + case DEMOKANKYO_SPARKLES: + DemoKankyo_DrawSparkles(thisx, globalCtx); + break; + } + } + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { + this->actor.objBankIndex = this->objBankIndex; + } +} + +// transform relating to blue rain +void func_80989B54(Actor* thisx, GlobalContext* globalCtx, s16 i) { + DemoKankyo* this = THIS; + + switch (globalCtx->sceneNum) { + case SCENE_HIRAL_DEMO: + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 500.0f; + this->unk_150[i].unk_0.y = 500.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 500.0f; + break; + case SCENE_TOKINOMA: + this->unk_150[i].unk_C.x = 0.0f; + this->unk_150[i].unk_C.y = 0.0f; + this->unk_150[i].unk_C.z = 0.0f; + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 180.0f; + this->unk_150[i].unk_0.y = 10.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 180.0f; + break; + case SCENE_SPOT00: + this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 600.0f; + this->unk_150[i].unk_0.y = -500.0f; + this->unk_150[i].unk_0.z = (Rand_ZeroOne() - 0.5f) * 600.0f; + break; + } + this->unk_150[i].unk_18 = Rand_ZeroOne() * (D_8098CF80 * 4.0f) + D_8098CF80; +} + +void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + f32 temp_f12_2; + s16 i; + f32 dx; + f32 dy; + f32 dz; + f32 norm; + f32 translateX; + f32 translateY; + f32 translateZ; + s16 j; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1186); + + for (i = 0; i < 30; i++) { + s32 pad[2]; + + dx = globalCtx->view.lookAt.x - globalCtx->view.eye.x; + dy = globalCtx->view.lookAt.y - globalCtx->view.eye.y; + dz = globalCtx->view.lookAt.z - globalCtx->view.eye.z; + norm = sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); + + if (globalCtx->sceneNum != SCENE_TOKINOMA) { + this->unk_150[i].unk_C.x = globalCtx->view.eye.x + (dx / norm) * 350.0f; + this->unk_150[i].unk_C.y = globalCtx->view.eye.y + (dy / norm) * 80.0f; + this->unk_150[i].unk_C.z = globalCtx->view.eye.z + (dz / norm) * 350.0f; + } + + switch (this->unk_150[i].unk_22) { + case 0: + func_80989B54(thisx, globalCtx, i); + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + this->unk_150[i].unk_0.y = Rand_ZeroOne() * 500.0f; + } else { + this->unk_150[i].unk_0.y = Rand_ZeroOne() * -500.0f; + } + this->unk_150[i].unk_22++; + break; + case 1: + temp_f12_2 = globalCtx->view.eye.y + (dy / norm) * 150.0f; + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + this->unk_150[i].unk_0.y -= this->unk_150[i].unk_18; + } else { + this->unk_150[i].unk_0.y += this->unk_150[i].unk_18; + } + if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + if (this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y < temp_f12_2 - 300.0f) { + this->unk_150[i].unk_22++; + } + } else if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + if (temp_f12_2 + 300.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) { + this->unk_150[i].unk_22++; + } + } else { + if (1000.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) { + this->unk_150[i].unk_22++; + } + } + break; + case 2: + func_80989B54(thisx, globalCtx, i); + this->unk_150[i].unk_22--; + break; + } + + Matrix_Translate(this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x, + this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y, + this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z, MTXMODE_NEW); + if (gSaveContext.entranceIndex != 0x00A0) { // Cutscene Map + Matrix_RotateX(M_PI, MTXMODE_APPLY); + } + + gDPPipeSync(POLY_XLU_DISP++); + if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 255); + } else { + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 150, 255, 255); + } + + Matrix_Scale(sRainScale * 0.001f, sRainScale * 0.001f, sRainScale * 0.001f, MTXMODE_APPLY); + + for (j = 0; j < 5; j++) { + s32 pad1; + + if (globalCtx->sceneNum != SCENE_TOKINOMA) { + if (this->unk_150[i].unk_0.x >= 0.0f) { + translateX = -j * 1500.0f; + } else { + translateX = j * 1500.0f; + } + if (this->unk_150[i].unk_0.z >= 0.0f) { + translateZ = -j * 1500.0f; + } else { + translateZ = j * 1500.0f; + } + if (j % 2 != 0) { + translateY = j * 4000.0f; + } else { + translateY = -j * 4000.0f; + } + } else { + translateX = 0.0f; + translateY = j * 10.0f; + translateZ = 0.0f; + } + + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1344), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); + gSPDisplayList(POLY_XLU_DISP++, D_06000080); + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1358); +} + +void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1376); + + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); + Matrix_RotateX(DEG_TO_RAD(this->unk_150[0].unk_C.x), MTXMODE_APPLY); + Matrix_RotateY(DEG_TO_RAD(this->unk_150[0].unk_C.y), MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[0].unk_C.z), MTXMODE_APPLY); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1404), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06000DE0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1409); +} + +void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s16 i; + s32 pad; + f32 dx; + f32 dy; + f32 dz; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1425); + + for (i = 0; i < 30; i++) { + dx = -(Math_SinS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); + dy = Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 5.0f + 1200.0f; + dz = (Math_CosS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); + + Matrix_Translate(globalCtx->view.eye.x + dx, globalCtx->view.eye.y + dy + ((i - 12.0f) * 300.0f), + globalCtx->view.eye.z + dz, MTXMODE_NEW); + Matrix_Scale(125.0f, 60.0f, 125.0f, MTXMODE_APPLY); + + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 210, 210, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255); + gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); + gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1461), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex)); + + func_80094C50(globalCtx->state.gfxCtx); + + gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffDustDL); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1474); +} + +void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1487); + + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1492), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06007440); + Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1497), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06007578); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1501); +} + +void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { + DemoKankyo* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1514); + + if (globalCtx->csCtx.state == 0 || gSaveContext.sceneSetupIndex >= 4) { + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames & 0x7F, 64, 32)); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1529), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06008390); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1534); +} + +void DemoKankyo_Vec3fCopy(Vec3f* src, Vec3f* dst) { + dst->x = src->x; + dst->y = src->y; + dst->z = src->z; +} + +Vec3f* DemoKankyo_Vec3fAddVecSph(Vec3f* dst, Vec3f* vec, VecSph* sph) { + Vec3f result; + Vec3f sphVec; + + OLib_VecSphGeoToVec3f(&sphVec, sph); + result.x = vec->x + sphVec.x; + result.y = vec->y + sphVec.y; + result.z = vec->z + sphVec.z; + *dst = result; + return dst; +} + +void DemoKankyo_Vec3fAddPosRot(PosRot* posRot, Vec3f* vec, Vec3f* dst) { + VecSph sph; + Vec3f vecCopy; + + DemoKankyo_Vec3fCopy(vec, &vecCopy); + OLib_Vec3fToVecSphGeo(&sph, &vecCopy); + sph.yaw += posRot->rot.y; + DemoKankyo_Vec3fAddVecSph(dst, &posRot->pos, &sph); +} + +void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { + static f32 sWarpRoll; + static f32 sWarpFoV; + // the following 2 vars are unused + static u32 D_8098CF90; + static u32 D_8098CF94; + static Vec3f D_8098CF98; + + s16 i; + f32 temp_f22; + DemoKankyo* this = THIS; + Gfx* disp; + Player* player = PLAYER; + Vec3f camPos; + f32 translateX; + f32 translateY; + f32 translateZ; + PosRot posRot; + u8 linkAge = gSaveContext.linkAge; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1824); + + if (this->sparkleCounter < 30) { + this->sparkleCounter += 2; + } + for (i = this->sparkleCounter - 1; i >= 0; i--) { + temp_f22 = 1.0f - (i / (f32)this->sparkleCounter); + + switch (this->unk_150[i].unk_22) { + case 0: + this->unk_150[i].unk_20 = 0; + this->unk_150[i].unk_1C = 0; + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_23 = 0; + this->unk_150[i].unk_22++; + case 1: + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpOutCameraPoints, &this->unk_150[i].unk_20, + &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + if (globalCtx->sceneNum == SCENE_TOKINOMA && globalCtx->csCtx.frames == 25) { + this->unk_150[i].unk_22++; + } + } else { + Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpInCameraPoints, &this->unk_150[i].unk_20, + &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + if (D_8098CF84 < globalCtx->csCtx.frames && this->actor.params == DEMOKANKYO_WARP_OUT) { + this->unk_150[i].unk_22++; + } + } + Actor_GetWorld(&posRot, &player->actor); + DemoKankyo_Vec3fAddPosRot(&posRot, &camPos, &D_8098CF98); + break; + case 2: + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + if (i == 0) { + func_800776E4(globalCtx); + this->unk_150[i].unk_22++; + } + } else if (i + 1 == this->sparkleCounter && globalCtx->csCtx.state == 0) { + func_80088AF0(globalCtx); + Actor_Kill(&this->actor); + } + break; + } + + this->unk_150[i].unk_C.x = D_8098CF98.x; + this->unk_150[i].unk_C.y = D_8098CF98.y; + this->unk_150[i].unk_C.z = D_8098CF98.z; + + switch (this->unk_150[i].unk_23) { + case 0: + this->unk_150[i].unk_18 = Rand_ZeroOne(); + this->unk_150[i].unk_23++; + case 1: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f); + if (this->unk_150[i].unk_18 >= 1.0f) { + this->unk_150[i].unk_23 = 2; + } + break; + case 2: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 0.0f, 0.5f, 0.3f, 0.2f); + if (this->unk_150[i].unk_18 <= 0.0f) { + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22); + this->unk_150[i].unk_18 = 0.0f; + this->unk_150[i].unk_23 = 1; + } + break; + } + + translateX = this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x; + translateY = this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y; + translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z; + + if (this->unk_150[i].unk_22 < 2) { + disp = (u32)gEffFlash1DL; + if (linkAge != 0) { + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW); + } else { + if (translateY) {} + Matrix_Translate(translateX, translateY + 15.0f, translateZ, MTXMODE_NEW); + } + Matrix_Scale(this->unk_150[i].unk_18 * (0.018f * temp_f22), this->unk_150[i].unk_18 * (0.018f * temp_f22), + this->unk_150[i].unk_18 * (0.018f * temp_f22), MTXMODE_APPLY); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255); + if (this->actor.params == DEMOKANKYO_WARP_OUT) { + gDPSetEnvColor(POLY_XLU_DISP++, sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].r, + sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].g, + sWarpSparkleEnvColors[globalCtx->msgCtx.unk_E3EC].b, 255); + } else { + s8 respawnData = gSaveContext.respawn[1].data; + gDPSetEnvColor(POLY_XLU_DISP++, sWarpSparkleEnvColors[respawnData].r, + sWarpSparkleEnvColors[respawnData].g, sWarpSparkleEnvColors[respawnData].b, 255); + } + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2011), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, disp); + this->unk_150[i].unk_24 += 0x190; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2019); +} + +void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { + static f32 sSparklesRoll; + static f32 sSparklesFoV; + // the following 3 vars are unused + static u32 D_8098CFAC; + static u32 D_8098CFB0; + static u32 D_8098CFB4; + static Vec3f D_8098CFB8; + + DemoKankyo* this = THIS; + f32 translateX; + f32 translateY; + f32 translateZ; + Vec3f camPos; + f32 temp_f20; + f32 scale; + s16 i; + PosRot posRot; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2434); + + if (this->sparkleCounter < 20) { + this->sparkleCounter++; + } + + for (i = this->sparkleCounter - 1; i >= 0; i--) { + temp_f20 = 1.0f - (i / (f32)this->sparkleCounter); + + switch (this->unk_150[i].unk_22) { + case 0: + this->unk_150[i].unk_20 = 0; + this->unk_150[i].unk_1C = 0; + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_23 = 0; + this->unk_150[i].unk_22++; + case 1: + if (func_800BB2B4(&camPos, &sSparklesRoll, &sSparklesFoV, sSparklesCameraPoints, + &this->unk_150[i].unk_20, &this->unk_150[i].unk_1C) != 0) { + this->unk_150[i].unk_22++; + } + Actor_GetWorld(&posRot, &this->actor); + DemoKankyo_Vec3fAddPosRot(&posRot, &camPos, &D_8098CFB8); + break; + case 2: + if (i + 1 == this->sparkleCounter && globalCtx->csCtx.state == 0) { + Actor_Kill(&this->actor); + } + break; + } + + this->unk_150[i].unk_C.x = D_8098CFB8.x; + this->unk_150[i].unk_C.y = D_8098CFB8.y; + this->unk_150[i].unk_C.z = D_8098CFB8.z; + + switch (this->unk_150[i].unk_23) { + case 0: + this->unk_150[i].unk_18 = Rand_ZeroOne(); + this->unk_150[i].unk_23++; + case 1: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f); + if (1.0f <= this->unk_150[i].unk_18) { + this->unk_150[i].unk_23 = 2; + } + break; + case 2: + Math_SmoothStepToF(&this->unk_150[i].unk_18, 0.0f, 0.5f, 0.3f, 0.2f); + if (this->unk_150[i].unk_18 <= 0.0f) { + this->unk_150[i].unk_0.x = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.y = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20); + this->unk_150[i].unk_18 = 0.0f; + this->unk_150[i].unk_23 = 1; + } + break; + } + + translateX = this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x; + translateY = this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y; + translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z; + + if (this->unk_150[i].unk_22 < 2) { + Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW); + scale = this->unk_150[i].unk_18 * (0.02f * temp_f20); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, sSparkleEnvColors[3].r, sSparkleEnvColors[3].g, sSparkleEnvColors[3].b, + 255); + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2572), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); + this->unk_150[i].unk_24 += 0x190; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2579); +} diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index f16653a37f..97eaea4a3b 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -6,9 +6,47 @@ struct DemoKankyo; +typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, GlobalContext*); + +typedef enum { + /* 0x00 */ DEMOKANKYO_BLUE_RAIN, + /* 0x01 */ DEMOKANKYO_BLUE_RAIN_2, + /* 0x02 */ DEMOKANKYO_ROCK_1, + /* 0x03 */ DEMOKANKYO_ROCK_2, + /* 0x04 */ DEMOKANKYO_ROCK_3, + /* 0x05 */ DEMOKANKYO_ROCK_4, + /* 0x06 */ DEMOKANKYO_ROCK_5, + /* 0x07 */ DEMOKANKYO_CLOUDS, + /* 0x08 */ DEMOKANKYO_8, // These unnamed types are removed types that would have used object_gi_melody + /* 0x09 */ DEMOKANKYO_9, + /* 0x0A */ DEMOKANKYO_A, + /* 0x0B */ DEMOKANKYO_B, + /* 0x0C */ DEMOKANKYO_C, + /* 0x0D */ DEMOKANKYO_DOOR_OF_TIME, + /* 0x0E */ DEMOKANKYO_LIGHT_PLANE, + /* 0x0F */ DEMOKANKYO_WARP_OUT, + /* 0x10 */ DEMOKANKYO_WARP_IN, + /* 0x11 */ DEMOKANKYO_SPARKLES +} DemoKankyoType; + +typedef struct { + /* 0x00 */ Vec3f unk_0; + /* 0x0C */ Vec3f unk_C; + /* 0x18 */ f32 unk_18; // For Door of Time, this is the amount to translate it by used for when it's opening + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 unk_20; + /* 0x22 */ u8 unk_22; // mode ? + /* 0x23 */ u8 unk_23; + /* 0x24 */ s16 unk_24; +} DemoKankyoUnk150; // size = 0x28 + typedef struct DemoKankyo { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4B8]; + /* 0x014C */ u8 objBankIndex; + /* 0x014D */ u8 sparkleCounter; + /* 0x014E */ u8 warpTimer; + /* 0x0150 */ DemoKankyoUnk150 unk_150[30]; + /* 0x0600 */ DemoKankyoActionFunc actionFunc; } DemoKankyo; // size = 0x0604 extern const ActorInit Demo_Kankyo_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c new file mode 100644 index 0000000000..88660dec8e --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpInCS[] = { + CS_BEGIN_CUTSCENE(2, 164), + CS_CAM_POS_PLAYER_LIST(0, 135), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 79, 59, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 78, 60, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 78, 60, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 79, 59, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 30, 78, 60, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 164), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 50, 23, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 48, 22, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 48, 22, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 101, 21, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 101, 21, 0x0000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c new file mode 100644 index 0000000000..08915b5c82 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c @@ -0,0 +1,31 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpOutCS[] = { + CS_BEGIN_CUTSCENE(5, 1167), + CS_CAM_POS_PLAYER_LIST(0, 1138), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5CB), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5EB), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0x20BA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA1BC), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 31, 82, 61, 0xA5E1), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 55, 99, 31, 0xA1BC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 55, 99, 31, 0xA5E1), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.324859619140625f, 17, 59, 31, 0xA5CB), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5EB), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 17, 59, 31, 0x20BA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA1BC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 17, 59, 31, 0xA5E1), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 97, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c new file mode 100644 index 0000000000..c3f73c91d0 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpInToTCS[] = { + CS_BEGIN_CUTSCENE(2, 118), + CS_CAM_POS_PLAYER_LIST(0, 89), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 102, 48, 0x0047), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 118), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 71, 25, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 71, 25, 0x0047), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c new file mode 100644 index 0000000000..ad72e76d85 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gAdultWarpOutToTCS[] = { + CS_BEGIN_CUTSCENE(5, 1120), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1091), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324859619140625f, 42, 89, 50, 0x29D0), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324859619140625f, 24, 66, 29, 0x29D0), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c new file mode 100644 index 0000000000..a86b93dd22 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c @@ -0,0 +1,27 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpInCS[] = { + CS_BEGIN_CUTSCENE(2, 1164), + CS_CAM_POS_PLAYER_LIST(0, 1135), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 68, 59, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 32, 68, 60, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 69, 59, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0xB46C), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32485580444336f, 31, 64, 59, 0x05BC), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1164), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 12, 40, 22, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 11, 38, 22, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 11, 39, 22, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32485580444336f, 57, 86, 21, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32485580444336f, 57, 86, 21, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0xB46C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32485580444336f, 57, 86, 21, 0x05BC), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c new file mode 100644 index 0000000000..e0d467d43b --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c @@ -0,0 +1,31 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpOutCS[] = { + CS_BEGIN_CUTSCENE(5, 1167), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1138), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA8A5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xA3D9), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324859619140625f, 30, 63, 61, 0xF3A5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5D5), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5E7), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xA5EC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xBCA5), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.32486343383789f, 29, 61, 59, 0xEEC0), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1167), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 79, 31, 0xA8A5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324859619140625f, 54, 80, 31, 0xA3D9), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 10, 60.324859619140625f, 54, 79, 31, 0xF3A5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 60.32486343383789f, 15, 42, 30, 0xA5D5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xA5E7), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.32486343383789f, 15, 42, 30, 0xA5EC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xBCA5), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.32486343383789f, 15, 42, 30, 0xEEC0), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c new file mode 100644 index 0000000000..549d8a77a5 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c @@ -0,0 +1,27 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpInToTCS[] = { + CS_BEGIN_CUTSCENE(2, 1118), + CS_CAM_POS_PLAYER_LIST(0, 1089), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 71.32476043701172f, 53, 53, 40, 0x010F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0120), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 53, 53, 40, 0x0131), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F4), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x01F6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0207), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 70.59991455078125f, 58, 89, 47, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1118), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.52477264404297f, 11, 29, 10, 0x010F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.39991760253906f, 11, 29, 10, 0x0120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 11, 29, 10, 0x0131), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 7, 70.59991455078125f, 29, 58, 25, 0x01F4), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x01F6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 70.59991455078125f, 29, 58, 25, 0x0207), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 70.59991455078125f, 29, 58, 25, 0x0000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c new file mode 100644 index 0000000000..d68e8139d8 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c @@ -0,0 +1,25 @@ +#include "z_demo_kankyo.h" +#include "z64cutscene_commands.h" + +// clang-format off +CutsceneData gChildWarpOutToTCS[] = { + CS_BEGIN_CUTSCENE(5, 1120), + CS_SCENE_TRANS_FX(0x0005, 36, 46), + CS_SCENE_TRANS_FX(0x0001, 30, 35), + CS_CAM_POS_PLAYER_LIST(0, 1091), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F1C), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1F8C), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x1FFC), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x206C), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.324867248535156f, 41, 75, 49, 0x20DC), + CS_CAM_FOCUS_POINT_PLAYER_LIST(0, 1120), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F1C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x1F8C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.324867248535156f, 24, 52, 29, 0x1FFC), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x206C), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.324867248535156f, 24, 52, 29, 0x20DC), + CS_MISC_LIST(1), + CS_MISC(0x000C, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index e735c71b3b..2aaba14058 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -9,10 +9,15 @@ void EnCs_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnCs_Update(Actor* thisx, GlobalContext* globalCtx); void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06008540; -extern UNK_TYPE D_0602AF70; +void EnCs_Walk(EnCs* this, GlobalContext* globalCtx); +void EnCs_Talk(EnCs* this, GlobalContext* globalCtx); +void EnCs_Wait(EnCs* this, GlobalContext* globalCtx); +s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* pos, Vec3s* rot, void* thisx); +void EnCs_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx); + +extern FlexSkeletonHeader D_06008540; // Graveyard boy skeleton +extern Gfx D_0602AF70[]; // Spooky Mask in Child Link's object -/* const ActorInit En_Cs_InitVars = { ACTOR_EN_CS, ACTORCAT_NPC, @@ -25,7 +30,7 @@ const ActorInit En_Cs_InitVars = { (ActorFunc)EnCs_Draw, }; -static ColliderCylinderInit D_809E28C0 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -44,35 +49,432 @@ static ColliderCylinderInit D_809E28C0 = { }, { 18, 63, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s") +static CollisionCheckInfoInit2 sColChkInfoInit2 = { 0, 0, 0, 0, MASS_IMMOVABLE }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s") +static DamageTable sDamageTable = { 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s") +static struct_D_80AA1678 sAnimations[] = { + { 0x06000700, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x06000E10, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x06001588, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x0600195C, 1.0f, ANIMMODE_ONCE, -10.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s") +void EnCs_SetAnimFromIndex(EnCs* this, s32 animIndex, s32* currentAnimIndex) { + f32 morphFrames; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1D38.s") + if ((*currentAnimIndex < 0) || (animIndex == *currentAnimIndex)) { + morphFrames = 0.0f; + } else { + morphFrames = sAnimations[animIndex].transitionRate; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E80.s") + if (sAnimations[animIndex].frameCount >= 0.0f) { + Animation_Change(&this->skelAnime, sAnimations[animIndex].animation, sAnimations[animIndex].frameCount, 0.0f, + Animation_GetLastFrame(sAnimations[animIndex].animation), sAnimations[animIndex].mode, + morphFrames); + } else { + Animation_Change(&this->skelAnime, sAnimations[animIndex].animation, sAnimations[animIndex].frameCount, + Animation_GetLastFrame(sAnimations[animIndex].animation), 0.0f, sAnimations[animIndex].mode, + morphFrames); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1E90.s") + *currentAnimIndex = animIndex; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s") +void EnCs_Init(Actor* thisx, GlobalContext* globalCtx) { + EnCs* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2134.s") + if (gSaveContext.nightFlag != 0) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E22D4.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2360.s") + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008540, NULL, this->jointTable, this->morphTable, 16); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s") + CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2784.s") + Animation_Change(&this->skelAnime, sAnimations[0].animation, 1.0f, 0.0f, + Animation_GetLastFrame(sAnimations[0].animation), sAnimations[0].mode, + sAnimations[0].transitionRate); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E2814.s") + this->actor.targetMode = 6; + this->path = this->actor.params & 0xFF; + this->unk_1EC = 0; // This variable is unused anywhere else + this->talkState = 0; + this->currentAnimIndex = -1; + this->actor.gravity = -1.0f; + + EnCs_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + + this->actionFunc = EnCs_Walk; + this->walkSpeed = 1.0f; +} + +void EnCs_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnCs* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +s32 EnCs_GetTalkState(EnCs* this, GlobalContext* globalCtx) { + s32 pad; + s32 pad2; + s32 talkState = 1; + + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 4: + if (func_80106BC8(globalCtx) != 0) { + if (globalCtx->msgCtx.choiceIndex == 0) { + this->actor.textId = 0x2026; + EnCs_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + talkState = 2; + } else { + this->actor.textId = 0x2024; + EnCs_SetAnimFromIndex(this, 1, &this->currentAnimIndex); + talkState = 2; + } + } + break; + case 6: + if (func_80106BC8(globalCtx)) { + if (this->actor.textId == 0x2026) { + Player_UnsetMask(globalCtx); + Item_Give(globalCtx, ITEM_SOLD_OUT); + gSaveContext.itemGetInf[3] |= 0x400; + Rupees_ChangeBy(30); + this->actor.textId = 0x2027; + talkState = 2; + } else { + talkState = 0; + } + } + break; + case 0: + case 1: + case 2: + case 3: + case 5: + break; + } + + return talkState; +} + +s32 EnCs_GetTextID(EnCs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 textId = Text_GetFaceReaction(globalCtx, 15); + + if (gSaveContext.itemGetInf[3] & 0x400) { + if (textId == 0) { + textId = 0x2028; + } + } else if (player->currentMask == PLAYER_MASK_SPOOKY) { + textId = 0x2023; + } else { + if (textId == 0) { + textId = 0x2022; + } + } + + return textId; +} + +void EnCs_HandleTalking(EnCs* this, GlobalContext* globalCtx) { + s32 pad; + s16 sp2A; + s16 sp28; + + if (this->talkState == 2) { + func_8010B720(globalCtx, this->actor.textId); + this->talkState = 1; + } else if (this->talkState == 1) { + this->talkState = EnCs_GetTalkState(this, globalCtx); + } else if (func_8002F194(&this->actor, globalCtx)) { + if ((this->actor.textId == 0x2022) || ((this->actor.textId != 0x2022) && (this->actor.textId != 0x2028))) { + EnCs_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + } + + if ((this->actor.textId == 0x2023) || (this->actor.textId == 0x2028)) { + EnCs_SetAnimFromIndex(this, 1, &this->currentAnimIndex); + } + + if (this->actor.textId == 0x2023) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } + + this->talkState = 1; + } else { + func_8002F374(globalCtx, &this->actor, &sp2A, &sp28); + + if ((sp2A >= 0) && (sp2A <= 320) && (sp28 >= 0) && (sp28 <= 240) && (func_8002F2CC(this, globalCtx, 100.0f))) { + this->actor.textId = EnCs_GetTextID(this, globalCtx); + } + } +} + +s32 EnCs_GetwaypointCount(Path* pathList, s32 pathIndex) { + Path* path = &pathList[pathIndex]; + + return path->count; +} + +s32 EnCs_GetPathPoint(Path* pathList, Vec3f* dest, s32 pathIndex, s32 waypoint) { + Path* path = pathList; + Vec3s* pathPos; + + path += pathIndex; + pathPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[waypoint]; + + dest->x = pathPos->x; + dest->y = pathPos->y; + dest->z = pathPos->z; + + return 0; +} + +s32 EnCs_HandleWalking(EnCs* this, GlobalContext* globalCtx) { + f32 xDiff; + f32 zDiff; + Vec3f pathPos; + s32 waypointCount; + s16 walkAngle1; + s16 walkAngle2; + + EnCs_GetPathPoint(globalCtx->setupPathList, &pathPos, this->path, this->waypoint); + xDiff = pathPos.x - this->actor.world.pos.x; + zDiff = pathPos.z - this->actor.world.pos.z; + walkAngle1 = Math_FAtan2F(xDiff, zDiff) * (32768.0f / M_PI); + this->walkAngle = walkAngle1; + this->walkDist = sqrtf((xDiff * xDiff) + (zDiff * zDiff)); + + while (this->walkDist <= 10.44f) { + this->waypoint++; + waypointCount = EnCs_GetwaypointCount(globalCtx->setupPathList, this->path); + + if ((this->waypoint < 0) || (!(this->waypoint < waypointCount))) { + this->waypoint = 0; + } + + EnCs_GetPathPoint(globalCtx->setupPathList, &pathPos, this->path, this->waypoint); + xDiff = pathPos.x - this->actor.world.pos.x; + zDiff = pathPos.z - this->actor.world.pos.z; + walkAngle2 = Math_FAtan2F(xDiff, zDiff) * (32768.0f / M_PI); + this->walkAngle = walkAngle2; + this->walkDist = sqrtf((xDiff * xDiff) + (zDiff * zDiff)); + } + + Math_SmoothStepToS(&this->actor.shape.rot.y, this->walkAngle, 1, 2500, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + this->actor.speedXZ = this->walkSpeed; + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + + return 0; +} + +void EnCs_Walk(EnCs* this, GlobalContext* globalCtx) { + s32 rnd; + s32 animIndex; + s32 curAnimFrame; + + if (this->talkState != 0) { + this->actionFunc = EnCs_Talk; + return; + } + + if (SkelAnime_Update(&this->skelAnime)) { + animIndex = this->currentAnimIndex; + + if (this->talkState == 0) { + if (gSaveContext.itemGetInf[3] & 0x400) { + rnd = Rand_ZeroOne() * 10.0f; + } else { + rnd = Rand_ZeroOne() * 5.0f; + } + + if (rnd == 0) { + if (gSaveContext.itemGetInf[3] & 0x400) { + animIndex = 2.0f * Rand_ZeroOne(); + animIndex = (animIndex == 0) ? 2 : 1; + } else { + animIndex = 2; + } + + this->actionFunc = EnCs_Wait; + } else { + animIndex = 0; + } + } + + EnCs_SetAnimFromIndex(this, animIndex, &this->currentAnimIndex); + } + + if (this->talkState == 0) { + curAnimFrame = this->skelAnime.curFrame; + + if (((curAnimFrame >= 8) && (curAnimFrame < 16)) || ((curAnimFrame >= 23) && (curAnimFrame < 30)) || + (curAnimFrame == 0)) { + this->walkSpeed = 0.0f; + } else { + this->walkSpeed = 1.0f; + } + + EnCs_HandleWalking(this, globalCtx); + } +} + +void EnCs_Wait(EnCs* this, GlobalContext* globalCtx) { + s32 animIndex; + + if (this->talkState != 0) { + this->actionFunc = EnCs_Talk; + return; + } + + if (SkelAnime_Update(&this->skelAnime)) { + animIndex = this->currentAnimIndex; + + if (this->talkState == 0) { + if (this->animLoopCount > 0) { + this->animLoopCount--; + animIndex = this->currentAnimIndex; + } else { + animIndex = 0; + this->actionFunc = EnCs_Walk; + } + } + + EnCs_SetAnimFromIndex(this, animIndex, &this->currentAnimIndex); + } +} + +void EnCs_Talk(EnCs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (SkelAnime_Update(&this->skelAnime) != 0) { + EnCs_SetAnimFromIndex(this, this->currentAnimIndex, &this->currentAnimIndex); + } + + this->flag |= 1; + this->npcInfo.unk_18.x = player->actor.focus.pos.x; + this->npcInfo.unk_18.y = player->actor.focus.pos.y; + this->npcInfo.unk_18.z = player->actor.focus.pos.z; + func_80034A14(&this->actor, &this->npcInfo, 0, 4); + + if (this->talkState == 0) { + EnCs_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + this->actionFunc = EnCs_Walk; + this->flag &= ~1; + } +} + +void EnCs_Update(Actor* thisx, GlobalContext* globalCtx) { + static s32 eyeBlinkFrames[] = { 70, 1, 1 }; + EnCs* this = THIS; + s32 pad; + + if (this->currentAnimIndex == 0) { + if (((s32)this->skelAnime.curFrame == 9) || ((s32)this->skelAnime.curFrame == 23)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); + } + } else if (this->currentAnimIndex == 1) { + if (((s32)this->skelAnime.curFrame == 10) || ((s32)this->skelAnime.curFrame == 25)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); + } + } else if ((this->currentAnimIndex == 2) && ((s32)this->skelAnime.curFrame == 20)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); + } + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + + this->actionFunc(this, globalCtx); + + EnCs_HandleTalking(this, globalCtx); + + this->eyeBlinkTimer--; + + if (this->eyeBlinkTimer < 0) { + this->eyeIndex++; + + if (this->eyeIndex >= 3) { + this->eyeIndex = 0; + } + + this->eyeBlinkTimer = eyeBlinkFrames[this->eyeIndex]; + } +} + +void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) { + static u64* eyeTextures[] = { 0x06002130, 0x06002930, 0x06003130 }; + EnCs* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 968); + + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnCs_OverrideLimbDraw, EnCs_PostLimbDraw, &this->actor); + + if (gSaveContext.itemGetInf[3] & 0x400) { + s32 childLinkObjectIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_LINK_CHILD); + + // Handle attaching the Spooky Mask to the boy's face + if (childLinkObjectIndex >= 0) { + Mtx* mtx; + + Matrix_Put(&this->spookyMaskMtx); + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_cs.c", 1000); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[childLinkObjectIndex].segment); + gSPSegment(POLY_OPA_DISP++, 0x0D, mtx - 7); + gSPDisplayList(POLY_OPA_DISP++, D_0602AF70); + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 1015); +} + +s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* pos, Vec3s* rot, void* thisx) { + EnCs* this = THIS; + + if (this->flag & 1) { + switch (limbIndex) { + case 8: + rot->x += this->npcInfo.unk_0E.y; + rot->y -= this->npcInfo.unk_0E.x; + break; + case 15: + rot->x += this->npcInfo.unk_08.y; + rot->z += this->npcInfo.unk_08.x; + break; + } + } + + return 0; +} + +void EnCs_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + static Vec3f D_809E2970 = { 500.0f, 800.0f, 0.0f }; + EnCs* this = THIS; + + if (limbIndex == 15) { + Matrix_MultVec3f(&D_809E2970, &this->actor.focus.pos); + Matrix_Translate(0.0f, -200.0f, 0.0f, MTXMODE_APPLY); + Matrix_RotateY(0.0f, MTXMODE_APPLY); + Matrix_RotateX(0.0f, MTXMODE_APPLY); + Matrix_RotateZ(1.7453293f, MTXMODE_APPLY); + Matrix_Get(&this->spookyMaskMtx); + } +} diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h index ffd9592c35..86adda3953 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h @@ -6,9 +6,32 @@ struct EnCs; +typedef void (*EnCsActionFunc)(struct EnCs*, GlobalContext*); + typedef struct EnCs { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1F8]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnCsActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ s32 talkState; + /* 0x01E4 */ s32 eyeIndex; + /* 0x01E8 */ s32 eyeBlinkTimer; + /* 0x01EC */ s32 unk_1EC; + /* 0x01F0 */ char unk_1F0[4]; + /* 0x01F4 */ s32 path; + /* 0x01F8 */ char unk_1F8[4]; + /* 0x01FC */ s32 waypoint; + /* 0x0200 */ s32 animLoopCount; // How many time the current animation should loop before changing + /* 0x0204 */ f32 walkAngle; + /* 0x0208 */ f32 walkDist; + /* 0x020C */ f32 walkSpeed; + /* 0x0210 */ s32 currentAnimIndex; + /* 0x0214 */ char unk_214[4]; + /* 0x0218 */ MtxF spookyMaskMtx; + /* 0x0258 */ struct_80034A14_arg1 npcInfo; + /* 0x0280 */ s32 flag; + /* 0x0284 */ Vec3s jointTable[16]; + /* 0x02E4 */ Vec3s morphTable[16]; } EnCs; // size = 0x0344 extern const ActorInit En_Cs_InitVars; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 7bec3178a7..f9954bbf77 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -1,17 +1,32 @@ +/* + * File: z_en_daiku_kakariko.c + * Overlay: ovl_En_Daiku_Kakariko + * Description: Kakariko Village Carpenters + */ + #include "z_en_daiku_kakariko.h" #define FLAGS 0x00000019 #define THIS ((EnDaikuKakariko*)thisx) +typedef enum { + /* 0x0 */ CARPENTER_ICHIRO, // Red and purple pants, normal hair + /* 0x1 */ CARPENTER_SABOORO, // Light blue pants + /* 0x2 */ CARPENTER_JIRO, // Green pants + /* 0x3 */ CARPENTER_SHIRO // Pink and purple pants, two-spiked hair +} KakarikoCarpenterType; + void EnDaikuKakariko_Init(Actor* thisx, GlobalContext* globalCtx); void EnDaikuKakariko_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDaikuKakariko_Update(Actor* thisx, GlobalContext* globalCtx); void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06007958; +void EnDaikuKakariko_Wait(EnDaikuKakariko* this, GlobalContext* globalCtx); +void EnDaikuKakariko_Run(EnDaikuKakariko* this, GlobalContext* globalCtx); + +extern FlexSkeletonHeader D_06007958; -/* const ActorInit En_Daiku_Kakariko_InitVars = { ACTOR_EN_DAIKU_KAKARIKO, ACTORCAT_NPC, @@ -24,7 +39,7 @@ const ActorInit En_Daiku_Kakariko_InitVars = { (ActorFunc)EnDaikuKakariko_Draw, }; -static ColliderCylinderInit D_809E54B0 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -43,29 +58,464 @@ static ColliderCylinderInit D_809E54B0 = { }, { 18, 66, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s") +static CollisionCheckInfoInit2 sColChkInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s") +static DamageTable sDamageTable = { 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E474C.s") +static struct_D_80AA1678 sAnimations[] = { + { 0x06001AB0, 1.0f, 2, -7.0f }, { 0x06007DE0, 1.0f, 0, -7.0f }, { 0x0600885C, 1.0f, 0, -7.0f }, + { 0x06000C44, 1.0f, 0, -7.0f }, { 0x06000600, 1.0f, 0, -7.0f }, { 0x06008164, 1.0f, 0, -7.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s") +void EnDaikuKakariko_SetAnimFromIndex(EnDaikuKakariko* this, s32 animIndex, s32* currentAnimIndex) { + f32 morphFrames; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E49A8.s") + if ((*currentAnimIndex < 0) || (animIndex == *currentAnimIndex)) { + morphFrames = 0.0f; + } else { + morphFrames = sAnimations[animIndex].transitionRate; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4A7C.s") + Animation_Change(&this->skelAnime, sAnimations[animIndex].animation, 1.0f, 0.0f, + Animation_GetLastFrame(sAnimations[animIndex].animation), sAnimations[animIndex].mode, + morphFrames); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4B14.s") + *currentAnimIndex = animIndex; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s") +void EnDaikuKakariko_Init(Actor* thisx, GlobalContext* globalCtx) { + static u16 initFlags[] = { 0x0080, 0x00B0, 0x0070, 0x0470 }; // List of inital values for this->flags + EnDaikuKakariko* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s") + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + switch (globalCtx->sceneNum) { + case SCENE_SPOT01: + if (gSaveContext.nightFlag == 0) { + this->flags |= 1; + this->flags |= initFlags[this->actor.params & 3]; + } + break; + case SCENE_KAKARIKO: + if (gSaveContext.nightFlag == 1) { + this->flags |= 2; + } + break; + case SCENE_DRAG: + this->flags |= 4; + break; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E50B4.s") + if (!(this->flags & 7)) { + Actor_Kill(&this->actor); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s") + if (gSaveContext.nightFlag == 1) { + this->flags |= 8; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f); + + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007958, NULL, &this->jointTable, &this->morphTable, 17); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + + CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInit); + + Animation_Change(&this->skelAnime, sAnimations->animation, 1.0f, 0.0f, + Animation_GetLastFrame(sAnimations->animation), sAnimations->mode, sAnimations->transitionRate); + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + + this->actor.gravity = 0.0f; + this->runSpeed = 3.0f; + this->actor.uncullZoneForward = 1200.0f; + this->actor.targetMode = 6; + this->currentAnimIndex = -1; + + if (this->flags & 0x40) { + this->actor.gravity = -1.0f; + } + + if (this->flags & 0x10) { + EnDaikuKakariko_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_Run; + } else { + if (this->flags & 8) { + if (((this->actor.params & 3) == CARPENTER_SABOORO) || ((this->actor.params & 3) == CARPENTER_SHIRO)) { + EnDaikuKakariko_SetAnimFromIndex(this, 5, &this->currentAnimIndex); + this->flags |= 0x800; + } else { + EnDaikuKakariko_SetAnimFromIndex(this, 1, &this->currentAnimIndex); + } + + this->skelAnime.curFrame = (s32)(Rand_ZeroOne() * this->skelAnime.endFrame); + } else { + EnDaikuKakariko_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + this->skelAnime.curFrame = (s32)(Rand_ZeroOne() * this->skelAnime.endFrame); + } + + this->flags |= 0x100; + this->actionFunc = EnDaikuKakariko_Wait; + } +} + +void EnDaikuKakariko_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnDaikuKakariko* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +s32 EnDaikuKakariko_GetTalkState(EnDaikuKakariko* this, GlobalContext* globalCtx) { + s32 talkState = 2; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && (func_80106BC8(globalCtx))) { + switch (this->actor.textId) { + case 0x6061: + gSaveContext.infTable[23] |= 0x40; + break; + case 0x6064: + gSaveContext.infTable[23] |= 0x100; + break; + } + talkState = 0; + } + return talkState; +} + +void EnDaikuKakariko_HandleTalking(EnDaikuKakariko* this, GlobalContext* globalCtx) { + static s32 maskReactionSets[] = { 1, 2, 3, 4 }; + s16 sp26; + s16 sp24; + + if (this->talkState == 2) { + this->talkState = EnDaikuKakariko_GetTalkState(this, globalCtx); + } else if (func_8002F194(&this->actor, globalCtx)) { + this->talkState = 2; + } else { + func_8002F374(globalCtx, &this->actor, &sp26, &sp24); + + if ((sp26 >= 0) && (sp26 <= 320) && (sp24 >= 0) && (sp24 <= 240) && (this->talkState == 0) && + (func_8002F2CC(&this->actor, globalCtx, 100.0f) == 1)) { + this->actor.textId = Text_GetFaceReaction(globalCtx, maskReactionSets[this->actor.params & 3]); + + if (this->actor.textId == 0) { + switch (this->actor.params & 3) { + case 0: + if (this->flags & 8) { + this->actor.textId = 0x5076; + } else { + this->actor.textId = 0x5075; + } + break; + case 1: + if (this->flags & 1) { + this->actor.textId = 0x502A; + } else { + this->actor.textId = 0x5074; + } + break; + case 2: + if (this->flags & 1) { + this->actor.textId = 0x506A; + } else { + this->actor.textId = 0x506B; + } + break; + case 3: + if (this->flags & 1) { + this->actor.textId = 0x5077; + } else { + this->actor.textId = 0x5078; + } + break; + } + } + } + } +} + +void EnDaikuKakariko_Talk(EnDaikuKakariko* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + EnDaikuKakariko_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + } + + EnDaikuKakariko_HandleTalking(this, globalCtx); + + if (this->talkState == 0) { + if (this->flags & 0x10) { + EnDaikuKakariko_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + this->flags &= ~0x0300; + this->actionFunc = EnDaikuKakariko_Run; + return; + } + + if (!(this->flags & 8)) { + EnDaikuKakariko_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + } + + if ((this->flags & 0x800) == 0) { + this->flags &= ~0x0200; + this->flags |= 0x100; + } + + this->actionFunc = EnDaikuKakariko_Wait; + } +} + +void EnDaikuKakariko_Wait(EnDaikuKakariko* this, GlobalContext* globalCtx) { + EnDaikuKakariko_HandleTalking(this, globalCtx); + + if (SkelAnime_Update(&this->skelAnime)) { + EnDaikuKakariko_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + } + + if (this->talkState != 0) { + if (!(this->flags & 8)) { + EnDaikuKakariko_SetAnimFromIndex(this, 4, &this->currentAnimIndex); + } + + if (!(this->flags & 0x800)) { + this->flags |= 0x200; + this->flags &= ~0x0100; + } + + this->actionFunc = EnDaikuKakariko_Talk; + } +} + +void EnDaikuKakariko_StopRunning(EnDaikuKakariko* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + this->timer--; + + if (this->timer <= 0) { + EnDaikuKakariko_SetAnimFromIndex(this, 3, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_Run; + } else { + this->skelAnime.curFrame = this->skelAnime.startFrame; + } + } + + EnDaikuKakariko_HandleTalking(this, globalCtx); + + if (this->talkState != 0) { + this->flags |= 0x200; + EnDaikuKakariko_SetAnimFromIndex(this, 4, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_Talk; + } +} + +void EnDaikuKakariko_Run(EnDaikuKakariko* this, GlobalContext* globalCtx) { + s32 pad; + Path* path; + Vec3s* pathPos; + f32 xDist; + f32 zDist; + s16 runAngle; + f32 runDist; + s16 angleStepDiff; + s32 run; + + do { + path = &globalCtx->setupPathList[(this->actor.params >> 8) & 0xFF]; + pathPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[this->waypoint]; + xDist = pathPos->x - this->actor.world.pos.x; + zDist = pathPos->z - this->actor.world.pos.z; + runAngle = Math_FAtan2F(xDist, zDist) * (32768.0f / M_PI); + runDist = sqrtf((xDist * xDist) + (zDist * zDist)); + + run = false; + + if (runDist <= 10.0f) { + if (this->pathContinue == false) { + this->waypoint++; + + if (this->waypoint >= path->count) { + if (this->flags & 0x20) { + this->waypoint = path->count - 2; + this->pathContinue = true; + this->run = run = false; + + if (this->flags & 0x400) { + this->timer = 2; + EnDaikuKakariko_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_StopRunning; + return; + } + } else { + this->waypoint = 0; + run = true; + } + } else { + this->run = run = true; + } + } else { + this->waypoint--; + + if (this->waypoint < 0) { + this->waypoint = 1; + this->pathContinue = false; + this->run = run = false; + + if (this->flags & 0x400) { + this->timer = 2; + EnDaikuKakariko_SetAnimFromIndex(this, 0, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_StopRunning; + return; + } + } else { + run = true; + } + } + } + } while (run); + + angleStepDiff = Math_SmoothStepToS(&this->actor.shape.rot.y, runAngle, 1, 5000, 0); + + this->actor.world.rot.y = this->actor.shape.rot.y; + + if (this->run == false) { + if (angleStepDiff == 0) { + this->run = true; + } else { + this->actor.speedXZ = 0.0f; + } + } + + if (this->run == true) { + Math_SmoothStepToF(&this->actor.speedXZ, this->runSpeed, 0.8f, runDist, 0.0f); + } + + Actor_MoveForward(&this->actor); + + if (this->flags & 0x40) { + Actor_UpdateBgCheckInfo(globalCtx, this, 0.0f, 0.0f, 0.0f, 4); + } else if (this->flags & 0x80) { + this->runFlag |= 1; + this->flags &= ~0x0080; + } else if (this->runFlag & 1) { + Actor_UpdateBgCheckInfo(globalCtx, this, 0.0f, 0.0f, 0.0f, 4); + this->runFlag &= ~1; + } + + SkelAnime_Update(&this->skelAnime); + EnDaikuKakariko_HandleTalking(this, globalCtx); + + if (this->talkState != 0) { + this->flags |= 0x200; + EnDaikuKakariko_SetAnimFromIndex(this, 4, &this->currentAnimIndex); + this->actionFunc = EnDaikuKakariko_Talk; + } +} + +void EnDaikuKakariko_Update(Actor* thisx, GlobalContext* globalCtx) { + EnDaikuKakariko* this = THIS; + s32 pad; + Player* player = PLAYER; + s32 pad2; + + if (this->currentAnimIndex == 3) { + if (((s32)this->skelAnime.curFrame == 6) || ((s32)this->skelAnime.curFrame == 15)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); + } + } + + Collider_UpdateCylinder(&this->actor, &this->collider); + + if (this->flags & 4) { + this->collider.dim.pos.x -= 27; + this->collider.dim.pos.z -= 27; + this->collider.dim.radius = 63; + } + + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + + this->actionFunc(this, globalCtx); + + this->npcInfo.unk_18.x = player->actor.focus.pos.x; + this->npcInfo.unk_18.y = player->actor.focus.pos.y; + this->npcInfo.unk_18.z = player->actor.focus.pos.z; + + if (this->flags & 0x100) { + this->neckAngleTarget.x = 5900; + this->flags |= 0x1000; + func_80034A14(&this->actor, &this->npcInfo, 0, 2); + } else if (this->flags & 0x200) { + this->neckAngleTarget.x = 5900; + this->flags |= 0x1000; + func_80034A14(&this->actor, &this->npcInfo, 0, 4); + } + + Math_SmoothStepToS(&this->neckAngle.x, this->neckAngleTarget.x, 1, 1820, 0); +} + +s32 EnDaikuKakariko_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnDaikuKakariko* this = THIS; + Vec3s angle; + + switch (limbIndex) { + case 8: + angle = this->npcInfo.unk_0E; + Matrix_RotateX(-(angle.y * (M_PI / 32768.0f)), MTXMODE_APPLY); + Matrix_RotateZ(-(angle.x * (M_PI / 32768.0f)), MTXMODE_APPLY); + break; + case 15: + Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); + angle = this->npcInfo.unk_08; + + if (this->flags & 0x1000) { + osSyncPrintf("<%d>\n", this->neckAngle.x); + Matrix_RotateX((angle.y + this->neckAngle.y) * (M_PI / 32768.0f), MTXMODE_APPLY); + Matrix_RotateZ((angle.x + this->neckAngle.x) * (M_PI / 32768.0f), MTXMODE_APPLY); + } else { + Matrix_RotateX(angle.y * (M_PI / 32768.0f), MTXMODE_APPLY); + Matrix_RotateZ(angle.x * (M_PI / 32768.0f), MTXMODE_APPLY); + } + + Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); + break; + } + + return 0; +} + +void EnDaikuKakariko_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + static Gfx* carpenterHeadDLists[] = { 0x06005BD0, 0x06005AC0, 0x06005990, 0x06005880 }; + static Vec3f unkVec = { 700.0f, 1100.0f, 0.0f }; + EnDaikuKakariko* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1104); + + if (limbIndex == 15) { + Matrix_MultVec3f(&unkVec, &this->actor.focus.pos); + gSPDisplayList(POLY_OPA_DISP++, carpenterHeadDLists[this->actor.params & 3]); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1113); +} + +void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnDaikuKakariko* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1124); + + func_80093D18(globalCtx->state.gfxCtx); + + if ((thisx->params & 3) == CARPENTER_ICHIRO) { + gDPSetEnvColor(POLY_OPA_DISP++, 170, 10, 70, 255); + } else if ((thisx->params & 3) == CARPENTER_SABOORO) { + gDPSetEnvColor(POLY_OPA_DISP++, 170, 200, 255, 255); + } else if ((thisx->params & 3) == CARPENTER_JIRO) { + gDPSetEnvColor(POLY_OPA_DISP++, 0, 230, 70, 255); + } else if ((thisx->params & 3) == CARPENTER_SHIRO) { + gDPSetEnvColor(POLY_OPA_DISP++, 200, 0, 150, 255); + } + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw, thisx); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1151); +} diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h index ec07a3a077..3ea130c1b3 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h @@ -6,9 +6,28 @@ struct EnDaikuKakariko; +typedef void (*EnDaikuKakarikoActionFunc)(struct EnDaikuKakariko*, GlobalContext*); + typedef struct EnDaikuKakariko { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1BC]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnDaikuKakarikoActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ s32 talkState; + /* 0x01E4 */ s32 waypoint; + /* 0x01E8 */ f32 runSpeed; + /* 0x01EC */ s32 currentAnimIndex; + /* 0x01F0 */ char unk_1F0[8]; // Unused variables? + /* 0x01F8 */ s32 pathContinue; // If true, continue looping through the path data + /* 0x01FC */ s32 run; // If true the carpenter will run + /* 0x0200 */ u16 flags; + /* 0x0202 */ u16 runFlag; + /* 0x0204 */ struct_80034A14_arg1 npcInfo; // Info related to NPCs and turning their head towards the player + /* 0x022C */ Vec3s jointTable[17]; + /* 0x0292 */ Vec3s morphTable[17]; + /* 0x02F8 */ s32 timer; + /* 0x02FC */ Vec3s neckAngle; + /* 0x0302 */ Vec3s neckAngleTarget; } EnDaikuKakariko; // size = 0x0308 extern const ActorInit En_Daiku_Kakariko_InitVars; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index daa4bba25a..562f1c68cc 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -157,7 +157,7 @@ void EnDh_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawCircle, 64.0f); this->actor.params = ENDH_WAIT_UNDERGROUND; this->actor.colChkInfo.mass = MASS_HEAVY; - this->actor.colChkInfo.health = (gSaveContext.linkAge == 0) ? 14 : 20; + this->actor.colChkInfo.health = LINK_IS_ADULT ? 14 : 20; this->alpha = this->unk_258 = 255; this->actor.flags &= ~1; Collider_InitCylinder(globalCtx, &this->collider1); diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index ddf73c8053..6b6e24701e 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -385,7 +385,7 @@ void func_809EFDD0(EnDns* this, GlobalContext* globalCtx) { func_8002F434(&this->actor, globalCtx, GI_NUT_UPGRADE_40, 130.0f, 100.0f); } } else { - func_8002F434(&this->actor, globalCtx, this->dnsItemEntry->getItemID, 130.0f, 100.0f); + func_8002F434(&this->actor, globalCtx, this->dnsItemEntry->getItemId, 130.0f, 100.0f); } } diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index 4a6b670b4a..864b27f6cf 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -13,7 +13,7 @@ typedef void (*EnDnsSetRupeesAndFlags)(struct EnDns*); typedef struct { /* 0x00 */ s16 itemPrice; /* 0x02 */ u16 itemAmount; - /* 0x04 */ s32 getItemID; + /* 0x04 */ s32 getItemId; /* 0x08 */ EnDnsPurchaseableCheck purchaseableCheck; /* 0x0C */ EnDnsSetRupeesAndFlags setRupeesAndFlags; } DnsItemEntry; // size = 0x10 diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index bee4ffe008..f9fbe02d33 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -1,4 +1,11 @@ +/* + * File: z_en_dodojr.c + * Overlay: ovl_En_Dodojr + * Description: Baby Dodongo + */ + #include "z_en_dodojr.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" #define FLAGS 0x00000005 @@ -9,14 +16,29 @@ void EnDodojr_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDodojr_Update(Actor* thisx, GlobalContext* globalCtx); void EnDodojr_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060004A0; -extern UNK_TYPE D_060005F0; -extern UNK_TYPE D_06000724; -extern UNK_TYPE D_06000860; -extern UNK_TYPE D_060009D4; -extern UNK_TYPE D_060020E0; +void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7BE4(EnDodojr* this, GlobalContext* globalCtx); +void func_809F74C4(EnDodojr* this, GlobalContext* globalCtx); +void func_809F758C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F786C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F799C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F78EC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F773C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F77AC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F784C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7AB8(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7A00(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx); +void func_809F768C(EnDodojr* this, GlobalContext* globalCtx); + +extern AnimationHeader D_060004A0; +extern AnimationHeader D_060005F0; +extern AnimationHeader D_06000724; +extern AnimationHeader D_06000860; +extern AnimationHeader D_060009D4; +extern SkeletonHeader D_060020E0; -/* const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORCAT_ENEMY, @@ -29,7 +51,7 @@ const ActorInit En_Dodojr_InitVars = { (ActorFunc)EnDodojr_Draw, }; -static ColliderCylinderInit D_809F7EB0 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_HIT6, AT_ON | AT_TYPE_ENEMY, @@ -48,79 +70,585 @@ static ColliderCylinderInit D_809F7EB0 = { }, { 18, 20, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s") +static CollisionCheckInfoInit2 sColChkInit = { 1, 2, 25, 25, 0xFF }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s") +void EnDodojr_Init(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s") + ActorShape_Init(&this->actor.shape.rot.x, 0.0f, NULL, 18.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060020E0, &D_060009D4, &this->jointTable, &this->morphTable, 15); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(4), &sColChkInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s") + this->actor.naviEnemyId = 0xE; + this->actor.flags &= ~1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s") + Actor_SetScale(&this->actor, 0.02f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s") + this->actionFunc = func_809F73AC; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s") +void EnDodojr_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s") +void func_809F64D0(EnDodojr* this) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + func_8003426C(&this->actor, 0x4000, 200, 0, 8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s") +void func_809F6510(EnDodojr* this, GlobalContext* globalCtx, s32 count) { + Color_RGBA8 prim = { 170, 130, 90, 255 }; + Color_RGBA8 env = { 100, 60, 20, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = ((Rand_ZeroOne() - 0.5f) * 65536.0f); + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s") + pos.y = this->dustPos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s") + for (i = count; i >= 0; i--, angle += (s16)(0x10000 / count)) { + accel.x = (Rand_ZeroOne() - 0.5f) * 4.0f; + accel.z = (Rand_ZeroOne() - 0.5f) * 4.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s") + pos.x = (Math_SinS(angle) * 22.0f) + this->dustPos.x; + pos.z = (Math_CosS(angle) * 22.0f) + this->dustPos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s") + func_8002836C(globalCtx, &pos, &velocity, &accel, &prim, &env, 120, 40, 10); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s") +void func_809F6730(EnDodojr* this, GlobalContext* globalCtx, Vec3f* arg2) { + Color_RGBA8 prim = { 170, 130, 90, 255 }; + Color_RGBA8 env = { 100, 60, 20, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = ((Rand_ZeroOne() - 0.5f) * 65536.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s") + pos.y = this->actor.floorHeight; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s") + accel.x = (Rand_ZeroOne() - 0.5f) * 2; + accel.z = (Rand_ZeroOne() - 0.5f) * 2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s") + pos.x = (Math_SinS(angle) * 11.0f) + arg2->x; + pos.z = (Math_CosS(angle) * 11.0f) + arg2->z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s") + func_8002836C(globalCtx, &pos, &velocity, &accel, &prim, &env, 100, 60, 8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s") +s32 func_809F68B0(EnDodojr* this, GlobalContext* globalCtx) { + if (this->actor.velocity.y >= 0.0f) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s") + if (this->unk_1FC == 0) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s") + if (this->actor.bgCheckFlags & 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + this->dustPos = this->actor.world.pos; + func_809F6510(this, globalCtx, 10); + this->actor.velocity.y = 10.0f / (4 - this->unk_1FC); + this->unk_1FC--; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s") + if (this->unk_1FC == 0) { + this->actor.velocity.y = 0.0f; + return 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s") +void func_809F6994(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_06000860); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s") + Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f); + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 2.6f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s") +void func_809F6A20(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_060004A0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s") + Animation_Change(&this->skelAnime, &D_060004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f); + this->actor.speedXZ = 0.0f; + this->actor.velocity.x = 0.0f; + this->actor.velocity.z = 0.0f; + this->actor.gravity = -0.8f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s") + if (this->unk_1FC == 0) { + this->unk_1FC = 3; + this->actor.velocity.y = 10.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s") +void func_809F6AC4(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_060005F0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s") + Animation_Change(&this->skelAnime, &D_060005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f); + this->actor.velocity.y = 0.0f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s") +void func_809F6B38(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_06000724); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s") + Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f); + this->actor.gravity = -0.8f; + this->unk_1FC = 3; + this->actor.velocity.y = 10.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s") +void func_809F6BBC(EnDodojr* this) { + this->actor.shape.shadowDraw = NULL; + this->actor.flags &= ~1; + this->actor.home.pos = this->actor.world.pos; + this->actor.speedXZ = 0.0f; + this->actor.gravity = -0.8f; + this->timer3 = 30; + this->dustPos = this->actor.world.pos; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s") +void func_809F6C24(EnDodojr* this) { + Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f); + Audio_PlayActorSound2(this, NA_SE_EN_DODO_M_EAT); + this->actor.speedXZ = 0.0f; + this->actor.velocity.x = 0.0f; + this->actor.velocity.z = 0.0f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s") +s32 func_809F6CA4(EnDodojr* this, GlobalContext* globalCtx) { + Actor* bomb; + Vec3f unkVec = { 99999.0f, 99999.0f, 99999.0f }; + s32 retVar = 0; + f32 xDist; + f32 yDist; + f32 zDist; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s") + bomb = globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].head; + this->bomb = NULL; + + while (bomb != NULL) { + if ((bomb->params != 0) || (bomb->parent != NULL) || (bomb->update == NULL)) { + bomb = bomb->next; + continue; + } + + if (bomb->id != ACTOR_EN_BOM) { + bomb = bomb->next; + continue; + } + + xDist = bomb->world.pos.x - this->actor.world.pos.x; + yDist = bomb->world.pos.y - this->actor.world.pos.y; + zDist = bomb->world.pos.z - this->actor.world.pos.z; + + if ((fabsf(xDist) >= fabsf(unkVec.x)) || (fabsf(yDist) >= fabsf(unkVec.y)) || + (fabsf(zDist) >= fabsf(unkVec.z))) { + bomb = bomb->next; + continue; + } + + this->bomb = bomb; + unkVec = bomb->world.pos; + retVar = 1; + bomb = bomb->next; + } + + return retVar; +} + +s32 func_809F6DD0(EnDodojr* this) { + if (this->bomb == NULL) { + return 0; + } else if (this->bomb->parent != NULL) { + return 0; + } else if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->bomb->world.pos) > 30.0f) { + return 0; + } else { + this->bomb->parent = this; + return 1; + } +} + +void func_809F6E54(EnDodojr* this, GlobalContext* globalCtx) { + f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f }; + s32 pad; + Player* player = PLAYER; + Vec3f pos; + s16 angleIndex; + + if ((this->bomb == NULL) || (this->bomb->update == NULL) || + ((this->bomb != NULL) && (this->bomb->parent != NULL))) { + func_809F6CA4(this, globalCtx); + } + + if (this->bomb != NULL) { + pos = this->bomb->world.pos; + } else { + pos = player->actor.world.pos; + } + + if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &pos) > 80.0f) { + angleIndex = (s16)(this->actor.home.pos.x + this->actor.home.pos.y + this->actor.home.pos.z + + globalCtx->state.frames / 30) % + 12; + angleIndex = ABS(angleIndex); + pos.x += 80.0f * sinf(angles[angleIndex]); + pos.z += 80.0f * cosf(angles[angleIndex]); + } + + Math_SmoothStepToS(&this->actor.world.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &pos), 10, 1000, 1); + this->actor.shape.rot.y = this->actor.world.rot.y; +} + +s32 func_809F706C(EnDodojr* this) { + if (this->actor.xzDistToPlayer > 40.0f) { + return 0; + } else { + return 1; + } +} + +void func_809F709C(EnDodojr* this) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_DEAD); + this->actor.flags &= ~1; + func_809F6A20(this); + this->actionFunc = func_809F7AB8; +} + +s32 func_809F70E8(EnDodojr* this, GlobalContext* globalCtx) { + if ((this->actionFunc == func_809F773C) || (this->actionFunc == func_809F77AC) || + (this->actionFunc == func_809F784C) || (this->actionFunc == func_809F7A00) || + (this->actionFunc == func_809F7AB8) || (this->actionFunc == func_809F7B3C) || + (this->actionFunc == func_809F7BE4)) { + return 0; + } + + if (globalCtx->actorCtx.unk_02 != 0) { + if (this->actionFunc != func_809F73AC) { + if (this->actionFunc == func_809F74C4) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + } + + func_809F709C(this); + } + return 0; + } + + if (!(this->collider.base.acFlags & 2)) { + return 0; + } else { + this->collider.base.acFlags &= ~2; + + if ((this->actionFunc == func_809F73AC) || (this->actionFunc == func_809F74C4)) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + } + + if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) { + func_80032C7C(globalCtx, &this->actor); + this->timer2 = 2; + this->actionFunc = func_809F7C48; + return 1; + } + + if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != func_809F78EC) && + (this->actionFunc != func_809F786C)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + this->timer1 = 120; + func_8003426C(&this->actor, 0, 200, 0, 120); + func_809F6A20(this); + this->actionFunc = func_809F786C; + } + + return 0; + } +} + +void func_809F72A4(EnDodojr* this, GlobalContext* globalCtx) { + Collider_UpdateCylinder(&this->actor, &this->collider); + + if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) { + if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) || + (this->actionFunc == func_809F799C)) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) || + (this->actionFunc == func_809F786C) || (this->actionFunc == func_809F78EC) || + (this->actionFunc == func_809F799C)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) { + f32 lastFrame = Animation_GetLastFrame(&D_06000860); + Player* player = PLAYER; + f32 dist; + + if (!(this->actor.xzDistToPlayer >= 320.0f)) { + dist = this->actor.world.pos.y - player->actor.world.pos.y; + + if (!(dist >= 40.0f)) { + Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_UP); + this->actor.world.pos.y -= 60.0f; + this->actor.flags |= 1; + this->actor.world.rot.x -= 0x4000; + this->actor.shape.rot.x = this->actor.world.rot.x; + this->dustPos = this->actor.world.pos; + this->dustPos.y = this->actor.floorHeight; + this->actionFunc = func_809F74C4; + } + } +} + +void func_809F74C4(EnDodojr* this, GlobalContext* globalCtx) { + f32 sp2C; + + Math_SmoothStepToS(&this->actor.shape, 0, 4, 0x3E8, 0x64); + sp2C = this->actor.shape.rot.x; + sp2C /= 16384.0f; + this->actor.world.pos.y = this->actor.home.pos.y + (60.0f * sp2C); + func_809F6510(this, globalCtx, 3); + + if (sp2C == 0.0f) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + this->actor.world.rot.x = this->actor.shape.rot.x; + this->actor.speedXZ = 2.6f; + this->actionFunc = func_809F758C; + } +} + +void func_809F758C(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(&this->actor); + func_809F6730(this, globalCtx, &this->actor.world.pos); + + if (DECR(this->timer4) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_MOVE); + this->timer4 = 5; + } + + if (func_809F6DD0(this) != 0) { + func_809F6C24(this); + this->actionFunc = func_809F768C; + return; + } + + func_809F6E54(this, globalCtx); + + if (func_809F706C(this) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_CRY); + func_809F6B38(this); + this->actionFunc = func_809F799C; + } + + if (this->actor.bgCheckFlags & 8) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_DOWN); + func_809F6BBC(this); + this->actionFunc = func_809F7A00; + } +} + +void func_809F768C(EnDodojr* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (((s16)this->skelAnime.curFrame - 8) < 4) { + bomb = (EnBom*)this->bomb; + bomb->timer++; + this->bomb->world.pos = this->headPos; + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DRINK); + Actor_Kill(this->bomb); + this->timer3 = 24; + this->unk_1FC = 0; + this->actionFunc = func_809F773C; + } +} + +void func_809F773C(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer3) == 0) { + func_809F64D0(this); + this->actor.flags &= ~1; + func_809F6A20(this); + this->actionFunc = func_809F77AC; + } +} + +void func_809F77AC(EnDodojr* this, GlobalContext* globalCtx) { + this->rootScale = 1.2f; + this->rootScale *= ((f32)this->actor.colorFilterTimer / 8); + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + this->timer3 = 60; + func_809F6AC4(this); + this->unk_1FC = 7; + this->actionFunc = func_809F784C; + } +} + +void func_809F784C(EnDodojr* this, GlobalContext* globalCtx) { + func_809F7B3C(this, globalCtx); +} + +void func_809F786C(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + func_809F6AC4(this); + this->actionFunc = func_809F78EC; + } + + Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10); + this->actor.world.rot.x = this->actor.shape.rot.x; + this->actor.colorFilterTimer = this->timer1; +} + +void func_809F78EC(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer1) != 0) { + if (this->timer1 < 30) { + if ((this->timer1 & 1) != 0) { + this->actor.world.pos.x += 1.5f; + this->actor.world.pos.z += 1.5f; + } else { + this->actor.world.pos.x -= 1.5f; + this->actor.world.pos.z -= 1.5f; + } + + return; + } + } else { + func_809F6994(this); + this->actionFunc = func_809F758C; + } +} + +void func_809F799C(EnDodojr* this, GlobalContext* globalCtx) { + this->actor.flags |= 0x1000000; + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + func_809F6994(this); + this->actionFunc = func_809F758C; + } +} + +void func_809F7A00(EnDodojr* this, GlobalContext* globalCtx) { + f32 tmp; + + Math_SmoothStepToS(&this->actor.shape.rot.x, 0x4000, 4, 1000, 100); + + if (DECR(this->timer3) != 0) { + tmp = (30 - this->timer3) / 30.0f; + this->actor.world.pos.y = this->actor.home.pos.y - (60.0f * tmp); + } else { + Actor_Kill(&this->actor); + } + + func_809F6510(this, globalCtx, 3); +} + +void func_809F7AB8(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(this); + Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10); + this->actor.world.rot.x = this->actor.shape.rot.x; + + if (func_809F68B0(this, globalCtx) != 0) { + this->timer3 = 60; + func_809F6AC4(this); + this->unk_1FC = 7; + this->actionFunc = func_809F7B3C; + } +} + +void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (this->unk_1FC != 0) { + if (this->actor.colorFilterTimer == 0) { + func_8003426C(&this->actor, 0x4000, 200, 0, this->unk_1FC); + this->unk_1FC--; + } + } else { + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, BOMB_BODY); + + if (bomb != NULL) { + bomb->timer = 0; + } + + this->timer3 = 8; + this->actionFunc = func_809F7BE4; + } +} + +void func_809F7BE4(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer3) == 0) { + Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.world.pos, 0x40); + Actor_Kill(&this->actor); + } +} + +void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer2) == 0) { + func_809F709C(this); + } +} + +void EnDodojr_Update(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; + + SkelAnime_Update(&this->skelAnime); + Actor_MoveForward(&this->actor); + func_809F70E8(this, globalCtx); + + if (this->actionFunc != func_809F73AC) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, this->collider.dim.radius, this->collider.dim.height, 0.0f, 5); + } + + this->actionFunc(this, globalCtx); + Actor_SetFocus(&this->actor, 10.0f); + func_809F72A4(this, globalCtx); +} + +s32 func_809F7D50(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + EnDodojr* this = THIS; + Vec3f D_809F7F64 = { 480.0f, 620.0f, 0.0f }; + + if (limbIndex == 1) { + Matrix_Scale((this->rootScale * 0.5f) + 1.0f, this->rootScale + 1.0f, (this->rootScale * 0.5f) + 1.0f, 1); + } + + if (limbIndex == 4) { + Matrix_MultVec3f(&D_809F7F64, &this->headPos); + } + + return 0; +} + +void func_809F7DFC(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { +} + +void EnDodojr_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; + + if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) { + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, func_809F7D50, func_809F7DFC, + &this->actor); + } +} diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index b16146f1f3..a46e9fd28d 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -6,9 +6,24 @@ struct EnDodojr; +typedef void (*EnDodojrActionFunc)(struct EnDodojr*, GlobalContext*); + typedef struct EnDodojr { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x174]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnDodojrActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ Actor* bomb; + /* 0x01E4 */ Vec3f headPos; + /* 0x01F0 */ Vec3f dustPos; + /* 0x01FC */ s16 unk_1FC; + /* 0x01FE */ s16 timer1; + /* 0x0200 */ s16 timer2; + /* 0x0202 */ s16 timer3; + /* 0x0204 */ s16 timer4; + /* 0x0208 */ f32 rootScale; // scale used with the root limb + /* 0x020C */ Vec3s jointTable[15]; + /* 0x0266 */ Vec3s morphTable[15]; } EnDodojr; // size = 0x02C0 extern const ActorInit En_Dodojr_InitVars; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 7d4e47ce01..0264d9adbb 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -57,10 +57,14 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, 50 }; static struct_80034EC0_Entry sAnimations[] = { - { 0x06001368, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06001368, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, - { 0x06000D78, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, { 0x06000278, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, - { 0x06001150, 1.0f, 0.0f, 4.0f, 0x02, -6.0f }, { 0x06001150, 1.0f, 5.0f, 25.0f, 0x04, -6.0f }, - { 0x06000928, 1.0f, 0.0f, 6.0f, 0x02, -6.0f }, { 0x06000C28, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, + { 0x06001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x06001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { 0x06000D78, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { 0x06000278, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { 0x06001150, 1.0f, 0.0f, 4.0f, ANIMMODE_ONCE, -6.0f }, + { 0x06001150, 1.0f, 5.0f, 25.0f, ANIMMODE_LOOP_PARTIAL, -6.0f }, + { 0x06000928, 1.0f, 0.0f, 6.0f, ANIMMODE_ONCE, -6.0f }, + { 0x06000C28, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index eb2aba76c7..b9b8b0f11e 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -9,13 +9,19 @@ void EnDu_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDu_Update(Actor* thisx, GlobalContext* globalCtx); void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_020059E0; -extern UNK_TYPE D_02006930; -extern UNK_TYPE D_02007DE0; -extern UNK_TYPE D_060041F4; -extern UNK_TYPE D_06011CA8; +void func_809FE3B4(EnDu* this, GlobalContext* globalCtx); +void func_809FE3C0(EnDu* this, GlobalContext* globalCtx); +void func_809FE638(EnDu* this, GlobalContext* globalCtx); +void func_809FE890(EnDu* this, GlobalContext* globalCtx); +void func_809FE4A4(EnDu* this, GlobalContext* globalCtx); +void func_809FE6CC(EnDu* this, GlobalContext* globalCtx); +void func_809FE740(EnDu* this, GlobalContext* globalCtx); +void func_809FE798(EnDu* this, GlobalContext* globalCtx); +void func_809FEC14(EnDu* this, GlobalContext* globalCtx); +void func_809FEC70(EnDu* this, GlobalContext* globalCtx); +void func_809FECE4(EnDu* this, GlobalContext* globalCtx); +void func_809FEB08(EnDu* this, GlobalContext* globalCtx); -/* const ActorInit En_Du_InitVars = { ACTOR_EN_DU, ACTORCAT_NPC, @@ -28,7 +34,7 @@ const ActorInit En_Du_InitVars = { (ActorFunc)EnDu_Draw, }; -static ColliderCylinderInit D_809FF230 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -47,59 +53,549 @@ static ColliderCylinderInit D_809FF230 = { }, { 20, 46, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s") +static CollisionCheckInfoInit2 sColChkInfoInit = { + 0, 0, 0, 0, MASS_IMMOVABLE, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s") +static struct_80034EC0_Entry sAnimations[] = { + { 0x06006EB0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06006EB0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06000800, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06000D00, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06001D70, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06002374, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x0600288C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06002D94, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x06002D94, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, { 0x06003D48, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, + { 0x06004C04, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, { 0x06003A30, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, + { 0x060046F4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06004ED8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, + { 0x060041F4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -6.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s") +extern CutsceneData D_020059E0[]; +extern CutsceneData D_02006930[]; +extern CutsceneData D_02007DE0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s") +extern AnimationHeader D_060041F4; +extern FlexSkeletonHeader D_06011CA8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s") +void EnDu_SetupAction(EnDu* this, EnDuActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s") +u16 func_809FDC38(GlobalContext* globalCtx, Actor* actor) { + u16 reaction = Text_GetFaceReaction(globalCtx, 0x21); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s") + if (reaction != 0) { + return reaction; + } + if (CUR_UPG_VALUE(UPG_STRENGTH)) { + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x301E; + } else { + return 0x301D; + } + } + if (gSaveContext.infTable[0x11] & 8) { + return 0x301B; + } else { + return 0x301A; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s") +s16 func_809FDCDC(GlobalContext* globalCtx, Actor* actor) { + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 0: + case 1: + break; + case 2: + switch (actor->textId) { + case 0x301A: + gSaveContext.infTable[0x11] |= 8; + break; + case 0x301C: + case 0x301F: + return 2; + case 0x3020: + gSaveContext.eventChkInf[0x2] |= 4; + break; + } + return 0; + case 3: + case 4: + case 5: + break; + case 6: + if (func_80106BC8(globalCtx)) { + return 3; + } + break; + case 7: + case 8: + case 9: + break; + } + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s") +s32 func_809FDDB4(EnDu* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_SPOT18 && gSaveContext.linkAge == 1) { + return 1; + } else if (globalCtx->sceneNum == SCENE_HIDAN && !(gSaveContext.infTable[0x11] & 0x400) && LINK_IS_ADULT) { + return 1; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s") +void func_809FDE24(EnDu* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 phi_a3 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s") + if (this->unk_1F4.unk_00 == 0) { + phi_a3 = 1; + } + if (this->actionFunc == func_809FE890) { + phi_a3 = 1; + } + this->unk_1F4.unk_18 = player->actor.world.pos; + this->unk_1F4.unk_14 = 10.0f; + func_80034A14(&this->actor, &this->unk_1F4, 3, phi_a3); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s") +void func_809FDE9C(EnDu* this) { + if (this->unk_1F2 > 0) { + this->unk_1F2--; + } else { + this->unk_1F2 = 0; + } + if (this->unk_1F2 < 3) { + this->unk_1EF = this->unk_1F2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s") + switch (this->unk_1EC) { + case 0: + if (this->unk_1F2 == 0) { + this->unk_1F2 = Rand_S16Offset(0x1E, 0x1E); + } + break; + case 1: + if (this->unk_1F2 == 0) { + this->unk_1EF = 2; + } + break; + case 2: + if (this->unk_1F2 == 0) { + this->unk_1EF = 2; + } + break; + case 3: + if (this->unk_1F2 == 0) { + this->unk_1EF = 0; + } + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s") + switch (this->unk_1ED) { + case 1: + this->unk_1F0 = 1; + break; + case 2: + this->unk_1F0 = 2; + break; + case 3: + this->unk_1F0 = 3; + break; + default: + this->unk_1F0 = 0; + break; + } + if (this->unk_1EE == 1) { + this->unk_1F1 = 1; + } else { + this->unk_1F1 = 0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s") +void func_809FDFC0(CsCmdActorAction* csAction, Vec3f* dst) { + dst->x = csAction->startPos.x; + dst->y = csAction->startPos.y; + dst->z = csAction->startPos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s") +void func_809FE000(CsCmdActorAction* csAction, Vec3f* dst) { + dst->x = csAction->endPos.x; + dst->y = csAction->endPos.y; + dst->z = csAction->endPos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s") +void func_809FE040(EnDu* this) { + s32 animationIndices[] = { 8, 8, 8, 8, 9, 10, 10, 13 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s") + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + this->unk_1E6++; + if (this->unk_1E6 >= 8) { + this->unk_1E6 = 0; + } + func_80034EC0(&this->skelAnime, sAnimations, animationIndices[this->unk_1E6]); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s") +void func_809FE104(EnDu* this) { + s32 animationIndices[] = { 8, 8, 11, 12 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s") + if (this->unk_1E6 < 4) { + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + this->unk_1E6++; + if (this->unk_1E6 < 4) { + func_80034EC0(&this->skelAnime, sAnimations, animationIndices[this->unk_1E6]); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s") +void EnDu_Init(Actor* thisx, GlobalContext* globalCtx) { + EnDu* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, NULL, 0, 0, 0); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit); + if (func_809FDDB4(this, globalCtx) == 0) { + Actor_Kill(&this->actor); + return; + } + func_80034EC0(&this->skelAnime, sAnimations, 0); + Actor_SetScale(&this->actor, 0.01f); + this->actor.targetMode = 1; + this->unk_1F4.unk_00 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s") + if (gSaveContext.cutsceneIndex >= 0xFFF0) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02006930); + gSaveContext.cutsceneTrigger = 1; + EnDu_SetupAction(this, func_809FE890); + } else if (globalCtx->sceneNum == 4) { + EnDu_SetupAction(this, func_809FE638); + } else if (gSaveContext.linkAge != 0) { + EnDu_SetupAction(this, func_809FE3C0); + } else { + EnDu_SetupAction(this, func_809FE3B4); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s") +void EnDu_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnDu* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s") + SkelAnime_Free(&this->skelAnime, globalCtx); + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s") +void func_809FE3B4(EnDu* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s") +void func_809FE3C0(EnDu* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (player->stateFlags2 & 0x1000000) { + func_8010BD88(globalCtx, 0x22); + player->stateFlags2 |= 0x2000000; + player->unk_6A8 = &this->actor; + EnDu_SetupAction(this, func_809FE4A4); + return; + } + if (this->unk_1F4.unk_00 == 2) { + func_8002DF54(globalCtx, &this->actor, 7); + this->unk_1F4.unk_00 = 0; + } + if (this->actor.xzDistToPlayer < 116.0f + this->collider.dim.radius) { + player->stateFlags2 |= 0x800000; + } +} + +void func_809FE4A4(EnDu* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (globalCtx->msgCtx.unk_E3EE == 4) { + globalCtx->msgCtx.unk_E3EE = 0; + EnDu_SetupAction(this, func_809FE3C0); + } else if (globalCtx->msgCtx.unk_E3EE >= 6) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02007DE0); + gSaveContext.cutsceneTrigger = 1; + this->unk_1E8 = 1; + EnDu_SetupAction(this, func_809FE890); + globalCtx->msgCtx.unk_E3EE = 4; + } else if (globalCtx->msgCtx.unk_E3EE == 3) { + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_020059E0); + gSaveContext.cutsceneTrigger = 1; + this->unk_1E8 = 0; + EnDu_SetupAction(this, func_809FE890); + globalCtx->msgCtx.unk_E3EE = 4; + } else { + player->stateFlags2 |= 0x800000; + } +} + +void func_809FE638(EnDu* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (!(player->stateFlags1 & 0x20000000)) { + func_800800F8(globalCtx, 0xD02, -0x63, &this->actor, 0); + player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.world.rot.y + 0x7FFF; + func_800F5C64(0x51); + EnDu_SetupAction(this, func_809FE6CC); + this->unk_1E2 = 0x32; + } +} + +void func_809FE6CC(EnDu* this, GlobalContext* globalCtx) { + s16 phi_v1; + + if (this->unk_1E2 == 0) { + phi_v1 = 0; + } else { + this->unk_1E2--; + phi_v1 = this->unk_1E2; + } + if (phi_v1 == 0) { + this->actor.textId = 0x3039; + func_8010B680(globalCtx, this->actor.textId, NULL); + this->unk_1F4.unk_00 = 1; + EnDu_SetupAction(this, func_809FE740); + } +} + +void func_809FE740(EnDu* this, GlobalContext* globalCtx) { + if (this->unk_1F4.unk_00 == 0) { + func_8005B1A4(ACTIVE_CAM); + this->unk_1E2 = 0x5A; + EnDu_SetupAction(this, func_809FE798); + } +} + +void func_809FE798(EnDu* this, GlobalContext* globalCtx) { + s32 phi_v0; + + if (this->unk_1E2 == 0) { + phi_v0 = 0; + } else { + this->unk_1E2--; + phi_v0 = this->unk_1E2; + } + if (phi_v0 != 0) { + switch (this->unk_1E2) { + case 0x50: + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK_B); + break; + case 0x3C: + Audio_PlayActorSound2(&this->actor, NA_SE_EV_SLIDE_DOOR_OPEN); + break; + case 0xF: + Audio_PlayActorSound2(&this->actor, NA_SE_EV_SLIDE_DOOR_CLOSE); + break; + case 5: + Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONE_BOUND); + break; + } + if (this->unk_1E2 >= 0x3D) { + this->actor.world.pos.x -= 10.0f; + } + } else { + Actor_Kill(&this->actor); + gSaveContext.infTable[0x11] |= 0x400; + } +} + +void func_809FE890(EnDu* this, GlobalContext* globalCtx) { + f32 frame; + Vec3f startPos; + Vec3f endPos; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + CsCmdActorAction* csAction; + + if (globalCtx->csCtx.state == 0) { + func_8002DF54(globalCtx, &this->actor, 1); + EnDu_SetupAction(this, func_809FEB08); + return; + } + csAction = globalCtx->csCtx.npcActions[2]; + + if (csAction != NULL) { + func_809FDFC0(csAction, &startPos); + func_809FE000(csAction, &endPos); + if (this->unk_1EA == 0) { + func_809FDFC0(csAction, &startPos); + this->actor.world.pos = startPos; + } + if (this->unk_1EA != csAction->action) { + if (csAction->action == 1) { + func_80034EC0(&this->skelAnime, sAnimations, 1); + } + if (csAction->action == 7 || csAction->action == 8) { + this->unk_1E6 = 0; + func_80034EC0(&this->skelAnime, sAnimations, 7); + } + this->unk_1EA = csAction->action; + if (this->unk_1EA == 7) { + this->unk_1F2 = 0xB; + this->unk_1EC = 2; + this->unk_1ED = 2; + this->unk_1EE = 1; + } + if (this->unk_1EA == 8) { + this->unk_1F2 = 0xB; + this->unk_1EC = 3; + this->unk_1ED = 3; + this->unk_1EE = 0; + } + } + if (this->unk_1EA == 7) { + func_809FE040(this); + } + if (this->unk_1EA == 8) { + func_809FE104(this); + } + this->actor.shape.rot.x = csAction->urot.x; + this->actor.shape.rot.y = csAction->urot.y; + this->actor.shape.rot.z = csAction->urot.z; + this->actor.velocity = velocity; + + if (globalCtx->csCtx.frames < csAction->endFrame) { + frame = csAction->endFrame - csAction->startFrame; + + this->actor.velocity.x = (endPos.x - startPos.x) / frame; + this->actor.velocity.y = (endPos.y - startPos.y) / frame; + this->actor.velocity.y += this->actor.gravity; + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } + this->actor.velocity.z = (endPos.z - startPos.z) / frame; + } + } +} + +void func_809FEB08(EnDu* this, GlobalContext* globalCtx) { + this->unk_1F2 = 0xB; + this->unk_1EC = 0; + this->unk_1ED = 0; + this->unk_1EE = 0; + + if (this->unk_1E8 == 1) { + func_8002DF54(globalCtx, &this->actor, 7); + func_80034EC0(&this->skelAnime, sAnimations, 1); + EnDu_SetupAction(this, func_809FE3C0); + return; + } + if (CUR_UPG_VALUE(UPG_STRENGTH) <= 0) { + this->actor.textId = 0x301C; + EnDu_SetupAction(this, func_809FEC14); + } else { + this->actor.textId = 0x301F; + EnDu_SetupAction(this, func_809FE3C0); + } + func_8010B680(globalCtx, this->actor.textId, NULL); + func_80034EC0(&this->skelAnime, sAnimations, 0xE); + this->unk_1F4.unk_00 = 1; +} + +void func_809FEC14(EnDu* this, GlobalContext* globalCtx) { + if (this->unk_1F4.unk_00 == 2) { + func_8002DF54(globalCtx, &this->actor, 7); + EnDu_SetupAction(this, func_809FEC70); + func_809FEC70(this, globalCtx); + } +} + +void func_809FEC70(EnDu* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + EnDu_SetupAction(this, func_809FECE4); + } else { + f32 xzRange = this->actor.xzDistToPlayer + 1.0f; + func_8002F434(&this->actor, globalCtx, 0x54, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f); + } +} + +void func_809FECE4(EnDu* this, GlobalContext* globalCtx) { + if (this->unk_1F4.unk_00 == 3) { + this->unk_1F4.unk_00 = 0; + EnDu_SetupAction(this, func_809FE3C0); + } +} + +void EnDu_Update(Actor* thisx, GlobalContext* globalCtx) { + EnDu* this = THIS; + s32 pad; + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + + if (this->skelAnime.animation == &D_060041F4 && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 1); + } + + SkelAnime_Update(&this->skelAnime); + func_809FDE9C(this); + func_809FDE24(this, globalCtx); + + if (this->actionFunc == func_809FE890) { + this->actor.world.pos.x += this->actor.velocity.x; + this->actor.world.pos.y += this->actor.velocity.y; + this->actor.world.pos.z += this->actor.velocity.z; + } else { + func_8002D7EC(&this->actor); + } + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + + if (this->actionFunc != func_809FE4A4) { + func_800343CC(globalCtx, &this->actor, &this->unk_1F4.unk_00, this->collider.dim.radius + 116.0f, func_809FDC38, + func_809FDCDC); + } + this->actionFunc(this, globalCtx); +} + +s32 EnDu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, + Gfx** gfx) { + EnDu* this = THIS; + Vec3s sp1C; + + if (limbIndex == 16) { + Matrix_Translate(2400.0f, 0.0f, 0.0f, MTXMODE_APPLY); + sp1C = this->unk_1F4.unk_08; + Matrix_RotateX(BINANG_TO_RAD(sp1C.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD(sp1C.x), MTXMODE_APPLY); + Matrix_Translate(-2400.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } + if (limbIndex == 8) { + sp1C = this->unk_1F4.unk_0E; + Matrix_RotateY(BINANG_TO_RAD(sp1C.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD(sp1C.x), MTXMODE_APPLY); + } + return 0; +} + +void EnDu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { + EnDu* this = THIS; + Vec3f D_809FF40C = { 0.0f, -1000.0f, 0.0f }; + + if (limbIndex == 16) { + Matrix_MultVec3f(&D_809FF40C, &this->actor.focus.pos); + } +} + +void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) { + static UNK_TYPE D_809FF418[] = { 0x06008080, 0x06008480, 0x06008880, 0x0600A540 }; + static UNK_TYPE D_809FF428[] = { 0x06008C80, 0x06009D40, 0x0600A940, 0x0600B180 }; + static UNK_TYPE D_809FF438[] = { 0x06007FC0, 0x0600B140 }; + + EnDu* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1470); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809FF418[this->unk_1EF])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_809FF428[this->unk_1F0])); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_809FF438[this->unk_1F1])); + + func_80034BA0(globalCtx, &this->skelAnime, EnDu_OverrideLimbDraw, EnDu_PostLimbDraw, &this->actor, 255); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1487); +} diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h index f2fe848d0b..0b9ffcbd86 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.h +++ b/src/overlays/actors/ovl_En_Du/z_en_du.h @@ -6,9 +6,27 @@ struct EnDu; +typedef void (*EnDuActionFunc)(struct EnDu*, GlobalContext*); + typedef struct EnDu { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xD0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnDuActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ char unk_1E0[0x2]; + /* 0x01E2 */ s16 unk_1E2; + /* 0x01E4 */ char unk_1E4[0x2]; + /* 0x01E6 */ s16 unk_1E6; + /* 0x01E8 */ s16 unk_1E8; + /* 0x01EA */ s16 unk_1EA; + /* 0x01EC */ u8 unk_1EC; + /* 0x01ED */ u8 unk_1ED; + /* 0x01EE */ u8 unk_1EE; + /* 0x01EF */ u8 unk_1EF; + /* 0x01F0 */ u8 unk_1F0; + /* 0x01F1 */ u8 unk_1F1; + /* 0x01F2 */ s16 unk_1F2; + /* 0x01F4 */ struct_80034A14_arg1 unk_1F4; } EnDu; // size = 0x021C extern const ActorInit En_Du_InitVars; diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 03dea3370f..2a4e12f1d6 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -194,9 +194,11 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit2 sColChkInit = { 24, 2, 25, 25, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x060010B4, 1.0f, 0.0f, -1.0f, 0x03, 0.0f }, { 0x06005C64, 1.0f, 0.0f, -1.0f, 0x03, -10.0f }, - { 0x06006044, 0.0f, 0.0f, -1.0f, 0x03, -10.0f }, { 0x06006A18, 1.0f, 0.0f, -1.0f, 0x01, -10.0f }, - { 0x06006B64, 0.0f, 0.0f, -1.0f, 0x03, -10.0f }, + { 0x060010B4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, + { 0x06005C64, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, + { 0x06006044, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, + { 0x06006A18, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { 0x06006B64, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -10.0f }, }; s32 EnFd_SpawnCore(EnFd* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 69031c56a8..dfe76fa91d 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -61,9 +61,9 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit2 D_80A1FB94 = { 8, 2, 25, 25, MASS_IMMOVABLE }; static struct_80034EC0_Entry D_80A1FBA0[] = { - { 0x06006CF8, 0.0f, 0.0f, -1.0f, 0x03, 0.0f }, - { 0x06007CD0, 1.0f, 0.0f, -1.0f, 0x03, -8.0f }, - { 0x06007DC8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { 0x06006CF8, 0.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, 0.0f }, + { 0x06007CD0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { 0x06007DC8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, }; extern FlexSkeletonHeader D_06007C30; diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 1b32cb1ec8..861015fcb1 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -9,12 +9,47 @@ void EnFz_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnFz_Update(Actor* thisx, GlobalContext* globalCtx); void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060030A0; -extern UNK_TYPE D_060030A8; -extern UNK_TYPE D_06003158; -extern UNK_TYPE D_06003160; +void EnFz_UpdateTargetPos(EnFz* this, GlobalContext* globalCtx); + +// Stationary Freezard +void EnFz_SetupBlowSmokeStationary(EnFz* this); +void EnFz_BlowSmokeStationary(EnFz* this, GlobalContext* globalCtx); + +// Moving Freezard that can vanish and reappear +void EnFz_Wait(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupAppear(EnFz* this); +void EnFz_Appear(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupAimForMove(EnFz* this); +void EnFz_AimForMove(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupMoveTowardsPlayer(EnFz* this); +void EnFz_MoveTowardsPlayer(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupAimForFreeze(EnFz* this); +void EnFz_AimForFreeze(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupBlowSmoke(EnFz* this, GlobalContext* globalCtx); +void EnFz_BlowSmoke(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupDisappear(EnFz* this); +void EnFz_Disappear(EnFz* this, GlobalContext* globalCtx); +void EnFz_SetupWait(EnFz* this); + +// Killed with fire source +void EnFz_SetupMelt(EnFz* this); +void EnFz_Melt(EnFz* this, GlobalContext* globalCtx); + +// Death +void EnFz_SetupDespawn(EnFz* this, GlobalContext* globalCtx); +void EnFz_Despawn(EnFz* this, GlobalContext* globalCtx); + +// Ice Smoke Effects +void EnFz_SpawnIceSmokeNoFreeze(EnFz* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 xyScale); +void EnFz_SpawnIceSmokeFreeze(EnFz* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 xyScale, f32 xyScaleTarget, + s16 primAlpha, u8 isTimerMod8); +void EnFz_UpdateIceSmoke(EnFz* this, GlobalContext* globalCtx); +void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx); + +// Same effects as "z_eff_ss_ice_smoke.h" +extern Gfx* D_060030A0[]; +extern Gfx* D_06003158[]; -/* const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORCAT_ENEMY, @@ -27,7 +62,7 @@ const ActorInit En_Fz_InitVars = { (ActorFunc)EnFz_Draw, }; -static ColliderCylinderInitType1 sCylinderInit = { +static ColliderCylinderInitType1 sCylinderInit1 = { { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, @@ -46,7 +81,7 @@ static ColliderCylinderInitType1 sCylinderInit = { { 30, 80, 0, { 0, 0, 0 } }, }; -static ColliderCylinderInitType1 sCylinderInit = { +static ColliderCylinderInitType1 sCylinderInit2 = { { COLTYPE_METAL, AT_NONE, @@ -65,7 +100,7 @@ static ColliderCylinderInitType1 sCylinderInit = { { 35, 80, 0, { 0, 0, 0 } }, }; -static ColliderCylinderInitType1 sCylinderInit = { +static ColliderCylinderInitType1 sCylinderInit3 = { { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, @@ -83,73 +118,779 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { 20, 30, -15, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s") +DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, 0x0), + /* Deku stick */ DMG_ENTRY(0, 0xF), + /* Slingshot */ DMG_ENTRY(0, 0xF), + /* Explosive */ DMG_ENTRY(2, 0xF), + /* Boomerang */ DMG_ENTRY(0, 0xF), + /* Normal arrow */ DMG_ENTRY(0, 0xF), + /* Hammer swing */ DMG_ENTRY(2, 0xF), + /* Hookshot */ DMG_ENTRY(2, 0xF), + /* Kokiri sword */ DMG_ENTRY(0, 0xF), + /* Master sword */ DMG_ENTRY(2, 0xF), + /* Giant's Knife */ DMG_ENTRY(4, 0xF), + /* Fire arrow */ DMG_ENTRY(4, 0x2), + /* Ice arrow */ DMG_ENTRY(0, 0xF), + /* Light arrow */ DMG_ENTRY(0, 0xF), + /* Unk arrow 1 */ DMG_ENTRY(0, 0xF), + /* Unk arrow 2 */ DMG_ENTRY(0, 0xF), + /* Unk arrow 3 */ DMG_ENTRY(0, 0xF), + /* Fire magic */ DMG_ENTRY(4, 0x2), + /* Ice magic */ DMG_ENTRY(0, 0x0), + /* Light magic */ DMG_ENTRY(0, 0x0), + /* Shield */ DMG_ENTRY(0, 0x0), + /* Mirror Ray */ DMG_ENTRY(0, 0x0), + /* Kokiri spin */ DMG_ENTRY(0, 0xF), + /* Giant spin */ DMG_ENTRY(4, 0xF), + /* Master spin */ DMG_ENTRY(2, 0xF), + /* Kokiri jump */ DMG_ENTRY(0, 0xF), + /* Giant jump */ DMG_ENTRY(8, 0xF), + /* Master jump */ DMG_ENTRY(4, 0xF), + /* Unknown 1 */ DMG_ENTRY(0, 0x0), + /* Unblockable */ DMG_ENTRY(0, 0x0), + /* Hammer jump */ DMG_ENTRY(0, 0x0), + /* Unknown 2 */ DMG_ENTRY(0, 0x0), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s") +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 59, ICHAIN_CONTINUE), + ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), + ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A200B0.s") +void EnFz_Init(Actor* thisx, GlobalContext* globalCtx) { + EnFz* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + this->actor.colChkInfo.damageTable = &sDamageTable; + this->actor.colChkInfo.health = 6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A202FC.s") + Collider_InitCylinder(globalCtx, &this->collider1); + Collider_SetCylinderType1(globalCtx, &this->collider1, &this->actor, &sCylinderInit1); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A203DC.s") + Collider_InitCylinder(globalCtx, &this->collider2); + Collider_SetCylinderType1(globalCtx, &this->collider2, &this->actor, &sCylinderInit2); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A204A0.s") + Collider_InitCylinder(globalCtx, &this->collider3); + Collider_SetCylinderType1(globalCtx, &this->collider3, &this->actor, &sCylinderInit3); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20704.s") + Actor_SetScale(&this->actor, 0.008f); + this->actor.colChkInfo.mass = MASS_IMMOVABLE; + this->actor.flags &= ~1; + this->unusedTimer1 = 0; + this->unusedCounter = 0; + this->updateBgInfo = true; + this->isMoving = false; + this->isFreezing = false; + this->isActive = true; + this->isDespawning = false; + this->actor.speedXZ = 0.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + this->posOrigin.y = this->actor.world.pos.y; + this->iceSmokeFreezingSpawnHeight = this->actor.world.pos.y; + this->posOrigin.x = this->actor.world.pos.x; + this->posOrigin.z = this->actor.world.pos.z; + this->unusedFloat = 135.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20748.s") + if (this->actor.params < 0) { + this->envAlpha = 0; + this->actor.scale.y = 0.0f; + EnFz_SetupWait(this); + } else { + this->envAlpha = 255; + EnFz_SetupBlowSmokeStationary(this); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20774.s") + EnFz_UpdateTargetPos(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A207F4.s") +void EnFz_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnFz* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20830.s") + Collider_DestroyCylinder(globalCtx, &this->collider1); + Collider_DestroyCylinder(globalCtx, &this->collider2); + Collider_DestroyCylinder(globalCtx, &this->collider3); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20880.s") +void EnFz_UpdateTargetPos(EnFz* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f hitPos; + Vec3f vec1; + s32 bgId; + CollisionPoly* hitPoly; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A208A8.s") + pos.x = this->actor.world.pos.x; + pos.y = this->actor.world.pos.y + 20.0f; + pos.z = this->actor.world.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20938.s") + Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_NEW); + Matrix_RotateRPY(this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, MTXMODE_APPLY); + vec1.x = vec1.y = 0.0f; + vec1.z = 220.0f; + Matrix_MultVec3f(&vec1, &this->wallHitPos); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20978.s") + if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &pos, &this->wallHitPos, &hitPos, &hitPoly, true, false, false, + true, &bgId)) { + Math_Vec3f_Copy(&this->wallHitPos, &hitPos); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209B4.s") + pos.x = this->actor.world.pos.x - this->wallHitPos.x; + pos.z = this->actor.world.pos.z - this->wallHitPos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A209E4.s") + this->distToTargetSq = SQ(pos.x) + SQ(pos.z); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A20.s") +s32 EnFz_ReachedTarget(EnFz* this, Vec3f* vec) { + if (this->distToTargetSq <= (SQ(this->actor.world.pos.x - vec->x) + SQ(this->actor.world.pos.z - vec->z))) { + return true; + } else { + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A4C.s") +void EnFz_Damaged(EnFz* this, GlobalContext* globalCtx, Vec3f* vec, s32 numEffects, f32 unkFloat) { + s32 i; + Vec3f pos; + Vec3f vel; + Vec3f accel; + Color_RGBA8 primColor; + Color_RGBA8 envColor; + f32 scale; + s32 life; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20A88.s") + primColor.r = 155; + primColor.g = 255; + primColor.b = 255; + primColor.a = 255; + envColor.r = 200; + envColor.g = 200; + envColor.b = 200; + accel.x = accel.z = 0.0f; + accel.y = -1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20AC0.s") + for (i = 0; i < numEffects; i++) { + scale = Rand_CenteredFloat(0.3f) + 0.6f; + life = (s32)Rand_CenteredFloat(5.0f) + 12; + pos.x = Rand_CenteredFloat(unkFloat) + vec->x; + pos.y = Rand_ZeroFloat(unkFloat) + vec->y; + pos.z = Rand_CenteredFloat(unkFloat) + vec->z; + vel.x = Rand_CenteredFloat(10.0f); + vel.y = Rand_ZeroFloat(10.0f) + 2.0f; + vel.z = Rand_CenteredFloat(10.0f); + EffectSsEnIce_Spawn(globalCtx, &pos, scale, &vel, &accel, &primColor, &envColor, life); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20CAC.s") + CollisionCheck_SpawnShieldParticles(globalCtx, vec); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D4C.s") +void EnFz_SpawnIceSmokeHiddenState(EnFz* this) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20D7C.s") +// Fully grown +void EnFz_SpawnIceSmokeGrowingState(EnFz* this) { + Vec3f pos; + Vec3f velocity; + Vec3f accel; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20DBC.s") + if ((this->counter % 16) == 0) { + pos.x = Rand_CenteredFloat(40.0f) + this->actor.world.pos.x; + pos.y = Rand_CenteredFloat(40.0f) + this->actor.world.pos.y + 30.0f; + pos.z = Rand_CenteredFloat(40.0f) + this->actor.world.pos.z; + accel.x = accel.z = 0.0f; + accel.y = 0.1f; + velocity.x = velocity.y = velocity.z = 0.0f; + EnFz_SpawnIceSmokeNoFreeze(this, &pos, &velocity, &accel, Rand_ZeroFloat(7.5f) + 15.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20E84.s") +// (2) Growing or Shrinking to/from hiding or (3) melting from fire +void EnFz_SpawnIceSmokeActiveState(EnFz* this) { + Vec3f pos; + Vec3f velocity; + Vec3f accel; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20EC4.s") + if ((this->counter % 4) == 0) { + pos.x = Rand_CenteredFloat(40.0f) + this->actor.world.pos.x; + pos.y = this->iceSmokeFreezingSpawnHeight; + pos.z = Rand_CenteredFloat(40.0f) + this->actor.world.pos.z; + accel.x = accel.z = 0.0f; + accel.y = 0.1f; + velocity.x = velocity.y = velocity.z = 0.0f; + EnFz_SpawnIceSmokeNoFreeze(this, &pos, &velocity, &accel, Rand_ZeroFloat(7.5f) + 15.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s") +void EnFz_ApplyDamage(EnFz* this, GlobalContext* globalCtx) { + Vec3f vec; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s") + if (this->isMoving && ((this->actor.bgCheckFlags & 8) || + (func_800339B8(&this->actor, globalCtx, 60.0f, this->actor.world.rot.y) == 0))) { + this->actor.bgCheckFlags &= ~8; + this->isMoving = false; + this->speedXZ = 0.0f; + this->actor.speedXZ = 0.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A2145C.s") + if (this->isFreezing) { + if ((this->actor.params < 0) && (this->collider1.base.atFlags & 2)) { + this->isMoving = false; + this->collider1.base.acFlags &= ~2; + this->actor.speedXZ = this->speedXZ = 0.0f; + this->timer = 10; + EnFz_SetupDisappear(this); + } else if (this->collider2.base.acFlags & 0x80) { + this->collider2.base.acFlags &= ~0x80; + this->collider1.base.acFlags &= ~2; + } else if (this->collider1.base.acFlags & 2) { + this->collider1.base.acFlags &= ~2; + if (this->actor.colChkInfo.damageEffect != 2) { + if (this->actor.colChkInfo.damageEffect == 0xF) { + Actor_ApplyDamage(&this->actor); + func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 8); + if (this->actor.colChkInfo.health) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); + vec.x = this->actor.world.pos.x; + vec.y = this->actor.world.pos.y; + vec.z = this->actor.world.pos.z; + EnFz_Damaged(this, globalCtx, &vec, 10, 0.0f); + this->unusedCounter++; + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FREEZAD_DEAD); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_ICE_BROKEN); + vec.x = this->actor.world.pos.x; + vec.y = this->actor.world.pos.y; + vec.z = this->actor.world.pos.z; + EnFz_Damaged(this, globalCtx, &vec, 30, 10.0f); + EnFz_SetupDespawn(this, globalCtx); + } + } + } else { + Actor_ApplyDamage(&this->actor); + func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 8); + if (this->actor.colChkInfo.health == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FREEZAD_DEAD); + EnFz_SetupMelt(this); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); + } + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A21500.s") +void EnFz_SetYawTowardsPlayer(EnFz* this) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 10, 2000, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s") +void EnFz_SetupDisappear(EnFz* this) { + this->state = 2; + this->isFreezing = false; + this->actor.flags &= ~1; + this->actionFunc = EnFz_Disappear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s") +void EnFz_Disappear(EnFz* this, GlobalContext* globalCtx) { + this->envAlpha -= 16; + + if (this->envAlpha > 255) { + this->envAlpha = 0; + } + + if (Math_SmoothStepToF(&this->actor.scale.y, 0.0f, 1.0f, 0.0005f, 0) == 0.0f) { + EnFz_SetupWait(this); + } +} + +void EnFz_SetupWait(EnFz* this) { + this->state = 0; + this->unusedNum2 = 0; + this->unusedNum1 = 0; + this->timer = 100; + this->actionFunc = EnFz_Wait; + this->actor.world.pos.x = this->posOrigin.x; + this->actor.world.pos.y = this->posOrigin.y; + this->actor.world.pos.z = this->posOrigin.z; +} + +void EnFz_Wait(EnFz* this, GlobalContext* globalCtx) { + if ((this->timer == 0) && (this->actor.xzDistToPlayer < 400.0f)) { + EnFz_SetupAppear(this); + } +} + +void EnFz_SetupAppear(EnFz* this) { + this->state = 2; + this->timer = 20; + this->unusedNum2 = 4000; + this->actionFunc = EnFz_Appear; +} + +void EnFz_Appear(EnFz* this, GlobalContext* globalCtx) { + if (this->timer == 0) { + this->envAlpha += 8; + if (this->envAlpha > 255) { + this->envAlpha = 255; + } + + if (Math_SmoothStepToF(&this->actor.scale.y, 0.008f, 1.0f, 0.0005f, 0.0f) == 0.0f) { + EnFz_SetupAimForMove(this); + } + } +} + +void EnFz_SetupAimForMove(EnFz* this) { + this->state = 1; + this->timer = 40; + this->updateBgInfo = true; + this->isFreezing = true; + this->actor.flags |= 1; + this->actionFunc = EnFz_AimForMove; + this->actor.gravity = -1.0f; +} + +void EnFz_AimForMove(EnFz* this, GlobalContext* globalCtx) { + EnFz_SetYawTowardsPlayer(this); + + if (this->timer == 0) { + EnFz_SetupMoveTowardsPlayer(this); + } +} + +void EnFz_SetupMoveTowardsPlayer(EnFz* this) { + this->state = 1; + this->isMoving = true; + this->timer = 100; + this->actionFunc = EnFz_MoveTowardsPlayer; + this->speedXZ = 4.0f; +} + +void EnFz_MoveTowardsPlayer(EnFz* this, GlobalContext* globalCtx) { + if ((this->timer == 0) || !this->isMoving) { + EnFz_SetupAimForFreeze(this); + } +} + +void EnFz_SetupAimForFreeze(EnFz* this) { + this->state = 1; + this->timer = 40; + this->actionFunc = EnFz_AimForFreeze; + this->speedXZ = 0.0f; + this->actor.speedXZ = 0.0f; +} + +void EnFz_AimForFreeze(EnFz* this, GlobalContext* globalCtx) { + EnFz_SetYawTowardsPlayer(this); + + if (this->timer == 0) { + EnFz_SetupBlowSmoke(this, globalCtx); + } +} + +void EnFz_SetupBlowSmoke(EnFz* this, GlobalContext* globalCtx) { + this->state = 1; + this->timer = 80; + this->actionFunc = EnFz_BlowSmoke; + EnFz_UpdateTargetPos(this, globalCtx); +} + +void EnFz_BlowSmoke(EnFz* this, GlobalContext* globalCtx) { + Vec3f vec1; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + u8 isTimerMod8; + s16 primAlpha; + + if (this->timer == 0) { + EnFz_SetupDisappear(this); + } else if (this->timer >= 11) { + isTimerMod8 = false; + primAlpha = 150; + func_8002F974(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); + + if ((this->timer - 10) < 16) { // t < 26 + primAlpha = (this->timer * 10) - 100; + } + + accel.x = accel.z = 0.0f; + accel.y = 0.6f; + + pos.x = this->actor.world.pos.x; + pos.y = this->actor.world.pos.y + 20.0f; + pos.z = this->actor.world.pos.z; + + Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + + vec1.x = 0.0f; + vec1.y = -2.0f; + vec1.z = 20.0f; // xz velocity + + Matrix_MultVec3f(&vec1, &velocity); + + if ((this->timer % 8) == 0) { + isTimerMod8 = true; + } + + EnFz_SpawnIceSmokeFreeze(this, &pos, &velocity, &accel, 2.0f, 25.0f, primAlpha, isTimerMod8); + + pos.x += (velocity.x * 0.5f); + pos.y += (velocity.y * 0.5f); + pos.z += (velocity.z * 0.5f); + + EnFz_SpawnIceSmokeFreeze(this, &pos, &velocity, &accel, 2.0f, 25.0f, primAlpha, false); + } +} + +void EnFz_SetupDespawn(EnFz* this, GlobalContext* globalCtx) { + this->state = 0; + this->updateBgInfo = true; + this->isFreezing = false; + this->isDespawning = true; + this->actor.flags &= ~1; + this->isActive = false; + this->timer = 60; + this->speedXZ = 0.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 0.0f; + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP); + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x60); + this->actionFunc = EnFz_Despawn; +} + +void EnFz_Despawn(EnFz* this, GlobalContext* globalCtx) { + if (this->timer == 0) { + Actor_Kill(&this->actor); + } +} + +void EnFz_SetupMelt(EnFz* this) { + this->state = 3; + this->isFreezing = false; + this->isDespawning = true; + this->actor.flags &= ~1; + this->actionFunc = EnFz_Melt; + this->actor.speedXZ = 0.0f; + this->speedXZ = 0.0f; +} + +void EnFz_Melt(EnFz* this, GlobalContext* globalCtx) { + Math_StepToF(&this->actor.scale.y, 0.0006f, 0.0002f); + + if (this->actor.scale.y < 0.006f) { + this->actor.scale.x += 0.0004f; + this->actor.scale.z += 0.0004f; + } + + if (this->actor.scale.y < 0.004f) { + this->envAlpha -= 8; + if (this->envAlpha > 255) { + this->envAlpha = 0; + } + } + + if (this->envAlpha == 0) { + EnFz_SetupDespawn(this, globalCtx); + } +} + +void EnFz_SetupBlowSmokeStationary(EnFz* this) { + this->state = 1; + this->timer = 40; + this->updateBgInfo = true; + this->isFreezing = true; + this->actor.flags |= 1; + this->actionFunc = EnFz_BlowSmokeStationary; + this->actor.gravity = -1.0f; +} + +void EnFz_BlowSmokeStationary(EnFz* this, GlobalContext* globalCtx) { + Vec3f vec1; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + u8 isTimerMod8; + s16 primAlpha; + + if (this->counter & 0xC0) { + EnFz_SetYawTowardsPlayer(this); + EnFz_UpdateTargetPos(this, globalCtx); + } else { + isTimerMod8 = false; + primAlpha = 150; + func_8002F974(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); + + if ((this->counter & 0x3F) >= 48) { + primAlpha = 630 - ((this->counter & 0x3F) * 10); + } + + accel.x = accel.z = 0.0f; + accel.y = 0.6f; + + pos.x = this->actor.world.pos.x; + pos.y = this->actor.world.pos.y + 20.0f; + pos.z = this->actor.world.pos.z; + + Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + + vec1.x = 0.0f; + vec1.y = -2.0f; + vec1.z = 20.0f; + + Matrix_MultVec3f(&vec1, &velocity); + + if ((this->counter % 8) == 0) { + isTimerMod8 = true; + } + + EnFz_SpawnIceSmokeFreeze(this, &pos, &velocity, &accel, 2.0f, 25.0f, primAlpha, isTimerMod8); + + pos.x += (velocity.x * 0.5f); + pos.y += (velocity.y * 0.5f); + pos.z += (velocity.z * 0.5f); + + EnFz_SpawnIceSmokeFreeze(this, &pos, &velocity, &accel, 2.0f, 25.0f, primAlpha, false); + } +} + +static EnFzSpawnIceSmokeFunc iceSmokeSpawnFuncs[] = { + EnFz_SpawnIceSmokeHiddenState, + EnFz_SpawnIceSmokeGrowingState, + EnFz_SpawnIceSmokeActiveState, + EnFz_SpawnIceSmokeActiveState, +}; + +void EnFz_Update(Actor* thisx, GlobalContext* globalCtx) { + EnFz* this = THIS; + s32 pad; + + this->counter++; + + if (this->unusedTimer1 != 0) { + this->unusedTimer1--; + } + + if (this->timer != 0) { + this->timer--; + } + + if (this->unusedTimer2 != 0) { + this->unusedTimer2--; + } + + Actor_SetFocus(&this->actor, 50.0f); + EnFz_ApplyDamage(this, globalCtx); + this->actionFunc(this, globalCtx); + if (this->isDespawning == false) { + Collider_UpdateCylinder(&this->actor, &this->collider1); + Collider_UpdateCylinder(&this->actor, &this->collider2); + if (this->isFreezing) { + if (this->actor.colorFilterTimer == 0) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider2.base); + } + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base); + } + } + + Math_StepToF(&this->actor.speedXZ, this->speedXZ, 0.2f); + Actor_MoveForward(&this->actor); + + if (this->updateBgInfo) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 20.0f, 5); + } + + iceSmokeSpawnFuncs[this->state](this); + EnFz_UpdateIceSmoke(this, globalCtx); +} + +void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Gfx* displayLists[] = { + 0x06001130, // Body fully intact (5 or 6 health) + 0x060021A0, // Top right horn chipped off (from Freezards perspective) (3 or 4 health) + 0x06002CA0, // Entire head chipped off (1 or 2 health) + }; + EnFz* this = THIS; + s32 pad; + s32 index; + + index = (6 - this->actor.colChkInfo.health) >> 1; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fz.c", 1167); + + if (1) {} + + if (this->actor.colChkInfo.health == 0) { + index = 2; + } + + if (this->isActive) { + func_8002ED80(&this->actor, globalCtx, 0); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, globalCtx->state.frames & 0x7F, 32, 32, 1, 0, + (2 * globalCtx->state.frames) & 0x7F, 32, 32)); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fz.c", 1183), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0, + PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, ENVIRONMENT, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 155, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, this->envAlpha); + gSPDisplayList(POLY_XLU_DISP++, displayLists[index]); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fz.c", 1200); + EnFz_DrawIceSmoke(this, globalCtx); +} + +void EnFz_SpawnIceSmokeNoFreeze(EnFz* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 xyScale) { + EnFzEffectSsIceSmoke* iceSmoke = this->iceSmoke; + s16 i; + + for (i = 0; i < ARRAY_COUNT(this->iceSmoke); i++) { + if (iceSmoke->type == 0) { + iceSmoke->type = 1; + iceSmoke->pos = *pos; + iceSmoke->velocity = *velocity; + iceSmoke->accel = *accel; + iceSmoke->primAlphaState = 0; + iceSmoke->xyScale = xyScale / 1000.0f; + iceSmoke->primAlpha = 0; + iceSmoke->timer = 0; + break; + } + + iceSmoke++; + } +} + +void EnFz_SpawnIceSmokeFreeze(EnFz* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 xyScale, f32 xyScaleTarget, + s16 primAlpha, u8 isTimerMod8) { + EnFzEffectSsIceSmoke* iceSmoke = this->iceSmoke; + s16 i; + + for (i = 0; i < ARRAY_COUNT(this->iceSmoke); i++) { + if (iceSmoke->type == 0) { + iceSmoke->type = 2; + iceSmoke->pos = *pos; + iceSmoke->velocity = *velocity; + iceSmoke->accel = *accel; + iceSmoke->primAlphaState = 0; + iceSmoke->xyScale = xyScale / 1000.0f; + iceSmoke->xyScaleTarget = xyScaleTarget / 1000.0f; + iceSmoke->primAlpha = primAlpha; + iceSmoke->timer = 0; + iceSmoke->isTimerMod8 = isTimerMod8; + break; + } + + iceSmoke++; + } +} + +void EnFz_UpdateIceSmoke(EnFz* this, GlobalContext* globalCtx) { + EnFzEffectSsIceSmoke* iceSmoke = this->iceSmoke; + s16 i; + Vec3f pos; + + for (i = 0; i < ARRAY_COUNT(this->iceSmoke); i++) { + if (iceSmoke->type) { + iceSmoke->pos.x += iceSmoke->velocity.x; + iceSmoke->pos.y += iceSmoke->velocity.y; + iceSmoke->pos.z += iceSmoke->velocity.z; + iceSmoke->timer++; + iceSmoke->velocity.x += iceSmoke->accel.x; + iceSmoke->velocity.y += iceSmoke->accel.y; + iceSmoke->velocity.z += iceSmoke->accel.z; + if (iceSmoke->type == 1) { + if (iceSmoke->primAlphaState == 0) { // Becoming more opaque + iceSmoke->primAlpha += 10; + if (iceSmoke->primAlpha >= 100) { + iceSmoke->primAlphaState++; + } + } else { // Becoming more transparent + iceSmoke->primAlpha -= 3; + if (iceSmoke->primAlpha <= 0) { + iceSmoke->primAlpha = 0; + iceSmoke->type = 0; + } + } + } else if (iceSmoke->type == 2) { // Freezing + Math_ApproachF(&iceSmoke->xyScale, iceSmoke->xyScaleTarget, 0.1f, iceSmoke->xyScaleTarget / 10.0f); + if (iceSmoke->primAlphaState == 0) { // Becoming more opaque + if (iceSmoke->timer >= 7) { + iceSmoke->primAlphaState++; + } + } else { // Becoming more transparent, slows down + iceSmoke->accel.y = 2.0f; + iceSmoke->primAlpha -= 17; + iceSmoke->velocity.x *= 0.75f; + iceSmoke->velocity.z *= 0.75f; + if (iceSmoke->primAlpha <= 0) { + iceSmoke->primAlpha = 0; + iceSmoke->type = 0; + } + } + + if ((this->unusedTimer2 == 0) && (iceSmoke->primAlpha >= 101) && iceSmoke->isTimerMod8) { + this->collider3.dim.pos.x = (s16)iceSmoke->pos.x; + this->collider3.dim.pos.y = (s16)iceSmoke->pos.y; + this->collider3.dim.pos.z = (s16)iceSmoke->pos.z; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider3.base); + } + + pos.x = iceSmoke->pos.x; + pos.y = iceSmoke->pos.y + 10.0f; + pos.z = iceSmoke->pos.z; + + if ((iceSmoke->primAlphaState != 2) && EnFz_ReachedTarget(this, &pos)) { + iceSmoke->primAlphaState = 2; + iceSmoke->velocity.x = 0.0f; + iceSmoke->velocity.z = 0.0f; + } + } + } + iceSmoke++; + } +} + +void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { + EnFzEffectSsIceSmoke* iceSmoke = this->iceSmoke; + s16 i; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + u8 texLoaded = false; + + OPEN_DISPS(gfxCtx, "../z_en_fz.c", 1384); + + func_80093D84(globalCtx->state.gfxCtx); + + for (i = 0; i < ARRAY_COUNT(this->iceSmoke); i++) { + if (iceSmoke->type > 0) { + gDPPipeSync(POLY_XLU_DISP++); + + if (!texLoaded) { + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_060030A0)); + texLoaded++; + } + + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, iceSmoke->primAlpha); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 3 * (iceSmoke->timer + (3 * i)), + 15 * (iceSmoke->timer + (3 * i)), 32, 64, 1, 0, 0, 32, 32)); + Matrix_Translate(iceSmoke->pos.x, iceSmoke->pos.y, iceSmoke->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_Scale(iceSmoke->xyScale, iceSmoke->xyScale, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_fz.c", 1424), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_06003158)); + } + + iceSmoke++; + } + + CLOSE_DISPS(gfxCtx, "../z_en_fz.c", 1430); +} diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h index b5a354343a..3e8ab60411 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -6,9 +6,50 @@ struct EnFz; +typedef void (*EnFzActionFunc)(struct EnFz*, GlobalContext*); +typedef void (*EnFzSpawnIceSmokeFunc)(struct EnFz*); + +typedef struct { + /* 0x0000 */ u8 type; // 0,1,2: State of freezard (1 not freezing, 2 freezing) + /* 0x0001 */ u8 timer; // increments primAlphaState after reaching 7 (freezing), used in Gfx_TwoTexScroll + /* 0x0004 */ Vec3f pos; // Random position within 20.0f of actor + /* 0x0010 */ Vec3f velocity; + /* 0x001C */ Vec3f accel; + /* 0x0028 */ char unk_28[0x4]; + /* 0x002C */ s16 primAlpha; // transparency in RGBA colour system + /* 0x002E */ s16 primAlphaState; // 0: increasing (more opaque) 1: decreasing (more transparent) 2: collision + /* 0x0030 */ f32 xyScale; // + /* 0x0034 */ f32 xyScaleTarget; + /* 0x0038 */ u8 isTimerMod8; // conditional, used to run CollisionCheck_SetAT +} EnFzEffectSsIceSmoke; // size = 0x3C + typedef struct EnFz { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA88]; + /* 0x014C */ EnFzActionFunc actionFunc; + /* 0x0150 */ ColliderCylinder collider1; + /* 0x019C */ ColliderCylinder collider2; + /* 0x01E8 */ ColliderCylinder collider3; + /* 0x0234 */ Vec3f posOrigin; // Spawn position for moving freezard + /* 0x0240 */ s16 counter; // A perpetual counter + /* 0x0242 */ s16 unusedTimer1; + /* 0x0244 */ s16 timer; // Used to time transition into next action. Can be 10, 20, 40, 60, 80, 100 + /* 0x0246 */ u8 updateBgInfo; // Always true in every instance + /* 0x0247 */ u8 isMoving; // Freezard is moving in xz plane + /* 0x0248 */ u8 isFreezing; // Freezard shooting ice projectiles that can freeze Link + /* 0x0249 */ u8 unusedCounter; // Incremented when Freezard takes damage + /* 0x024C */ f32 iceSmokeFreezingSpawnHeight; // Height for Ice Smoke Spawn, only when freezing + /* 0x0250 */ f32 unusedFloat; // Set to 135.0f + /* 0x0254 */ f32 speedXZ; // Set to 4.0f when moving + /* 0x0258 */ u32 envAlpha; // transparency in RGBA colour system + /* 0x025C */ u16 unusedNum1; // Only set to 0 + /* 0x025E */ u16 unusedNum2; // Set to either 0 when hidden or 4000 when growing + /* 0x0260 */ u8 state; // 0 (hidden) 1 (growning/shrinking) 2 (full size) 3 (melting from fire) + /* 0x0261 */ u8 isActive; // Default true. Set to false after beginning to despawn + /* 0x0262 */ u8 isDespawning; // Default false. Set to false after beginning to despawn or melting + /* 0x0263 */ u8 unusedTimer2; // Timer + /* 0x0264 */ Vec3f wallHitPos; // Position contact was made with a wall + /* 0x0270 */ f32 distToTargetSq; + /* 0x0274 */ EnFzEffectSsIceSmoke iceSmoke[40]; } EnFz; // size = 0x0BD4 extern const ActorInit En_Fz_InitVars; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index b321627579..34930335ad 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -5,6 +5,7 @@ */ #include "z_en_ge3.h" +#include "objects/object_geldb/object_geldb.h" #define FLAGS 0x00000019 @@ -15,10 +16,10 @@ void EnGe3_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGe3_Update(Actor* thisx, GlobalContext* globalCtx); void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_0600A458; -extern UNK_TYPE D_0600B07C; +void EnGe3_WaitLookAtPlayer(EnGe3* this, GlobalContext* globalCtx); +void EnGe3_ForceTalk(EnGe3* this, GlobalContext* globalCtx); +void EnGe3_UpdateWhenNotTalking(Actor* thisx, GlobalContext* globalCtx); -/* const ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, ACTORCAT_NPC, @@ -31,7 +32,7 @@ const ActorInit En_Ge3_InitVars = { (ActorFunc)EnGe3_Draw, }; -static ColliderCylinderInit D_80A35190 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -50,37 +51,248 @@ static ColliderCylinderInit D_80A35190 = { }, { 20, 50, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s") +static EnGe3ActionFunc sActionFuncs[] = { EnGe3_WaitLookAtPlayer }; +static AnimationHeader* sAnimations[] = { &gGerudoRedStandAnim }; // Idle with right hand on hip and left over mouth +static u8 sAnimationModes[] = { ANIMMODE_LOOP }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s") +void EnGe3_ChangeAction(EnGe3* this, s32 i) { + this->actionFunc = sActionFuncs[i]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A347F4.s") + Animation_Change(&this->skelAnime, sAnimations[i], 1.0f, 0.0f, (f32)Animation_GetLastFrame(sAnimations[i]), + sAnimationModes[i], -8.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A3490C.s") + this->unk_30C &= ~2; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A20.s") +void EnGe3_Init(Actor* thisx, GlobalContext* globalCtx2) { + EnGe3* this = THIS; + GlobalContext* globalCtx = globalCtx2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34A80.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGerudoRedSkel, NULL, this->jointTable, this->morphTable, + GELDB_LIMB_MAX); + Animation_PlayLoop(&this->skelAnime, &gGerudoRedStandAnim); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actor.colChkInfo.mass = MASS_IMMOVABLE; + Actor_SetScale(&this->actor, 0.01f); + this->actor.world.rot.z = 0; + this->actor.shape.rot.z = 0; + EnGe3_ChangeAction(this, 0); + this->actionFunc = EnGe3_ForceTalk; + this->unk_30C = 0; + this->actor.targetMode = 6; + this->actor.minVelocityY = -4.0f; + this->actor.gravity = -1.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34AA0.s") +void EnGe3_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnGe3* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B00.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34B90.s") +void EnGe3_TurnToFacePlayer(EnGe3* this, GlobalContext* globalCtx) { + s32 pad; + s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s") + if (ABS(angleDiff) <= 0x4000) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 6, 4000, 100); + this->actor.world.rot.y = this->actor.shape.rot.y; + func_80038290(globalCtx, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); + } else { + if (angleDiff < 0) { + Math_SmoothStepToS(&this->headRot.y, -0x2000, 6, 6200, 0x100); + } else { + Math_SmoothStepToS(&this->headRot.y, 0x2000, 6, 6200, 0x100); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34CE4.s") + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 12, 1000, 100); + this->actor.world.rot.y = this->actor.shape.rot.y; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34D68.s") +void EnGe3_LookAtPlayer(EnGe3* this, GlobalContext* globalCtx) { + if ((ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) <= 0x2300) && + (this->actor.xzDistToPlayer < 100.0f)) { + func_80038290(globalCtx, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); + } else { + Math_SmoothStepToS(&this->headRot.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->headRot.y, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_306.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->unk_306.y, 0, 6, 6200, 100); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Update.s") +void EnGe3_Wait(EnGe3* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + this->actionFunc = EnGe3_WaitLookAtPlayer; + this->actor.update = EnGe3_UpdateWhenNotTalking; + this->actor.flags &= ~0x10000; + } + EnGe3_TurnToFacePlayer(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s") +void EnGe3_WaitLookAtPlayer(EnGe3* this, GlobalContext* globalCtx) { + EnGe3_LookAtPlayer(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A35004.s") +void EnGe3_WaitTillCardGiven(EnGe3* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->actionFunc = EnGe3_Wait; + } else { + func_8002F434(&this->actor, globalCtx, GI_GERUDO_CARD, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s") +void EnGe3_GiveCard(EnGe3* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actor.flags &= ~0x10000; + this->actionFunc = EnGe3_WaitTillCardGiven; + func_8002F434(&this->actor, globalCtx, GI_GERUDO_CARD, 10000.0f, 50.0f); + } +} + +void EnGe3_ForceTalk(EnGe3* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->actionFunc = EnGe3_GiveCard; + } else { + if (!(this->unk_30C & 4)) { + func_8002DF54(globalCtx, &this->actor, 7); + this->unk_30C |= 4; + } + this->actor.textId = 0x6004; + this->actor.flags |= 0x10000; + func_8002F1C4(&this->actor, globalCtx, 300.0f, 300.0f, 0); + } + EnGe3_LookAtPlayer(this, globalCtx); +} + +void EnGe3_UpdateCollision(EnGe3* this, GlobalContext* globalCtx) { + s32 pad; + s32 pad2; + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 40.0f, 25.0f, 40.0f, 5); + + if (!(this->unk_30C & 2) && SkelAnime_Update(&this->skelAnime)) { + this->unk_30C |= 2; + } +} + +void EnGe3_MoveAndBlink(EnGe3* this, GlobalContext* globalCtx) { + + Actor_MoveForward(&this->actor); + + if (DECR(this->blinkTimer) == 0) { + this->blinkTimer = Rand_S16Offset(60, 60); + } + + this->eyeIndex = this->blinkTimer; + + if (this->eyeIndex >= 3) { + this->eyeIndex = 0; + } +} + +void EnGe3_UpdateWhenNotTalking(Actor* thisx, GlobalContext* globalCtx) { + EnGe3* this = THIS; + + EnGe3_UpdateCollision(this, globalCtx); + this->actionFunc(this, globalCtx); + + if (func_8002F194(&this->actor, globalCtx)) { + this->actionFunc = EnGe3_Wait; + this->actor.update = EnGe3_Update; + } else { + this->actor.textId = 0x6005; + if (this->actor.xzDistToPlayer < 100.0f) { + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + } + + EnGe3_MoveAndBlink(this, globalCtx); +} + +void EnGe3_Update(Actor* thisx, GlobalContext* globalCtx) { + EnGe3* this = THIS; + + EnGe3_UpdateCollision(this, globalCtx); + this->actionFunc(this, globalCtx); + EnGe3_MoveAndBlink(this, globalCtx); +} + +s32 EnGe3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnGe3* this = THIS; + + switch (limbIndex) { + // Hide swords and veil from object_geldb + case GELDB_LIMB_VEIL: + case GELDB_LIMB_R_SWORD: + case GELDB_LIMB_L_SWORD: + *dList = NULL; + return false; + // Turn head + case GELDB_LIMB_HEAD: + rot->x += this->headRot.y; + + // This is a hack to fix the color-changing clothes this Gerudo has on N64 versions + default: + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ge3.c", 547); + switch (limbIndex) { + case GELDB_LIMB_NECK: + break; + case GELDB_LIMB_HEAD: + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 80, 60, 10, 255); + break; + case GELDB_LIMB_R_SWORD: + case GELDB_LIMB_L_SWORD: + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 140, 170, 230, 255); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); + break; + default: + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 140, 0, 0, 255); + break; + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ge3.c", 566); + break; + } + return false; +} + +void EnGe3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnGe3* this = THIS; + Vec3f D_80A351C8 = { 600.0f, 700.0f, 0.0f }; + + if (limbIndex == GELDB_LIMB_HEAD) { + Matrix_MultVec3f(&D_80A351C8, &this->actor.focus.pos); + } +} + +static u64* sEyeTextures[] = { + 0x06005FE8, // Half-open + 0x060065A8, // Quarter-open + 0x06006D28, // Closed +}; + +void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx2) { + EnGe3* this = THIS; + GlobalContext* globalCtx = globalCtx2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ge3.c", 614); + + func_800943C8(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex])); + func_8002EBCC(&this->actor, globalCtx, 0); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnGe3_OverrideLimbDraw, EnGe3_PostLimbDraw, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ge3.c", 631); +} diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index c35bb41ccf..caf8e6bd5e 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -3,12 +3,24 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" struct EnGe3; +typedef void (*EnGe3ActionFunc)(struct EnGe3*, GlobalContext*); + typedef struct EnGe3 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C8]; + /* 0x014C */ ColliderCylinder collider; + /* 0x0198 */ SkelAnime skelAnime; + /* 0x01DC */ Vec3s jointTable[GELDB_LIMB_MAX]; + /* 0x026C */ Vec3s morphTable[GELDB_LIMB_MAX]; + /* 0x02FC */ s16 eyeIndex; + /* 0x02FE */ s16 blinkTimer; + /* 0x0300 */ Vec3s headRot; + /* 0x0306 */ Vec3s unk_306; + /* 0x030C */ u16 unk_30C; + /* 0x0310 */ EnGe3ActionFunc actionFunc; } EnGe3; // size = 0x0314 extern const ActorInit En_Ge3_InitVars; diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 5636969159..b2c0a88dc0 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -229,7 +229,7 @@ void EnGeldB_Init(Actor* thisx, GlobalContext* globalCtx) { this->blinkState = 0; this->unkFloat = 10.0f; SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGerudoRedSkel, &gGerudoRedNeutralAnim, this->jointTable, - this->morphTable, 24); + this->morphTable, GELDB_LIMB_MAX); Collider_InitCylinder(globalCtx, &this->bodyCollider); Collider_SetCylinder(globalCtx, &this->bodyCollider, thisx, &sBodyCylInit); Collider_InitTris(globalCtx, &this->blockCollider); @@ -366,8 +366,8 @@ void EnGeldB_Wait(EnGeldB* this, GlobalContext* globalCtx) { this->actor.focus.pos = this->actor.world.pos; this->actor.bgCheckFlags &= ~2; this->actor.velocity.y = 0.0f; - func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); func_80033260(globalCtx, &this->actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0); + func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); } if (SkelAnime_Update(&this->skelAnime)) { EnGeldB_SetupReady(this); @@ -391,8 +391,8 @@ void EnGeldB_Flee(EnGeldB* this, GlobalContext* globalCtx) { } if (this->skelAnime.curFrame == 2.0f) { this->actor.gravity = 0.0f; - func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); func_80033260(globalCtx, &this->actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0); + func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); } if (SkelAnime_Update(&this->skelAnime)) { Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight + 300.0f, 1.0f, 20.5f, 0.0f); @@ -923,8 +923,8 @@ void EnGeldB_SpinAttack(EnGeldB* this, GlobalContext* globalCtx) { if ((s32)this->skelAnime.curFrame < 9) { this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer; } else if ((s32)this->skelAnime.curFrame == 13) { - func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); func_80033260(globalCtx, &this->actor, &this->leftFootPos, 3.0f, 2, 2.0f, 0, 0, 0); + func_80033260(globalCtx, &this->actor, &this->rightFootPos, 3.0f, 2, 2.0f, 0, 0, 0); this->swordState = 1; this->actor.speedXZ = 10.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EN_GERUDOFT_ATTACK); @@ -1089,8 +1089,8 @@ void EnGeldB_SetupJump(EnGeldB* this) { void EnGeldB_Jump(EnGeldB* this, GlobalContext* globalCtx) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); if (this->actor.velocity.y >= 5.0f) { - func_800355B8(globalCtx, &this->rightFootPos); func_800355B8(globalCtx, &this->leftFootPos); + func_800355B8(globalCtx, &this->rightFootPos); } if (SkelAnime_Update(&this->skelAnime) && (this->actor.bgCheckFlags & 3)) { this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer; @@ -1428,14 +1428,14 @@ s32 EnGeldB_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis EnGeldB* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_geldB.c", 2507); - if (limbIndex == 3) { + if (limbIndex == GELDB_LIMB_NECK) { rot->z += this->headRot.x; rot->x += this->headRot.y; rot->y += this->headRot.z; - } else if (limbIndex == 6) { + } else if (limbIndex == GELDB_LIMB_HEAD) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 80, 60, 10, 255); - } else if ((limbIndex == 11) || (limbIndex == 16)) { + } else if ((limbIndex == GELDB_LIMB_R_SWORD) || (limbIndex == GELDB_LIMB_L_SWORD)) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 140, 170, 230, 255); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); @@ -1461,7 +1461,7 @@ void EnGeldB_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, EnGeldB* this = THIS; s32 bodyPart = -1; - if (limbIndex == 11) { + if (limbIndex == GELDB_LIMB_R_SWORD) { Matrix_MultVec3f(&swordQuadOffset1, &this->swordCollider.dim.quad[1]); Matrix_MultVec3f(&swordQuadOffset0, &this->swordCollider.dim.quad[0]); Matrix_MultVec3f(&swordQuadOffset3, &this->swordCollider.dim.quad[3]); @@ -1479,45 +1479,48 @@ void EnGeldB_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, EffectBlure_AddVertex(Effect_GetByIndex(this->blureIndex), &swordTip, &swordHilt); } } else { - Actor_SetFeetPos(&this->actor, limbIndex, 19, &footOffset, 22, &footOffset); + Actor_SetFeetPos(&this->actor, limbIndex, GELDB_LIMB_L_FOOT, &footOffset, GELDB_LIMB_R_FOOT, &footOffset); } - if (limbIndex == 19) { - Matrix_MultVec3f(&footOffset, &this->rightFootPos); - } else if (limbIndex == 22) { + + if (limbIndex == GELDB_LIMB_L_FOOT) { Matrix_MultVec3f(&footOffset, &this->leftFootPos); + } else if (limbIndex == GELDB_LIMB_R_FOOT) { + Matrix_MultVec3f(&footOffset, &this->rightFootPos); } + if (this->iceTimer != 0) { switch (limbIndex) { - case 3: + case GELDB_LIMB_NECK: bodyPart = 0; break; - case 16: + case GELDB_LIMB_L_SWORD: bodyPart = 1; break; - case 11: + case GELDB_LIMB_R_SWORD: bodyPart = 2; break; - case 12: + case GELDB_LIMB_L_UPPER_ARM: bodyPart = 3; break; - case 7: + case GELDB_LIMB_R_UPPER_ARM: bodyPart = 4; break; - case 2: + case GELDB_LIMB_TORSO: bodyPart = 5; break; - case 23: + case GELDB_LIMB_WAIST: bodyPart = 6; break; - case 19: + case GELDB_LIMB_L_FOOT: bodyPart = 7; break; - case 22: + case GELDB_LIMB_R_FOOT: bodyPart = 8; break; default: break; } + if (bodyPart >= 0) { Vec3f limbPos; diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index 2e875d1c2e..e5fc25d8e8 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -6,14 +6,42 @@ struct EnGeldB; +typedef enum { + /* 00 */ GELDB_LIMB_NONE, + /* 01 */ GELDB_LIMB_ROOT, + /* 02 */ GELDB_LIMB_TORSO, + /* 03 */ GELDB_LIMB_NECK, + /* 04 */ GELDB_LIMB_PONYTAIL, + /* 05 */ GELDB_LIMB_VEIL, + /* 06 */ GELDB_LIMB_HEAD, + /* 07 */ GELDB_LIMB_R_UPPER_ARM, + /* 08 */ GELDB_LIMB_R_FOREARM, + /* 09 */ GELDB_LIMB_R_WRIST, + /* 10 */ GELDB_LIMB_R_HAND, + /* 11 */ GELDB_LIMB_R_SWORD, + /* 12 */ GELDB_LIMB_L_UPPER_ARM, + /* 13 */ GELDB_LIMB_L_FOREARM, + /* 14 */ GELDB_LIMB_L_WRIST, + /* 15 */ GELDB_LIMB_L_HAND, + /* 16 */ GELDB_LIMB_L_SWORD, + /* 17 */ GELDB_LIMB_L_THIGH, + /* 18 */ GELDB_LIMB_L_SHIN, + /* 19 */ GELDB_LIMB_L_FOOT, + /* 20 */ GELDB_LIMB_R_THIGH, + /* 21 */ GELDB_LIMB_R_SHIN, + /* 22 */ GELDB_LIMB_R_FOOT, + /* 23 */ GELDB_LIMB_WAIST, + /* 24 */ GELDB_LIMB_MAX +} EnGeldBLimb; + typedef void (*EnGeldBActionFunc)(struct EnGeldB*, GlobalContext*); typedef struct EnGeldB { /* 0x0000 */ Actor actor; /* 0x014C */ Vec3s bodyPartsPos[10]; /* 0x0188 */ SkelAnime skelAnime; - /* 0x01CC */ Vec3s jointTable[24]; - /* 0x025C */ Vec3s morphTable[24]; + /* 0x01CC */ Vec3s jointTable[GELDB_LIMB_MAX]; + /* 0x025C */ Vec3s morphTable[GELDB_LIMB_MAX]; /* 0x02EC */ s32 action; /* 0x02F0 */ char unk_2F0[4]; /* 0x02F4 */ EnGeldBActionFunc actionFunc; @@ -36,8 +64,8 @@ typedef struct EnGeldB { /* 0x036C */ ColliderQuad swordCollider; /* 0x03EC */ ColliderTris blockCollider; /* 0x040C */ ColliderTrisElement blockElements[2]; - /* 0x04C4 */ Vec3f leftFootPos; - /* 0x04D0 */ Vec3f rightFootPos; + /* 0x04C4 */ Vec3f rightFootPos; + /* 0x04D0 */ Vec3f leftFootPos; /* 0x04DC */ Vec3s headRot; } EnGeldB; // size = 0x04E4 diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 078e2a7995..06beb3e169 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1,4 +1,5 @@ #include "z_en_go.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000039 @@ -10,17 +11,40 @@ void EnGo_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGo_Update(Actor* thisx, GlobalContext* globalCtx); void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06004930; -extern UNK_TYPE D_0600BD80; -extern UNK_TYPE D_0600C140; -extern UNK_TYPE D_0600CE80; -extern UNK_TYPE D_0600DE80; -extern UNK_TYPE D_0600FD40; -extern UNK_TYPE D_0600FD50; -extern UNK_TYPE D_0600FEF0; -extern UNK_TYPE D_06010590; +void func_80A3FEB4(EnGo* this, GlobalContext* globalCtx); +void EnGo_StopRolling(EnGo* this, GlobalContext* globalCtx); +void func_80A4008C(EnGo* this, GlobalContext* globalCtx); +void EnGo_GoronLinkRolling(EnGo* this, GlobalContext* globalCtx); +void EnGo_FireGenericActionFunc(EnGo* this, GlobalContext* globalCtx); +void EnGo_CurledUp(EnGo* this, GlobalContext* globalCtx); +void EnGo_WakeUp(EnGo* this, GlobalContext* globalCtx); + +void func_80A40494(EnGo* this, GlobalContext* globalCtx); +void func_80A405CC(EnGo* this, GlobalContext* globalCtx); +void EnGo_BiggoronActionFunc(EnGo* this, GlobalContext* globalCtx); +void func_80A408D8(EnGo* this, GlobalContext* globalCtx); + +void func_80A40B1C(EnGo* this, GlobalContext* globalCtx); +void EnGo_GetItem(EnGo* this, GlobalContext* globalCtx); +void func_80A40C78(EnGo* this, GlobalContext* globalCtx); +void EnGo_Eyedrops(EnGo* this, GlobalContext* globalCtx); +void func_80A40DCC(EnGo* this, GlobalContext* globalCtx); + +void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep); +void EnGo_UpdateDust(EnGo* this); +void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx); + +extern AnimationHeader D_060029A8; +extern AnimationHeader D_06004930; +extern Gfx D_0600BD80[]; +extern Gfx D_0600C140[]; +extern u64 D_0600CE80[]; +extern u64 D_0600DE80[]; +extern Gfx D_0600FD40[]; +extern Gfx D_0600FD50[]; +extern FlexSkeletonHeader D_0600FEF0; +extern AnimationHeader D_06010590; -/* const ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORCAT_NPC, @@ -33,7 +57,7 @@ const ActorInit En_Go_InitVars = { (ActorFunc)EnGo_Draw, }; -static ColliderCylinderInit D_80A41B00 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -52,93 +76,1173 @@ static ColliderCylinderInit D_80A41B00 = { }, { 20, 46, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E570.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E578.s") +static CollisionCheckInfoInit2 sColChkInfoInit = { + 0, 0, 0, 0, MASS_IMMOVABLE, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3E908.s") +typedef struct { + AnimationHeader* animation; + f32 playSpeed; + u8 mode; + f32 morphRate; +} EnGoAnimation; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3ED24.s") +static EnGoAnimation sAnimationEntries[] = { + { &D_06004930, 0.0f, ANIMMODE_LOOP_INTERP, 0.0f }, + { &D_06004930, 0.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &D_060029A8, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &D_06010590, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s") +void EnGo_SetupAction(EnGo* this, EnGoActionFunc* actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EE8C.s") +u16 EnGo_GetTextID(GlobalContext* globalCtx, EnGo* this) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EFE8.s") + switch (this->actor.params & 0xF0) { + case 0x90: + if (gSaveContext.bgsFlag) { + return 0x305E; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) { + if (func_800775CC(globalCtx) >= 3) { + return 0x305E; + } else { + return 0x305D; + } + } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_EYEDROPS) { + player->exchangeItemId = EXCH_ITEM_EYEDROPS; + return 0x3059; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) { + return 0x3058; + } else { + player->exchangeItemId = EXCH_ITEM_SWORD_BROKEN; + return 0x3053; + } + case 0x00: + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) { + if (gSaveContext.infTable[16] & 0x8000) { + return 0x3042; + } else { + return 0x3041; + } + } else if (CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1) || (gSaveContext.infTable[16] & 0x2000)) { + if (gSaveContext.infTable[16] & 0x4000) { + return 0x3038; + } else { + return 0x3037; + } + } else { + if (gSaveContext.infTable[16] & 0x200) { + if (gSaveContext.infTable[16] & 0x400) { + return 0x3033; + } else { + return 0x3032; + } + } else { + return 0x3030; + } + } + case 0x10: + if (Flags_GetSwitch(globalCtx, this->actor.params >> 8)) { + return 0x3052; + } else { + return 0x3051; + } + case 0x20: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.eventChkInf[2] & 0x8) { + return 0x3021; + } else if (gSaveContext.infTable[14] & 0x1) { + return 0x302A; + } else { + return 0x3008; + } + case 0x30: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.eventChkInf[2] & 0x8) { + return 0x3026; + } else { + return 0x3009; + } + case 0x40: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.eventChkInf[2] & 0x8) { + return 0x3026; + } else { + return 0x300A; + } + case 0x50: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.infTable[15] & 1) { + return 0x3015; + } else { + return 0x3014; + } + case 0x60: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.infTable[15] & 0x10) { + return 0x3017; + } else { + return 0x3016; + } + case 0x70: + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else if (gSaveContext.infTable[15] & 0x100) { + return 0x3019; + } else { + return 0x3018; + } + default: + return 0x0000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F060.s") +s16 EnGo_SetFlagsGetStates(GlobalContext* globalCtx, EnGo* this) { + s16 unkState = 1; + f32 xzRange; + f32 yRange = fabsf(this->actor.yDistToPlayer) + 1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F0E4.s") + xzRange = this->actor.xzDistToPlayer + 1.0f; + switch (func_8010BDBC(&globalCtx->msgCtx)) { + if (globalCtx) {} + case 2: + switch (this->actor.textId) { + case 0x3008: + gSaveContext.infTable[14] |= 1; + unkState = 0; + break; + case 0x300B: + gSaveContext.infTable[14] |= 0x800; + unkState = 0; + break; + case 0x3014: + gSaveContext.infTable[15] |= 1; + unkState = 0; + break; + case 0x3016: + gSaveContext.infTable[15] |= 0x10; + unkState = 0; + break; + case 0x3018: + gSaveContext.infTable[15] |= 0x100; + unkState = 0; + break; + case 0x3036: + func_8002F434(&this->actor, globalCtx, GI_TUNIC_GORON, xzRange, yRange); + gSaveContext.infTable[16] |= 0x2000; // EnGo exclusive flag + unkState = 2; + break; + case 0x3037: + gSaveContext.infTable[16] |= 0x4000; + unkState = 0; + break; + case 0x3041: + gSaveContext.infTable[16] |= 0x8000; + unkState = 0; + break; + case 0x3059: + unkState = 2; + break; + case 0x3052: + case 0x3054: + case 0x3055: + case 0x305A: + unkState = 2; + break; + case 0x305E: + unkState = 2; + break; + default: + unkState = 0; + break; + } + break; + case 4: + if (func_80106BC8(globalCtx)) { + switch (this->actor.textId) { + case 0x300A: + if (globalCtx->msgCtx.choiceIndex == 0) { + if (CUR_UPG_VALUE(UPG_STRENGTH) || (gSaveContext.infTable[14] & 0x800)) { + this->actor.textId = 0x300B; + } else { + this->actor.textId = 0x300C; + } + } else { + this->actor.textId = 0x300D; + } + func_8010B720(globalCtx, this->actor.textId); + unkState = 1; + break; + case 0x3034: + if (globalCtx->msgCtx.choiceIndex == 0) { + if (gSaveContext.infTable[16] & 0x800) { + this->actor.textId = 0x3033; + } else { + this->actor.textId = 0x3035; + } + } else if (gSaveContext.infTable[16] & 0x800) { + this->actor.textId = 0x3036; + } else { + this->actor.textId = 0x3033; + } + func_8010B720(globalCtx, this->actor.textId); + unkState = 1; + break; + case 0x3054: + case 0x3055: + if (globalCtx->msgCtx.choiceIndex == 0) { + unkState = 2; + } else { + this->actor.textId = 0x3056; + func_8010B720(globalCtx, this->actor.textId); + unkState = 1; + } + gSaveContext.infTable[11] |= 0x10; + break; + } + } + break; + case 5: + if (func_80106BC8(globalCtx)) { + switch (this->actor.textId) { + case 0x3035: + gSaveContext.infTable[16] |= 0x800; + case 0x3032: + case 0x3033: + this->actor.textId = 0x3034; + func_8010B720(globalCtx, this->actor.textId); + unkState = 1; + break; + default: + unkState = 2; + break; + } + } + break; + case 6: + if (func_80106BC8(globalCtx)) { + unkState = 3; + } + break; + case 0: + case 1: + case 3: + case 7: + case 9: + break; + } + return unkState; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F15C.s") +s32 func_80A3ED24(GlobalContext* globalCtx, EnGo* this, struct_80034A14_arg1* arg2, f32 arg3, + u16 (*getTextId)(GlobalContext*, Actor*), s16 (*unkFunc2)(GlobalContext*, Actor*)) { + if (arg2->unk_00) { + arg2->unk_00 = unkFunc2(globalCtx, &this->actor); + return false; + } else if (func_8002F194(&this->actor, globalCtx)) { + arg2->unk_00 = 1; + return true; + } else if (!func_8002F2CC(&this->actor, globalCtx, arg3)) { + return false; + } else { + this->actor.textId = getTextId(globalCtx, &this->actor); + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F260.s") +void EnGo_ChangeAnimation(EnGo* this, s32 animIndex) { + Animation_Change(&this->skelAnime, sAnimationEntries[animIndex].animation, + sAnimationEntries[animIndex].playSpeed * ((this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f), 0.0f, + Animation_GetLastFrame(sAnimationEntries[animIndex].animation), sAnimationEntries[animIndex].mode, + sAnimationEntries[animIndex].morphRate); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F274.s") +s32 EnGo_IsActorSpawned(EnGo* this, GlobalContext* globalCtx) { + if (((this->actor.params) & 0xF0) == 0x90) { + return true; + } else if (globalCtx->sceneNum == SCENE_HIDAN && !Flags_GetSwitch(globalCtx, (this->actor.params) >> 8) && + LINK_IS_ADULT && (this->actor.params & 0xF0) == 0x10) { + return true; + } else if (globalCtx->sceneNum == SCENE_SPOT18 && LINK_IS_ADULT && (this->actor.params & 0xF0) == 0x00) { + return true; + } else if (globalCtx->sceneNum == SCENE_SPOT16 && gSaveContext.linkAge == 1 && + ((this->actor.params & 0xF0) == 0x20 || (this->actor.params & 0xF0) == 0x30 || + (this->actor.params & 0xF0) == 0x40)) { + return true; + } else if (globalCtx->sceneNum == SCENE_SPOT18 && gSaveContext.linkAge == 1 && + ((this->actor.params & 0xF0) == 0x50 || (this->actor.params & 0xF0) == 0x60 || + (this->actor.params & 0xF0) == 0x70)) { + return true; + } else { + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s") +f32 EnGo_GetGoronSize(EnGo* this) { + switch (this->actor.params & 0xF0) { + case 0x00: + return 10.0f; + case 0x20: + case 0x30: + case 0x50: + case 0x60: + case 0x70: + return 20.0f; + case 0x40: + return 60.0f; + default: + return 20.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F4BC.s") +void func_80A3F060(EnGo* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 unkVal; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F594.s") + if (this->actionFunc != EnGo_BiggoronActionFunc && this->actionFunc != EnGo_FireGenericActionFunc && + this->actionFunc != func_80A40B1C) { + unkVal = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F7C0.s") + this->unk_1E0.unk_18 = player->actor.world.pos; + this->unk_1E0.unk_14 = EnGo_GetGoronSize(this); + func_80034A14(&this->actor, &this->unk_1E0, 4, unkVal); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F908.s") +void func_80A3F0E4(EnGo* this) { + if (DECR(this->unk_214) == 0) { + this->unk_216++; + if (this->unk_216 >= 3) { + this->unk_214 = Rand_S16Offset(30, 30); + this->unk_216 = 0; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s") +s32 EnGo_IsCameraModified(EnGo* this, GlobalContext* globalCtx) { + f32 xyzDist; + s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + Camera* camera = globalCtx->cameraPtrs[0]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s") + if (fabsf(yawDiff) > 10920.0f) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEB4.s") + xyzDist = (this->actor.scale.x / 0.01f) * 10000.0f; + if ((this->actor.params & 0xF0) == 0x90) { + Camera_ChangeSetting(camera, CAM_SET_TEPPEN); + xyzDist *= 4.8f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3FEF8.s") + if (fabsf(this->actor.xyzDistToPlayerSq) > xyzDist) { + if (camera->setting == 0x3F) { + Camera_ChangeSetting(camera, CAM_SET_NORMAL0); + } + return 0; + } else { + return 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4008C.s") +void EnGo_ReverseAnimation(EnGo* this) { + f32 startFrame = this->skelAnime.startFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4011C.s") + this->skelAnime.startFrame = this->skelAnime.endFrame; + this->skelAnime.endFrame = startFrame; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A4020C.s") +void EnGo_UpdateShadow(EnGo* this) { + s16 shadowAlpha; + f32 currentFrame = this->skelAnime.curFrame; + s16 shadowAlphaTarget = + (this->skelAnime.animation == &D_06004930 && currentFrame > 32.0f) || this->skelAnime.animation != &D_06004930 + ? 255 + : 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40218.s") + shadowAlpha = this->actor.shape.shadowAlpha; + Math_SmoothStepToS(&shadowAlpha, shadowAlphaTarget, 10, 60, 1); + this->actor.shape.shadowAlpha = shadowAlpha; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40318.s") +s32 EnGo_FollowPath(EnGo* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* pointPos; + f32 xDist; + f32 zDist; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40494.s") + if ((this->actor.params & 0xF) == 15) { + return false; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A405CC.s") + path = &globalCtx->setupPathList[this->actor.params & 0xF]; + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos += this->unk_218; + xDist = pointPos->x - this->actor.world.pos.x; + zDist = pointPos->z - this->actor.world.pos.z; + Math_SmoothStepToS(&this->actor.world.rot.y, (s16)(Math_FAtan2F(xDist, zDist) * ((f32)0x8000 / M_PI)), 10, 1000, 1); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A406E0.s") + if ((SQ(xDist) + SQ(zDist)) < 600.0f) { + this->unk_218++; + if (this->unk_218 >= path->count) { + this->unk_218 = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A408D8.s") + if ((this->actor.params & 0xF0) != 0x00) { + return true; + } else if (Flags_GetSwitch(globalCtx, this->actor.params >> 8)) { + return true; + } else if (this->unk_218 >= this->actor.shape.rot.z) { + this->unk_218 = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40A54.s") + return true; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B1C.s") + return false; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40B74.s") +s32 EnGo_SetMovedPos(EnGo* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* pointPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40C78.s") + if ((this->actor.params & 0xF) == 0xF) { + return false; + } else { + path = &globalCtx->setupPathList[this->actor.params & 0xF]; + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos += (path->count - 1); + this->actor.world.pos.x = pointPos->x; + this->actor.world.pos.y = pointPos->y; + this->actor.world.pos.z = pointPos->z; + this->actor.home.pos = this->actor.world.pos; + return true; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40D5C.s") +s32 EnGo_SpawnDust(EnGo* this, u8 initialTimer, f32 scale, f32 scaleStep, s32 numDustEffects, f32 radius, f32 xzAccel) { + Vec3f pos = { 0.0f, 0.0f, 0.0f }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + s16 angle; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40DCC.s") + pos = this->actor.world.pos; // Overwrites pos + pos.y = this->actor.floorHeight; + angle = (Rand_ZeroOne() - 0.5f) * 0x10000; + i = numDustEffects; + while (i >= 0) { + accel.x = (Rand_ZeroOne() - 0.5f) * xzAccel; + accel.z = (Rand_ZeroOne() - 0.5f) * xzAccel; + pos.x = (Math_SinS(angle) * radius) + this->actor.world.pos.x; + pos.z = (Math_CosS(angle) * radius) + this->actor.world.pos.z; + EnGo_AddDust(this, &pos, &velocity, &accel, initialTimer, scale, scaleStep); + angle += (s16)(0x10000 / numDustEffects); + i--; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s") +s32 EnGo_IsRollingOnGround(EnGo* this, s16 unkArg1, f32 unkArg2) { + if ((this->actor.bgCheckFlags & 1) == 0 || this->actor.velocity.y > 0.0f) { + return false; + } else if (this->unk_1E0.unk_00 != 0) { + return true; + } else if (DECR(this->unk_21C)) { + if ((this->unk_21C & 1)) { + this->actor.world.pos.y += 1.5f; + } else { + this->actor.world.pos.y -= 1.5f; + } + return true; + } else { + this->unk_21A--; + if (this->unk_21A <= 0) { + if (this->unk_21A == 0) { + this->unk_21C = Rand_S16Offset(60, 30); + this->unk_21A = 0; + this->actor.velocity.y = 0.0f; + return true; + } + this->unk_21A = unkArg1; + } + this->actor.velocity.y = ((f32)this->unk_21A / (f32)unkArg1) * unkArg2; + return true; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s") +void func_80A3F908(EnGo* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 float1; + s32 isUnkCondition; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s") + if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_GoronLinkRolling || + this->actionFunc == EnGo_FireGenericActionFunc || this->actionFunc == EnGo_Eyedrops || + this->actionFunc == func_80A40DCC || this->actionFunc == EnGo_GetItem || this->actionFunc == func_80A40C78 || + this->actionFunc == func_80A40B1C) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A411C8.s") + float1 = (this->collider.dim.radius + 30.0f); + float1 *= (this->actor.scale.x / 0.01f); + if ((this->actor.params & 0xF0) == 0x90) { + float1 *= 4.8f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A413DC.s") + if ((this->actor.params & 0xF0) == 0x90) { + isUnkCondition = + func_80A3ED24(globalCtx, &this->actor, &this->unk_1E0, float1, EnGo_GetTextID, EnGo_SetFlagsGetStates); + } else { + isUnkCondition = + func_800343CC(globalCtx, &this->actor, &this->unk_1E0, float1, EnGo_GetTextID, EnGo_SetFlagsGetStates); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s") + if (((this->actor.params & 0xF0) == 0x90) && (isUnkCondition == true)) { + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) { + if (func_8002F368(globalCtx) == EXCH_ITEM_SWORD_BROKEN) { + if (gSaveContext.infTable[11] & 0x10) { + this->actor.textId = 0x3055; + } else { + this->actor.textId = 0x3054; + } + } else { + this->actor.textId = 0x3053; + } + player->actor.textId = this->actor.textId; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41604.s") + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) { + if (func_8002F368(globalCtx) == EXCH_ITEM_EYEDROPS) { + this->actor.textId = 0x3059; + } else { + this->actor.textId = 0x3058; + } + player->actor.textId = this->actor.textId; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A416A8.s") +void EnGo_Init(Actor* thisx, GlobalContext* globalCtx) { + EnGo* this = THIS; + s32 pad; + Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; // unused + Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, 0, 0, 0); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit); + + if (!EnGo_IsActorSpawned(this, globalCtx)) { + Actor_Kill(&this->actor); + return; + } + + if ((this->actor.params & 0xF0) && ((this->actor.params & 0xF0) != 0x90)) { + this->actor.flags &= ~0x10; + this->actor.flags &= ~0x20; + } + + EnGo_ChangeAnimation(this, 0); + this->actor.targetMode = 6; + this->unk_1E0.unk_00 = 0; + this->actor.gravity = -1.0f; + + switch (this->actor.params & 0xF0) { + case 0x00: + Actor_SetScale(&this->actor, 0.008f); + if (CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1)) { + EnGo_SetMovedPos(this, globalCtx); + EnGo_SetupAction(this, EnGo_CurledUp); + } else { + this->actor.shape.yOffset = 1400.0f; + this->actor.speedXZ = 3.0f; + EnGo_SetupAction(this, EnGo_GoronLinkRolling); + } + break; + case 0x10: + this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + Actor_SetScale(&this->actor, 0.01f); + EnGo_SetupAction(this, EnGo_FireGenericActionFunc); + break; + case 0x40: + if (gSaveContext.infTable[14] & 0x800) { + EnGo_SetMovedPos(this, globalCtx); + } + Actor_SetScale(&this->actor, 0.015f); + EnGo_SetupAction(this, EnGo_CurledUp); + break; + case 0x30: + this->actor.shape.yOffset = 1400.0f; + Actor_SetScale(&this->actor, 0.01f); + EnGo_SetupAction(this, func_80A3FEB4); + break; + case 0x90: + this->actor.targetMode = 5; + Actor_SetScale(&this->actor, 0.16f); + EnGo_SetupAction(this, EnGo_CurledUp); + break; + case 0x20: + case 0x50: + case 0x60: + case 0x70: + Actor_SetScale(&this->actor, 0.01f); + EnGo_SetupAction(this, EnGo_CurledUp); + break; + default: + Actor_Kill(&this->actor); + } +} + +void EnGo_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnGo* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void func_80A3FEB4(EnGo* this, GlobalContext* globalCtx) { + if (!(this->actor.xyzDistToPlayerSq > SQ(1200.0f))) { + EnGo_SetupAction(this, EnGo_StopRolling); + } +} + +void EnGo_StopRolling(EnGo* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (DECR(this->unk_20E) == 0) { + if (this->collider.base.ocFlags2 & 1) { + this->collider.base.ocFlags2 &= ~1; + globalCtx->damagePlayer(globalCtx, -4); + func_8002F71C(globalCtx, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); + this->unk_20E = 0x10; + } + } + + this->actor.speedXZ = 3.0f; + if ((EnGo_FollowPath(this, globalCtx) == true) && (this->unk_218 == 0)) { + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); + if (bomb != NULL) { + bomb->timer = 0; + } + + this->actor.speedXZ = 0.0f; + EnGo_SetupAction(this, func_80A4008C); + } + + this->actor.shape.rot = this->actor.world.rot; + + if (EnGo_IsRollingOnGround(this, 3, 6.0f)) { + EnGo_SpawnDust(this, 12, 0.16f, 0.1f, 1, 10.0f, 20.0f); + } +} + +void func_80A4008C(EnGo* this, GlobalContext* globalCtx) { + if (EnGo_IsRollingOnGround(this, 3, 6.0f)) { + if (this->unk_21A == 0) { + this->actor.shape.yOffset = 0.0f; + EnGo_SetupAction(this, EnGo_CurledUp); + } else { + EnGo_SpawnDust(this, 12, 0.16f, 0.1f, 1, 10.0f, 20.0f); + } + } +} + +void EnGo_GoronLinkRolling(EnGo* this, GlobalContext* globalCtx) { + if ((EnGo_FollowPath(this, globalCtx) == true) && Flags_GetSwitch(globalCtx, this->actor.params >> 8) && + (this->unk_218 == 0)) { + this->actor.speedXZ = 0.0f; + EnGo_SetupAction(this, func_80A4008C); + gSaveContext.infTable[16] |= 0x200; + } + + this->actor.shape.rot = this->actor.world.rot; + + if (EnGo_IsRollingOnGround(this, 3, 6.0f)) { + EnGo_SpawnDust(this, 12, 0.18f, 0.2f, 2, 13.0f, 20.0f); + } +} + +void EnGo_FireGenericActionFunc(EnGo* this, GlobalContext* globalCtx) { +} + +void EnGo_CurledUp(EnGo* this, GlobalContext* globalCtx) { + if ((DECR(this->unk_210) == 0) && EnGo_IsCameraModified(this, globalCtx)) { + Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + + this->skelAnime.playSpeed = 0.1f; + this->skelAnime.playSpeed *= (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f; + + EnGo_SetupAction(this, EnGo_WakeUp); + if ((this->actor.params & 0xF0) == 0x90) { + func_800800F8(globalCtx, 0x1068, -0x63, &this->actor, 0); + } + } +} + +void EnGo_WakeUp(EnGo* this, GlobalContext* globalCtx) { + f32 frame; + + if (this->skelAnime.playSpeed != 0.0f) { + Math_SmoothStepToF(&this->skelAnime.playSpeed, ((this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f) * 0.5f, 0.1f, + 1000.0f, 0.1f); + frame = this->skelAnime.curFrame; + frame += this->skelAnime.playSpeed; + + if (frame <= 12.0f) { + return; + } else { + this->skelAnime.curFrame = 12.0f; + this->skelAnime.playSpeed = 0.0f; + if ((this->actor.params & 0xF0) != 0x90) { + this->unk_212 = 30; + return; + } + } + } + + if (DECR(this->unk_212) == 0) { + Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + EnGo_SetupAction(this, func_80A405CC); + } else if (!EnGo_IsCameraModified(this, globalCtx)) { + EnGo_ReverseAnimation(this); + this->skelAnime.playSpeed = 0.0f; + EnGo_SetupAction(this, func_80A40494); + } +} + +void func_80A40494(EnGo* this, GlobalContext* globalCtx) { + f32 frame; + + Math_SmoothStepToF(&this->skelAnime.playSpeed, ((this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f) * -0.5f, 0.1f, + 1000.0f, 0.1f); + frame = this->skelAnime.curFrame; + frame += this->skelAnime.playSpeed; + + if (!(frame >= 0.0f)) { + Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + EnGo_SpawnDust(this, 10, 0.4f, 0.1f, 16, 26.0f, 2.0f); + EnGo_ReverseAnimation(this); + this->skelAnime.playSpeed = 0.0f; + this->skelAnime.curFrame = 0.0f; + this->unk_210 = Rand_S16Offset(30, 30); + EnGo_SetupAction(this, EnGo_CurledUp); + } +} + +void func_80A405CC(EnGo* this, GlobalContext* globalCtx) { + f32 lastFrame; + f32 frame; + + lastFrame = Animation_GetLastFrame(&D_06004930); + Math_SmoothStepToF(&this->skelAnime.playSpeed, (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f, 0.1f, 1000.0f, + 0.1f); + + frame = this->skelAnime.curFrame; + frame += this->skelAnime.playSpeed; + + if (!(frame < lastFrame)) { + this->skelAnime.curFrame = lastFrame; + this->skelAnime.playSpeed = 0.0f; + this->unk_212 = Rand_S16Offset(30, 30); + if (((this->actor.params & 0xF0) == 0x40) && ((gSaveContext.infTable[14] & 0x800) == 0)) { + EnGo_SetupAction(this, func_80A40B1C); + } else { + EnGo_SetupAction(this, EnGo_BiggoronActionFunc); + } + } +} + +void EnGo_BiggoronActionFunc(EnGo* this, GlobalContext* globalCtx) { + if (((this->actor.params & 0xF0) == 0x90) && (this->unk_1E0.unk_00 == 2)) { + if (gSaveContext.bgsFlag) { + this->unk_1E0.unk_00 = 0; + } else { + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) { + EnGo_ChangeAnimation(this, 2); + this->unk_21E = 100; + this->unk_1E0.unk_00 = 0; + EnGo_SetupAction(this, EnGo_Eyedrops); + globalCtx->msgCtx.msgMode = 0x37; + gSaveContext.timer2State = 0; + func_800800F8(globalCtx, 0x105E, -0x63, &this->actor, 0); + } else { + this->unk_1E0.unk_00 = 0; + EnGo_SetupAction(this, EnGo_GetItem); + func_80106CCC(globalCtx); + EnGo_GetItem(this, globalCtx); + } + } + } else if (((this->actor.params & 0xF0) == 0) && (this->unk_1E0.unk_00 == 2)) { + EnGo_SetupAction(this, EnGo_GetItem); + globalCtx->msgCtx.unk_E3E7 = 4; + globalCtx->msgCtx.msgMode = 0x36; + } else { + if ((DECR(this->unk_212) == 0) && !EnGo_IsCameraModified(this, globalCtx)) { + EnGo_ReverseAnimation(this); + this->skelAnime.playSpeed = -0.1f; + this->skelAnime.playSpeed *= (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f; + EnGo_SetupAction(this, func_80A408D8); + } + } +} + +void func_80A408D8(EnGo* this, GlobalContext* globalCtx) { + f32 frame; + + if (this->skelAnime.playSpeed != 0.0f) { + Math_SmoothStepToF(&this->skelAnime.playSpeed, ((this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f) * -1.0f, + 0.1f, 1000.0f, 0.1f); + frame = this->skelAnime.curFrame; + frame += this->skelAnime.playSpeed; + if (frame >= 12.0f) { + return; + } else { + this->skelAnime.curFrame = 12.0f; + this->skelAnime.playSpeed = 0.0f; + if ((this->actor.params & 0xF0) != 0x90) { + this->unk_212 = 30; + return; + } + } + } + + if (DECR(this->unk_212) == 0) { + EnGo_SetupAction(this, func_80A40494); + } else if (EnGo_IsCameraModified(this, globalCtx)) { + EnGo_ReverseAnimation(this); + Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->skelAnime.playSpeed = 0.0f; + EnGo_SetupAction(this, func_80A405CC); + } +} + +void func_80A40A54(EnGo* this, GlobalContext* globalCtx) { + f32 float1 = ((f32)0x8000 / Animation_GetLastFrame(&D_06010590)); + f32 float2 = this->skelAnime.curFrame * float1; + + this->actor.speedXZ = Math_SinS((s16)float2); + if (EnGo_FollowPath(this, globalCtx) && this->unk_218 == 0) { + EnGo_ChangeAnimation(this, 1); + this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + this->actor.speedXZ = 0.0f; + EnGo_SetupAction(this, EnGo_BiggoronActionFunc); + } +} + +void func_80A40B1C(EnGo* this, GlobalContext* globalCtx) { + if (gSaveContext.infTable[14] & 0x800) { + EnGo_ChangeAnimation(this, 3); + EnGo_SetupAction(this, func_80A40A54); + } else { + EnGo_BiggoronActionFunc(this, globalCtx); + } +} + +void EnGo_GetItem(EnGo* this, GlobalContext* globalCtx) { + f32 xzDist; + f32 yDist; + s32 getItem; + + if (Actor_HasParent(&this->actor, globalCtx)) { + this->unk_1E0.unk_00 = 2; + this->actor.parent = NULL; + EnGo_SetupAction(this, func_80A40C78); + } else { + this->unk_20C = 0; + if ((this->actor.params & 0xF0) == 0x90) { + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) { + getItem = GI_SWORD_BGS; + this->unk_20C = 1; + } + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) { + getItem = GI_CLAIM_CHECK; + } + if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) { + getItem = GI_PRESCRIPTION; + } + } + + if ((this->actor.params & 0xF0) == 0) { + getItem = GI_TUNIC_GORON; + } + + yDist = fabsf(this->actor.yDistToPlayer) + 1.0f; + xzDist = this->actor.xzDistToPlayer + 1.0f; + func_8002F434(&this->actor, globalCtx, getItem, xzDist, yDist); + } +} + +void func_80A40C78(EnGo* this, GlobalContext* globalCtx) { + if (this->unk_1E0.unk_00 == 3) { + EnGo_SetupAction(this, EnGo_BiggoronActionFunc); + if ((this->actor.params & 0xF0) != 0x90) { + this->unk_1E0.unk_00 = 0; + } else if (this->unk_20C) { + this->unk_1E0.unk_00 = 0; + gSaveContext.bgsFlag = true; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) { + this->actor.textId = 0x3058; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E0.unk_00 = 1; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) { + this->actor.textId = 0x305C; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E0.unk_00 = 1; + func_800775D8(); + } + } +} + +void EnGo_Eyedrops(EnGo* this, GlobalContext* globalCtx) { + if (DECR(this->unk_21E) == 0) { + this->actor.textId = 0x305A; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E0.unk_00 = 1; + EnGo_SetupAction(this, func_80A40DCC); + } +} + +void func_80A40DCC(EnGo* this, GlobalContext* globalCtx) { + if (this->unk_1E0.unk_00 == 2) { + EnGo_ChangeAnimation(this, 1); + this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + func_80106CCC(globalCtx); + EnGo_SetupAction(this, EnGo_GetItem); + EnGo_GetItem(this, globalCtx); + } +} + +void EnGo_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnGo* this = THIS; + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + SkelAnime_Update(&this->skelAnime); + + if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_FireGenericActionFunc || + this->actionFunc == func_80A40B1C) { + func_80034F54(globalCtx, this->jointTable, this->morphTable, 18); + } + + EnGo_UpdateShadow(this); + + if (this->unk_1E0.unk_00 == 0) { + Actor_MoveForward(&this->actor); + } + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + func_80A3F0E4(this); + func_80A3F908(this, globalCtx); + this->actionFunc(this, globalCtx); + func_80A3F060(this, globalCtx); +} + +void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) { + Vec3f D_80A41BB4 = { 0.0f, 0.0f, 0.0f }; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2320); + + Matrix_Push(); + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2326), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(POLY_OPA_DISP++, D_0600BD80); + + Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos); + Matrix_Pull(); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2341); +} + +void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) { + Vec3f D_80A41BC0 = { 0.0f, 0.0f, 0.0f }; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2355); + + Matrix_Push(); + func_80093D18(globalCtx->state.gfxCtx); + Matrix_RotateRPY((s16)(globalCtx->state.frames * ((s16)this->actor.speedXZ * 1400)), 0, this->actor.shape.rot.z, + MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2368), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_0600C140); + Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos); + Matrix_Pull(); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2383); +} + +s32 EnGo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnGo* this = THIS; + Vec3s vec1; + f32 float1; + + if (limb == 17) { + Matrix_Translate(2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); + vec1 = this->unk_1E0.unk_08; + float1 = (vec1.y / (f32)0x8000) * M_PI; + Matrix_RotateX(float1, MTXMODE_APPLY); + float1 = (vec1.x / (f32)0x8000) * M_PI; + Matrix_RotateZ(float1, MTXMODE_APPLY); + Matrix_Translate(-2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } + + if (limb == 10) { + vec1 = this->unk_1E0.unk_0E; + float1 = (vec1.y / (f32)0x8000) * M_PI; + Matrix_RotateY(float1, MTXMODE_APPLY); + float1 = (vec1.x / (f32)0x8000) * M_PI; + Matrix_RotateX(float1, MTXMODE_APPLY); + } + + if ((limb == 10) || (limb == 11) || (limb == 14)) { + float1 = Math_SinS(this->jointTable[limb]); + rot->y += float1 * 200.0f; + float1 = Math_CosS(this->morphTable[limb]); + rot->z += float1 * 200.0f; + } + + return 0; +} + +void EnGo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnGo* this = THIS; + Vec3f D_80A41BCC = { 600.0f, 0.0f, 0.0f }; + + if (limbIndex == 17) { + Matrix_MultVec3f(&D_80A41BCC, &this->actor.focus.pos); + } +} + +void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnGo* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2479); + + EnGo_UpdateDust(this); + Matrix_Push(); + EnGo_DrawDust(this, globalCtx); + Matrix_Pull(); + + if (this->actionFunc == EnGo_CurledUp) { + EnGo_DrawCurledUp(this, globalCtx); + return; // needed for match? + } else if (this->actionFunc == EnGo_GoronLinkRolling || this->actionFunc == func_80A3FEB4 || + this->actionFunc == EnGo_StopRolling || this->actionFunc == func_80A3FEB4) { + EnGo_DrawRolling(this, globalCtx); + return; // needed for match? + } else { + func_800943C8(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_0600CE80)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_0600DE80)); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, EnGo_OverrideLimbDraw, EnGo_PostLimbDraw, &this->actor); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2525); + EnGo_DrawDust(this, globalCtx); + } +} + +void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) { + EnGoEffect* dustEffect = this->dustEffects; + s16 i; + s16 timer; + + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type != 1) { + dustEffect->scale = scale; + dustEffect->scaleStep = scaleStep; + if (1) {} + timer = initialTimer; + dustEffect->timer = timer; + dustEffect->type = 1; + dustEffect->initialTimer = initialTimer; + dustEffect->pos = *pos; + dustEffect->accel = *accel; + dustEffect->velocity = *velocity; + return; + } + } +} + +void EnGo_UpdateDust(EnGo* this) { + EnGoEffect* dustEffect = this->dustEffects; + f32 randomNumber; + s16 i; + + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type) { + dustEffect->timer--; + if (dustEffect->timer == 0) { + dustEffect->type = 0; + } + + dustEffect->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + randomNumber = Rand_ZeroOne() * 0.4f; + dustEffect->accel.z = randomNumber - 0.2f; + dustEffect->pos.x += dustEffect->velocity.x; + dustEffect->pos.y += dustEffect->velocity.y; + dustEffect->pos.z += dustEffect->velocity.z; + dustEffect->velocity.x += dustEffect->accel.x; + dustEffect->velocity.y += dustEffect->accel.y; + dustEffect->velocity.z += randomNumber - 0.2f; + dustEffect->scale += dustEffect->scaleStep; + } + } +} + +void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { + static u64* dustTex[] = { gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex }; + EnGoEffect* dustEffect = this->dustEffects; + s16 alpha; + s16 firstDone; + s16 index; + s16 i; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2626); + firstDone = false; + func_80093D84(globalCtx->state.gfxCtx); + if (1) {} + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type) { + if (!firstDone) { + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); + gSPDisplayList(POLY_XLU_DISP++, D_0600FD40); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); + firstDone = true; + } + + alpha = dustEffect->timer * (255.0f / dustEffect->initialTimer); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 130, 90, alpha); + gDPPipeSync(POLY_XLU_DISP++); + Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2664), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + index = dustEffect->timer * (8.0f / dustEffect->initialTimer); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index])); + gSPDisplayList(POLY_XLU_DISP++, D_0600FD50); + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2678); +} diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index 0cc54c7d78..e07dbe4dbd 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -6,9 +6,56 @@ struct EnGo; +typedef void (*EnGoActionFunc)(struct EnGo*, GlobalContext*); +typedef u16 (*callback1_80A3ED24)(GlobalContext*, struct EnGo*); +typedef s16 (*callback2_80A3ED24)(GlobalContext*, struct EnGo*); + +// WIP type docs +// /* 0x00 */ GORON1_CITY_LINK, +// /* 0x10 */ GORON1_FIRE_GENERIC, +// /* 0x20 */ GORON1_DMT_DC_ENTRANCE, +// /* 0x30 */ GORON1_DMT_ROLLING_SMALL, +// /* 0x40 */ GORON1_DMT_BOMB_FLOWER, +// /* 0x50 */ GORON1_CITY_ENTRANCE, +// /* 0x60 */ GORON1_CITY_ISLAND, +// /* 0x70 */ GORON1_CITY_LOST_WOODS, +// /* 0x80 */ // Not Used +// /* 0x90 */ GORON1_DMT_BIGGORON, + + +typedef struct { + /* 0x0000 */ u8 type; + /* 0x0001 */ u8 timer; + /* 0x0002 */ u8 initialTimer; + /* 0x0004 */ f32 scale; + /* 0x0008 */ f32 scaleStep; + /* 0x000C */ Color_RGBA8 color; + /* 0x0010 */ char unk_10[4]; + /* 0x0014 */ Vec3f pos; + /* 0x0020 */ Vec3f velocity; + /* 0x002C */ Vec3f accel; +} EnGoEffect; // size = 0x38 + typedef struct EnGo { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x57C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnGoActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ struct_80034A14_arg1 unk_1E0; + /* 0x0208 */ char unk_208[0x4]; + /* 0x020c */ s16 unk_20C; + /* 0x020e */ s16 unk_20E; + /* 0x0210 */ s16 unk_210; + /* 0x0212 */ s16 unk_212; + /* 0x0214 */ s16 unk_214; + /* 0x0216 */ s16 unk_216; + /* 0x0218 */ s16 unk_218; + /* 0x021A */ s16 unk_21A; + /* 0x021C */ s16 unk_21C; + /* 0x021E */ s16 unk_21E; + /* 0x0220 */ s16 jointTable[18]; + /* 0x0244 */ s16 morphTable[18]; + /* 0x0268 */ EnGoEffect dustEffects[20]; } EnGo; // size = 0x06C8 extern const ActorInit En_Go_InitVars; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index bdac0d42db..8fb06e0059 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1,38 +1,101 @@ #include "z_en_go2.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000039 #define THIS ((EnGo2*)thisx) +/* +FLAGS + +gSaveContext.eventChkInf[2] & 0x8 - DC entrance boulder blown up as child + +InfTable + +gSaveContext.infTable[11] & 0x10 +gSaveContext.infTable[14] & 0x1 - Talked to DMT Goron at DC entrance (Before DC is opened as child) +gSaveContext.infTable[14] & 0x8 - Talked to GC Goron in bottom level stairwell +gSaveContext.infTable[14] & 0x40 - Talked to GC Goron at LW entrance (Before LW shortcut is opened) +gSaveContext.infTable[14] & 0x800 - Talked to DMT Goron at Bomb Flower with goron bracelet +gSaveContext.infTable[15] & 0x1 - Talked to Goron at GC Entrance (Before goron ruby is obtained) +gSaveContext.infTable[15] & 0x10 - Talked to Goron at GC Island (Before goron ruby is obtained) +gSaveContext.infTable[15] & 0x100 - (not on cloud modding) Talked to GC Goron outside Darunias door (after opening door, +before getting goron bracelet) gSaveContext.infTable[16] & 0x200 - Obtained Fire Tunic from Goron Link +gSaveContext.infTable[16] & 0x400 - (not on cloud modding) +gSaveContext.infTable[16] & 0x800 - Spoke to Goron Link About Volvagia +gSaveContext.infTable[16] & 0x1000 - Stopped Goron Link's Rolling +gSaveContext.infTable[16] & 0x2000 - EnGo Exclusive +gSaveContext.infTable[16] & 0x4000 - Spoke to Goron Link +gSaveContext.infTable[16] & 0x8000 - (not on cloud modding) + +gSaveContext.infTable[17] & 0x4000 - Bomb bag upgrade obtained from rolling Goron + +EnGo +pathIndex: this->actor.params & 0xF +Goron: this->actor.params & 0xF0 + +EnGo2 +(this->actor.params & 0x3E0) >> 5 +(this->actor.params & 0xFC00) >> 0xA - Gorons in Fire Temple +this->actor.params & 0x1F + +Gorons only move when this->unk_194.unk_00 == 0 +*/ + void EnGo2_Init(Actor* thisx, GlobalContext* globalCtx); void EnGo2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGo2_Update(Actor* thisx, GlobalContext* globalCtx); void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000750; -extern UNK_TYPE D_06000D5C; -extern UNK_TYPE D_06004930; -extern UNK_TYPE D_0600BD80; -extern UNK_TYPE D_0600C140; -extern UNK_TYPE D_0600FD40; -extern UNK_TYPE D_0600FD50; -extern UNK_TYPE D_0600FEF0; +void EnGo2_StopRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_CurledUp(EnGo2* this, GlobalContext* globalCtx); -/* -const ActorInit En_Go2_InitVars = { - ACTOR_EN_GO2, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnGo2), - (ActorFunc)EnGo2_Init, - (ActorFunc)EnGo2_Destroy, - (ActorFunc)EnGo2_Update, - (ActorFunc)EnGo2_Draw, -}; +void func_80A46B40(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_GoronDmtBombFlowerAnimation(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_GoronRollingBigContinueRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_ContinueRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_SlowRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_GroundRolling(EnGo2* this, GlobalContext* globalCtx); -static ColliderCylinderInit D_80A48114 = { +void EnGo2_ReverseRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_SetupGetItem(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_SetGetItem(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_GoronLinkStopRolling(EnGo2* this, GlobalContext* globalCtx); +void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx); + +extern AnimationHeader D_06000750; +extern AnimationHeader D_06000D5C; +extern AnimationHeader D_0600161C; +extern AnimationHeader D_06001A00; +extern AnimationHeader D_060021D0; +extern AnimationHeader D_060029A8; +extern AnimationHeader D_06002D80; +extern AnimationHeader D_06003768; +extern AnimationHeader D_060038E4; +extern AnimationHeader D_06004930; +extern AnimationHeader D_06010590; +extern Gfx D_0600BD80[]; +extern Gfx D_0600C140[]; +extern u64 D_0600CE80[]; +extern u64 D_0600D280[]; +extern u64 D_0600D680[]; +extern u64 D_0600DA80[]; +extern u64 D_0600DE80[]; +extern u64 D_0600E680[]; +extern Gfx D_0600FD40[]; +extern Gfx D_0600FD50[]; + +extern FlexSkeletonHeader D_0600FEF0; + +static u64* sDustTex[] = { gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex }; + +static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; +static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f }; +static Vec3f sAccel = { 0.0f, 0.3f, 0.0f }; + +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -51,199 +114,1957 @@ static ColliderCylinderInit D_80A48114 = { }, { 40, 65, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42D30.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42DD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4320C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43424.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43468.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A434E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A435E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A436DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43824.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4387C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A438B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43950.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A439AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43A88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43B64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43C9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43D78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A43F90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44010.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44258.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A442F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4433C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44398.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A443E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4444C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A444FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4488C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A448C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44A9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44AB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44C68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44DC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44EF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45088.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45288.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45360.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4546C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A454CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45578.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4561C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45734.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4578C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A457F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45848.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4592C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45A00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45B9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45D40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45DA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45E48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A45F9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4601C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4607C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A460B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A461A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A463D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46B40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46CD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46D5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46DBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46E54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A46F88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47024.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A470E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47158.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4725C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47490.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47578.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47C20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47E34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s") +static CollisionCheckInfoInit2 sColChkInfoInit = { + 0, 0, 0, 0, MASS_IMMOVABLE, +}; + +const ActorInit En_Go2_InitVars = { + ACTOR_EN_GO2, + ACTORCAT_NPC, + FLAGS, + OBJECT_OF1D_MAP, + sizeof(EnGo2), + (ActorFunc)EnGo2_Init, + (ActorFunc)EnGo2_Destroy, + (ActorFunc)EnGo2_Update, + (ActorFunc)EnGo2_Draw, +}; + +static EnGo2DataStruct1 D_80A4816C[14] = { + { 0, 0, 0, 68, 148 }, { 0, 0, 0, 24, 52 }, { 0, 320, 380, 400, 120 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 46, 90 }, + { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, + { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, { 0, 0, 0, 30, 68 }, +}; + +static EnGo2DataStruct2 D_80A481F8[14] = { + { 30.0f, 0.026f, 6, 60.0f }, { 24.0f, 0.008f, 6, 30.0f }, { 28.0f, 0.16f, 5, 380.0f }, { 28.0f, 0.01f, 7, 40.0f }, + { 30.0f, 0.015f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, + { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, + { 28.0f, 0.01f, 6, 30.0f }, { 28.0f, 0.01f, 6, 30.0f }, +}; + +static f32 D_80A482D8[14][2] = { + { 80.0f, 80.0f }, { -10.0f, -10.0f }, { 800.0f, 800.0f }, { 0.0f, 0.0f }, { 20.0f, 40.0f }, + { 20.0f, 20.0f }, { 20.0f, 20.0f }, { 20.0f, 20.0f }, { 20.0f, 20.0f }, { 20.0f, 20.0f }, + { 20.0f, 20.0f }, { 20.0f, 20.0f }, { 20.0f, 20.0f }, { 20.0f, 20.0f }, +}; + +static struct_80034EC0_Entry sAnimations[] = { + { &D_06004930, 0.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &D_06004930, 0.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &D_060029A8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_06010590, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &D_06003768, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_060038E4, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, + { &D_06002D80, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, { &D_0600161C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &D_06001A00, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_060021D0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &D_06004930, 0.0f, 0.0f, -1.0f, 0x01, -8.0f }, { &D_06000750, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &D_06000D5C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, +}; + +static EnGo2DustEffectData sDustEffectData[2][4] = { + { + { 12, 0.2f, 0.2f, 1, 18.0f, 0.0f }, + { 12, 0.1f, 0.2f, 12, 26.0f, 0.0f }, + { 12, 0.1f, 0.3f, 4, 10.0f, 0.0f }, + { 12, 0.2f, 0.2f, 1, 18.0f, 0.0f }, + }, + { + { 12, 0.5f, 0.4f, 3, 42.0f, 0.0f }, + { 12, 0.5f, 0.4f, 3, 42.0f, 0.0f }, + { 12, 0.5f, 0.4f, 3, 42.0f, 0.0f }, + { 12, 0.5f, 0.4f, 3, 42.0f, 0.0f }, + }, +}; + +static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; + +void EnGo2_AddDust(EnGo2* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) { + EnGoEffect* dustEffect = this->dustEffects; + s16 i; + s16 timer; + + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type != 1) { + dustEffect->scale = scale; + dustEffect->scaleStep = scaleStep; + if (1) {} + timer = initialTimer; + dustEffect->timer = timer; + dustEffect->type = 1; + dustEffect->initialTimer = initialTimer; + dustEffect->pos = *pos; + dustEffect->accel = *accel; + dustEffect->velocity = *velocity; + return; + } + } +} + +void EnGo2_UpdateDust(EnGo2* this) { + EnGoEffect* dustEffect = this->dustEffects; + f32 randomNumber; + s16 i; + + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type) { + dustEffect->timer--; + if (dustEffect->timer == 0) { + dustEffect->type = 0; + } + dustEffect->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f; + randomNumber = Rand_ZeroOne() * 0.4f; + dustEffect->accel.z = randomNumber - 0.2f; + dustEffect->pos.x += dustEffect->velocity.x; + dustEffect->pos.y += dustEffect->velocity.y; + dustEffect->pos.z += dustEffect->velocity.z; + dustEffect->velocity.x += dustEffect->accel.x; + dustEffect->velocity.y += dustEffect->accel.y; + dustEffect->velocity.z += randomNumber - 0.2f; + dustEffect->scale += dustEffect->scaleStep; + } + } +} + +void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { + EnGoEffect* dustEffect = this->dustEffects; + s16 alpha; + s16 firstDone; + s16 index; + s16 i; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 111); + + firstDone = false; + func_80093D84(globalCtx->state.gfxCtx); + if (1) {} + + for (i = 0; i < ARRAY_COUNT(this->dustEffects); i++, dustEffect++) { + if (dustEffect->type) { + if (!firstDone) { + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); + gSPDisplayList(POLY_XLU_DISP++, D_0600FD40); + gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); + firstDone = true; + } + + alpha = dustEffect->timer * (255.0f / dustEffect->initialTimer); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 130, 90, alpha); + gDPPipeSync(POLY_XLU_DISP++); + Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 137), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + index = dustEffect->timer * (8.0f / dustEffect->initialTimer); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index])); + gSPDisplayList(POLY_XLU_DISP++, D_0600FD50); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 151); +} + +s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32 numDustEffects, f32 radius, + f32 yAccel) { + Vec3f pos = sPos; + Vec3f velocity = sVelocity; + Vec3f accel = sAccel; + s32 i; + s16 angle; + + pos = this->actor.world.pos; // overwrites sPos data + pos.y = this->actor.floorHeight; + angle = (Rand_ZeroOne() - 0.5f) * 0x10000; + i = numDustEffects; + while (i >= 0) { + accel.y += Rand_ZeroOne() * yAccel; + pos.x = (Math_SinS(angle) * radius) + this->actor.world.pos.x; + pos.z = (Math_CosS(angle) * radius) + this->actor.world.pos.z; + EnGo2_AddDust(this, &pos, &velocity, &accel, initialTimer, scale, scaleStep); + angle += (s16)(0x10000 / numDustEffects); + i--; + } + return 0; +} + +void EnGo2_GetItem(EnGo2* this, GlobalContext* globalCtx, s32 getItemId) { + this->getItemId = getItemId; + func_8002F434(&this->actor, globalCtx, getItemId, this->actor.xzDistToPlayer + 1.0f, + fabsf(this->actor.yDistToPlayer) + 1.0f); +} + +s32 EnGo2_GetDialogState(EnGo2* this, GlobalContext* globalCtx) { + s16 dialogState = func_8010BDBC(&globalCtx->msgCtx); + + if ((this->dialogState == 10) || (this->dialogState == 5) || (this->dialogState == 2) || (this->dialogState == 1)) { + if (dialogState != this->dialogState) { + this->unk_20C++; + } + } + + this->dialogState = dialogState; + return dialogState; +} + +u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) { + switch ((this->actor.params & 0xFC00) >> 0xA) { + case 3: + return 0x3069; + case 5: + return 0x306A; + case 4: + return 0x306B; + case 2: + return 0x306C; + case 10: + return 0x306D; + case 8: + return 0x306E; + case 11: + return 0x306F; + case 1: + return 0x3070; + default: + return 0x3052; + } +} + +u16 EnGo2_GetTextIdGoronCityRollingBig(GlobalContext* globalCtx, EnGo2* this) { + if (gSaveContext.infTable[17] & 0x4000) { + return 0x3013; + } else if (CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12) { + return 0x3012; + } else { + return 0x3011; + } +} + +u16 EnGo2_GetStateGoronCityRollingBig(GlobalContext* globalCtx, EnGo2* this) { + s32 bombBagUpgrade; + + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 2: + return 2; + case 5: + if (func_80106BC8(globalCtx)) { + if (this->actor.textId == 0x3012) { + this->actionFunc = EnGo2_SetupGetItem; + bombBagUpgrade = CUR_CAPACITY(UPG_BOMB_BAG) == 30 ? GI_BOMB_BAG_40 : GI_BOMB_BAG_30; + EnGo2_GetItem(this, globalCtx, bombBagUpgrade); + func_80106CCC(globalCtx); + gSaveContext.infTable[17] |= 0x4000; + return 2; + } else { + return 2; + } + } + default: + return 1; + } +} + +u16 EnGo2_GetTextIdGoronDmtBombFlower(GlobalContext* globalCtx, EnGo2* this) { + return CHECK_QUEST_ITEM(QUEST_GORON_RUBY) ? 0x3027 : 0x300A; +} + +// DMT Goron by Bomb Flower Choice +u16 EnGo2_GetStateGoronDmtBombFlower(GlobalContext* globalCtx, EnGo2* this) { + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 2: + if ((this->actor.textId == 0x300B) && (gSaveContext.infTable[14] & 0x800) == 0) { + gSaveContext.infTable[14] |= 0x800; + return 2; + } else { + return 0; + } + case 4: + if (func_80106BC8(globalCtx)) { + // Ask question to DMT Goron by bomb flower + if (this->actor.textId == 0x300A) { + if (globalCtx->msgCtx.choiceIndex == 0) { + this->actor.textId = CUR_UPG_VALUE(UPG_STRENGTH) ? 0x300B : 0x300C; + } else { + this->actor.textId = 0x300D; + } + func_8010B720(globalCtx, this->actor.textId); + } + return 1; + } + default: + return 1; + } +} + +u16 EnGo2_GetTextIdGoronDmtRollingSmall(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else { + return (gSaveContext.eventChkInf[2] & 0x8) ? 0x3026 : 0x3009; + } +} + +u16 EnGo2_GetStateGoronDmtRollingSmall(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronDmtDcEntrance(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && LINK_IS_ADULT) { + return 0x3043; + } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else { + return gSaveContext.eventChkInf[2] & 0x8 ? 0x3021 : gSaveContext.infTable[14] & 0x1 ? 0x302A : 0x3008; + } +} + +u16 EnGo2_GetStateGoronDmtDcEntrance(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x3008) { + gSaveContext.infTable[14] |= 0x1; + } + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityEntrance(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && LINK_IS_ADULT) { + return 0x3043; + } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else { + return gSaveContext.infTable[15] & 0x1 ? 0x3015 : 0x3014; + } +} + +u16 EnGo2_GetStateGoronCityEntrance(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x3014) { + gSaveContext.infTable[15] |= 0x1; + } + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityIsland(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && LINK_IS_ADULT) { + return 0x3043; + } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3067; + } else { + return gSaveContext.infTable[15] & 0x10 ? 0x3017 : 0x3016; + } +} + +u16 EnGo2_GetStateGoronCityIsland(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x3016) { + gSaveContext.infTable[15] |= 0x10; + } + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityLowestFloor(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && LINK_IS_ADULT) { + return 0x3043; + } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 0x3027; + } else { + return CUR_UPG_VALUE(UPG_STRENGTH) + ? 0x302C + : !Flags_GetSwitch(globalCtx, 0x1B) ? 0x3017 : gSaveContext.infTable[15] & 0x100 ? 0x3019 : 0x3018; + } +} + +u16 EnGo2_GetStateGoronCityLowestFloor(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x3018) { + gSaveContext.infTable[15] |= 0x100; + } + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityLink(GlobalContext* globalCtx, EnGo2* this) { + if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) { + return gSaveContext.infTable[16] & 0x8000 ? 0x3042 : 0x3041; + } else if (CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1)) { + return gSaveContext.infTable[16] & 0x4000 ? 0x3038 : 0x3037; + } else if (gSaveContext.infTable[16] & 0x1000) { + this->unk_20C = 0; + this->dialogState = 0; + return gSaveContext.infTable[16] & 0x400 ? 0x3033 : 0x3032; + } else { + return 0x3030; + } +} + +u16 EnGo2_GetStateGoronCityLink(GlobalContext* globalCtx, EnGo2* this) { + switch (EnGo2_GetDialogState(this, globalCtx)) { + case 2: + switch (this->actor.textId) { + case 0x3036: + EnGo2_GetItem(this, globalCtx, GI_TUNIC_GORON); + this->actionFunc = EnGo2_SetupGetItem; + return 2; + case 0x3037: + gSaveContext.infTable[16] |= 0x4000; + default: + return 0; + } + case 4: + if (func_80106BC8(globalCtx)) { + if (this->actor.textId == 0x3034) { + if (globalCtx->msgCtx.choiceIndex == 0) { + this->actor.textId = gSaveContext.infTable[16] & 0x800 ? 0x3033 : 0x3035; + if (this->actor.textId == 0x3035) { + func_800F8D04(0x39EB); + } + } else { + this->actor.textId = gSaveContext.infTable[16] & 0x800 ? 0x3036 : 0x3033; + if (this->actor.textId == 0x3036) { + func_800F8D04(0x39EB); + } + } + func_8010B720(globalCtx, this->actor.textId); + this->unk_20C = 0; + } + } else { + break; + } + return 1; + case 5: + if (func_80106BC8(globalCtx)) { + switch (this->actor.textId) { + case 0x3035: + gSaveContext.infTable[16] |= 0x800; + case 0x3032: + case 0x3033: + this->actor.textId = 0x3034; + func_8010B720(globalCtx, this->actor.textId); + return 1; + default: + return 2; + } + } + } + return 1; +} + +u16 EnGo2_GetTextIdGoronDmtBiggoron(GlobalContext* globalCtx, EnGo2* this) { + Player* player = PLAYER; + + if (gSaveContext.bgsFlag) { + player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK; + return 0x305E; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) { + player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK; + return 0x305E; + } else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) { + player->exchangeItemId = EXCH_ITEM_EYEDROPS; + return 0x3058; + } else { + player->exchangeItemId = EXCH_ITEM_SWORD_BROKEN; + return 0x3053; + } +} + +u16 EnGo2_GetStateGoronDmtBiggoron(GlobalContext* globalCtx, EnGo2* this) { + s32 unusedPad; + u8 dialogState = this->dialogState; + + switch (EnGo2_GetDialogState(this, globalCtx)) { + case 6: + if (this->actor.textId == 0x305E) { + if (!gSaveContext.bgsFlag) { + EnGo2_GetItem(this, globalCtx, GI_SWORD_BGS); + this->actionFunc = EnGo2_SetupGetItem; + return 2; + } else { + return 0; + } + } else { + return 0; + } + case 3: + switch (this->actor.textId) { + case 0x305E: + if (func_8002F368(globalCtx) != EXCH_ITEM_CLAIM_CHECK) { + break; + } + case 0x3059: + if (dialogState == 0) { + func_800F4524(&D_801333D4, NA_SE_EN_GOLON_WAKE_UP, 60); + } + case 0x3054: + if (dialogState == 0) { + Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + return 1; + case 4: + if (func_80106BC8(globalCtx)) { + if ((this->actor.textId == 0x3054) || (this->actor.textId == 0x3055)) { + if (globalCtx->msgCtx.choiceIndex == 0) { + EnGo2_GetItem(this, globalCtx, GI_PRESCRIPTION); + this->actionFunc = EnGo2_SetupGetItem; + return 2; + } + this->actor.textId = 0x3056; + func_8010B720(globalCtx, this->actor.textId); + } + return 1; + } + break; + case 5: + if (func_80106BC8(globalCtx)) { + if (this->actor.textId == 0x3059) { + globalCtx->msgCtx.msgMode = 0x37; + this->actionFunc = EnGo2_BiggoronEyedrops; + } + return 2; + } + } + return 1; +} + +u16 EnGo2_GetTextIdGoronFireGeneric(GlobalContext* globalCtx, EnGo2* this) { + if (Flags_GetSwitch(globalCtx, (this->actor.params & 0xFC00) >> 0xA)) { + return 0x3071; + } else { + return 0x3051; + } +} + +u16 EnGo2_GetStateGoronFireGeneric(GlobalContext* globalCtx, EnGo2* this) { + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 2: + return 0; + case 5: + if (func_80106BC8(globalCtx)) { + if (this->actor.textId == 0x3071) { + this->actor.textId = EnGo2_GoronFireGenericGetTextId(this); + func_8010B720(globalCtx, this->actor.textId); + } + return 1; + } + default: + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityStairwell(GlobalContext* globalCtx, EnGo2* this) { + return LINK_IS_CHILD ? gSaveContext.infTable[14] & 0x8 ? 0x3022 : 0x300E : 0x3043; +} + +u16 EnGo2_GetStateGoronCityStairwell(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x300E) { + gSaveContext.infTable[14] |= 0x8; + } + return 0; + } else { + return 1; + } +} + +// Goron in child market bazaar after obtaining Goron Ruby +u16 EnGo2_GetTextIdGoronMarketBazaar(GlobalContext* globalCtx, EnGo2* this) { + return 0x7122; +} + +u16 EnGo2_GetStateGoronMarketBazaar(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextIdGoronCityLostWoods(GlobalContext* globalCtx, EnGo2* this) { + if (LINK_IS_CHILD) { + if (Flags_GetSwitch(globalCtx, 0x1C)) { + return 0x302F; + } else { + return gSaveContext.infTable[14] & 0x40 ? 0x3025 : 0x3024; + } + } else { + return 0x3043; + } +} + +u16 EnGo2_GetStateGoronCityLostWoods(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->actor.textId == 0x3024) { + gSaveContext.infTable[14] |= 0x40; + } + return 0; + } else { + return 1; + } +} + +// Goron at base of DMT summit +u16 EnGo2_GetTextIdGoronDmtFairyHint(GlobalContext* globalCtx, EnGo2* this) { + if (LINK_IS_CHILD) { + return CHECK_QUEST_ITEM(QUEST_GORON_RUBY) ? 0x3065 : 0x3064; + } else { + return 0x3043; + } +} + +u16 EnGo2_GetStateGoronDmtFairyHint(GlobalContext* globalCtx, EnGo2* this) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + return 0; + } else { + return 1; + } +} + +u16 EnGo2_GetTextId(GlobalContext* globalCtx, EnGo2* this) { + u16 faceReaction = Text_GetFaceReaction(globalCtx, 0x20); + + if (faceReaction) { + return faceReaction; + } else { + switch (this->actor.params & 0x1F) { + case GORON_CITY_ROLLING_BIG: + return EnGo2_GetTextIdGoronCityRollingBig(globalCtx, this); + case GORON_CITY_LINK: + return EnGo2_GetTextIdGoronCityLink(globalCtx, this); + case GORON_DMT_BIGGORON: + return EnGo2_GetTextIdGoronDmtBiggoron(globalCtx, this); + case GORON_FIRE_GENERIC: + return EnGo2_GetTextIdGoronFireGeneric(globalCtx, this); + case GORON_DMT_BOMB_FLOWER: + return EnGo2_GetTextIdGoronDmtBombFlower(globalCtx, this); + case GORON_DMT_ROLLING_SMALL: + return EnGo2_GetTextIdGoronDmtRollingSmall(globalCtx, this); + case GORON_DMT_DC_ENTRANCE: + return EnGo2_GetTextIdGoronDmtDcEntrance(globalCtx, this); + case GORON_CITY_ENTRANCE: + return EnGo2_GetTextIdGoronCityEntrance(globalCtx, this); + case GORON_CITY_ISLAND: + return EnGo2_GetTextIdGoronCityIsland(globalCtx, this); + case GORON_CITY_LOWEST_FLOOR: + return EnGo2_GetTextIdGoronCityLowestFloor(globalCtx, this); + case GORON_CITY_STAIRWELL: + return EnGo2_GetTextIdGoronCityStairwell(globalCtx, this); + case GORON_CITY_LOST_WOODS: + return EnGo2_GetTextIdGoronCityLostWoods(globalCtx, this); + case GORON_DMT_FAIRY_HINT: + return EnGo2_GetTextIdGoronDmtFairyHint(globalCtx, this); + case GORON_MARKET_BAZAAR: + return EnGo2_GetTextIdGoronMarketBazaar(globalCtx, this); + } + } +} + +u16 EnGo2_GetState(GlobalContext* globalCtx, EnGo2* this) { + switch (this->actor.params & 0x1F) { + case GORON_CITY_ROLLING_BIG: + return EnGo2_GetStateGoronCityRollingBig(globalCtx, this); + case GORON_CITY_LINK: + return EnGo2_GetStateGoronCityLink(globalCtx, this); + case GORON_DMT_BIGGORON: + return EnGo2_GetStateGoronDmtBiggoron(globalCtx, this); + case GORON_FIRE_GENERIC: + return EnGo2_GetStateGoronFireGeneric(globalCtx, this); + case GORON_DMT_BOMB_FLOWER: + return EnGo2_GetStateGoronDmtBombFlower(globalCtx, this); + case GORON_DMT_ROLLING_SMALL: + return EnGo2_GetStateGoronDmtRollingSmall(globalCtx, this); + case GORON_DMT_DC_ENTRANCE: + return EnGo2_GetStateGoronDmtDcEntrance(globalCtx, this); + case GORON_CITY_ENTRANCE: + return EnGo2_GetStateGoronCityEntrance(globalCtx, this); + case GORON_CITY_ISLAND: + return EnGo2_GetStateGoronCityIsland(globalCtx, this); + case GORON_CITY_LOWEST_FLOOR: + return EnGo2_GetStateGoronCityLowestFloor(globalCtx, this); + case GORON_CITY_STAIRWELL: + return EnGo2_GetStateGoronCityStairwell(globalCtx, this); + case GORON_CITY_LOST_WOODS: + return EnGo2_GetStateGoronCityLostWoods(globalCtx, this); + case GORON_DMT_FAIRY_HINT: + return EnGo2_GetStateGoronDmtFairyHint(globalCtx, this); + case GORON_MARKET_BAZAAR: + return EnGo2_GetStateGoronMarketBazaar(globalCtx, this); + } +} + +s32 func_80A44790(EnGo2* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON && (this->actor.params & 0x1F) != GORON_CITY_ROLLING_BIG) { + return func_800343CC(globalCtx, &this->actor, &this->unk_194.unk_00, this->unk_218, EnGo2_GetTextId, + EnGo2_GetState); + } else if (((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) && ((this->collider.base.ocFlags2 & 1) == 0)) { + return false; + } else { + if (func_8002F194(&this->actor, globalCtx)) { + this->unk_194.unk_00 = 1; + return true; + } else if (this->unk_194.unk_00 != 0) { + this->unk_194.unk_00 = EnGo2_GetState(globalCtx, this); + return false; + } else if (func_8002F2CC(&this->actor, globalCtx, this->unk_218)) { + this->actor.textId = EnGo2_GetTextId(globalCtx, this); + } + return false; + } +} + +void EnGo2_SetColliderDim(EnGo2* this) { + u8 index = this->actor.params & 0x1F; + + this->collider.dim.radius = D_80A4816C[index].radius; + this->collider.dim.height = D_80A4816C[index].height; +} + +void EnGo2_SetShape(EnGo2* this) { + u8 index = this->actor.params & 0x1F; + + this->actor.shape.shadowScale = D_80A481F8[index].shape_unk_10; + Actor_SetScale(&this->actor, D_80A481F8[index].scale); + this->actor.targetMode = D_80A481F8[index].actor_unk_1F; + this->unk_218 = D_80A481F8[index].unk_218; + this->unk_218 += this->collider.dim.radius; +} + +void EnGo2_CheckCollision(EnGo2* this, GlobalContext* globalCtx) { + Vec3s pos; + f32 xzDist; + + pos.x = this->actor.world.pos.x; + pos.y = this->actor.world.pos.y; + pos.z = this->actor.world.pos.z; + xzDist = D_80A4816C[this->actor.params & 0x1F].xzDist; + pos.x += (s16)(xzDist * Math_SinS(this->actor.shape.rot.y)); + pos.z += (s16)(xzDist * Math_CosS(this->actor.shape.rot.y)); + pos.y += D_80A4816C[this->actor.params & 0x1F].yDist; + this->collider.dim.pos = pos; + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); +} + +void EnGo2_SwapInitialFrameAnimFrameCount(EnGo2* this) { + f32 initialFrame; + + initialFrame = this->skelAnime.startFrame; + this->skelAnime.startFrame = this->skelAnime.endFrame; + this->skelAnime.endFrame = initialFrame; +} + +s32 func_80A44AB0(EnGo2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 arg2; + + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + return false; + } else { + if ((this->actionFunc != EnGo2_SlowRolling) && (this->actionFunc != EnGo2_ReverseRolling) && + (this->actionFunc != EnGo2_ContinueRolling)) { + return false; + } else { + if (this->collider.base.acFlags & 2) { + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + this->actor.flags &= ~0x1000000; + this->collider.base.acFlags &= ~0x2; + EnGo2_StopRolling(this, globalCtx); + return true; + } + if (player->invincibilityTimer <= 0) { + this->collider.base.ocFlags1 |= 8; + } else { + return false; + } + if (this->collider.base.ocFlags2 & 1) { + this->collider.base.ocFlags2 &= ~1; + + arg2 = this->actionFunc == EnGo2_ContinueRolling ? 1.5f : this->actor.speedXZ * 1.5f; + + globalCtx->damagePlayer(globalCtx, -4); + func_8002F71C(globalCtx, &this->actor, arg2, this->actor.yawTowardsPlayer, 6.0f); + Audio_PlayActorSound2(player, NA_SE_PL_BODY_HIT); + this->collider.base.ocFlags1 &= ~0x8; + } + } + } + return false; +} + +s32 EnGo2_UpdateWaypoint(EnGo2* this, GlobalContext* globalCtx) { + s32 change; + + if (this->path == NULL) { + return 0; + } + + change = (u8)(this->path->count - 1); + if (this->reverse) { + this->waypoint--; + if (this->waypoint < 0) { + this->waypoint = change - 1; + } + } else { + this->waypoint++; + if (this->waypoint >= change) { + this->waypoint = 0; + } + } + + return 1; +} + +s32 EnGo2_Orient(EnGo2* this, GlobalContext* globalCtx) { + s16 targetYaw; + f32 waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw); + + Math_SmoothStepToS(&this->actor.world.rot.y, targetYaw, 6, 4000, 1); + if (waypointDistSq > 0.0f && waypointDistSq < SQ(30.0f)) { + return EnGo2_UpdateWaypoint(this, globalCtx); + } else { + return 0; + } +} + +s32 func_80A44D84(EnGo2* this) { + s16 targetYaw; + + Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw); + this->actor.world.rot.y = targetYaw; + return 1; +} + +s32 EnGo2_IsWakingUp(EnGo2* this) { + s16 yawDiff; + f32 xyzDist = (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ? 800.0f : 200.0f; + f32 yDist = (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ? 400.0f : 60.0f; + s16 yawDiffAbs; + + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + if ((this->collider.base.ocFlags2 & 1) == 0) { + this->actor.flags &= ~1; + return false; + } else { + this->actor.flags |= 1; + return true; + } + } + + xyzDist = SQ(xyzDist); + yawDiff = (f32)this->actor.yawTowardsPlayer - (f32)this->actor.shape.rot.y; + yawDiffAbs = ABS(yawDiff); + if (this->actor.xyzDistToPlayerSq <= xyzDist && fabsf(this->actor.yDistToPlayer) < yDist && yawDiffAbs < 0x2AA8) { + return true; + } else { + return false; + } +} + +s32 EnGo2_IsRollingOnGround(EnGo2* this, s16 arg1, f32 arg2, s16 arg3) { + if ((this->actor.bgCheckFlags & 1) == 0 || this->actor.velocity.y > 0.0f) { + return false; + } + + if (DECR(this->unk_590)) { + if (!arg3) { + return true; + } else { + this->actor.world.pos.y = + (this->unk_590 & 1) ? this->actor.world.pos.y + 1.5f : this->actor.world.pos.y - 1.5f; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG); + return true; + } + } + + if (this->unk_59C >= 2) { + Audio_PlayActorSound2(&this->actor, (this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG + ? NA_SE_EN_GOLON_LAND_BIG + : NA_SE_EN_DODO_M_GND); + } + + this->unk_59C--; + if (this->unk_59C <= 0) { + if (this->unk_59C == 0) { + this->unk_590 = Rand_S16Offset(60, 30); + this->unk_59C = 0; + this->actor.velocity.y = 0.0f; + return true; + } else { + this->unk_59C = arg1; + } + } + + this->actor.velocity.y = ((f32)this->unk_59C / (f32)arg1) * arg2; + return true; +} + +void EnGo2_BiggoronSetTextId(EnGo2* this, GlobalContext* globalCtx, Player* player) { + u16 textId; + + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + if (gSaveContext.bgsFlag) { + if (func_8002F368(globalCtx) == EXCH_ITEM_CLAIM_CHECK) { + this->actor.textId = 0x3003; + } else { + this->actor.textId = 0x305E; + } + player->actor.textId = this->actor.textId; + + } else if (!gSaveContext.bgsFlag && (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)) { + if (func_8002F368(globalCtx) == EXCH_ITEM_CLAIM_CHECK) { + if (func_800775CC() >= 3) { + textId = 0x305E; + } else { + textId = 0x305D; + } + this->actor.textId = textId; + } else { + if (func_800775CC() >= 3) { + textId = 0x3002; + } else { + textId = 0x305D; + } + this->actor.textId = textId; + } + player->actor.textId = this->actor.textId; + + } else if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) && + (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_CLAIM_CHECK)) { + if (func_8002F368(globalCtx) == EXCH_ITEM_EYEDROPS) { + this->actor.textId = 0x3059; + } else { + this->actor.textId = 0x3058; + } + if (this->actor.textId == 0x3059) { + gSaveContext.timer2State = 0; + } + player->actor.textId = this->actor.textId; + + } else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_SWORD_BROKEN) { + if (func_8002F368(globalCtx) == EXCH_ITEM_SWORD_BROKEN) { + if (gSaveContext.infTable[11] & 0x10) { + textId = 0x3055; + } else { + textId = 0x3054; + } + this->actor.textId = textId; + } else { + this->actor.textId = 0x3053; + } + player->actor.textId = this->actor.textId; + } else { + this->actor.textId = 0x3053; + player->actor.textId = this->actor.textId; + } + } +} + +void func_80A45288(EnGo2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 linkAge; + + if (this->actionFunc != EnGo2_GoronFireGenericAction) { + this->unk_194.unk_18 = player->actor.world.pos; + linkAge = gSaveContext.linkAge; + this->unk_194.unk_14 = D_80A482D8[this->actor.params & 0x1F][linkAge]; + func_80034A14(&this->actor, &this->unk_194, 4, this->unk_26E); + } + if ((this->actionFunc != EnGo2_SetGetItem) && (this->isAwake == true)) { + if (func_80A44790(this, globalCtx)) { + EnGo2_BiggoronSetTextId(this, globalCtx, player); + } + } +} + +void func_80A45360(EnGo2* this, f32* alpha) { + f32 alphaTarget = (this->skelAnime.animation == &D_06004930) && (this->skelAnime.curFrame <= 32.0f) ? 0.0f : 255.0f; + + Math_ApproachF(alpha, alphaTarget, 0.4f, 100.0f); + this->actor.shape.shadowAlpha = (u8)(u32)*alpha; +} + +void EnGo2_RollForward(EnGo2* this) { + f32 speedXZ = this->actor.speedXZ; + + if (this->unk_194.unk_00 != 0) { + this->actor.speedXZ = 0.0f; + } + + if (this->actionFunc != EnGo2_ContinueRolling) { + Actor_MoveForward(&this->actor); + } + + this->actor.speedXZ = speedXZ; +} + +void func_80A454CC(EnGo2* this) { + switch (this->actor.params & 0x1F) { + case GORON_CITY_ROLLING_BIG: + case GORON_DMT_DC_ENTRANCE: + case GORON_CITY_ENTRANCE: + case GORON_CITY_STAIRWELL: + case GORON_DMT_FAIRY_HINT: + func_80034EC0(&this->skelAnime, sAnimations, 9); + break; + case GORON_DMT_BIGGORON: + if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN && INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS) { + func_80034EC0(&this->skelAnime, sAnimations, 4); + break; + } + default: + this->skelAnime.playSpeed = 0.0f; + break; + } +} + +f32 EnGo2_GetTargetXZSpeed(EnGo2* this) { + f32 yDist = (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ? 400.0f : 60.0f; + s32 index = this->actor.params & 0x1F; + + if (index == GORON_CITY_LINK && (fabsf(this->actor.yDistToPlayer) < yDist) && + (this->actor.xzDistToPlayer < 400.0f)) { + return 9.0f; + } else { + return index == GORON_CITY_ROLLING_BIG ? 3.6000001f : 6.0f; + } +} + +s32 EnGo2_IsCameraModified(EnGo2* this, GlobalContext* globalCtx) { + Camera* camera = globalCtx->cameraPtrs[0]; + + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + if (EnGo2_IsWakingUp(this)) { + Camera_ChangeSetting(camera, CAM_SET_TEPPEN); + func_8005AD1C(camera, 4); + } else if (!EnGo2_IsWakingUp(this) && (camera->setting == CAM_SET_TEPPEN)) { + Camera_ChangeSetting(camera, CAM_SET_DUNGEON1); + func_8005ACFC(camera, 4); + } + } + + if ((this->actor.params & 0x1F) == GORON_FIRE_GENERIC || (this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG || + (this->actor.params & 0x1F) == GORON_CITY_STAIRWELL || (this->actor.params & 0x1F) == GORON_DMT_BIGGORON || + (this->actor.params & 0x1F) == GORON_MARKET_BAZAAR) { + return true; + } else if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && (CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1))) { + return true; + } else { + return false; + } +} + +void EnGo2_DefaultWakingUp(EnGo2* this) { + if (EnGo2_IsWakingUp(this)) { + this->unk_26E = 2; + } else { + this->unk_26E = 1; + } + + if (this->unk_194.unk_00 != 0) { + this->unk_26E = 4; + } + + this->isAwake = true; +} + +void EnGo2_WakingUp(EnGo2* this) { + f32 xyzDist = (this->actor.params & 0x1F) == GORON_DMT_BIGGORON ? 800.0f : 200.0f; + s32 isTrue = true; + + xyzDist = SQ(xyzDist); + this->unk_26E = 1; + if ((this->actor.xyzDistToPlayerSq <= xyzDist) || (this->unk_194.unk_00 != 0)) { + this->unk_26E = 4; + } + + this->isAwake = isTrue; +} + +void EnGo2_BiggoronWakingUp(EnGo2* this) { + if (EnGo2_IsWakingUp(this) || this->unk_194.unk_00 != 0) { + this->unk_26E = 2; + this->isAwake = true; + } else { + this->unk_26E = 1; + this->isAwake = false; + } +} + +void EnGo2_SelectGoronWakingUp(EnGo2* this) { + switch (this->actor.params & 0x1F) { + case GORON_DMT_BOMB_FLOWER: + this->isAwake = true; + this->unk_26E = EnGo2_IsWakingUp(this) ? 2 : 1; + break; + case GORON_FIRE_GENERIC: + EnGo2_WakingUp(this); + break; + case GORON_DMT_BIGGORON: + EnGo2_BiggoronWakingUp(this); + break; + case GORON_CITY_LINK: + if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1)) { + EnGo2_WakingUp(this); + break; + } + default: + EnGo2_DefaultWakingUp(this); + } +} + +void EnGo2_EyeMouthTexState(EnGo2* this) { + switch (this->eyeMouthTexState) { + case 1: + this->blinkTimer = 0; + this->eyeTexIndex = 0; + this->mouthTexIndex = 0; + break; + case 2: + this->blinkTimer = 0; + this->eyeTexIndex = 1; + this->mouthTexIndex = 0; + break; + // case 3 only when biggoron is given eyedrops. Biggoron smiles. (only use of second mouth texture) + case 3: + this->blinkTimer = 0; + this->eyeTexIndex = 0; + this->mouthTexIndex = 1; + break; + default: + if (DECR(this->blinkTimer) == 0) { + this->eyeTexIndex++; + if (this->eyeTexIndex >= 4) { + this->blinkTimer = Rand_S16Offset(30, 30); + this->eyeTexIndex = 1; + } + } + } +} + +void EnGo2_SitDownAnimation(EnGo2* this) { + if ((this->skelAnime.playSpeed != 0.0f) && (this->skelAnime.animation == &D_06004930)) { + if (this->skelAnime.playSpeed > 0.0f && this->skelAnime.curFrame == 14.0f) { + if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN); + } else { + func_800F4524(&D_801333D4, NA_SE_EN_GOLON_SIT_DOWN, 60); + } + } + if (this->skelAnime.playSpeed < 0.0f) { + if (this->skelAnime.curFrame == 1.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } + if (this->skelAnime.curFrame == 40.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN); + } + } + } +} + +void EnGo2_GetDustData(EnGo2* this, s32 index2) { + s32 index1 = (this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG ? 1 : 0; + EnGo2DustEffectData* dustEffectData = &sDustEffectData[index1][index2]; + + EnGo2_SpawnDust(this, dustEffectData->initialTimer, dustEffectData->scale, dustEffectData->scaleStep, + dustEffectData->numDustEffects, dustEffectData->radius, dustEffectData->yAccel); +} + +void EnGo2_RollingAnimation(EnGo2* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + this->actor.flags &= ~1; + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->skelAnime.playSpeed = -0.5f; + } else { + func_80034EC0(&this->skelAnime, sAnimations, 1); + this->skelAnime.playSpeed = -1.0f; + } + EnGo2_SwapInitialFrameAnimFrameCount(this); + this->unk_26E = 1; + this->unk_211 = false; + this->isAwake = false; + this->actionFunc = EnGo2_CurledUp; +} + +void EnGo2_WakeUp(EnGo2* this, GlobalContext* globalCtx) { + if (this->skelAnime.playSpeed == 0.0f) { + if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_WAKE_UP); + } else { + func_800F4524(&D_801333D4, NA_SE_EN_GOLON_WAKE_UP, 60); + } + } + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + func_800800F8(globalCtx, 0x1068, -0x63, &this->actor, 0); + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->skelAnime.playSpeed = 0.5f; + } else { + func_80034EC0(&this->skelAnime, sAnimations, 1); + this->skelAnime.playSpeed = 1.0f; + } + this->actionFunc = func_80A46B40; +} + +void EnGo2_GetItemAnimation(EnGo2* this, GlobalContext* globalCtx) { + func_80034EC0(&this->skelAnime, sAnimations, 1); + this->unk_211 = true; + this->actionFunc = func_80A46B40; + this->skelAnime.playSpeed = 0.0f; + this->actor.speedXZ = 0.0f; + this->skelAnime.curFrame = this->skelAnime.endFrame; +} + +void EnGo2_SetupRolling(EnGo2* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x1F) == GORON_CITY_ROLLING_BIG || (this->actor.params & 0x1F) == GORON_CITY_LINK) { + this->collider.info.bumperFlags = 1; + this->actor.speedXZ = gSaveContext.infTable[17] & 0x4000 ? 6.0f : 3.6000001f; + } else { + this->actor.speedXZ = 6.0f; + } + this->actor.flags |= 0x1000000; + this->animTimer = 10; + this->actor.shape.yOffset = 1800.0f; + this->actor.speedXZ += this->actor.speedXZ; // Speeding up + this->actionFunc = EnGo2_ContinueRolling; +} + +void EnGo2_StopRolling(EnGo2* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (((this->actor.params & 0x1F) != GORON_CITY_ROLLING_BIG) && ((this->actor.params & 0x1F) != GORON_CITY_LINK)) { + if ((this->actor.params & 0x1F) == GORON_DMT_ROLLING_SMALL) { + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); + if (bomb != NULL) { + bomb->timer = 0; + } + } + } else { + this->collider.info.bumperFlags = 0; + } + + this->actor.shape.rot = this->actor.world.rot; + this->unk_59C = 0; + this->unk_590 = 0; + this->actionFunc = EnGo2_GroundRolling; + this->actor.shape.yOffset = 0.0f; + this->actor.speedXZ = 0.0f; +} + +s32 EnGo2_IsFreeingGoronInFire(EnGo2* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x1F) != GORON_FIRE_GENERIC) { + return false; + } + + // shaking curled up + this->actor.world.pos.x += (globalCtx->state.frames & 1) ? 1.0f : -1.0f; + if (Flags_GetSwitch(globalCtx, (this->actor.params & 0xFC00) >> 0xA)) { + return true; + } + return false; +} + +s32 EnGo2_IsGoronDmtBombFlower(EnGo2* this) { + if ((this->actor.params & 0x1F) != GORON_DMT_BOMB_FLOWER || this->unk_194.unk_00 != 2) { + return false; + } + + func_80034EC0(&this->skelAnime, sAnimations, 3); + this->unk_194.unk_00 = 0; + this->isAwake = false; + this->unk_26E = 1; + this->actionFunc = EnGo2_GoronDmtBombFlowerAnimation; + return true; +} + +s32 EnGo2_IsGoronRollingBig(EnGo2* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x1F) != GORON_CITY_ROLLING_BIG || (this->unk_194.unk_00 != 2)) { + return false; + } + this->unk_194.unk_00 = 0; + EnGo2_RollingAnimation(this, globalCtx); + this->actionFunc = EnGo2_GoronRollingBigContinueRolling; + return true; +} + +s32 EnGo2_IsGoronFireGeneric(EnGo2* this) { + if ((this->actor.params & 0x1F) != GORON_FIRE_GENERIC || this->unk_194.unk_00 == 0) { + return false; + } + this->actionFunc = EnGo2_GoronFireGenericAction; + return true; +} + +s32 EnGo2_IsGoronLinkReversing(EnGo2* this) { + if ((this->actor.params & 0x1F) != GORON_CITY_LINK || (this->waypoint >= this->unk_216) || + !EnGo2_IsWakingUp(this)) { + return false; + } + return true; +} + +s32 EnGo2_IsRolling(EnGo2* this) { + if (this->unk_194.unk_00 == 0 || this->actor.speedXZ < 1.0f) { + return false; + } + if (EnGo2_IsRollingOnGround(this, 2, 20.0 / 3.0f, 0)) { + if ((this->unk_590 >= 9) && (this->unk_59C == 0)) { + this->unk_590 = 8; + } + EnGo2_GetDustData(this, 0); + } + return true; +} + +void EnGo2_GoronLinkAnimation(EnGo2* this, GlobalContext* globalCtx) { + s32 animation = 13; + + if ((this->actor.params & 0x1F) == GORON_CITY_LINK) { + if ((this->actor.textId == 0x3035 && this->unk_20C == 0) || + (this->actor.textId == 0x3036 && this->unk_20C == 0)) { + if (this->skelAnime.animation != &D_06000D5C) { + animation = 12; + this->eyeMouthTexState = 0; + } + } + + if ((this->actor.textId == 0x3032 && this->unk_20C == 12) || (this->actor.textId == 0x3033) || + (this->actor.textId == 0x3035 && this->unk_20C == 6)) { + if (this->skelAnime.animation != &D_06000750) { + animation = 11; + this->eyeMouthTexState = 1; + } + } + + if (this->skelAnime.animation == &D_06000750) { + if (this->skelAnime.curFrame == 20.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_CRY); + } + } + + if (animation != 13) { + func_80034EC0(&this->skelAnime, sAnimations, animation); + } + } +} + +void EnGo2_GoronFireCamera(EnGo2* this, GlobalContext* globalCtx) { + s16 yaw; + + this->camId = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, this->camId, CAM_STAT_ACTIVE); + Path_CopyLastPoint(this->path, &this->at); + yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->at) + 0xE38; + this->eye.x = Math_SinS(yaw) * 100.0f + this->actor.world.pos.x; + this->eye.z = Math_CosS(yaw) * 100.0f + this->actor.world.pos.z; + this->eye.y = this->actor.world.pos.y + 20.0f; + this->at.x = this->actor.world.pos.x; + this->at.y = this->actor.world.pos.y + 40.0f; + this->at.z = this->actor.world.pos.z; + Gameplay_CameraSetAtEye(globalCtx, this->camId, &this->at, &this->eye); +} + +void EnGo2_GoronFireClearCamera(EnGo2* this, GlobalContext* globalCtx) { + Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_ACTIVE); + Gameplay_ClearCamera(globalCtx, this->camId); +} + +void EnGo2_BiggoronAnimation(EnGo2* this) { + if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN && INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS && + (this->actor.params & 0x1F) == GORON_DMT_BIGGORON && this->unk_194.unk_00 == 0) { + if (DECR(this->animTimer) == 0) { + this->animTimer = Rand_S16Offset(30, 30); + func_800F4524(&D_801333D4, NA_SE_EN_GOLON_EYE_BIG, 60); + } + } +} + +void EnGo2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnGo2* this = THIS; + s32 pad; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, &this->jointTable, &this->morphTable, 18); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + + // Not GORON_CITY_ROLLING_BIG, GORON_CITY_LINK, GORON_DMT_BIGGORON + switch (this->actor.params & 0x1F) { + case GORON_FIRE_GENERIC: + case GORON_DMT_BOMB_FLOWER: + case GORON_DMT_ROLLING_SMALL: + case GORON_DMT_DC_ENTRANCE: + case GORON_CITY_ENTRANCE: + case GORON_CITY_ISLAND: + case GORON_CITY_LOWEST_FLOOR: + case GORON_CITY_STAIRWELL: + case GORON_CITY_LOST_WOODS: + case GORON_DMT_FAIRY_HINT: + case GORON_MARKET_BAZAAR: + this->actor.flags &= ~0x10; + this->actor.flags &= ~0x20; + } + + EnGo2_SetColliderDim(this); + EnGo2_SetShape(this); + func_80034EC0(&this->skelAnime, sAnimations, 0); + this->actor.gravity = -1.0f; + this->alpha = this->actor.shape.shadowAlpha = 0; + this->reverse = 0; + this->isAwake = false; + this->unk_211 = false; + this->goronState = 0; + this->waypoint = 0; + this->unk_216 = this->actor.shape.rot.z; + this->unk_26E = 1; + this->path = Path_GetByIndex(globalCtx, (this->actor.params & 0x3E0) >> 5, 0x1F); + switch (this->actor.params & 0x1F) { + case GORON_CITY_ENTRANCE: + case GORON_CITY_ISLAND: + case GORON_CITY_LOWEST_FLOOR: + case GORON_CITY_STAIRWELL: + case GORON_CITY_LOST_WOODS: + if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && LINK_IS_ADULT) { + Actor_Kill(&this->actor); + } + this->actionFunc = EnGo2_CurledUp; + break; + case GORON_MARKET_BAZAAR: + if ((LINK_IS_ADULT) || !CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + Actor_Kill(&this->actor); + } + EnGo2_GetItemAnimation(this, globalCtx); + break; + case GORON_CITY_LINK: + if ((gSaveContext.infTable[16] & 0x200)) { + Path_CopyLastPoint(this->path, &this->actor.world.pos); + this->actor.home.pos = this->actor.world.pos; + if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && (CHECK_OWNED_EQUIP(EQUIP_TUNIC, 1))) { + EnGo2_GetItemAnimation(this, globalCtx); + } else { + this->actionFunc = EnGo2_CurledUp; + } + } else { + gSaveContext.infTable[16] &= ~0x1000; + this->collider.dim.height = (D_80A4816C[this->actor.params & 0x1F].height * 0.6f); + EnGo2_SetupRolling(this, globalCtx); + this->isAwake = true; + } + break; + case GORON_CITY_ROLLING_BIG: + case GORON_DMT_ROLLING_SMALL: + this->collider.dim.height = (D_80A4816C[this->actor.params & 0x1F].height * 0.6f); + EnGo2_SetupRolling(this, globalCtx); + break; + case GORON_FIRE_GENERIC: + if (Flags_GetSwitch(globalCtx, (this->actor.params & 0xFC00) >> 0xA)) { + Actor_Kill(&this->actor); + } else { + this->isAwake = true; + this->actionFunc = EnGo2_CurledUp; + } + break; + case GORON_DMT_BIGGORON: + this->actor.shape.shadowDraw = NULL; + this->actor.flags &= ~1; + if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN) && + (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS)) { + this->eyeMouthTexState = 1; + } + this->collider.base.acFlags = 0; + this->collider.base.ocFlags1 = 0xD; // OC_PLAYER | OC_NO_PUSH | OC_ON + this->actionFunc = EnGo2_CurledUp; + break; + case GORON_DMT_BOMB_FLOWER: + if (gSaveContext.infTable[14] & 0x800) { + Path_CopyLastPoint(this->path, &this->actor.world.pos); + this->actor.home.pos = this->actor.world.pos; + } + case GORON_DMT_DC_ENTRANCE: + case GORON_DMT_FAIRY_HINT: + default: + this->actionFunc = EnGo2_CurledUp; + } +} + +void EnGo2_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} + +void EnGo2_CurledUp(EnGo2* this, GlobalContext* globalCtx) { + u8 index = this->actor.params & 0x1F; + s16 height; + s32 quake; + + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + quake = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quake, -0x3CB0); + Quake_SetQuakeValues(quake, 8, 0, 0, 0); + Quake_SetCountdown(quake, 16); + } else { + EnGo2_GetDustData(this, 1); + } + this->skelAnime.playSpeed = 0.0f; + } + + if ((s32)this->skelAnime.curFrame == 0) { + this->collider.dim.height = (D_80A4816C[index].height * 0.6f); + } else { + height = D_80A4816C[index].height; + this->collider.dim.height = + ((D_80A4816C[index].height * 0.4f * (this->skelAnime.curFrame / this->skelAnime.startFrame)) + + (height * 0.6f)); + } + if (EnGo2_IsFreeingGoronInFire(this, globalCtx)) { + this->isAwake = false; + EnGo2_WakeUp(this, globalCtx); + } + if (((this->actor.params & 0x1F) != GORON_FIRE_GENERIC) && EnGo2_IsWakingUp(this)) { + EnGo2_WakeUp(this, globalCtx); + } +} + +void func_80A46B40(EnGo2* this, GlobalContext* globalCtx) { + u8 index = (this->actor.params & 0x1F); + f32 height; + + if (this->unk_211 == true) { + EnGo2_BiggoronAnimation(this); + EnGo2_GoronLinkAnimation(this, globalCtx); + EnGo2_SelectGoronWakingUp(this); + + if (!EnGo2_IsGoronRollingBig(this, globalCtx) && !EnGo2_IsGoronFireGeneric(this)) { + if (EnGo2_IsGoronDmtBombFlower(this)) { + return; + } + } else { + return; + } + } else { + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { + this->actor.flags |= 1; + } + func_80A454CC(this); + this->unk_211 = true; + this->collider.dim.height = D_80A4816C[index].height; + } else { + height = D_80A4816C[index].height; + this->collider.dim.height = + (s16)((height * 0.4f * (this->skelAnime.curFrame / this->skelAnime.endFrame)) + (height * 0.6f)); + } + } + if ((!EnGo2_IsCameraModified(this, globalCtx)) && (!EnGo2_IsWakingUp(this))) { + EnGo2_RollingAnimation(this, globalCtx); + } +} + +void EnGo2_GoronDmtBombFlowerAnimation(EnGo2* this, GlobalContext* globalCtx) { + f32 float1 = this->skelAnime.endFrame; + f32 float2 = this->skelAnime.curFrame * ((f32)0x8000 / float1); + + this->actor.speedXZ = Math_SinS(float2); + if ((EnGo2_Orient(this, globalCtx)) && (this->waypoint == 0)) { + EnGo2_GetItemAnimation(this, globalCtx); + } +} + +void EnGo2_GoronRollingBigContinueRolling(EnGo2* this, GlobalContext* globalCtx) { + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + EnGo2_GetDustData(this, 1); + this->skelAnime.playSpeed = 0.0f; + EnGo2_SetupRolling(this, globalCtx); + } +} + +void EnGo2_ContinueRolling(EnGo2* this, GlobalContext* globalCtx) { + f32 float1 = 1000.0f; + + if (((this->actor.params & 0x1F) != GORON_DMT_ROLLING_SMALL || !(this->actor.xyzDistToPlayerSq > SQ(float1))) && + DECR(this->animTimer) == 0) { + this->actionFunc = EnGo2_SlowRolling; + this->actor.speedXZ *= 0.5f; // slowdown + } + EnGo2_GetDustData(this, 2); +} + +void EnGo2_SlowRolling(EnGo2* this, GlobalContext* globalCtx) { + s32 orientation; + s32 index; + + if (!EnGo2_IsRolling(this)) { + if (EnGo2_IsRollingOnGround(this, 4, 8.0f, 1) == true) { + if (EnGo2_IsGoronLinkReversing(this)) { + this->actionFunc = EnGo2_ReverseRolling; + return; + } + EnGo2_GetDustData(this, 3); + } + orientation = EnGo2_Orient(this, globalCtx); + index = this->actor.params & 0x1F; + if (index != GORON_CITY_LINK) { + if ((index == GORON_DMT_ROLLING_SMALL) && (orientation == 1) && (this->waypoint == 0)) { + EnGo2_StopRolling(this, globalCtx); + return; + } + } else if ((orientation == 2) && (this->waypoint == 1)) { + EnGo2_StopRolling(this, globalCtx); + return; + } + Math_ApproachF(&this->actor.speedXZ, EnGo2_GetTargetXZSpeed(this), 0.4f, 0.6f); + this->actor.shape.rot = this->actor.world.rot; + } +} + +void EnGo2_GroundRolling(EnGo2* this, GlobalContext* globalCtx) { + if (EnGo2_IsRollingOnGround(this, 4, 8.0f, 0)) { + EnGo2_GetDustData(this, 0); + if (this->unk_59C == 0) { + switch (this->actor.params & 0x1F) { + case GORON_CITY_LINK: + this->goronState = 0; + this->actionFunc = EnGo2_GoronLinkStopRolling; + break; + case GORON_CITY_ROLLING_BIG: + EnGo2_WakeUp(this, globalCtx); + break; + default: + this->actionFunc = EnGo2_CurledUp; + } + } + } +} + +void EnGo2_ReverseRolling(EnGo2* this, GlobalContext* globalCtx) { + if (!EnGo2_IsRolling(this)) { + Math_ApproachF(&this->actor.speedXZ, 0.0f, 0.6f, 0.8f); + if (this->actor.speedXZ >= 1.0f) { + EnGo2_GetDustData(this, 3); + } + if ((s32)this->actor.speedXZ == 0) { + this->actor.world.rot.y ^= 0x8000; + this->actor.shape.rot.y = this->actor.world.rot.y; + this->reverse ^= 1; + EnGo2_UpdateWaypoint(this, globalCtx); + EnGo2_SetupRolling(this, globalCtx); + } + } +} + +void EnGo2_SetupGetItem(EnGo2* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->actionFunc = EnGo2_SetGetItem; + } else { + func_8002F434(&this->actor, globalCtx, this->getItemId, this->actor.xzDistToPlayer + 1.0f, + fabsf(this->actor.yDistToPlayer) + 1.0f); + } +} + +void EnGo2_SetGetItem(EnGo2* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) { + this->unk_194.unk_00 = 0; + switch (this->getItemId) { + case GI_CLAIM_CHECK: + func_800775D8(); + EnGo2_GetItemAnimation(this, globalCtx); + return; + case GI_TUNIC_GORON: + gSaveContext.infTable[16] |= 0x200; + EnGo2_GetItemAnimation(this, globalCtx); + return; + case GI_SWORD_BGS: + gSaveContext.bgsFlag = true; + break; + case GI_BOMB_BAG_30: + case GI_BOMB_BAG_40: + EnGo2_RollingAnimation(this, globalCtx); + this->actionFunc = EnGo2_GoronRollingBigContinueRolling; + return; + } + this->actionFunc = func_80A46B40; + } +} + +void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx) { + switch (this->goronState) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 5); + this->actor.flags &= ~1; + this->actor.shape.rot.y += 0x5B0; + this->unk_26E = 1; + this->animTimer = this->skelAnime.endFrame + 60.0f + 60.0f; // eyeDrops animation timer + this->eyeMouthTexState = 2; + this->unk_20C = 0; + this->goronState++; + func_800F483C(0x28, 5); + func_800800F8(globalCtx, 0x105E, -0x63, &this->actor, 0); + break; + case 1: + if (DECR(this->animTimer)) { + if (this->animTimer == 60 || this->animTimer == 120) { + func_8005B1A4(ACTIVE_CAM); + func_800F4524(&D_801333D4, NA_SE_EV_GORON_WATER_DROP, 60); + } + } else { + func_800F4524(&D_801333D4, NA_SE_EN_GOLON_GOOD_BIG, 60); + func_80034EC0(&this->skelAnime, sAnimations, 6); + func_8010B720(globalCtx, 0x305A); + this->eyeMouthTexState = 3; + this->goronState++; + func_800F483C(0x7F, 5); + } + break; + case 2: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + this->eyeMouthTexState = 0; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + func_80034EC0(&this->skelAnime, sAnimations, 1); + this->actor.flags |= 1; + this->unk_26E = 2; + this->skelAnime.playSpeed = 0.0f; + this->skelAnime.curFrame = this->skelAnime.endFrame; + EnGo2_GetItem(this, globalCtx, GI_CLAIM_CHECK); + this->actionFunc = EnGo2_SetupGetItem; + this->goronState = 0; + } + break; + } +} + +void EnGo2_GoronLinkStopRolling(EnGo2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + switch (this->goronState) { + case 0: + if (func_8010BDBC(&globalCtx->msgCtx)) { + return; + } else { + func_8010B680(globalCtx, 0x3031, NULL); + player->actor.freezeTimer = 10; + this->goronState++; + } + case 1: + break; + default: + return; + } + + if (func_8010BDBC(&globalCtx->msgCtx) != 2) { + player->actor.freezeTimer = 10; + } else { + gSaveContext.infTable[16] |= 0x1000; + this->unk_26E = 1; + this->unk_211 = false; + this->isAwake = false; + this->actionFunc = EnGo2_CurledUp; + } +} + +void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Vec3s D_80A4854C = { 0x00, 0x00, 0x00 }; + + switch (this->goronState) { + case 0: // Wake up + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + EnGo2_GoronFireCamera(this, globalCtx); + globalCtx->msgCtx.msgMode = 0x37; + func_80034EC0(&this->skelAnime, sAnimations, 2); + this->waypoint = 1; + this->skelAnime.playSpeed = 2.0f; + func_80A44D84(this); + this->actor.shape.rot = this->actor.world.rot; + this->animTimer = 60; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 2.0f; + this->unk_194.unk_08 = D_80A4854C; + this->unk_194.unk_0E = D_80A4854C; + this->goronState++; + this->goronState++; + player->actor.world.rot.y = this->actor.world.rot.y; + player->actor.shape.rot.y = this->actor.world.rot.y; + player->actor.world.pos.x = + (f32)((Math_SinS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.x); + player->actor.world.pos.z = + (f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z); + func_8002DF54(globalCtx, &this->actor, 8); + func_800F5C64(0x51); + } + break; + case 2: // Walking away + if (DECR(this->animTimer)) { + if (!(this->animTimer % 8)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); + } + Actor_MoveForward(&this->actor); + } else { + this->animTimer = 0; + this->actor.speedXZ = 0.0f; + if ((((this->actor.params & 0xFC00) >> 0xA) != 1) && (((this->actor.params & 0xFC00) >> 0xA) != 2) && + (((this->actor.params & 0xFC00) >> 0xA) != 4) && (((this->actor.params & 0xFC00) >> 0xA) != 5) && + (((this->actor.params & 0xFC00) >> 0xA) != 9) && (((this->actor.params & 0xFC00) >> 0xA) != 11)) { + this->goronState++; + } + this->goronState++; + } + break; + case 3: // Walking away + this->animTimer++; + if (!(this->animTimer % 8) && (this->animTimer < 10)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); + } + if (this->animTimer == 10) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_IRON_DOOR_OPEN); + } + if (this->animTimer > 44) { + Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 20, NA_SE_EV_IRON_DOOR_CLOSE); + } else { + break; + } + case 4: // Finalize walking away + func_80106CCC(globalCtx); + EnGo2_GoronFireClearCamera(this, globalCtx); + func_8002DF54(globalCtx, &this->actor, 7); + Actor_Kill(&this->actor); + break; + case 1: + break; + } +} + +void EnGo2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnGo2* this = THIS; + + func_80A45360(this, &this->alpha); + EnGo2_SitDownAnimation(this); + SkelAnime_Update(&this->skelAnime); + EnGo2_RollForward(this); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, (f32)this->collider.dim.height * 0.5f, + (f32)this->collider.dim.radius * 0.6f, 0.0f, 5); + if (this->unk_194.unk_00 == 0) { + func_80A44AB0(this, globalCtx); + } + this->actionFunc(this, globalCtx); + if (this->unk_211 == true) { + func_80034F54(globalCtx, this->unk_226, this->unk_24A, 18); + } + func_80A45288(this, globalCtx); + EnGo2_EyeMouthTexState(this); + EnGo2_CheckCollision(this, globalCtx); +} + +s32 EnGo2_DrawCurledUp(EnGo2* this, GlobalContext* globalCtx) { + Vec3f D_80A48554 = { 0.0f, 0.0f, 0.0f }; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2881); + func_80093D18(globalCtx->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2.c", 2884), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_0600BD80); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2889); + Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos); + + return 1; +} + +s32 EnGo2_DrawRolling(EnGo2* this, GlobalContext* globalCtx) { + s32 pad; + Vec3f D_80A48560 = { 0.0f, 0.0f, 0.0f }; + f32 speedXZ; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2914); + func_80093D18(globalCtx->state.gfxCtx); + speedXZ = this->actionFunc == EnGo2_ReverseRolling ? 0.0f : this->actor.speedXZ; + Matrix_RotateRPY((globalCtx->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2.c", 2926), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_0600C140); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2930); + Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos); + return 1; +} + +s32 EnGo2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnGo2* this = THIS; + Vec3s vec1; + f32 float1; + + if (limb == 17) { + Matrix_Translate(2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); + vec1 = this->unk_194.unk_08; + float1 = (vec1.y / (f32)0x8000) * M_PI; + Matrix_RotateX(float1, MTXMODE_APPLY); + float1 = (vec1.x / (f32)0x8000) * M_PI; + Matrix_RotateZ(float1, MTXMODE_APPLY); + Matrix_Translate(-2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } + if (limb == 10) { + vec1 = this->unk_194.unk_0E; + float1 = (vec1.y / (f32)0x8000) * M_PI; + Matrix_RotateY(float1, MTXMODE_APPLY); + float1 = (vec1.x / (f32)0x8000) * M_PI; + Matrix_RotateX(float1, MTXMODE_APPLY); + } + if ((limb == 10) || (limb == 11) || (limb == 14)) { + float1 = Math_SinS(this->unk_226[limb]); + rot->y += float1 * 200.0f; + float1 = Math_CosS(this->unk_24A[limb]); + rot->z += float1 * 200.0f; + } + return 0; +} + +void EnGo2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnGo2* this = THIS; + Vec3f D_80A4856C = { 600.0f, 0.0f, 0.0f }; + + if (limbIndex == 17) { + Matrix_MultVec3f(&D_80A4856C, &this->actor.focus.pos); + } +} + +void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnGo2* this = THIS; + u64* eyeTextures[] = { D_0600DA80, D_0600CE80, D_0600D280, D_0600D680 }; + u64* mouthTextures[] = { D_0600DE80, D_0600E680 }; + + EnGo2_UpdateDust(this); + Matrix_Push(); + EnGo2_DrawDust(this, globalCtx); + Matrix_Pull(); + + if ((this->actionFunc == EnGo2_CurledUp) && (this->skelAnime.playSpeed == 0.0f) && + (this->skelAnime.curFrame == 0.0f)) { + if (1) {} + EnGo2_DrawCurledUp(this, globalCtx); + } else if (this->actionFunc == EnGo2_SlowRolling || this->actionFunc == EnGo2_ReverseRolling || + this->actionFunc == EnGo2_ContinueRolling) { + EnGo2_DrawRolling(this, globalCtx); + } else { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 3063); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, EnGo2_OverrideLimbDraw, EnGo2_PostLimbDraw, this); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 3081); + } +} diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h index c8a73d467c..2a277b09b0 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h @@ -3,12 +3,107 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_En_Go/z_en_go.h" struct EnGo2; +typedef void (*EnGo2ActionFunc)(struct EnGo2*, GlobalContext*); + +typedef enum { + /* 0x00 */ GORON_CITY_ROLLING_BIG, + /* 0x01 */ GORON_CITY_LINK, + /* 0x02 */ GORON_DMT_BIGGORON, + /* 0x03 */ GORON_FIRE_GENERIC, + /* 0x04 */ GORON_DMT_BOMB_FLOWER, + /* 0x05 */ GORON_DMT_ROLLING_SMALL, + /* 0x06 */ GORON_DMT_DC_ENTRANCE, + /* 0x07 */ GORON_CITY_ENTRANCE, + /* 0x08 */ GORON_CITY_ISLAND, + /* 0x09 */ GORON_CITY_LOWEST_FLOOR, + /* 0x0A */ GORON_CITY_STAIRWELL, + /* 0x0B */ GORON_CITY_LOST_WOODS, + /* 0x0C */ GORON_DMT_FAIRY_HINT, + /* 0x0D */ GORON_MARKET_BAZAAR +} GoronType; + +// WIP fire temple type docs +// /* 0x00 */ UNUSED +// /* 0x01 */ GORON_FIRE_LAVA_ROOM_OPEN +// /* 0x02 */ GORON_FIRE_LAVA_ROOM_BOMB +// /* 0x03 */ GORON_FIRE_MAZE_LOWER +// /* 0x04 */ GORON_FIRE_MAZE_SHORTCUT +// /* 0x05 */ GORON_FIRE_MAZE_SIDE_ROOM +// /* 0x06 */ GORON_FIRE_BOSS_KEY +// /* 0x07 */ GORON_FIRE_BOSS_KEY +// /* 0x08 */ GORON_FIRE_NEAR_BOSS +// /* 0x09 */ GORON_FIRE_BOSS_KEY +// /* 0x0A */ GORON_FIRE_MAZE_UPPER, +// /* 0x0B */ GORON_FIRE_HIGHEST + + +typedef struct { + s16 unused; + s16 yDist; + s16 xzDist; + s16 radius; + s16 height; +} EnGo2DataStruct1; // size = 0xA + +typedef struct { + f32 shape_unk_10; + f32 scale; + s8 actor_unk_1F; + f32 unk_218; +} EnGo2DataStruct2; // size = 0x10 + +typedef struct { + u8 initialTimer; + f32 scale; + f32 scaleStep; + s32 numDustEffects; + f32 radius; + f32 yAccel; +} EnGo2DustEffectData; // size = 0x18 + typedef struct EnGo2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x454]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnGo2ActionFunc actionFunc; + /* 0x0194 */ struct_80034A14_arg1 unk_194; + /* 0x01BC */ ColliderCylinder collider; + /* 0x0208 */ Path* path; + /* 0x020C */ u8 unk_20C; // counter for GORON_CITY_LINK animation + /* 0x020D */ u8 dialogState; + /* 0x020E */ u8 reverse; + /* 0x020F */ u8 isAwake; // Conditional + /* 0x0210 */ s8 waypoint; + /* 0x0211 */ u8 unk_211; // Conditional + // goron link: 0 - rolling, 1 - frozen + // biggoron: 0 - give eyedrops, 1 - applying eyedrops, 2 - getting claimcheck + // generic fire: 0 - + /* 0x0212 */ u8 goronState; + /* 0x0213 */ u8 eyeMouthTexState; // 0, 1, 2, 3 + /* 0x0214 */ u8 eyeTexIndex; + /* 0x0215 */ u8 mouthTexIndex; + /* 0x0216 */ u8 unk_216; // Set to z rotation, checked by waypoint + /* 0x0218 */ f32 unk_218; + /* 0x021C */ char unk_21C[0x04]; + /* 0x0220 */ f32 alpha; // Set to 0, used by func_80A45360, smoothed to this->actor.shape.unk_14 from either 0 or 255.0f + /* 0x0224 */ s16 blinkTimer; + /* 0x0226 */ s16 unk_226[18]; // Remains unknown + /* 0x024A */ s16 unk_24A[18]; // Remains unknown + /* 0x026E */ u16 unk_26E; // Remains unknown = 1, 2, or 4: used in func_80034A14 + /* 0x0270 */ EnGoEffect dustEffects[10]; + /* 0x04A0 */ Vec3f eye; + /* 0x04AC */ Vec3f at; + /* 0x04B8 */ Vec3s jointTable[18]; + /* 0x0524 */ Vec3s morphTable[18]; + /* 0x0590 */ s16 unk_590; // timer + /* 0x0592 */ s16 animTimer; // animTimer. Plays NA_SE_EN_MORIBLIN_WALK, NA_SE_EV_IRON_DOOR_OPEN, NA_SE_EV_IRON_DOOR_CLOSE + /* 0x0594 */ s32 getItemId; + /* 0x0598 */ char unk_598[0x02]; + /* 0x059A */ s16 camId; + /* 0x059C */ s16 unk_59C; } EnGo2; // size = 0x05A0 extern const ActorInit En_Go2_InitVars; diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 9711aa0220..6401a2cb3f 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -10,10 +10,10 @@ #define FLAGS 0x00000010 #define THIS ((EnHorseGameCheckBase*)thisx) -#define AT_FINISH_LINE(actor) \ +#define AT_FINISH_LINE(actor) \ (Math3D_PointInSquare2D(sFinishLine[0], sFinishLine[1], sFinishLine[2], sFinishLine[3], (actor)->world.pos.x, \ (actor)->world.pos.z)) -#define AT_RANCH_EXIT(actor) \ +#define AT_RANCH_EXIT(actor) \ (Math3D_PointInSquare2D(sRanchExit[0], sRanchExit[1], sRanchExit[2], sRanchExit[3], (actor)->world.pos.x, \ (actor)->world.pos.z)) @@ -321,7 +321,8 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext* if (!(this->raceFlags & MALONRACE_PLAYER_ON_MARK) && AT_FINISH_LINE(player->rideActor)) { this->raceFlags |= MALONRACE_PLAYER_ON_MARK; - } else if ((this->raceFlags & MALONRACE_PLAYER_ON_MARK) && !(this->raceFlags & MALONRACE_PLAYER_START) && !AT_FINISH_LINE(player->rideActor)) { + } else if ((this->raceFlags & MALONRACE_PLAYER_ON_MARK) && !(this->raceFlags & MALONRACE_PLAYER_START) && + !AT_FINISH_LINE(player->rideActor)) { this->raceFlags |= MALONRACE_PLAYER_START; } if ((this->startTimer > 50) && !(this->raceFlags & MALONRACE_SET_TIMER)) { @@ -366,7 +367,8 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext* } } } - if ((player2->rideActor != NULL) && (this->raceFlags & MALONRACE_PLAYER_START) && AT_FINISH_LINE(player2->rideActor)) { + if ((player2->rideActor != NULL) && (this->raceFlags & MALONRACE_PLAYER_START) && + AT_FINISH_LINE(player2->rideActor)) { if ((this->lapCount == 1) && (this->fenceCheck[15] == 0) && (player2->rideActor->prevPos.x < -200.0f)) { this->raceFlags |= MALONRACE_BROKE_RULE; func_8010B680(globalCtx, 0x208C, NULL); diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 1a42e0f51c..a24a6668f9 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -62,10 +62,11 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { }; static struct_D_80AA1678 sAnimationInfo[] = { - { 0x06001CC0, 1.0f, 0, 0.0f }, { 0x06001CC0, 1.0f, 0, -10.0f }, { 0x06013C6C, 1.0f, 0, 0.0f }, - { 0x06013C6C, 1.0f, 0, -10.0f }, { 0x06000CB0, 1.0f, 0, 0.0f }, { 0x060003B4, 1.0f, 0, -10.0f }, - { 0x06001BE0, 1.0f, 0, 0.0f }, { 0x06013D60, 1.0f, 0, 0.0f }, { 0x0601431C, 1.0f, 0, 0.0f }, - { 0x06014CA8, 1.0f, 0, 0.0f }, + { 0x06001CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06001CC0, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06013C6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06013C6C, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06000CB0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060003B4, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06001BE0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06013D60, 1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x0601431C, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06014CA8, 1.0f, ANIMMODE_LOOP, 0.0f }, }; static AnimationHeader* D_80A7B918[] = { @@ -325,7 +326,7 @@ void func_80A79690(SkelAnime* skelAnime, EnIn* this, GlobalContext* globalCtx) { void func_80A796EC(EnIn* this, s32 arg1) { Animation_Change(&this->skelAnime, sAnimationInfo[arg1].animation, 1.0f, 0.0f, - Animation_GetLastFrame(sAnimationInfo[arg1].animation), sAnimationInfo[arg1].unk_08, + Animation_GetLastFrame(sAnimationInfo[arg1].animation), sAnimationInfo[arg1].mode, sAnimationInfo[arg1].transitionRate); } diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index b57116f370..b8b284c087 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -163,7 +163,7 @@ void EnKarebaba_SetupUpright(EnKarebaba* this) { Actor_SetScale(&this->actor, 0.01f); this->bodyCollider.base.colType = COLTYPE_HIT6; this->bodyCollider.base.acFlags &= ~AC_HARD; - this->bodyCollider.info.bumper.dmgFlags = gSaveContext.linkAge != 0 ? 0x07C00710 : 0x0FC00710; + this->bodyCollider.info.bumper.dmgFlags = LINK_IS_CHILD ? 0x07C00710 : 0x0FC00710; this->bodyCollider.dim.radius = 15; this->bodyCollider.dim.height = 80; this->headCollider.dim.height = 80; diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 0d0ffa29bd..7321059029 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -58,9 +58,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x0600075C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, - { 0x0600075C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, - { 0x0600046C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, + { 0x0600075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x0600075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x0600046C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, }; extern FlexSkeletonHeader D_060086D0; @@ -419,7 +419,7 @@ void EnKz_Wait(EnKz* this, GlobalContext* globalCtx) { } void EnKz_SetupGetItem(EnKz* this, GlobalContext* globalCtx) { - s32 getItemID; + s32 getItemId; f32 xzRange; f32 yRange; @@ -428,10 +428,10 @@ void EnKz_SetupGetItem(EnKz* this, GlobalContext* globalCtx) { this->unk_1E0.unk_00 = 1; this->actionFunc = EnKz_StartTimer; } else { - getItemID = this->isTrading == true ? GI_FROG : GI_TUNIC_ZORA; + getItemId = this->isTrading == true ? GI_FROG : GI_TUNIC_ZORA; yRange = fabsf(this->actor.yDistToPlayer) + 1.0f; xzRange = this->actor.xzDistToPlayer + 1.0f; - func_8002F434(&this->actor, globalCtx, getItemID, xzRange, yRange); + func_8002F434(&this->actor, globalCtx, getItemId, xzRange, yRange); } } diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index d3429e0567..cc7f9da85f 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -62,10 +62,10 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_D_80AA1678 D_80AA1678[] = { - { 0x06000820, 1.0f, 0x00, 0.0f }, - { 0x06000820, 1.0f, 0x00, -10.0f }, - { 0x06008D64, 1.0f, 0x00, 0.0f }, - { 0x06008D64, 1.0f, 0x00, -10.0f }, + { 0x06000820, 1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x06000820, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x06008D64, 1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x06008D64, 1.0f, ANIMMODE_LOOP, -10.0f }, }; static Vec3f D_80AA16B8 = { 800.0f, 0.0f, 0.0f }; @@ -220,7 +220,7 @@ void func_80AA0A0C(EnMa1* this) { void func_80AA0A84(EnMa1* this, UNK_TYPE idx) { f32 frameCount = Animation_GetLastFrame(D_80AA1678[idx].animation); - Animation_Change(&this->skelAnime, D_80AA1678[idx].animation, 1.0f, 0.0f, frameCount, D_80AA1678[idx].unk_08, + Animation_Change(&this->skelAnime, D_80AA1678[idx].animation, 1.0f, 0.0f, frameCount, D_80AA1678[idx].mode, D_80AA1678[idx].transitionRate); } diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index ff55495958..a3ecbf1afc 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -56,8 +56,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_D_80AA1678 D_80AA2858[] = { - { 0x060007D4, 1.0f, 0x00, 0.0f }, { 0x060007D4, 1.0f, 0x00, -10.0f }, { 0x060093BC, 1.0f, 0x00, 0.0f }, - { 0x06009EE0, 1.0f, 0x00, 0.0f }, { 0x06009EE0, 1.0f, 0x00, -10.0f }, + { 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f }, }; static Vec3f D_80AA28A8 = { 900.0f, 0.0f, 0.0f }; @@ -199,7 +200,7 @@ void func_80AA1CC0(EnMa2* this) { void func_80AA1D44(EnMa2* this, s32 idx) { f32 frameCount = Animation_GetLastFrame(D_80AA2858[idx].animation); - Animation_Change(&this->skelAnime, D_80AA2858[idx].animation, 1.0f, 0.0f, frameCount, D_80AA2858[idx].unk_08, + Animation_Change(&this->skelAnime, D_80AA2858[idx].animation, 1.0f, 0.0f, frameCount, D_80AA2858[idx].mode, D_80AA2858[idx].transitionRate); } diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index e14d4c5b9e..fd15eac414 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -60,8 +60,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_D_80AA1678 D_80AA3848[] = { - { 0x060007D4, 1.0f, 0x00, 0.0f }, { 0x060007D4, 1.0f, 0x00, -10.0f }, { 0x060093BC, 1.0f, 0x00, 0.0f }, - { 0x06009EE0, 1.0f, 0x00, 0.0f }, { 0x06009EE0, 1.0f, 0x00, -10.0f }, + { 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f }, + { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f }, }; static Vec3f D_80AA3898 = { 900.0f, 0.0f, 0.0f }; @@ -246,7 +247,7 @@ void func_80AA2F80(EnMa3* this) { void func_80AA3004(EnMa3* this, s32 idx) { f32 frameCount = Animation_GetLastFrame(D_80AA3848[idx].animation); - Animation_Change(&this->skelAnime, D_80AA3848[idx].animation, 1.0f, 0.0f, frameCount, D_80AA3848[idx].unk_08, + Animation_Change(&this->skelAnime, D_80AA3848[idx].animation, 1.0f, 0.0f, frameCount, D_80AA3848[idx].mode, D_80AA3848[idx].transitionRate); } diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 2a8be4b847..98dabfb843 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -57,13 +57,13 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x060002C8, 0.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060002C8, 0.0f, 0.0f, -1.0f, 0x00, -10.0f }, - { 0x0600917C, 1.0f, 0.0f, -1.0f, 0x02, -1.0f }, { 0x06009E68, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, - { 0x06009B1C, 1.0f, 0.0f, -1.0f, 0x02, -1.0f }, { 0x06008E84, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, - { 0x060097F0, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, { 0x060092B0, 1.0f, 0.0f, -1.0f, 0x02, -1.0f }, - { 0x0600A138, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, { 0x06008FC0, 1.0f, 0.0f, -1.0f, 0x02, -1.0f }, - { 0x060002C8, 0.0f, 0.0f, -1.0f, 0x00, -8.0f }, { 0x06008510, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, - { 0x060095BC, 1.0f, 0.0f, -1.0f, 0x02, -1.0f }, { 0x06008738, 1.0f, 0.0f, -1.0f, 0x00, -1.0f }, + { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x0600917C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06009E68, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { 0x06009B1C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06008E84, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { 0x060097F0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x060092B0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { 0x0600A138, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x06008FC0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { 0x060002C8, 0.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { 0x06008510, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { 0x060095BC, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06008738, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, }; extern AnimationHeader D_060002C8; diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 9d1dea7e86..04384406fe 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -15,13 +15,14 @@ void EnMk_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnMk_Update(Actor* thisx, GlobalContext* globalCtx); void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000368; -extern UNK_TYPE D_06000724; -extern UNK_TYPE D_06000AC0; -extern UNK_TYPE D_06000D88; -extern UNK_TYPE D_06005DF0; +void EnMk_Wait(EnMk* this, GlobalContext* globalCtx); + +extern AnimationHeader D_06000368; +extern AnimationHeader D_06000724; +extern AnimationHeader D_06000AC0; +extern AnimationHeader D_06000D88; +extern FlexSkeletonHeader D_06005DF0; -/* const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORCAT_NPC, @@ -34,7 +35,7 @@ const ActorInit En_Mk_InitVars = { (ActorFunc)EnMk_Draw, }; -static ColliderCylinderInit D_80AAD620 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -53,41 +54,323 @@ static ColliderCylinderInit D_80AAD620 = { }, { 30, 40, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s") +void EnMk_Init(Actor* thisx, GlobalContext* globalCtx) { + EnMk* this = THIS; + s32 swimFlag; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA40.s") + this->actor.minVelocityY = -4.0f; + this->actor.gravity = -1.0f; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06005DF0, &D_06000D88, &this->jointTable, &this->morphTable, 13); + Animation_PlayLoop(&this->skelAnime, &D_06000D88); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actor.colChkInfo.mass = 0xFF; + Actor_SetScale(&this->actor, 0.01f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACA94.s") + this->actionFunc = EnMk_Wait; + this->flags = 0; + this->swimFlag = 0; + this->actor.targetMode = 6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB14.s") + if (gSaveContext.itemGetInf[1] & 1) { + this->flags |= 4; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACB6C.s") +void EnMk_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnMk* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACBAC.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s") +void func_80AACA40(EnMk* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + this->actor.flags &= 0xFFFEFFFF; + this->actionFunc = EnMk_Wait; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s") + this->flags |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s") +void func_80AACA94(EnMk* this, GlobalContext* globalCtx) { + if (Actor_HasParent(this, globalCtx) != 0) { + this->actor.parent = NULL; + this->actionFunc = func_80AACA40; + func_80088AA0(240); + gSaveContext.eventInf[1] &= ~1; + } else { + func_8002F434(&this->actor, globalCtx, GI_EYEDROPS, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s") +void func_80AACB14(EnMk* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + this->actionFunc = func_80AACA94; + func_8002F434(&this->actor, globalCtx, GI_EYEDROPS, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s") +void func_80AACB6C(EnMk* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->actionFunc = func_80AACB14; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACFA0.s") + this->flags |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD014.s") +void func_80AACBAC(EnMk* this, GlobalContext* globalCtx) { + if (this->timer > 0) { + this->timer--; + this->actor.shape.rot.y -= 0x800; + } else { + this->actionFunc = func_80AACB6C; + func_8010B720(globalCtx, 0x4030); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s") +void func_80AACC04(EnMk* this, GlobalContext* globalCtx) { + if (this->timer > 0) { + this->timer--; + } else { + this->timer = 16; + this->actionFunc = func_80AACBAC; + Animation_Change(&this->skelAnime, &D_06000D88, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D88), ANIMMODE_LOOP, + -4.0f); + this->flags &= ~2; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s") +void func_80AACCA0(EnMk* this, GlobalContext* globalCtx) { + if (this->timer > 0) { + this->timer--; + this->actor.shape.rot.y += 0x800; + } else { + this->timer = 120; + this->actionFunc = func_80AACC04; + Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000724), ANIMMODE_LOOP, + -4.0f); + this->flags &= ~2; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD518.s") +void func_80AACD48(EnMk* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD55C.s") + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = func_80AACCA0; + globalCtx->msgCtx.msgMode = 0x37; + player->exchangeItemId = EXCH_ITEM_NONE; + this->timer = 16; + Animation_Change(&this->skelAnime, &D_06000D88, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D88), ANIMMODE_LOOP, + -4.0f); + this->flags &= ~2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s") + this->flags |= 1; +} + +void func_80AACE2C(EnMk* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_8010B720(globalCtx, 0x4001); + Animation_Change(&this->skelAnime, &D_06000AC0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AC0), ANIMMODE_ONCE, + -4.0f); + this->flags &= ~2; + this->actionFunc = func_80AACD48; + } + + this->flags |= 1; +} + +void func_80AACEE8(EnMk* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_8010B720(globalCtx, 0x4000); + Animation_Change(&this->skelAnime, &D_06000AC0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AC0), ANIMMODE_LOOP, + -4.0f); + this->flags &= ~2; + this->actionFunc = func_80AACE2C; + } + + this->flags |= 1; +} + +void func_80AACFA0(EnMk* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->actionFunc = func_80AACA40; + gSaveContext.itemGetInf[1] |= 1; + } else { + func_8002F434(&this->actor, globalCtx, GI_HEART_PIECE, 10000.0f, 50.0f); + } +} + +void func_80AAD014(EnMk* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + this->actionFunc = func_80AACFA0; + func_8002F434(&this->actor, globalCtx, GI_HEART_PIECE, 10000.0f, 50.0f); + } + + this->flags |= 1; +} + +void EnMk_Wait(EnMk* this, GlobalContext* globalCtx) { + s16 angle; + s32 swimFlag; + Player* player = PLAYER; + s32 playerExchangeItem; + + if (func_8002F194(&this->actor, globalCtx) != 0) { + playerExchangeItem = func_8002F368(globalCtx); + + if (this->actor.textId != 0x4018) { + player->actor.textId = this->actor.textId; + this->actionFunc = func_80AACA40; + } else { + if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS) { + player->actor.textId = 0x4032; + this->actionFunc = func_80AACA40; + } else { + switch (playerExchangeItem) { + case EXCH_ITEM_NONE: + if (this->swimFlag >= 8) { + if (gSaveContext.itemGetInf[1] & 1) { + player->actor.textId = 0x4075; + this->actionFunc = func_80AACA40; + } else { + player->actor.textId = 0x4074; + this->actionFunc = func_80AAD014; + this->swimFlag = 0; + } + } else { + if (this->swimFlag == 0) { + player->actor.textId = 0x4018; + this->actionFunc = func_80AACA40; + } else { + player->actor.textId = 0x406C + this->swimFlag; + this->actionFunc = func_80AACA40; + } + } + break; + case EXCH_ITEM_FROG: + player->actor.textId = 0x4019; + this->actionFunc = func_80AACEE8; + Animation_Change(&this->skelAnime, &D_06000368, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000368), + ANIMMODE_ONCE, -4.0f); + this->flags &= ~2; + gSaveContext.timer2State = 0; + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + break; + default: + player->actor.textId = 0x4018; + this->actionFunc = func_80AACA40; + break; + } + } + } + } else { + this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1A); + + if (this->actor.textId == 0) { + this->actor.textId = 0x4018; + } + + angle = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + + if ((ABS(angle) < 0x2151) && (this->actor.xzDistToPlayer < 100.0f)) { + func_8002F298(&this->actor, globalCtx, 100.0f, EXCH_ITEM_FROG); + this->flags |= 1; + } + } +} + +void EnMk_Update(Actor* thisx, GlobalContext* globalCtx) { + EnMk* this = THIS; + s32 pad; + Vec3s vec; + Player* player; + s16 swimFlag; + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + + if ((!(this->flags & 2)) && (SkelAnime_Update(&this->skelAnime))) { + this->flags |= 2; + } + + this->actionFunc(this, globalCtx); + + if (this->flags & 1) { + func_80038290(globalCtx, &this->actor, &this->headRotation, &vec, this->actor.focus.pos); + } else { + Math_SmoothStepToS(&this->headRotation.x, 0, 6, 6200, 100); + Math_SmoothStepToS(&this->headRotation.y, 0, 6, 6200, 100); + } + + player = PLAYER; + + if (this->flags & 8) { + if (!(player->stateFlags2 & 0x400)) { + this->flags &= ~8; + } + } else { + if (player->currentBoots == PLAYER_BOOTS_IRON) { + this->flags |= 8; + } else if (player->stateFlags2 & 0x400) { + swimFlag = player->actor.yDistToWater; + + if (swimFlag > 0) { + if (swimFlag >= 320) { + if (swimFlag >= 355) { + swimFlag = 8; + } else { + swimFlag = 7; + } + } else if (swimFlag < 80) { + swimFlag = 1; + } else { + swimFlag *= 0.025f; + } + + if (this->swimFlag < swimFlag) { + this->swimFlag = swimFlag; + + if ((!(this->flags & 4)) && (this->swimFlag >= 8)) { + this->flags |= 4; + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + } + } + } + } +} + +s32 EnMk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + EnMk* this = THIS; + + if (limbIndex == 11) { + rot->y -= this->headRotation.y; + rot->z += this->headRotation.x; + } + + return 0; +} + +void EnMk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + static Vec3f D_80AAD64C = { 1000.0f, -100.0f, 0.0f }; + + if (limbIndex == 11) { + Matrix_MultVec3f(&D_80AAD64C, &thisx->focus); + } +} + +void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnMk* this = THIS; + + func_800943C8(globalCtx->state.gfxCtx); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnMk_OverrideLimbDraw, EnMk_PostLimbDraw, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index 4761131da9..a9d47ba4c9 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -6,9 +6,19 @@ struct EnMk; +typedef void (*EnMkActionFunc)(struct EnMk*, GlobalContext*); + typedef struct EnMk { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x13C]; + /* 0x014C */ ColliderCylinder collider; + /* 0x0198 */ SkelAnime skelAnime; + /* 0x01DC */ Vec3s jointTable[13]; + /* 0x022A */ Vec3s morphTable[13]; + /* 0x0278 */ Vec3s headRotation; // Used to rotate the man's head towards Link + /* 0x027E */ u16 flags; + /* 0x0280 */ s16 swimFlag; + /* 0x0282 */ u16 timer; + /* 0x0284 */ EnMkActionFunc actionFunc; } EnMk; // size = 0x0288 extern const ActorInit En_Mk_InitVars; diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 05940a2205..968846a62a 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -1,4 +1,5 @@ #include "z_en_ny.h" +#include "objects/object_ny/object_ny.h" #define FLAGS 0x00000005 @@ -9,11 +10,21 @@ void EnNy_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnNy_Update(Actor* thisx, GlobalContext* globalCtx); void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06001DD0; -extern UNK_TYPE D_06001EA8; -extern UNK_TYPE D_06001FC8; +void EnNy_UpdateUnused(Actor* thisx, GlobalContext* globalCtx); +void EnNy_Move(EnNy* this, GlobalContext* globalCtx); +void EnNy_Die(EnNy* this, GlobalContext* globalCtx); +void func_80ABCD40(EnNy* this); +void func_80ABCDBC(EnNy* this); +void EnNy_TurnToStone(EnNy* this, GlobalContext* globalCtx); +void func_80ABD11C(EnNy* this, GlobalContext* globalCtx); +void func_80ABCE50(EnNy* this, GlobalContext* globalCtx); +void func_80ABCE90(EnNy* this, GlobalContext* globalCtx); +void func_80ABCEEC(EnNy* this, GlobalContext* globalCtx); +void EnNy_UpdateDeath(Actor* thisx, GlobalContext* GlobalContext); +void EnNy_SetupDie(EnNy* this, GlobalContext* globalCtx); +void EnNy_DrawDeathEffect(Actor* thisx, GlobalContext* GlobalContext); +void func_80ABD3B8(EnNy* this, f32, f32); -/* const ActorInit En_Ny_InitVars = { ACTOR_EN_NY, ACTORCAT_ENEMY, @@ -26,7 +37,7 @@ const ActorInit En_Ny_InitVars = { (ActorFunc)EnNy_Draw, }; -static ColliderJntSphElementInit D_80ABE330[1] = { +static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { ELEMTYPE_UNK0, @@ -40,7 +51,7 @@ static ColliderJntSphElementInit D_80ABE330[1] = { }, }; -static ColliderJntSphInit D_80ABE354 = { +static ColliderJntSphInit sColliderInit = { { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, @@ -50,53 +61,545 @@ static ColliderJntSphInit D_80ABE354 = { COLSHAPE_JNTSPH, }, 1, - D_80ABE330, + sJntSphElementsInit, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s") +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, 0x0), + /* Deku stick */ DMG_ENTRY(0, 0x0), + /* Slingshot */ DMG_ENTRY(0, 0x0), + /* Explosive */ DMG_ENTRY(2, 0xF), + /* Boomerang */ DMG_ENTRY(0, 0x0), + /* Normal arrow */ DMG_ENTRY(2, 0xF), + /* Hammer swing */ DMG_ENTRY(2, 0xF), + /* Hookshot */ DMG_ENTRY(2, 0x1), + /* Kokiri sword */ DMG_ENTRY(0, 0x0), + /* Master sword */ DMG_ENTRY(2, 0xF), + /* Giant's Knife */ DMG_ENTRY(4, 0xF), + /* Fire arrow */ DMG_ENTRY(4, 0x2), + /* Ice arrow */ DMG_ENTRY(2, 0xF), + /* Light arrow */ DMG_ENTRY(2, 0xF), + /* Unk arrow 1 */ DMG_ENTRY(4, 0xE), + /* Unk arrow 2 */ DMG_ENTRY(0, 0x0), + /* Unk arrow 3 */ DMG_ENTRY(0, 0x0), + /* Fire magic */ DMG_ENTRY(4, 0x2), + /* Ice magic */ DMG_ENTRY(0, 0x0), + /* Light magic */ DMG_ENTRY(0, 0x0), + /* Shield */ DMG_ENTRY(0, 0x0), + /* Mirror Ray */ DMG_ENTRY(0, 0x0), + /* Kokiri spin */ DMG_ENTRY(0, 0x0), + /* Giant spin */ DMG_ENTRY(4, 0xF), + /* Master spin */ DMG_ENTRY(2, 0xF), + /* Kokiri jump */ DMG_ENTRY(0, 0x0), + /* Giant jump */ DMG_ENTRY(8, 0xF), + /* Master jump */ DMG_ENTRY(4, 0xF), + /* Unknown 1 */ DMG_ENTRY(0, 0x0), + /* Unblockable */ DMG_ENTRY(0, 0x0), + /* Hammer jump */ DMG_ENTRY(0, 0x0), + /* Unknown 2 */ DMG_ENTRY(0, 0x0), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD40.s") +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 40, ICHAIN_CONTINUE), + ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), + ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD84.s") +void EnNy_Init(Actor* thisx, GlobalContext* globalCtx) { + EnNy* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCD94.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + this->actor.colChkInfo.damageTable = &sDamageTable; + this->actor.colChkInfo.health = 2; + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sColliderInit, &this->elements); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f); + this->unk_1CA = 0; + this->unk_1D0 = 0; + Actor_SetScale(&this->actor, 0.01f); + this->actor.speedXZ = 0.0f; + this->actor.shape.rot.y = 0; + this->actor.gravity = -0.4f; + this->hitPlayer = 0; + this->unk_1CE = 2; + this->actor.velocity.y = 0.0f; + this->unk_1D4 = 0xFF; + this->unk_1D8 = 0; + this->unk_1E8 = 0.0f; + this->unk_1E0 = 0.25f; + if (this->actor.params == 0) { + // New initials + osSyncPrintf("ニュウ イニシャル[ %d ] ！！\n", this->actor.params); + this->actor.colChkInfo.mass = 0; + this->unk_1D4 = 0; + this->unk_1D8 = 0xFF; + this->unk_1E0 = 1.0f; + func_80ABCDBC(this); + } else { + // This mode is unused in the final game + // Dummy new initials + osSyncPrintf("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params); + osSyncPrintf("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); + this->actor.colChkInfo.mass = 0xFF; + this->collider.base.colType = COLTYPE_METAL; + this->actor.update = EnNy_UpdateUnused; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDAC.s") +void EnNy_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnNy* this = THIS; + Collider_DestroyJntSph(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDBC.s") +void func_80ABCD40(EnNy* this) { + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCDFC.s") + temp = (this->actor.yDistToWater > 0.0f) ? 0.7f : 1.0f; + this->unk_1E8 = 2.8f * temp; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE38.s") +void func_80ABCD84(EnNy* this) { + this->actionFunc = func_80ABCE50; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE50.s") +void func_80ABCD94(EnNy* this) { + this->stoneTimer = 0x14; + this->actionFunc = func_80ABCE90; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCE90.s") +void func_80ABCDAC(EnNy* this) { + this->actionFunc = func_80ABCEEC; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCEEC.s") +void func_80ABCDBC(EnNy* this) { + this->unk_1F4 = 0.0f; + func_80ABCD40(this); + this->stoneTimer = 180; + this->actionFunc = EnNy_Move; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s") +void EnNy_SetupTurnToStone(EnNy* this) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NYU_HIT_STOP); + this->actionFunc = EnNy_TurnToStone; + this->unk_1E8 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD05C.s") +void func_80ABCE38(EnNy* this) { + this->stoneTimer = 0x3C; + this->actionFunc = func_80ABD11C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD11C.s") +void func_80ABCE50(EnNy* this, GlobalContext* globalCtx) { + if (this->actor.xyzDistToPlayerSq <= 25600.0f) { + func_80ABCD94(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s") +void func_80ABCE90(EnNy* this, GlobalContext* globalCtx) { + s32 phi_v1; + s32 phi_v0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD3B8.s") + phi_v1 = this->unk_1D4 - 0x40; + phi_v0 = this->unk_1D8 + 0x40; + if (phi_v0 >= 0xFF) { + phi_v1 = 0; + phi_v0 = 0xFF; + func_80ABCDAC(this); + } + this->unk_1D4 = phi_v1; + this->unk_1D8 = phi_v0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s") +void func_80ABCEEC(EnNy* this, GlobalContext* globalCtx) { + f32 phi_f0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s") + phi_f0 = this->unk_1E0; + phi_f0 += 2.0f; + if (phi_f0 >= 1.0f) { + phi_f0 = 1.0f; + func_80ABCDBC(this); + } + this->unk_1E0 = phi_f0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD9AC.s") +void EnNy_Move(EnNy* this, GlobalContext* globalCtx) { + f32 yawDiff; + s32 stoneTimer; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBB8.s") + if (!(this->unk_1F0 < this->actor.yDistToWater)) { + func_8002F974(&this->actor, NA_SE_EN_NYU_MOVE - SFX_FLAG); + } + func_80ABCD40(this); + stoneTimer = this->stoneTimer; + this->stoneTimer--; + if ((stoneTimer <= 0) || (this->hitPlayer != false)) { + EnNy_SetupTurnToStone(this); + } else { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0xA, this->unk_1F4, 0); + Math_ApproachF(&this->unk_1F4, 2000.0f, 1.0f, 100.0f); + this->actor.world.rot.y = this->actor.shape.rot.y; + yawDiff = Math_FAtan2F(this->actor.yDistToPlayer, this->actor.xzDistToPlayer); + this->actor.speedXZ = fabsf(cosf(yawDiff) * this->unk_1E8); + if (this->unk_1F0 < this->actor.yDistToWater) { + this->unk_1EC = sinf(yawDiff) * this->unk_1E8; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s") +void EnNy_TurnToStone(EnNy* this, GlobalContext* globalCtx) { + f32 phi_f0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s") + phi_f0 = this->unk_1E0; + phi_f0 -= 2.0f; + if (phi_f0 <= 0.25f) { + phi_f0 = 0.25f; + if (this->actor.bgCheckFlags & 2) { + if (!(this->unk_1F0 < this->actor.yDistToWater)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } + this->actor.bgCheckFlags &= ~2; + this->actor.speedXZ = 0.0f; + this->actor.world.rot.y = this->actor.shape.rot.y; + func_80ABCE38(this); + } + } + this->unk_1E0 = phi_f0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s") +void func_80ABD11C(EnNy* this, GlobalContext* globalCtx) { + s32 phi_v0; + s32 phi_v1; + + phi_v0 = this->unk_1D4; + phi_v0 += 0x40; + phi_v1 = this->unk_1D8; + phi_v1 -= 0x40; + if (phi_v0 >= 0xFF) { + phi_v0 = 0xFF; + phi_v1 = 0; + if (this->stoneTimer != 0) { + this->stoneTimer--; + } else { + func_80ABCD84(this); + } + } + this->unk_1D4 = phi_v0; + this->unk_1D8 = phi_v1; +} + +s32 EnNy_CollisionCheck(EnNy* this, GlobalContext* globalCtx) { + u8 sp3F; + Vec3f effectPos; + + sp3F = 0; + this->hitPlayer = 0; + if (this->collider.base.atFlags & 4) { + this->collider.base.atFlags &= ~4; + this->hitPlayer = 1; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + this->actor.speedXZ = -4.0f; + return 0; + } + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + this->hitPlayer = 1; + return 0; + } else { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + effectPos.x = this->collider.elements[0].info.bumper.hitPos.x; + effectPos.y = this->collider.elements[0].info.bumper.hitPos.y; + effectPos.z = this->collider.elements[0].info.bumper.hitPos.z; + if ((this->unk_1E0 == 0.25f) && (this->unk_1D4 == 0xFF)) { + switch (this->actor.colChkInfo.damageEffect) { + case 0xE: + sp3F = 1; + case 0xF: + Actor_ApplyDamage(&this->actor); + func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50); + break; + case 1: + Actor_ApplyDamage(&this->actor); + func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50); + break; + case 2: + this->unk_1CA = 4; + Actor_ApplyDamage(&this->actor); + func_8003426C(&this->actor, 0x4000, 0xFF, 0x2000, 0x50); + break; + } + } + this->stoneTimer = 0; + if (this->actor.colChkInfo.health == 0) { + this->actor.shape.shadowAlpha = 0; + this->actor.flags &= ~1; + this->unk_1D0 = sp3F; + func_80032C7C(globalCtx, &this->actor); + return 1; + } + EffectSsHitMark_SpawnFixedScale(globalCtx, 0, &effectPos); + return 0; + } + } + return 0; +} + +void func_80ABD3B8(EnNy* this, f32 arg1, f32 arg2) { + if (this->unk_1E8 == 0.0f) { + this->actor.gravity = -0.4f; + } else if (!(arg1 < this->actor.yDistToWater)) { + this->actor.gravity = -0.4f; + } else if (arg2 < this->actor.yDistToWater) { + this->actor.gravity = 0.0; + if (this->unk_1EC < this->actor.velocity.y) { + this->actor.velocity.y -= 0.4f; + if (this->actor.velocity.y < this->unk_1EC) { + this->actor.velocity.y = this->unk_1EC; + } + } else if (this->actor.velocity.y < this->unk_1EC) { + this->actor.velocity.y += 0.4f; + if (this->unk_1EC < this->actor.velocity.y) { + this->actor.velocity.y = this->unk_1EC; + } + } + } +} + +void EnNy_Update(Actor* thisx, GlobalContext* globalCtx) { + EnNy* this = THIS; + f32 temp_f20; + f32 temp_f22; + s32 i; + + this->timer++; + temp_f20 = this->unk_1E0 - 0.25f; + if (this->unk_1CA != 0) { + this->unk_1CA--; + } + Actor_SetFocus(&this->actor, 0.0f); + Actor_SetScale(&this->actor, 0.01f); + this->collider.elements[0].dim.scale = 1.33f * temp_f20 + 1.0f; + temp_f22 = (24.0f * temp_f20) + 12.0f; + this->actor.shape.rot.x += (s16)(this->unk_1E8 * 1000.0f); + func_80ABD3B8(this, temp_f22 + 10.0f, temp_f22 - 10.0f); + Actor_MoveForward(&this->actor); + Math_StepToF(&this->unk_1E4, this->unk_1E8, 0.1f); + this->actionFunc(this, globalCtx); + this->actor.prevPos.y -= temp_f22; + this->actor.world.pos.y -= temp_f22; + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 7); + this->unk_1F0 = temp_f22; + this->actor.world.pos.y += temp_f22; + if (EnNy_CollisionCheck(this, globalCtx) != 0) { + for (i = 0; i < 8; i++) { + this->unk_1F8[i].x = (Rand_CenteredFloat(20.0f) + this->actor.world.pos.x); + this->unk_1F8[i].y = (Rand_CenteredFloat(20.0f) + this->actor.world.pos.y); + this->unk_1F8[i].z = (Rand_CenteredFloat(20.0f) + this->actor.world.pos.z); + } + this->timer = 0; + this->actor.update = EnNy_UpdateDeath; + this->actor.draw = EnNy_DrawDeathEffect; + this->actionFunc = EnNy_SetupDie; + return; + } + if (this->unk_1E0 > 0.25f) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void EnNy_SetupDie(EnNy* this, GlobalContext* globalCtx) { + s32 effectScale; + s32 i; + Vec3f effectPos; + Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; + Vec3f effectAccel = { 0.0f, 0.1f, 0.0f }; + + if (this->timer >= 2) { + if (this->actor.yDistToWater > 0.0f) { + for (i = 0; i < 10; i++) { + effectPos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x; + effectPos.y = Rand_CenteredFloat(30.0f) + this->actor.world.pos.y; + effectPos.z = Rand_CenteredFloat(30.0f) + this->actor.world.pos.z; + effectScale = Rand_S16Offset(0x50, 0x64); + EffectSsDtBubble_SpawnColorProfile(globalCtx, &effectPos, &effectVelocity, &effectAccel, effectScale, + 25, 0, 1); + } + for (i = 0; i < 0x14; i++) { + effectPos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x; + effectPos.y = Rand_CenteredFloat(30.0f) + this->actor.world.pos.y; + effectPos.z = Rand_CenteredFloat(30.0f) + this->actor.world.pos.z; + EffectSsBubble_Spawn(globalCtx, &effectPos, 10.0f, 10.0f, 30.0f, 0.25f); + } + } + for (i = 0; i < 8; i++) { + this->unk_1F8[i + 8].x = Rand_CenteredFloat(10.0f); + this->unk_1F8[i + 8].z = Rand_CenteredFloat(10.0f); + this->unk_1F8[i + 8].y = Rand_ZeroFloat(4.0f) + 4.0f; + } + this->timer = 0; + if (this->unk_1D0 == 0) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xA0); + } else { + Item_DropCollectible(globalCtx, &this->actor.world.pos, 8); + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NYU_DEAD); + this->actionFunc = EnNy_Die; + } +} + +void EnNy_Die(EnNy* this, GlobalContext* globalCtx) { + s32 i; + + if (this->actor.yDistToWater > 0.0f) { + for (i = 0; i < 8; i += 1) { + this->unk_1F8[i].x += this->unk_1F8[i + 8].x; + this->unk_1F8[i].y += this->unk_1F8[i + 8].y; + this->unk_1F8[i].z += this->unk_1F8[i + 8].z; + Math_StepToF(&this->unk_1F8[i + 8].x, 0.0f, 0.1f); + Math_StepToF(&this->unk_1F8[i + 8].y, -1.0f, 0.4f); + Math_StepToF(&this->unk_1F8[i + 8].z, 0.0f, 0.1f); + } + if (this->timer >= 0x1F) { + Actor_Kill(&this->actor); + return; + } + } else { + for (i = 0; i < 8; i += 1) { + this->unk_1F8[i].x += this->unk_1F8[i + 8].x; + this->unk_1F8[i].y += this->unk_1F8[i + 8].y; + this->unk_1F8[i].z += this->unk_1F8[i + 8].z; + Math_StepToF(&this->unk_1F8[i + 8].x, 0.0f, 0.15f); + Math_StepToF(&this->unk_1F8[i + 8].y, -1.0f, 0.6f); + Math_StepToF(&this->unk_1F8[i + 8].z, 0.0f, 0.15f); + } + if (this->timer >= 0x10) { + Actor_Kill(&this->actor); + return; + } + } +} + +void EnNy_UpdateDeath(Actor* thisx, GlobalContext* globalCtx) { + EnNy* this = THIS; + + this->timer++; + if (this->unk_1CA != 0) { + this->unk_1CA--; + } + this->actionFunc(this, globalCtx); +} + +void EnNy_UpdateUnused(Actor* thisx, GlobalContext* globalCtx2) { + EnNy* this = THIS; + GlobalContext* globalCtx = globalCtx2; + f32 sp3C; + f32 temp_f0; + + sp3C = this->unk_1E0 - 0.25f; + this->timer++; + Actor_SetFocus(&this->actor, 0.0f); + Actor_SetScale(&this->actor, 0.01f); + temp_f0 = (24.0f * sp3C) + 12.0f; + this->actor.prevPos.y -= temp_f0; + this->actor.world.pos.y -= temp_f0; + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 7); + this->unk_1F0 = temp_f0; + this->actor.world.pos.y += temp_f0; + + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_MoveForward(&this->actor); + Math_StepToF(&this->unk_1E4, this->unk_1E8, 0.1f); +} +static Vec3f sFireOffsets[] = { + { 5.0f, 0.0f, 0.0f }, + { -5.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 5.0f }, + { 0.0f, 0.0f, -5.0f }, +}; + +void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnNy* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 837); + Collider_UpdateSpheres(0, &this->collider); + func_8002ED80(&this->actor, globalCtx, 1); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 845), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_1D8); + gSPDisplayList(POLY_XLU_DISP++, gEnNyMetalBodyDlist); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_1D4); + gSPDisplayList(POLY_XLU_DISP++, gEnNyRockBodyDlist); + if (this->unk_1E0 > 0.25f) { + Matrix_Scale(this->unk_1E0, this->unk_1E0, this->unk_1E0, MTXMODE_APPLY); + func_8002EBCC(&this->actor, globalCtx, 1); + func_80093D18(globalCtx->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 868), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gEnNySpikeDlist); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 872); + if (this->unk_1CA != 0) { + Vec3f tempVec; + Vec3f* fireOffset; + s16 temp; + temp = this->unk_1CA - 1; + this->actor.colorFilterTimer++; + if (temp == 0) { + fireOffset = &sFireOffsets[temp & 3]; + tempVec.x = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.x + fireOffset->x); + tempVec.y = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.y + fireOffset->y); + tempVec.z = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.z + fireOffset->z); + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &tempVec, 100, 0, 0, -1); + } + } +} + +void EnNy_DrawDeathEffect(Actor* thisx, GlobalContext* globalCtx) { + EnNy* this = THIS; + Vec3f* temp; + f32 scale; + s32 i; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 900); + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, 0x00, 0x00, 0x00, 0xFF); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2); + gDPPipeSync(POLY_OPA_DISP++); + for (i = 0; i < 8; i++) { + if (this->timer < (i + 22)) { + temp = &this->unk_1F8[i]; + Matrix_Translate(temp->x, temp->y, temp->z, MTXMODE_NEW); + scale = this->actor.scale.x * 0.4f * (1.0f + (i * 0.04f)); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 912), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gEnNyRockBodyDlist); + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 919); + if (this->unk_1CA != 0) { + Vec3f tempVec; + Vec3f* fireOffset; + s16 fireOffsetIndex; + + fireOffsetIndex = this->unk_1CA - 1; + this->actor.colorFilterTimer++; + if ((fireOffsetIndex & 1) == 0) { + fireOffset = &sFireOffsets[fireOffsetIndex & 3]; + tempVec.x = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.x + fireOffset->x); + tempVec.y = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.y + fireOffset->y); + tempVec.z = Rand_CenteredFloat(5.0f) + (this->actor.world.pos.z + fireOffset->z); + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &tempVec, 100, 0, 0, -1); + } + } +} diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h index db9e3235b3..708c4e817c 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h @@ -6,9 +6,30 @@ struct EnNy; +typedef void (*EnNyActionFunc)(struct EnNy*, GlobalContext*); + typedef struct EnNy { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x16C]; + /* 0x014C */ EnNyActionFunc actionFunc; + /* 0x0150 */ ColliderJntSph collider; + /* 0x0170 */ ColliderJntSphElement elements[1]; + /* 0x01B0 */ char unk_1B0[0x18]; + /* 0x01C8 */ s16 timer; + /* 0x01CA */ s16 unk_1CA; + /* 0x01CC */ s16 hitPlayer; + /* 0x01CE */ u16 unk_1CE; + /* 0x01D0 */ u8 unk_1D0; + /* 0x01D1 */ s8 unk_1D1; + /* 0x01D4 */ s32 unk_1D4; + /* 0x01D8 */ s32 unk_1D8; + /* 0x01DC */ s32 stoneTimer; // Delay for when to attempt to change forms + /* 0x01E0 */ f32 unk_1E0; + /* 0x01E4 */ f32 unk_1E4; // This, unk_1E8, and unk_1EC have to do with movement speed + /* 0x01E8 */ f32 unk_1E8; + /* 0x01EC */ f32 unk_1EC; + /* 0x01F0 */ f32 unk_1F0; + /* 0x01F4 */ f32 unk_1F4; + /* 0x01F8 */ Vec3f unk_1F8[16]; } EnNy; // size = 0x02B8 extern const ActorInit En_Ny_InitVars; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 3f6958bbc4..930a9c9b18 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -1,4 +1,5 @@ #include "z_en_sa.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000019 @@ -9,16 +10,12 @@ void EnSa_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnSa_Update(Actor* thisx, GlobalContext* globalCtx); void EnSa_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_02005730; -extern UNK_TYPE D_02010E20; -extern UNK_TYPE D_06001D50; -extern UNK_TYPE D_06007B80; -extern UNK_TYPE D_0600B1A0; -extern UNK_TYPE D_0600BAEC; -extern UNK_TYPE D_0600C500; -extern UNK_TYPE D_06012100; +void func_80AF6448(EnSa* this, GlobalContext* globalCtx); +void func_80AF67D0(EnSa* this, GlobalContext* globalCtx); +void func_80AF683C(EnSa* this, GlobalContext* globalCtx); +void func_80AF68E4(EnSa* this, GlobalContext* globalCtx); +void func_80AF6B20(EnSa* this, GlobalContext* globalCtx); -/* const ActorInit En_Sa_InitVars = { ACTOR_EN_SA, ACTORCAT_NPC, @@ -31,7 +28,7 @@ const ActorInit En_Sa_InitVars = { (ActorFunc)EnSa_Draw, }; -static ColliderCylinderInit D_80AF7260 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -50,67 +47,714 @@ static ColliderCylinderInit D_80AF7260 = { }, { 20, 46, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5560.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s") +static CollisionCheckInfoInit2 sColChkInfoInit = { + 0, 0, 0, 0, MASS_IMMOVABLE, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF56F4.s") +static struct_D_80AA1678 sAnimationInfo[] = { + { 0x060021D8, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x0600E908, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x0600F1D4, 1.0f, ANIMMODE_LOOP, -10.0f }, { 0x0600EBB0, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x060021D8, 1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06010C44, 1.0f, ANIMMODE_LOOP, -10.0f }, + { 0x0600BAEC, 1.0f, ANIMMODE_LOOP, -10.0f }, { 0x0600C500, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x06001D50, 1.0f, ANIMMODE_ONCE, -10.0f }, { 0x0600CFD8, 1.0f, ANIMMODE_ONCE, -10.0f }, + { 0x0600D7E8, 1.0f, ANIMMODE_ONCE, -10.0f }, { 0x0600BAEC, 1.0f, ANIMMODE_LOOP, 0.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF57D8.s") +static struct_80034EC0_Entry sAnimations[] = { + { 0x0601291C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x06011580, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -4.0f }, + { 0x06013008, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x0601186C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { 0x06014470, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x06014850, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, + { 0x06011C38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, { 0x06012100, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f }, + { 0x06015220, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f }, { 0x060021D8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5894.s") +extern CutsceneData D_02005730[]; +extern CutsceneData D_02010E20[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF58B8.s") +extern AnimationHeader D_06001D50; +extern Gfx D_06007B80[]; +extern FlexSkeletonHeader D_0600B1A0; +extern AnimationHeader D_0600BAEC; +extern AnimationHeader D_0600C500; +extern AnimationHeader D_06012100; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF594C.s") +s16 func_80AF5560(EnSa* this, GlobalContext* globalCtx) { + s16 textState = func_8010BDBC(&globalCtx->msgCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF59E0.s") + if (this->unk_209 == 10 || this->unk_209 == 5 || this->unk_209 == 2 || this->unk_209 == 1) { + if (textState != this->unk_209) { + this->unk_208++; + } + } + this->unk_209 = textState; + return textState; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5A74.s") +u16 func_80AF55E0(GlobalContext* globalCtx, Actor* thisx) { + EnSa* this = THIS; + u16 reaction = Text_GetFaceReaction(globalCtx, 0x10); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5B10.s") + if (reaction != 0) { + return reaction; + } + if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { + return 0x10AD; + } + if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) { + this->unk_208 = 0; + this->unk_209 = 0; + if (gSaveContext.infTable[0] & 0x20) { + return 0x1048; + } else { + return 0x1047; + } + } + if (gSaveContext.eventChkInf[0] & 4) { + this->unk_208 = 0; + this->unk_209 = 0; + if (gSaveContext.infTable[0] & 8) { + return 0x1032; + } else { + return 0x1031; + } + } + if (gSaveContext.infTable[0] & 1) { + this->unk_208 = 0; + this->unk_209 = 0; + if (gSaveContext.infTable[0] & 2) { + return 0x1003; + } else { + return 0x1002; + } + } + return 0x1001; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5BA4.s") +s16 func_80AF56F4(GlobalContext* globalCtx, Actor* thisx) { + s16 ret = 1; + EnSa* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5C40.s") + switch (func_80AF5560(this, globalCtx)) { + case 2: + switch (this->actor.textId) { + case 0x1002: + gSaveContext.infTable[0] |= 2; + ret = 0; + break; + case 0x1031: + gSaveContext.eventChkInf[0] |= 8; + gSaveContext.infTable[0] |= 8; + ret = 0; + break; + case 0x1047: + gSaveContext.infTable[0] |= 0x20; + ret = 0; + break; + default: + ret = 0; + break; + } + break; + case 0: + case 1: + case 3: + case 4: + case 5: + case 7: + case 8: + case 9: + break; + } + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CD4.s") +void func_80AF57D8(EnSa* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum != SCENE_SPOT05 || + ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x1555 || this->unk_1E0.unk_00 != 0) { + func_800343CC(globalCtx, &this->actor, &this->unk_1E0.unk_00, this->collider.dim.radius + 30.0f, func_80AF55E0, + func_80AF56F4); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5CE4.s") +f32 func_80AF5894(EnSa* this) { + f32 endFrame = this->skelAnime.endFrame; + f32 startFrame = this->skelAnime.startFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s") + this->skelAnime.startFrame = endFrame; + this->skelAnime.curFrame = endFrame; + this->skelAnime.endFrame = startFrame; + this->skelAnime.playSpeed = -1.0f; + return startFrame; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5DFC.s") +void func_80AF58B8(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 3); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 2); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5F34.s") +void func_80AF594C(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 8); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 9); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF603C.s") +void func_80AF59E0(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 1); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 7); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF609C.s") +void func_80AF5A74(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 1); + func_80AF5894(this); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 9); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6130.s") +void func_80AF5B10(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 6); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 4); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6170.s") +void func_80AF5BA4(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 6); + func_80AF5894(this); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 9); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s") +void func_80AF5C40(EnSa* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 5); + this->unk_20A++; + case 1: + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { + func_80034EC0(&this->skelAnime, sAnimations, 0); + this->unk_20A++; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s") +void func_80AF5CD4(EnSa* this, u8 arg1) { + this->unk_20B = arg1; + this->unk_20A = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s") +void func_80AF5CE4(EnSa* this) { + switch (this->unk_20B) { + case 1: + func_80AF58B8(this); + break; + case 2: + func_80AF594C(this); + break; + case 3: + func_80AF59E0(this); + break; + case 4: + func_80AF5A74(this); + break; + case 5: + func_80AF5B10(this); + break; + case 6: + func_80AF5BA4(this); + break; + case 7: + func_80AF5C40(this); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s") +void func_80AF5D8C(EnSa* this, s32 action) { + Animation_Change(&this->skelAnime, sAnimationInfo[action].animation, 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationInfo[action].animation), sAnimationInfo[action].mode, + sAnimationInfo[action].transitionRate); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF683C.s") +s32 func_80AF5DFC(EnSa* this, GlobalContext* globalCtx) { + if (gSaveContext.cutsceneIndex >= 0xFFF0 && gSaveContext.cutsceneIndex != 0xFFFD) { + if (globalCtx->sceneNum == SCENE_SPOT04) { + return 4; + } + if (globalCtx->sceneNum == SCENE_SPOT05) { + return 5; + } + } + if (globalCtx->sceneNum == SCENE_KOKIRI_HOME5 && LINK_IS_CHILD && + INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY && !(gSaveContext.eventChkInf[4] & 1)) { + return 1; + } + if (globalCtx->sceneNum == SCENE_SPOT05 && (gSaveContext.eventChkInf[4] & 1)) { + return (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) ? 2 : 5; + } + if (globalCtx->sceneNum == SCENE_SPOT04 && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) { + if (gSaveContext.infTable[0] & 1) { + return 1; + } + return 4; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF68E4.s") +void func_80AF5F34(EnSa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 phi_a3 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6B20.s") + if (globalCtx->sceneNum == SCENE_SPOT04) { + phi_a3 = (this->actionFunc == func_80AF68E4) ? 1 : 4; + } + if (globalCtx->sceneNum == SCENE_SPOT05) { + phi_a3 = (this->skelAnime.animation == &D_0600BAEC) ? 1 : 3; + } + if (globalCtx->sceneNum == SCENE_SPOT05 && this->actionFunc == func_80AF6448 && + this->skelAnime.animation == &D_0600C500) { + phi_a3 = 1; + } + if (globalCtx->sceneNum == SCENE_SPOT05 && this->actionFunc == func_80AF68E4 && + this->skelAnime.animation == &D_06001D50) { + phi_a3 = 1; + } + this->unk_1E0.unk_18 = player->actor.world.pos; + this->unk_1E0.unk_14 = 4.0f; + func_80034A14(&this->actor, &this->unk_1E0, 2, phi_a3); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s") +s32 func_80AF603C(EnSa* this) { + if (this->skelAnime.animation != &D_0600BAEC && this->skelAnime.animation != &D_06001D50) { + return 0; + } + if (this->unk_1E0.unk_00 != 0) { + return 0; + } + this->unk_20E = 0; + if (this->unk_212 != 2) { + return 0; + } + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6D6C.s") +void func_80AF609C(EnSa* this) { + s16 phi_v1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6F0C.s") + if (func_80AF603C(this) == 0) { + if (this->unk_20E == 0) { + phi_v1 = 0; + } else { + this->unk_20E--; + phi_v1 = this->unk_20E; + } + if (phi_v1 == 0) { + this->unk_212++; + if (this->unk_212 < 3) { + this->unk_214 = this->unk_212; + } else { + this->unk_20E = Rand_S16Offset(30, 30); + this->unk_214 = 0; + this->unk_212 = this->unk_214; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s") +void func_80AF6130(CsCmdActorAction* csAction, Vec3f* dst) { + dst->x = csAction->startPos.x; + dst->y = csAction->startPos.y; + dst->z = csAction->startPos.z; +} + +void func_80AF6170(CsCmdActorAction* csAction, Vec3f* dst) { + dst->x = csAction->endPos.x; + dst->y = csAction->endPos.y; + dst->z = csAction->endPos.z; +} + +void EnSa_Init(Actor* thisx, GlobalContext* globalCtx) { + EnSa* this = THIS; + s32 pad; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 12.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B1A0, NULL, this->jointTable, this->morphTable, 17); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + + switch (func_80AF5DFC(this, globalCtx)) { + case 2: + func_80AF5D8C(this, 0xB); + this->actionFunc = func_80AF6448; + break; + case 5: + func_80AF5D8C(this, 0xB); + this->actionFunc = func_80AF683C; + break; + case 1: + this->actor.gravity = -1.0f; + func_80AF5D8C(this, 0); + this->actionFunc = func_80AF6448; + break; + case 4: + this->unk_210 = 0; + this->actor.gravity = -1.0f; + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02010E20); + gSaveContext.cutsceneTrigger = 1; + func_80AF5D8C(this, 4); + this->actionFunc = func_80AF68E4; + break; + case 3: + this->unk_210 = 0; + this->actor.gravity = -1.0f; + func_80AF5D8C(this, 0); + this->actionFunc = func_80AF68E4; + break; + case 0: + Actor_Kill(&this->actor); + return; + } + + Actor_SetScale(&this->actor, 0.01f); + + this->actor.targetMode = 6; + this->unk_1E0.unk_00 = 0; + this->alpha = 255; + this->unk_21A = this->actor.shape.rot; + + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, FAIRY_KOKIRI); +} + +void EnSa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnSa* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void func_80AF6448(EnSa* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_SPOT04) { + if (this->unk_1E0.unk_00 != 0) { + switch (this->actor.textId) { + case 0x1002: + if (this->unk_208 == 0 && this->unk_20B != 1) { + func_80AF5CD4(this, 1); + this->unk_216 = 1; + } + if (this->unk_208 == 2 && this->unk_20B != 2) { + func_80AF5CD4(this, 2); + this->unk_216 = 1; + } + if (this->unk_208 == 5) { + this->unk_216 = 0; + } + break; + case 0x1003: + if (this->unk_208 == 0 && this->unk_20B != 4) { + func_80AF5CD4(this, 4); + } + break; + case 0x1031: + if (this->unk_208 == 0 && this->unk_20B != 4 && this->skelAnime.animation == &D_06012100) { + func_80AF5CD4(this, 4); + this->unk_216 = 3; + } + if (this->unk_208 == 2 && this->unk_20B != 5) { + func_80AF5CD4(this, 5); + this->unk_216 = 2; + } + if (this->unk_208 == 4 && this->unk_20B != 6) { + func_80AF5CD4(this, 6); + this->unk_216 = 0; + } + break; + case 0x1032: + if (this->unk_208 == 0 && this->unk_20B != 4 && this->skelAnime.animation == &D_06012100) { + func_80AF5CD4(this, 4); + } + break; + case 0x1047: + if (this->unk_208 == 1 && this->unk_20B != 7) { + func_80AF5CD4(this, 7); + } + break; + case 0x1048: + if (this->unk_208 == 0 && this->unk_20B != 7) { + func_80AF5CD4(this, 7); + } + break; + } + } else if (!CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && + ((gSaveContext.infTable[0] & 2) || (gSaveContext.infTable[0] & 8))) { + if (this->unk_20B != 3) { + func_80AF5CD4(this, 3); + } + } else { + func_80AF5CD4(this, 0); + } + func_80AF5CE4(this); + } + if (this->skelAnime.animation == &D_0600C500) { + this->skelAnime.playSpeed = -1.0f; + if ((s32)this->skelAnime.curFrame == 0) { + func_80AF5D8C(this, 6); + } + } + if (this->unk_1E0.unk_00 != 0 && globalCtx->sceneNum == SCENE_SPOT05) { + Animation_Change(&this->skelAnime, &D_0600C500, 1.0f, 0.0f, 10.0f, ANIMMODE_ONCE, -10.0f); + this->actionFunc = func_80AF67D0; + } +} + +void func_80AF67D0(EnSa* this, GlobalContext* globalCtx) { + if (this->unk_1E0.unk_00 == 0) { + Animation_Change(&this->skelAnime, &D_0600C500, 0.0f, 10.0f, 0.0f, ANIMMODE_ONCE, -10.0f); + this->actionFunc = func_80AF6448; + } +} + +void func_80AF683C(EnSa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (!(player->actor.world.pos.z >= -2220.0f) && !Gameplay_InCsMode(globalCtx)) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02005730); + gSaveContext.cutsceneTrigger = 1; + this->actionFunc = func_80AF68E4; + } +} + +void func_80AF68E4(EnSa* this, GlobalContext* globalCtx) { + s16 phi_v0; + Vec3f startPos; + Vec3f endPos; + Vec3f D_80AF7448 = { 0.0f, 0.0f, 0.0f }; + CsCmdActorAction* csAction; + f32 temp_f0; + f32 gravity; + + if (globalCtx->csCtx.state == 0) { + this->actionFunc = func_80AF6B20; + return; + } + csAction = globalCtx->csCtx.npcActions[1]; + if (csAction != NULL) { + func_80AF6130(csAction, &startPos); + func_80AF6170(csAction, &endPos); + + if (this->unk_210 == 0) { + this->actor.world.pos = startPos; + } + if (this->unk_210 != csAction->action) { + switch (csAction->action) { + case 2: + this->unk_216 = 1; + break; + case 9: + this->unk_216 = 1; + break; + default: + this->unk_216 = 0; + break; + } + func_80AF5D8C(this, csAction->action); + this->unk_210 = csAction->action; + } + if (phi_v0) {} + if (csAction->action == 3) { + if (this->unk_20C == 0) { + phi_v0 = 0; + } else { + this->unk_20C--; + phi_v0 = this->unk_20C; + } + if (phi_v0 == 0) { + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->unk_20C = 8; + } + } + this->actor.shape.rot.x = csAction->urot.x; + this->actor.shape.rot.y = csAction->urot.y; + this->actor.shape.rot.z = csAction->urot.z; + this->actor.velocity = D_80AF7448; + + if (globalCtx->csCtx.frames < csAction->endFrame) { + temp_f0 = csAction->endFrame - csAction->startFrame; + this->actor.velocity.x = (endPos.x - startPos.x) / temp_f0; + this->actor.velocity.y = (endPos.y - startPos.y) / temp_f0; + gravity = this->actor.gravity; + if (globalCtx->sceneNum == SCENE_SPOT05) { + gravity = 0.0f; + } + this->actor.velocity.y += gravity; + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } + this->actor.velocity.z = (endPos.z - startPos.z) / temp_f0; + } + } +} + +void func_80AF6B20(EnSa* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_SPOT05) { + Item_Give(globalCtx, ITEM_SONG_SARIA); + func_80AF5D8C(this, 6); + } + + if (globalCtx->sceneNum == SCENE_SPOT04) { + func_80AF5D8C(this, 4); + this->actor.world.pos = this->actor.home.pos; + this->actor.world.rot = this->unk_21A; + this->unk_216 = 0; + gSaveContext.infTable[0] |= 1; + } + + this->actionFunc = func_80AF6448; +} + +void EnSa_Update(Actor* thisx, GlobalContext* globalCtx) { + EnSa* this = THIS; + s32 pad; + + Collider_UpdateCylinder(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + SkelAnime_Update(&this->skelAnime); + + if (this->skelAnime.animation == &D_06001D50 && this->skelAnime.curFrame >= Animation_GetLastFrame(&D_06001D50)) { + func_80AF5D8C(this, 6); + } + + if (this->actionFunc != func_80AF68E4) { + this->alpha = func_80034DD4(&this->actor, globalCtx, this->alpha, 400.0f); + } else { + this->alpha = 255; + } + + this->actor.shape.shadowAlpha = this->alpha; + + if (this->actionFunc == func_80AF68E4) { + this->actor.world.pos.x += this->actor.velocity.x; + this->actor.world.pos.y += this->actor.velocity.y; + this->actor.world.pos.z += this->actor.velocity.z; + } else { + func_8002D7EC(&this->actor); + } + + if (globalCtx->sceneNum != SCENE_SPOT05) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + } + + func_80AF609C(this); + this->actionFunc(this, globalCtx); + func_80AF57D8(this, globalCtx); + func_80AF5F34(this, globalCtx); +} + +s32 EnSa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, + Gfx** gfx) { + EnSa* this = THIS; + s32 pad; + Vec3s sp18; + + if (limbIndex == 16) { + Matrix_Translate(900.0f, 0.0f, 0.0f, MTXMODE_APPLY); + sp18 = this->unk_1E0.unk_08; + Matrix_RotateX(BINANG_TO_RAD(sp18.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD(sp18.x), MTXMODE_APPLY); + Matrix_Translate(-900.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } + + if (limbIndex == 9) { + sp18 = this->unk_1E0.unk_0E; + Matrix_RotateY(BINANG_TO_RAD(sp18.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD(sp18.x), MTXMODE_APPLY); + } + + if (globalCtx->sceneNum == SCENE_SPOT05 && limbIndex == 15) { + *dList = D_06007B80; + } + + return 0; +} + +void EnSa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { + EnSa* this = THIS; + Vec3f D_80AF7454 = { 400.0, 0.0f, 0.0f }; + + if (limbIndex == 16) { + Matrix_MultVec3f(&D_80AF7454, &this->actor.focus.pos); + } +} + +void EnSa_Draw(Actor* thisx, GlobalContext* globalCtx) { + static UNK_PTR D_80AF7460[] = { 0x06003588, 0x06004448, 0x06004648, 0x06004C48, 0x06003348 }; + static UNK_PTR D_80AF7474[] = { 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48 }; + + EnSa* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sa.c", 1444); + + if (this->alpha == 255) { + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AF7474[this->unk_212])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AF7474[this->unk_214])); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_80AF7460[this->unk_216])); + func_80034BA0(globalCtx, &this->skelAnime, EnSa_OverrideLimbDraw, EnSa_PostLimbDraw, &this->actor, this->alpha); + } else if (this->alpha != 0) { + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AF7474[this->unk_212])); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AF7474[this->unk_214])); + gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_80AF7460[this->unk_216])); + func_80034CC4(globalCtx, &this->skelAnime, EnSa_OverrideLimbDraw, EnSa_PostLimbDraw, &this->actor, this->alpha); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sa.c", 1497); +} diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h index 568e3204c4..a11ea87fca 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h @@ -6,9 +6,28 @@ struct EnSa; +typedef void (*EnSaActionFunc)(struct EnSa*, GlobalContext*); + typedef struct EnSa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1A0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnSaActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ struct_80034A14_arg1 unk_1E0; + /* 0x0208 */ u8 unk_208; + /* 0x0209 */ u8 unk_209; + /* 0x020A */ u8 unk_20A; + /* 0x020B */ u8 unk_20B; + /* 0x020C */ s16 unk_20C; + /* 0x020E */ s16 unk_20E; + /* 0x0210 */ s16 unk_210; + /* 0x0212 */ s16 unk_212; + /* 0x0214 */ s16 unk_214; + /* 0x0216 */ s16 unk_216; + /* 0x0218 */ s16 alpha; + /* 0x021A */ Vec3s unk_21A; + /* 0x0220 */ Vec3s jointTable[17]; + /* 0x0286 */ Vec3s morphTable[17]; } EnSa; // size = 0x02EC extern const ActorInit En_Sa_InitVars; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index d864bb2092..03f37a9171 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -123,11 +123,15 @@ extern AnimationHeader D_06005B98; extern AnimationHeader D_060055A8; extern AnimationHeader D_060055A8; -struct_80034EC0_Entry sAnimations[] = { - { &D_06000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f }, { &D_06005B98, 1.0f, 0.0f, -1.0f, 0x03, -8.0f }, - { &D_06000304, 4.0f, 0.0f, -1.0f, 0x03, -8.0f }, { &D_06000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, - { &D_060055A8, 1.0f, 0.0f, -1.0f, 0x03, -8.0f }, { &D_06000304, 8.0f, 0.0f, -1.0f, 0x01, -8.0f }, - { &D_06000304, 6.0f, 0.0f, -1.0f, 0x01, -8.0f }, { &D_06005B98, 2.0f, 0.0f, -1.0f, 0x01, -8.0f }, +static struct_80034EC0_Entry sAnimations[] = { + { &D_06000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, 0.0f }, + { &D_06005B98, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &D_06000304, 4.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &D_06000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &D_060055A8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &D_06000304, 8.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &D_06000304, 6.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &D_06005B98, 2.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, }; void EnSt_SetupAction(EnSt* this, EnStActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 8a1497bd75..a39ac40793 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -15,15 +15,15 @@ void EnTr_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTr_Update(Actor* thisx, GlobalContext* globalCtx); void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060013CC; -extern UNK_TYPE D_06001CDC; -extern UNK_TYPE D_060035CC; -extern UNK_TYPE D_06003FC8; -extern UNK_TYPE D_060049C8; -extern UNK_TYPE D_0600C530; -extern UNK_TYPE D_06011688; +void EnTr_DoNothing(EnTr* this, GlobalContext* globalCtx); +void EnTr_ShrinkVanish(EnTr* this, GlobalContext* globalCtx); +void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx); +void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx); + +void EnTr_UpdateRotation(EnTr* this, GlobalContext* globalCtx, s32 actionIndex); +void func_80B24038(EnTr* this, GlobalContext* globalCtx, s32 actionIndex); +void EnTr_SetStartPosRot(EnTr* this, GlobalContext* globalCtx, s32 actionIndex); -/* const ActorInit En_Tr_InitVars = { ACTOR_EN_TR, ACTORCAT_NPC, @@ -35,45 +35,522 @@ const ActorInit En_Tr_InitVars = { (ActorFunc)EnTr_Update, (ActorFunc)EnTr_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s") +// The first elements of these animation arrays are for Koume, the second for Kotake -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s") +static AnimationHeader* unused[] = { + 0x06003FC8, + 0x06001CDC, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s") +static AnimationHeader* D_80B24368[] = { + 0x06002BC4, // Turn to look over right shoulder + 0x06000BFC, // Turn to look over right shoulder +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s") +static AnimationHeader* D_80B24370[] = { + 0x060035CC, // Looking over left shoulder + 0x060013CC, // Looking over right shoulder +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s") +static AnimationHeader* D_80B24378[] = { + 0x060049C8, // Floating on broom + 0x060049C8, // Floating on broom +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s") +static AnimationHeader* D_80B24380[] = { + 0x06012E1C, // Casting magic + 0x06012E1C, // Casting magic +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s") +static f32 D_80B24388[] = { 0.0f, 20.0f, -30.0f, 20.0f, -20.0f, -20.0f, 30.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s") +static f32 D_80B243A4[] = { 0.0f, 30.0f, 0.0f, -30.0f, 30.0f, -30.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s") +// Has to be 1-dimensional to match +static Color_RGBA8 D_80B243C0[4] = { + { 255, 200, 0, 255 }, + { 255, 0, 0, 255 }, + { 255, 255, 255, 255 }, + { 0, 0, 255, 255 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s") +static u64* sEyeTextures[] = { + 0x060086D8, // Open + 0x060094D8, // Half + 0x060098D8, // Closed +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s") +extern AnimationHeader D_060013CC; // Looking over right shoulder +extern AnimationHeader D_06001CDC; // Standing, broom in left hand +extern AnimationHeader D_060035CC; // Looking over left shoulder +extern AnimationHeader D_06003FC8; // Standing, broom over right shoulder +extern AnimationHeader D_060049C8; // Floating on broom +extern FlexSkeletonHeader D_0600C530; +extern FlexSkeletonHeader D_06011688; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s") +void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s") +void EnTr_Init(Actor* thisx, GlobalContext* globalCtx) { + EnTr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + EnTr_SetupAction(this, EnTr_DoNothing); + this->unk_2D4 = 0; // Set and not used + this->actor.child = NULL; + Actor_SetScale(&this->actor, 0.01f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s") + switch (this->actor.params) { + case TR_KOUME: + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011688, &D_06003FC8, this->jointTable, + this->morphTable, 27); + Animation_PlayOnce(&this->skelAnime, &D_06003FC8); + this->animation = NULL; + EnTr_SetupAction(this, EnTr_ChooseAction1); + this->actionIndex = 3; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s") + case TR_KOTAKE: + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C530, &D_06001CDC, this->jointTable, + this->morphTable, 27); + Animation_PlayOnce(&this->skelAnime, &D_06001CDC); + this->animation = NULL; + EnTr_SetupAction(this, EnTr_ChooseAction1); + this->actionIndex = 2; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s") + default: + __assert("0", "../z_en_tr.c", 277); + break; + } +} +void EnTr_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} + +void EnTr_CrySpellcast(EnTr* this, GlobalContext* globalCtx) { + if (this->timer == 11) { + // Both cry in the title screen cutscene, but only Kotake in the in-game cutscene + if ((this->actor.params != TR_KOUME) || (gSaveContext.sceneSetupIndex == 6)) { + Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + + if (this->timer > 0) { + this->timer--; + } else if (this->actor.child != NULL) { + this->actor.child = NULL; + } + func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); +} + +void EnTr_DoNothing(EnTr* this, GlobalContext* globalCtx) { +} + +void EnTr_ChooseAction2(EnTr* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + if (globalCtx->csCtx.npcActions[this->actionIndex] != NULL) { + switch (globalCtx->csCtx.npcActions[this->actionIndex]->action) { + + case 4: + Actor_SetScale(&this->actor, 0.01f); + EnTr_SetupAction(this, EnTr_ShrinkVanish); + this->timer = 24; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD2); + break; + + case 6: + Animation_Change(&this->skelAnime, D_80B24380[this->actor.params], 1.0f, 0.0f, + Animation_GetLastFrame(D_80B24380[this->actor.params]), ANIMMODE_ONCE, -5.0f); + EnTr_SetupAction(this, EnTr_CrySpellcast); + this->animation = D_80B24378[this->actor.params]; + this->timer = 39; + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, + this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, + 0, this->actor.params + 9); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_MASIC1); + break; + + default: + func_80B24038(this, globalCtx, this->actionIndex); + EnTr_UpdateRotation(this, globalCtx, this->actionIndex); + break; + } + func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + } + } +} + +void EnTr_FlyKidnapCutscene(EnTr* this, GlobalContext* globalCtx) { + Vec3f originalPos; + s16 actionIndex; + + originalPos = this->actor.world.pos; + if (globalCtx->csCtx.state != 0) { + actionIndex = this->actionIndex; + + if (globalCtx->csCtx.npcActions[actionIndex] != NULL) { + if (globalCtx->csCtx.npcActions[actionIndex]->action == 8) { + func_80B24038(this, globalCtx, actionIndex); + this->actor.world.rot.y = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 10, 0x400, 0x100); + this->actor.world.rot.y = this->actor.shape.rot.y; + } else { + EnTr_SetStartPosRot(this, globalCtx, actionIndex); + this->actor.world.pos.x += Math_SinS(this->timer) * 150.0f; + this->actor.world.pos.y += -100.0f; + this->actor.world.pos.z += Math_CosS(this->timer) * 150.0f; + + this->actor.shape.rot.y = (s16)(this->timer) + 0x4000; + this->timer += 0x400; + + this->actor.velocity.x = this->actor.world.pos.x - originalPos.x; + this->actor.velocity.y = this->actor.world.pos.y - originalPos.y; + this->actor.velocity.z = this->actor.world.pos.z - originalPos.z; + } + + if (globalCtx->csCtx.frames < 670) { + func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + } + } + } +} + +void func_80B23254(EnTr* this, GlobalContext* globalCtx, s32 arg2, f32 arg3, f32 scale) { + Vec3f pos; + Vec3f velocity; + Vec3f accel; + Vec3f sp58; + Color_RGBA8* primColor; + Color_RGBA8* envColor; + Vec3f cameraEye; + s16 yaw; + s16 reversePitch; + f32 sp3C; + + cameraEye = ACTIVE_CAM->eye; + yaw = Math_Vec3f_Yaw(&cameraEye, &this->actor.world.pos); + reversePitch = -Math_Vec3f_Pitch(&cameraEye, &this->actor.world.pos); + accel.z = 0.0f; + accel.x = 0.0f; + sp3C = Math_SinS(yaw); + velocity.x = Math_CosS(reversePitch) * (arg3 * sp3C); + velocity.y = Math_SinS(reversePitch) * arg3; + sp3C = Math_CosS(yaw); + velocity.z = Math_CosS(reversePitch) * (arg3 * sp3C); + accel.y = 0.5f; + + primColor = &D_80B243C0[2 * this->actor.params]; + envColor = &D_80B243C0[2 * this->actor.params + 1]; + + sp58 = this->actor.world.pos; + sp58.x -= velocity.x * 10.0f; + sp58.y -= velocity.y * 10.0f; + sp58.z -= velocity.z * 10.0f; + + pos.x = sp58.x + ((D_80B24388[arg2] * scale) * Math_CosS(yaw)); + pos.y = sp58.y + (D_80B243A4[arg2] * scale); + pos.z = sp58.z - ((D_80B24388[arg2] * scale) * Math_SinS(yaw)); + func_8002829C(globalCtx, &pos, &velocity, &accel, primColor, envColor, (s32)(800.0f * scale), (s32)(80.0f * scale)); +} + +void EnTr_ShrinkVanish(EnTr* this, GlobalContext* globalCtx) { + s32 temp_hi; + + if (this->timer >= 17) { + this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68; + } else { + if (this->timer >= 5) { + Actor_SetScale(&this->actor, this->actor.scale.x * 0.9f); + this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68; + } else if (this->timer > 0) { + temp_hi = (this->timer * 2) % 7; + func_80B23254(this, globalCtx, temp_hi, 5.0f, 0.2f); + func_80B23254(this, globalCtx, (temp_hi + 1) % 7, 5.0f, 0.2f); + Actor_SetScale(&this->actor, this->actor.scale.x * 0.9f); + this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68; + } else { + EnTr_SetupAction(this, EnTr_WaitToReappear); + this->actor.draw = NULL; + } + } + + if (this->timer == 4) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_BUBLE_DOWN); + } + + if (this->timer > 0) { + this->timer--; + } +} + +void EnTr_Reappear(EnTr* this, GlobalContext* globalCtx) { + s32 temp_hi; + + if (this->timer >= 31) { + temp_hi = (this->timer * 2) % 7; + + func_80B23254(this, globalCtx, temp_hi, 5.0f, 1.0f); + func_80B23254(this, globalCtx, (temp_hi + 1) % 7, 5.0f, 1.0f); + } else if (this->timer == 30) { + this->actor.draw = EnTr_Draw; + this->actor.shape.rot.y += this->timer * 0x1A6; + } else if (this->timer > 0) { + this->actor.shape.rot.y += this->timer * 0x1A6; + Actor_SetScale(&this->actor, (this->actor.scale.x * 0.8f) + 0.002f); + } else { + EnTr_SetupAction(this, EnTr_ChooseAction2); + Actor_SetScale(&this->actor, 0.01f); + } + + if (this->timer > 0) { + this->timer--; + } + func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); +} + +void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) && + ((globalCtx->csCtx.npcActions[this->actionIndex]->action == 3) || + (globalCtx->csCtx.npcActions[this->actionIndex]->action == 5))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM); + this->timer = 34; + EnTr_SetStartPosRot(this, globalCtx, this->actionIndex); + EnTr_SetupAction(this, EnTr_Reappear); + Animation_PlayLoop(&this->skelAnime, &D_060049C8); + this->animation = NULL; + Actor_SetScale(&this->actor, 0.003f); + } + } +} + +void EnTr_TakeOff(EnTr* this, GlobalContext* globalCtx) { + f32 lastFrame = Animation_GetLastFrame(D_80B24378[this->actor.params]); + + if (globalCtx->csCtx.state != 0) { + if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) && + (globalCtx->csCtx.npcActions[this->actionIndex]->action == 3)) { + Animation_Change(&this->skelAnime, D_80B24378[this->actor.params], 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, + -10.0f); + this->animation = NULL; + EnTr_SetupAction(this, EnTr_ChooseAction2); + } + } +} + +void EnTr_TurnLookOverShoulder(EnTr* this, GlobalContext* globalCtx) { + f32 lastFrame = Animation_GetLastFrame(D_80B24368[this->actor.params]); + + if (globalCtx->csCtx.state != 0) { + if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) && + (globalCtx->csCtx.npcActions[this->actionIndex]->action == 2)) { + Animation_Change(&this->skelAnime, D_80B24368[this->actor.params], 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, + -4.0f); + this->animation = D_80B24370[this->actor.params]; + EnTr_SetupAction(this, EnTr_TakeOff); + } + } +} + +void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) { + u32 frames = globalCtx->gameplayFrames; + + if (globalCtx->csCtx.state != 0) { + if (globalCtx->csCtx.npcActions[this->actionIndex] != NULL) { + switch (globalCtx->csCtx.npcActions[this->actionIndex]->action) { + case 1: + EnTr_SetStartPosRot(this, globalCtx, this->actionIndex); + EnTr_SetupAction(this, EnTr_TurnLookOverShoulder); + break; + + case 3: + EnTr_SetStartPosRot(this, globalCtx, this->actionIndex); + EnTr_SetupAction(this, EnTr_ChooseAction2); + Animation_PlayLoop(&this->skelAnime, &D_060049C8); + this->animation = NULL; + break; + + case 4: + EnTr_SetupAction(this, EnTr_WaitToReappear); + this->actor.draw = NULL; + break; + + case 7: + EnTr_SetupAction(this, EnTr_FlyKidnapCutscene); + Animation_PlayLoop(&this->skelAnime, &D_060049C8); + this->animation = NULL; + this->timer = ((this->actor.params != TR_KOUME) ? ((u8)frames << 10) + 0x8000 : (u8)frames << 10); + break; + } + } + } +} + +void EnTr_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnTr* this = THIS; + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 5); + this->actionFunc(this, globalCtx); + + if (SkelAnime_Update(&this->skelAnime) != 0) { + if (this->animation != NULL) { + if ((this->animation == &D_060035CC) || (this->animation == &D_060013CC)) { + if (this->actor.params != TR_KOUME) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH); + } + Animation_PlayLoop(&this->skelAnime, this->animation); + } else if (this->animation == &D_060049C8) { + EnTr_SetupAction(this, EnTr_ChooseAction2); + Animation_Change(&this->skelAnime, &D_060049C8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060049C8), + ANIMMODE_LOOP, -5.0f); + } else { + Animation_PlayLoop(&this->skelAnime, this->animation); + } + this->animation = NULL; + } else { + this->skelAnime.curFrame = 0.0f; + } + } + Actor_SetFocus(&this->actor, 0.0f); + + if (DECR(this->blinkTimer) == 0) { + this->blinkTimer = Rand_S16Offset(60, 60); + } + this->eyeIndex = this->blinkTimer; + if (this->eyeIndex >= 3) { + this->eyeIndex = 0; + } +} + +s32 EnTr_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + Vec3f src = { 2300.0f, 0.0f, -600.0f }; + Vec3f dest = { 0.0f, 0.0f, 0.0f }; + EnTr* this = THIS; + Actor* child = this->actor.child; + + if ((child != NULL) && (limbIndex == 19)) { + Matrix_MultVec3f(&src, &dest); + dest.x -= (10.0f * Math_SinS(Camera_GetCamDirYaw(globalCtx->cameraPtrs[globalCtx->activeCamera]))); + dest.z -= (10.0f * Math_CosS(Camera_GetCamDirYaw(globalCtx->cameraPtrs[globalCtx->activeCamera]))); + child->world.pos = dest; + } + return 0; +} + +void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnTr* this = THIS; + + if (1) {} + + if ((globalCtx->csCtx.state == 0) || (globalCtx->csCtx.npcActions[this->actionIndex] == 0)) { + this->actor.shape.shadowDraw = NULL; + return; + } + + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tr.c", 840); + func_800943C8(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex])); + func_8002EBCC(&this->actor, globalCtx, 0); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnTr_OverrideLimbDraw, NULL, this); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tr.c", 854); +} + +f32 func_80B23FDC(GlobalContext* globalCtx, s32 actionIndex) { + f32 phi_f2; + + phi_f2 = func_8006F93C(globalCtx->csCtx.npcActions[actionIndex]->endFrame, + globalCtx->csCtx.npcActions[actionIndex]->startFrame, globalCtx->csCtx.frames); + phi_f2 = CLAMP_MAX(phi_f2, 1.0f); + return phi_f2; +} + +#ifdef NON_MATCHING +// Major ordering issues, not making the three 0.1fs separate rodata, etc. +void func_80B24038(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) { + Vec3f startPos; + Vec3f endPos; + Vec3f goalVel; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f2_2; + f32 phi_f12; + + startPos.x = globalCtx->csCtx.npcActions[actionIndex]->startPos.x; + startPos.y = globalCtx->csCtx.npcActions[actionIndex]->startPos.y; + startPos.z = globalCtx->csCtx.npcActions[actionIndex]->startPos.z; + + endPos.x = globalCtx->csCtx.npcActions[actionIndex]->endPos.x; + endPos.y = globalCtx->csCtx.npcActions[actionIndex]->endPos.y; + endPos.z = globalCtx->csCtx.npcActions[actionIndex]->endPos.z; + + temp_f0 = func_80B23FDC(globalCtx, actionIndex); + + goalVel.x = ((((endPos.x - startPos.x) * temp_f0) + startPos.x) - this->actor.world.pos.x) * 0.1f; + goalVel.y = ((((endPos.y - startPos.y) * temp_f0) + startPos.y) - this->actor.world.pos.y) * 0.1f; + goalVel.z = ((((endPos.z - startPos.z) * temp_f0) + startPos.z) - this->actor.world.pos.z) * 0.1f; + + temp_f0_2 = sqrtf(SQ(goalVel.x) + SQ(goalVel.y) + SQ(goalVel.z)); + phi_f12 = CLAMP(temp_f0_2, 0.0f, 20.0f); + + if ((temp_f0_2 != phi_f12) && (temp_f0_2 != 0.0f)) { + temp_f2_2 = phi_f12 / temp_f0_2; + + goalVel.x *= temp_f2_2; + goalVel.y *= temp_f2_2; + goalVel.z *= temp_f2_2; + } + + Math_StepToF(&this->actor.velocity.x, goalVel.x, 1.0f); + Math_StepToF(&this->actor.velocity.y, goalVel.y, 1.0f); + Math_StepToF(&this->actor.velocity.z, goalVel.z, 1.0f); + func_8002D7EC(&this->actor); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s") +void EnTr_UpdateRotation(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) { + s16 rotY; + s32 rotDiff; + s32 rotSign; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s") + rotY = globalCtx->csCtx.npcActions[actionIndex]->rot.y; + rotDiff = this->actor.world.rot.y - rotY; + + if (rotDiff < 0) { + rotDiff = 0 - rotDiff; + rotSign = 1; + } else { + rotSign = -1; + } + + if (rotDiff >= 0x8000) { + rotSign = 0 - rotSign; + rotDiff = 0x10000 - rotDiff; + } + + rotDiff *= 0.1f; + + this->actor.world.rot.y += rotDiff * rotSign; + this->actor.shape.rot.y = this->actor.world.rot.y; +} + +void EnTr_SetStartPosRot(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) { + Vec3f startPos; + + startPos.x = globalCtx->csCtx.npcActions[actionIndex]->startPos.x; + startPos.y = globalCtx->csCtx.npcActions[actionIndex]->startPos.y; + startPos.z = globalCtx->csCtx.npcActions[actionIndex]->startPos.z; + this->actor.world.pos = startPos; + this->actor.world.rot.y = this->actor.shape.rot.y = globalCtx->csCtx.npcActions[actionIndex]->rot.y; +} diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h index 1fed972c75..8ef0d8a70d 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h @@ -6,11 +6,27 @@ struct EnTr; +typedef void (*EnTrActionFunc)(struct EnTr*, GlobalContext*); + typedef struct EnTr { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x19C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[27]; + /* 0x0232 */ Vec3s morphTable[27]; + /* 0x02D4 */ s16 unk_2D4; + /* 0x02D6 */ u16 timer; // Also used as an angle + /* 0x02D8 */ s16 actionIndex; + /* 0x02DC */ EnTrActionFunc actionFunc; + /* 0x02E0 */ s16 eyeIndex; + /* 0x02E2 */ s16 blinkTimer; + /* 0x02E4 */ AnimationHeader* animation; } EnTr; // size = 0x02E8 extern const ActorInit En_Tr_InitVars; +typedef enum { + /* 0 */ TR_KOUME, + /* 1 */ TR_KOTAKE +} TwinrovaType; + #endif diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index c425bc1561..f20426a09e 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -326,10 +326,10 @@ const ActorInit En_Zo_InitVars = { }; static struct_80034EC0_Entry sAnimations[] = { - { &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, -8.0f }, { &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, 0.0f }, - { &D_06002F10, 0.0f, 1.0f, 1.0f, 2, 0.0f }, { &D_06002F10, 1.0f, 1.0f, -1.0f, 0, -8.0f }, - { &D_06002F10, 1.0f, 8.0f, -1.0f, 0, -8.0f }, { &D_0600219C, 1.0f, 0.0f, -1.0f, 0, -8.0f }, - { &D_06000598, 1.0f, 0.0f, -1.0f, 0, -8.0f }, { &D_06000D48, 1.0f, 0.0f, -1.0f, 0, -8.0f }, + { &D_06002FE8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &D_06002FE8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &D_06002F10, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f }, { &D_06002F10, 1.0f, 1.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &D_06002F10, 1.0f, 8.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &D_0600219C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, + { &D_06000598, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &D_06000D48, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, }; void EnZo_SpawnSplashes(EnZo* this) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 1e0091d561..36ab6e2c70 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -7378,7 +7378,7 @@ s32 func_80842AC4(GlobalContext* globalCtx, Player* this) { s32 func_80842B7C(GlobalContext* globalCtx, Player* this) { if (this->heldItemActionParam == PLAYER_AP_SWORD_BGS) { - if ((gSaveContext.bgsFlag == 0) && (gSaveContext.swordHealth > 0.0f)) { + if (!gSaveContext.bgsFlag && (gSaveContext.swordHealth > 0.0f)) { if ((gSaveContext.swordHealth -= 1.0f) <= 0.0f) { EffectSsStick_Spawn(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); func_800849EC(globalCtx); diff --git a/tools/overlayhelpers/damage_table.py b/tools/overlayhelpers/damage_table.py old mode 100644 new mode 100755 diff --git a/undefined_syms.txt b/undefined_syms.txt index f12e44240d..57379e23c0 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2241,12 +2241,27 @@ D_06010590 = 0x06010590; // z_en_go2 D_06000750 = 0x06000750; D_06000D5C = 0x06000D5C; +D_0600161C = 0x0600161C; +D_06001A00 = 0x06001A00; +D_060021D0 = 0x060021D0; +D_060029A8 = 0x060029A8; +D_06002D80 = 0x06002D80; +D_06003768 = 0x06003768; +D_060038E4 = 0x060038E4; D_06004930 = 0x06004930; D_0600BD80 = 0x0600BD80; D_0600C140 = 0x0600C140; +D_0600CE80 = 0x0600CE80; +D_0600D280 = 0x0600D280; +D_0600D680 = 0x0600D680; +D_0600DA80 = 0x0600DA80; +D_0600DE80 = 0x0600DE80; +D_0600E680 = 0x0600E680; D_0600FD40 = 0x0600FD40; D_0600FD50 = 0x0600FD50; D_0600FEF0 = 0x0600FEF0; +D_06010590 = 0x06010590; + // z_en_goma D_05000530 = 0x05000530; @@ -2337,10 +2352,12 @@ D_06005E18 = 0x06005E18; D_060003F4 = 0x060003F4; D_06004F70 = 0x06004F70; -// z_en_ny -D_06001DD0 = 0x06001DD0; -D_06001EA8 = 0x06001EA8; -D_06001FC8 = 0x06001FC8; +// z_en_m_thunder +D_04012570 = 0x04012570; +D_04012690 = 0x04012690; +D_04012AF0 = 0x04012AF0; +D_04012C10 = 0x04012C10; +D_04013610 = 0x04013610; // z_en_ossan D_060000F0 = 0x060000F0;