diff --git a/Dockerfile b/Dockerfile index 56a5fa12ed..8d979fc8fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get update && \ unzip \ clang-tidy \ clang-format \ - nano + nano \ + vbindiff RUN wget \ https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \ @@ -24,5 +25,7 @@ RUN wget \ RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein RUN python3 -m pip install --upgrade attrs pycparser +ENV LANG C.UTF-8 + RUN mkdir /oot WORKDIR /oot diff --git a/Makefile b/Makefile index c9dc9adb77..4a8074fd1f 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,6 @@ build/asm/%.o: asm/%.s build/data/%.o: data/%.s iconv --from UTF-8 --to EUC-JP $^ | $(AS) $(ASFLAGS) -o $@ - #build/assets/%.o: assets/%.s # $(AS) $(ASFLAGS) $^ -o $@ # $(OBJCOPY) -O binary $@ $@.bin diff --git a/asm/code_80100040.s b/asm/code_80100040.s deleted file mode 100644 index f3c6df2215..0000000000 --- a/asm/code_80100040.s +++ /dev/null @@ -1,131 +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 osPfsFreeBlocks -/* B771E0 80100040 27BDFEB0 */ addiu $sp, $sp, -0x150 -/* B771E4 80100044 AFBF002C */ sw $ra, 0x2c($sp) -/* B771E8 80100048 AFB50028 */ sw $s5, 0x28($sp) -/* B771EC 8010004C AFB40024 */ sw $s4, 0x24($sp) -/* B771F0 80100050 AFB30020 */ sw $s3, 0x20($sp) -/* B771F4 80100054 AFB2001C */ sw $s2, 0x1c($sp) -/* B771F8 80100058 AFB10018 */ sw $s1, 0x18($sp) -/* B771FC 8010005C AFB00014 */ sw $s0, 0x14($sp) -/* B77200 80100060 AFA50154 */ sw $a1, 0x154($sp) -/* B77204 80100064 8C8E0000 */ lw $t6, ($a0) -/* B77208 80100068 0080A025 */ move $s4, $a0 -/* B7720C 8010006C 00008025 */ move $s0, $zero -/* B77210 80100070 31CF0001 */ andi $t7, $t6, 1 -/* B77214 80100074 15E00003 */ bnez $t7, .L80100084 -/* B77218 80100078 00000000 */ nop -/* B7721C 8010007C 1000004D */ b .L801001B4 -/* B77220 80100080 24020005 */ li $v0, 5 -.L80100084: -/* B77224 80100084 0C040AFC */ jal func_80102BF0 -/* B77228 80100088 02802025 */ move $a0, $s4 -/* B7722C 8010008C 50400004 */ beql $v0, $zero, .L801000A0 -/* B77230 80100090 92980064 */ lbu $t8, 0x64($s4) -/* B77234 80100094 10000048 */ b .L801001B8 -/* B77238 80100098 8FBF002C */ lw $ra, 0x2c($sp) -/* B7723C 8010009C 92980064 */ lbu $t8, 0x64($s4) -.L801000A0: -/* B77240 801000A0 00009825 */ move $s3, $zero -/* B77244 801000A4 24150080 */ li $s5, 128 -/* B77248 801000A8 1B00003E */ blez $t8, .L801001A4 -/* B7724C 801000AC 27B20148 */ addiu $s2, $sp, 0x148 -/* B77250 801000B0 24110003 */ li $s1, 3 -.L801000B4: -/* B77254 801000B4 02802025 */ move $a0, $s4 -/* B77258 801000B8 27A50048 */ addiu $a1, $sp, 0x48 -/* B7725C 801000BC 00003025 */ move $a2, $zero -/* B77260 801000C0 0C040B31 */ jal func_80102CC4 -/* B77264 801000C4 326700FF */ andi $a3, $s3, 0xff -/* B77268 801000C8 10400003 */ beqz $v0, .L801000D8 -/* B7726C 801000CC 00000000 */ nop -/* B77270 801000D0 10000039 */ b .L801001B8 -/* B77274 801000D4 8FBF002C */ lw $ra, 0x2c($sp) -.L801000D8: -/* B77278 801000D8 5A600004 */ blezl $s3, .L801000EC -/* B7727C 801000DC 8E850060 */ lw $a1, 0x60($s4) -/* B77280 801000E0 10000002 */ b .L801000EC -/* B77284 801000E4 24050001 */ li $a1, 1 -/* B77288 801000E8 8E850060 */ lw $a1, 0x60($s4) -.L801000EC: -/* B7728C 801000EC 28A10080 */ slti $at, $a1, 0x80 -/* B77290 801000F0 10200026 */ beqz $at, .L8010018C -/* B77294 801000F4 00A01825 */ move $v1, $a1 -/* B77298 801000F8 02A53023 */ subu $a2, $s5, $a1 -/* B7729C 801000FC 30D90003 */ andi $t9, $a2, 3 -/* B772A0 80100100 1320000C */ beqz $t9, .L80100134 -/* B772A4 80100104 03252021 */ addu $a0, $t9, $a1 -/* B772A8 80100108 00054040 */ sll $t0, $a1, 1 -/* B772AC 8010010C 27A90048 */ addiu $t1, $sp, 0x48 -/* B772B0 80100110 01091021 */ addu $v0, $t0, $t1 -.L80100114: -/* B772B4 80100114 944A0000 */ lhu $t2, ($v0) -/* B772B8 80100118 24630001 */ addiu $v1, $v1, 1 -/* B772BC 8010011C 162A0002 */ bne $s1, $t2, .L80100128 -/* B772C0 80100120 00000000 */ nop -/* B772C4 80100124 26100001 */ addiu $s0, $s0, 1 -.L80100128: -/* B772C8 80100128 1483FFFA */ bne $a0, $v1, .L80100114 -/* B772CC 8010012C 24420002 */ addiu $v0, $v0, 2 -/* B772D0 80100130 10750016 */ beq $v1, $s5, .L8010018C -.L80100134: -/* B772D4 80100134 00035840 */ sll $t3, $v1, 1 -/* B772D8 80100138 27AC0048 */ addiu $t4, $sp, 0x48 -/* B772DC 8010013C 016C1021 */ addu $v0, $t3, $t4 -/* B772E0 80100140 944D0000 */ lhu $t5, ($v0) -.L80100144: -/* B772E4 80100144 562D0003 */ bnel $s1, $t5, .L80100154 -/* B772E8 80100148 944E0002 */ lhu $t6, 2($v0) -/* B772EC 8010014C 26100001 */ addiu $s0, $s0, 1 -/* B772F0 80100150 944E0002 */ lhu $t6, 2($v0) -.L80100154: -/* B772F4 80100154 562E0003 */ bnel $s1, $t6, .L80100164 -/* B772F8 80100158 944F0004 */ lhu $t7, 4($v0) -/* B772FC 8010015C 26100001 */ addiu $s0, $s0, 1 -/* B77300 80100160 944F0004 */ lhu $t7, 4($v0) -.L80100164: -/* B77304 80100164 562F0003 */ bnel $s1, $t7, .L80100174 -/* B77308 80100168 94580006 */ lhu $t8, 6($v0) -/* B7730C 8010016C 26100001 */ addiu $s0, $s0, 1 -/* B77310 80100170 94580006 */ lhu $t8, 6($v0) -.L80100174: -/* B77314 80100174 24420008 */ addiu $v0, $v0, 8 -/* B77318 80100178 16380002 */ bne $s1, $t8, .L80100184 -/* B7731C 8010017C 00000000 */ nop -/* B77320 80100180 26100001 */ addiu $s0, $s0, 1 -.L80100184: -/* B77324 80100184 5452FFEF */ bnel $v0, $s2, .L80100144 -/* B77328 80100188 944D0000 */ lhu $t5, ($v0) -.L8010018C: -/* B7732C 8010018C 92880064 */ lbu $t0, 0x64($s4) -/* B77330 80100190 26730001 */ addiu $s3, $s3, 1 -/* B77334 80100194 327900FF */ andi $t9, $s3, 0xff -/* B77338 80100198 0328082A */ slt $at, $t9, $t0 -/* B7733C 8010019C 1420FFC5 */ bnez $at, .L801000B4 -/* B77340 801001A0 03209825 */ move $s3, $t9 -.L801001A4: -/* B77344 801001A4 8FAA0154 */ lw $t2, 0x154($sp) -/* B77348 801001A8 00104A00 */ sll $t1, $s0, 8 -/* B7734C 801001AC 00001025 */ move $v0, $zero -/* B77350 801001B0 AD490000 */ sw $t1, ($t2) -.L801001B4: -/* B77354 801001B4 8FBF002C */ lw $ra, 0x2c($sp) -.L801001B8: -/* B77358 801001B8 8FB00014 */ lw $s0, 0x14($sp) -/* B7735C 801001BC 8FB10018 */ lw $s1, 0x18($sp) -/* B77360 801001C0 8FB2001C */ lw $s2, 0x1c($sp) -/* B77364 801001C4 8FB30020 */ lw $s3, 0x20($sp) -/* B77368 801001C8 8FB40024 */ lw $s4, 0x24($sp) -/* B7736C 801001CC 8FB50028 */ lw $s5, 0x28($sp) -/* B77370 801001D0 03E00008 */ jr $ra -/* B77374 801001D4 27BD0150 */ addiu $sp, $sp, 0x150 diff --git a/asm/code_801014C0.s b/asm/code_801014C0.s deleted file mode 100644 index f18fcb973b..0000000000 --- a/asm/code_801014C0.s +++ /dev/null @@ -1,330 +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 func_801014C0 -/* B78660 801014C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B78664 801014C4 AFBF001C */ sw $ra, 0x1c($sp) -/* B78668 801014C8 AFB00018 */ sw $s0, 0x18($sp) -/* B7866C 801014CC AFA50024 */ sw $a1, 0x24($sp) -/* B78670 801014D0 AFA60028 */ sw $a2, 0x28($sp) -/* B78674 801014D4 90AF0000 */ lbu $t7, ($a1) -/* B78678 801014D8 90E20000 */ lbu $v0, ($a3) -/* B7867C 801014DC 00E08025 */ move $s0, $a3 -/* B78680 801014E0 00A07025 */ move $t6, $a1 -/* B78684 801014E4 104F000A */ beq $v0, $t7, .L80101510 -/* B78688 801014E8 00003025 */ move $a2, $zero -/* B7868C 801014EC A0A20000 */ sb $v0, ($a1) -/* B78690 801014F0 91C70000 */ lbu $a3, ($t6) -/* B78694 801014F4 AFA40020 */ sw $a0, 0x20($sp) -/* B78698 801014F8 0C040B31 */ jal func_80102CC4 -/* B7869C 801014FC 8FA50028 */ lw $a1, 0x28($sp) -/* B786A0 80101500 10400003 */ beqz $v0, .L80101510 -/* B786A4 80101504 8FA40020 */ lw $a0, 0x20($sp) -/* B786A8 80101508 1000001E */ b .L80101584 -/* B786AC 8010150C 8FBF001C */ lw $ra, 0x1c($sp) -.L80101510: -/* B786B0 80101510 92190001 */ lbu $t9, 1($s0) -/* B786B4 80101514 8FB80028 */ lw $t8, 0x28($sp) -/* B786B8 80101518 00194040 */ sll $t0, $t9, 1 -/* B786BC 8010151C 03084821 */ addu $t1, $t8, $t0 -/* B786C0 80101520 95210000 */ lhu $at, ($t1) -/* B786C4 80101524 A6010000 */ sh $at, ($s0) -/* B786C8 80101528 8C8C0060 */ lw $t4, 0x60($a0) -/* B786CC 8010152C 3023FFFF */ andi $v1, $at, 0xffff -/* B786D0 80101530 006C082A */ slt $at, $v1, $t4 -/* B786D4 80101534 5420000C */ bnezl $at, .L80101568 -/* B786D8 80101538 24010001 */ li $at, 1 -/* B786DC 8010153C 920D0000 */ lbu $t5, ($s0) -/* B786E0 80101540 908F0064 */ lbu $t7, 0x64($a0) -/* B786E4 80101544 01AF082A */ slt $at, $t5, $t7 -/* B786E8 80101548 50200007 */ beql $at, $zero, .L80101568 -/* B786EC 8010154C 24010001 */ li $at, 1 -/* B786F0 80101550 92020001 */ lbu $v0, 1($s0) -/* B786F4 80101554 18400003 */ blez $v0, .L80101564 -/* B786F8 80101558 28410080 */ slti $at, $v0, 0x80 -/* B786FC 8010155C 14200008 */ bnez $at, .L80101580 -/* B78700 80101560 00001025 */ move $v0, $zero -.L80101564: -/* B78704 80101564 24010001 */ li $at, 1 -.L80101568: -/* B78708 80101568 14610003 */ bne $v1, $at, .L80101578 -/* B7870C 8010156C 00000000 */ nop -/* B78710 80101570 10000003 */ b .L80101580 -/* B78714 80101574 24020005 */ li $v0, 5 -.L80101578: -/* B78718 80101578 10000001 */ b .L80101580 -/* B7871C 8010157C 24020003 */ li $v0, 3 -.L80101580: -/* B78720 80101580 8FBF001C */ lw $ra, 0x1c($sp) -.L80101584: -/* B78724 80101584 8FB00018 */ lw $s0, 0x18($sp) -/* B78728 80101588 27BD0020 */ addiu $sp, $sp, 0x20 -/* B7872C 8010158C 03E00008 */ jr $ra -/* B78730 80101590 00000000 */ nop - -glabel osPfsReadWriteFile -/* B78734 80101594 27BDFE90 */ addiu $sp, $sp, -0x170 -/* B78738 80101598 AFBF002C */ sw $ra, 0x2c($sp) -/* B7873C 8010159C AFB30028 */ sw $s3, 0x28($sp) -/* B78740 801015A0 AFB20024 */ sw $s2, 0x24($sp) -/* B78744 801015A4 AFB10020 */ sw $s1, 0x20($sp) -/* B78748 801015A8 AFB0001C */ sw $s0, 0x1c($sp) -/* B7874C 801015AC AFA60178 */ sw $a2, 0x178($sp) -/* B78750 801015B0 8C8E0050 */ lw $t6, 0x50($a0) -/* B78754 801015B4 30D000FF */ andi $s0, $a2, 0xff -/* B78758 801015B8 00E08825 */ move $s1, $a3 -/* B7875C 801015BC 00AE082A */ slt $at, $a1, $t6 -/* B78760 801015C0 10200003 */ beqz $at, .L801015D0 -/* B78764 801015C4 00809025 */ move $s2, $a0 -/* B78768 801015C8 04A10003 */ bgez $a1, .L801015D8 -/* B7876C 801015CC 8FA20180 */ lw $v0, 0x180($sp) -.L801015D0: -/* B78770 801015D0 100000C7 */ b .L801018F0 -/* B78774 801015D4 24020005 */ li $v0, 5 -.L801015D8: -/* B78778 801015D8 18400003 */ blez $v0, .L801015E8 -/* B7877C 801015DC 304F001F */ andi $t7, $v0, 0x1f -/* B78780 801015E0 11E00003 */ beqz $t7, .L801015F0 -/* B78784 801015E4 00000000 */ nop -.L801015E8: -/* B78788 801015E8 100000C1 */ b .L801018F0 -/* B7878C 801015EC 24020005 */ li $v0, 5 -.L801015F0: -/* B78790 801015F0 06200003 */ bltz $s1, .L80101600 -/* B78794 801015F4 3238001F */ andi $t8, $s1, 0x1f -/* B78798 801015F8 53000004 */ beql $t8, $zero, .L8010160C -/* B7879C 801015FC 8E590000 */ lw $t9, ($s2) -.L80101600: -/* B787A0 80101600 100000BB */ b .L801018F0 -/* B787A4 80101604 24020005 */ li $v0, 5 -/* B787A8 80101608 8E590000 */ lw $t9, ($s2) -.L8010160C: -/* B787AC 8010160C 02402025 */ move $a0, $s2 -/* B787B0 80101610 33280001 */ andi $t0, $t9, 1 -/* B787B4 80101614 15000003 */ bnez $t0, .L80101624 -/* B787B8 80101618 00000000 */ nop -/* B787BC 8010161C 100000B4 */ b .L801018F0 -/* B787C0 80101620 24020005 */ li $v0, 5 -.L80101624: -/* B787C4 80101624 0C040AFC */ jal func_80102BF0 -/* B787C8 80101628 AFA50174 */ sw $a1, 0x174($sp) -/* B787CC 8010162C 24010002 */ li $at, 2 -/* B787D0 80101630 54410004 */ bnel $v0, $at, .L80101644 -/* B787D4 80101634 92490065 */ lbu $t1, 0x65($s2) -/* B787D8 80101638 100000AD */ b .L801018F0 -/* B787DC 8010163C 24020002 */ li $v0, 2 -/* B787E0 80101640 92490065 */ lbu $t1, 0x65($s2) -.L80101644: -/* B787E4 80101644 02402025 */ move $a0, $s2 -/* B787E8 80101648 51200008 */ beql $t1, $zero, .L8010166C -/* B787EC 8010164C 8E4A005C */ lw $t2, 0x5c($s2) -/* B787F0 80101650 0C041320 */ jal func_80104C80 -/* B787F4 80101654 00002825 */ move $a1, $zero -/* B787F8 80101658 50400004 */ beql $v0, $zero, .L8010166C -/* B787FC 8010165C 8E4A005C */ lw $t2, 0x5c($s2) -/* B78800 80101660 100000A4 */ b .L801018F4 -/* B78804 80101664 8FBF002C */ lw $ra, 0x2c($sp) -/* B78808 80101668 8E4A005C */ lw $t2, 0x5c($s2) -.L8010166C: -/* B7880C 8010166C 8FAB0174 */ lw $t3, 0x174($sp) -/* B78810 80101670 8E440004 */ lw $a0, 4($s2) -/* B78814 80101674 8E450008 */ lw $a1, 8($s2) -/* B78818 80101678 014B3021 */ addu $a2, $t2, $t3 -/* B7881C 8010167C 30CCFFFF */ andi $t4, $a2, 0xffff -/* B78820 80101680 01803025 */ move $a2, $t4 -/* B78824 80101684 0C0417D0 */ jal osReadMempak -/* B78828 80101688 27A7014C */ addiu $a3, $sp, 0x14c -/* B7882C 8010168C 10400003 */ beqz $v0, .L8010169C -/* B78830 80101690 97AD0150 */ lhu $t5, 0x150($sp) -/* B78834 80101694 10000097 */ b .L801018F4 -/* B78838 80101698 8FBF002C */ lw $ra, 0x2c($sp) -.L8010169C: -/* B7883C 8010169C 11A00003 */ beqz $t5, .L801016AC -/* B78840 801016A0 8FAE014C */ lw $t6, 0x14c($sp) -/* B78844 801016A4 15C00003 */ bnez $t6, .L801016B4 -/* B78848 801016A8 97AF0152 */ lhu $t7, 0x152($sp) -.L801016AC: -/* B7884C 801016AC 10000090 */ b .L801018F0 -/* B78850 801016B0 24020005 */ li $v0, 5 -.L801016B4: -/* B78854 801016B4 8E580060 */ lw $t8, 0x60($s2) -/* B78858 801016B8 93B90152 */ lbu $t9, 0x152($sp) -/* B7885C 801016BC 97AA0152 */ lhu $t2, 0x152($sp) -/* B78860 801016C0 01F8082A */ slt $at, $t7, $t8 -/* B78864 801016C4 5420000A */ bnezl $at, .L801016F0 -/* B78868 801016C8 24010001 */ li $at, 1 -/* B7886C 801016CC 92480064 */ lbu $t0, 0x64($s2) -/* B78870 801016D0 93A90153 */ lbu $t1, 0x153($sp) -/* B78874 801016D4 0328082A */ slt $at, $t9, $t0 -/* B78878 801016D8 50200005 */ beql $at, $zero, .L801016F0 -/* B7887C 801016DC 24010001 */ li $at, 1 -/* B78880 801016E0 19200002 */ blez $t1, .L801016EC -/* B78884 801016E4 29210080 */ slti $at, $t1, 0x80 -/* B78888 801016E8 14200007 */ bnez $at, .L80101708 -.L801016EC: -/* B7888C 801016EC 24010001 */ li $at, 1 -.L801016F0: -/* B78890 801016F0 15410003 */ bne $t2, $at, .L80101700 -/* B78894 801016F4 00000000 */ nop -/* B78898 801016F8 1000007D */ b .L801018F0 -/* B7889C 801016FC 24020005 */ li $v0, 5 -.L80101700: -/* B788A0 80101700 1000007B */ b .L801018F0 -/* B788A4 80101704 24020003 */ li $v0, 3 -.L80101708: -/* B788A8 80101708 16000007 */ bnez $s0, .L80101728 -/* B788AC 8010170C AFB00034 */ sw $s0, 0x34($sp) -/* B788B0 80101710 93AC0154 */ lbu $t4, 0x154($sp) -/* B788B4 80101714 318D0002 */ andi $t5, $t4, 2 -/* B788B8 80101718 55A00004 */ bnezl $t5, .L8010172C -/* B788BC 8010171C 97AF0152 */ lhu $t7, 0x152($sp) -/* B788C0 80101720 10000073 */ b .L801018F0 -/* B788C4 80101724 24020006 */ li $v0, 6 -.L80101728: -/* B788C8 80101728 97AF0152 */ lhu $t7, 0x152($sp) -.L8010172C: -/* B788CC 8010172C 240E00FF */ li $t6, 255 -/* B788D0 80101730 A3AE003B */ sb $t6, 0x3b($sp) -/* B788D4 80101734 06210003 */ bgez $s1, .L80101744 -/* B788D8 80101738 00111143 */ sra $v0, $s1, 5 -/* B788DC 8010173C 2621001F */ addiu $at, $s1, 0x1f -/* B788E0 80101740 00011143 */ sra $v0, $at, 5 -.L80101744: -/* B788E4 80101744 28410008 */ slti $at, $v0, 8 -/* B788E8 80101748 00408025 */ move $s0, $v0 -/* B788EC 8010174C 1420000D */ bnez $at, .L80101784 -/* B788F0 80101750 A7AF0048 */ sh $t7, 0x48($sp) -/* B788F4 80101754 02402025 */ move $a0, $s2 -.L80101758: -/* B788F8 80101758 27A5003B */ addiu $a1, $sp, 0x3b -/* B788FC 8010175C 27A6004C */ addiu $a2, $sp, 0x4c -/* B78900 80101760 0C040530 */ jal func_801014C0 -/* B78904 80101764 27A70048 */ addiu $a3, $sp, 0x48 -/* B78908 80101768 10400003 */ beqz $v0, .L80101778 -/* B7890C 8010176C 2610FFF8 */ addiu $s0, $s0, -8 -/* B78910 80101770 10000060 */ b .L801018F4 -/* B78914 80101774 8FBF002C */ lw $ra, 0x2c($sp) -.L80101778: -/* B78918 80101778 2A010008 */ slti $at, $s0, 8 -/* B7891C 8010177C 5020FFF6 */ beql $at, $zero, .L80101758 -/* B78920 80101780 02402025 */ move $a0, $s2 -.L80101784: -/* B78924 80101784 8FA20180 */ lw $v0, 0x180($sp) -/* B78928 80101788 8FB10184 */ lw $s1, 0x184($sp) -/* B7892C 8010178C 04410003 */ bgez $v0, .L8010179C -/* B78930 80101790 0002C143 */ sra $t8, $v0, 5 -/* B78934 80101794 2441001F */ addiu $at, $v0, 0x1f -/* B78938 80101798 0001C143 */ sra $t8, $at, 5 -.L8010179C: -/* B7893C 8010179C 1B000031 */ blez $t8, .L80101864 -/* B78940 801017A0 03009825 */ move $s3, $t8 -.L801017A4: -/* B78944 801017A4 24010008 */ li $at, 8 -/* B78948 801017A8 16010009 */ bne $s0, $at, .L801017D0 -/* B7894C 801017AC 02402025 */ move $a0, $s2 -/* B78950 801017B0 27A5003B */ addiu $a1, $sp, 0x3b -/* B78954 801017B4 27A6004C */ addiu $a2, $sp, 0x4c -/* B78958 801017B8 0C040530 */ jal func_801014C0 -/* B7895C 801017BC 27A70048 */ addiu $a3, $sp, 0x48 -/* B78960 801017C0 10400003 */ beqz $v0, .L801017D0 -/* B78964 801017C4 00008025 */ move $s0, $zero -/* B78968 801017C8 1000004A */ b .L801018F4 -/* B7896C 801017CC 8FBF002C */ lw $ra, 0x2c($sp) -.L801017D0: -/* B78970 801017D0 93B90048 */ lbu $t9, 0x48($sp) -/* B78974 801017D4 92480065 */ lbu $t0, 0x65($s2) -/* B78978 801017D8 02402025 */ move $a0, $s2 -/* B7897C 801017DC 53280008 */ beql $t9, $t0, .L80101800 -/* B78980 801017E0 93A90049 */ lbu $t1, 0x49($sp) -/* B78984 801017E4 0C041320 */ jal func_80104C80 -/* B78988 801017E8 03202825 */ move $a1, $t9 -/* B7898C 801017EC 50400004 */ beql $v0, $zero, .L80101800 -/* B78990 801017F0 93A90049 */ lbu $t1, 0x49($sp) -/* B78994 801017F4 1000003F */ b .L801018F4 -/* B78998 801017F8 8FBF002C */ lw $ra, 0x2c($sp) -/* B7899C 801017FC 93A90049 */ lbu $t1, 0x49($sp) -.L80101800: -/* B789A0 80101800 8FAC0034 */ lw $t4, 0x34($sp) -/* B789A4 80101804 02203825 */ move $a3, $s1 -/* B789A8 80101808 000950C0 */ sll $t2, $t1, 3 -/* B789AC 8010180C 01503021 */ addu $a2, $t2, $s0 -/* B789B0 80101810 30CBFFFF */ andi $t3, $a2, 0xffff -/* B789B4 80101814 15800007 */ bnez $t4, .L80101834 -/* B789B8 80101818 01603025 */ move $a2, $t3 -/* B789BC 8010181C 8E440004 */ lw $a0, 4($s2) -/* B789C0 80101820 8E450008 */ lw $a1, 8($s2) -/* B789C4 80101824 0C0417D0 */ jal osReadMempak -/* B789C8 80101828 02203825 */ move $a3, $s1 -/* B789CC 8010182C 10000006 */ b .L80101848 -/* B789D0 80101830 00401825 */ move $v1, $v0 -.L80101834: -/* B789D4 80101834 8E440004 */ lw $a0, 4($s2) -/* B789D8 80101838 8E450008 */ lw $a1, 8($s2) -/* B789DC 8010183C 0C04173C */ jal func_80105CF0 -/* B789E0 80101840 AFA00010 */ sw $zero, 0x10($sp) -/* B789E4 80101844 00401825 */ move $v1, $v0 -.L80101848: -/* B789E8 80101848 10400003 */ beqz $v0, .L80101858 -/* B789EC 8010184C 26310020 */ addiu $s1, $s1, 0x20 -/* B789F0 80101850 10000027 */ b .L801018F0 -/* B789F4 80101854 00601025 */ move $v0, $v1 -.L80101858: -/* B789F8 80101858 2673FFFF */ addiu $s3, $s3, -1 -/* B789FC 8010185C 1660FFD1 */ bnez $s3, .L801017A4 -/* B78A00 80101860 26100001 */ addiu $s0, $s0, 1 -.L80101864: -/* B78A04 80101864 8FAD0034 */ lw $t5, 0x34($sp) -/* B78A08 80101868 93A20154 */ lbu $v0, 0x154($sp) -/* B78A0C 8010186C 24010001 */ li $at, 1 -/* B78A10 80101870 15A1001C */ bne $t5, $at, .L801018E4 -/* B78A14 80101874 304E0002 */ andi $t6, $v0, 2 -/* B78A18 80101878 15C0001A */ bnez $t6, .L801018E4 -/* B78A1C 8010187C 344F0002 */ ori $t7, $v0, 2 -/* B78A20 80101880 A3AF0154 */ sb $t7, 0x154($sp) -/* B78A24 80101884 92580065 */ lbu $t8, 0x65($s2) -/* B78A28 80101888 02402025 */ move $a0, $s2 -/* B78A2C 8010188C 53000008 */ beql $t8, $zero, .L801018B0 -/* B78A30 80101890 8E48005C */ lw $t0, 0x5c($s2) -/* B78A34 80101894 0C041320 */ jal func_80104C80 -/* B78A38 80101898 00002825 */ move $a1, $zero -/* B78A3C 8010189C 50400004 */ beql $v0, $zero, .L801018B0 -/* B78A40 801018A0 8E48005C */ lw $t0, 0x5c($s2) -/* B78A44 801018A4 10000013 */ b .L801018F4 -/* B78A48 801018A8 8FBF002C */ lw $ra, 0x2c($sp) -/* B78A4C 801018AC 8E48005C */ lw $t0, 0x5c($s2) -.L801018B0: -/* B78A50 801018B0 8FB90174 */ lw $t9, 0x174($sp) -/* B78A54 801018B4 8E440004 */ lw $a0, 4($s2) -/* B78A58 801018B8 8E450008 */ lw $a1, 8($s2) -/* B78A5C 801018BC 01193021 */ addu $a2, $t0, $t9 -/* B78A60 801018C0 30C9FFFF */ andi $t1, $a2, 0xffff -/* B78A64 801018C4 01203025 */ move $a2, $t1 -/* B78A68 801018C8 AFA00010 */ sw $zero, 0x10($sp) -/* B78A6C 801018CC 0C04173C */ jal func_80105CF0 -/* B78A70 801018D0 27A7014C */ addiu $a3, $sp, 0x14c -/* B78A74 801018D4 50400004 */ beql $v0, $zero, .L801018E8 -/* B78A78 801018D8 8E440004 */ lw $a0, 4($s2) -/* B78A7C 801018DC 10000005 */ b .L801018F4 -/* B78A80 801018E0 8FBF002C */ lw $ra, 0x2c($sp) -.L801018E4: -/* B78A84 801018E4 8E440004 */ lw $a0, 4($s2) -.L801018E8: -/* B78A88 801018E8 0C040644 */ jal __osPfsGetStatus -/* B78A8C 801018EC 8E450008 */ lw $a1, 8($s2) -.L801018F0: -/* B78A90 801018F0 8FBF002C */ lw $ra, 0x2c($sp) -.L801018F4: -/* B78A94 801018F4 8FB0001C */ lw $s0, 0x1c($sp) -/* B78A98 801018F8 8FB10020 */ lw $s1, 0x20($sp) -/* B78A9C 801018FC 8FB20024 */ lw $s2, 0x24($sp) -/* B78AA0 80101900 8FB30028 */ lw $s3, 0x28($sp) -/* B78AA4 80101904 03E00008 */ jr $ra -/* B78AA8 80101908 27BD0170 */ addiu $sp, $sp, 0x170 diff --git a/asm/code_80101EB0.s b/asm/code_80101EB0.s deleted file mode 100644 index 9e79b49d1b..0000000000 --- a/asm/code_80101EB0.s +++ /dev/null @@ -1,337 +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 osPfsAllocateFile -/* B79050 80101EB0 27BDFD68 */ addiu $sp, $sp, -0x298 -/* B79054 80101EB4 AFB70040 */ sw $s7, 0x40($sp) -/* B79058 80101EB8 AFB6003C */ sw $s6, 0x3c($sp) -/* B7905C 80101EBC AFB50038 */ sw $s5, 0x38($sp) -/* B79060 80101EC0 AFB30030 */ sw $s3, 0x30($sp) -/* B79064 80101EC4 AFA5029C */ sw $a1, 0x29c($sp) -/* B79068 80101EC8 30AEFFFF */ andi $t6, $a1, 0xffff -/* B7906C 80101ECC 01C02825 */ move $a1, $t6 -/* B79070 80101ED0 00809825 */ move $s3, $a0 -/* B79074 80101ED4 AFBF0044 */ sw $ra, 0x44($sp) -/* B79078 80101ED8 AFB40034 */ sw $s4, 0x34($sp) -/* B7907C 80101EDC AFB2002C */ sw $s2, 0x2c($sp) -/* B79080 80101EE0 AFB10028 */ sw $s1, 0x28($sp) -/* B79084 80101EE4 AFB00024 */ sw $s0, 0x24($sp) -/* B79088 80101EE8 AFA702A4 */ sw $a3, 0x2a4($sp) -/* B7908C 80101EEC 0000B025 */ move $s6, $zero -/* B79090 80101EF0 0000B825 */ move $s7, $zero -/* B79094 80101EF4 11C00003 */ beqz $t6, .L80101F04 -/* B79098 80101EF8 0000A825 */ move $s5, $zero -/* B7909C 80101EFC 14C00003 */ bnez $a2, .L80101F0C -/* B790A0 80101F00 8FB102AC */ lw $s1, 0x2ac($sp) -.L80101F04: -/* B790A4 80101F04 100000AC */ b .L801021B8 -/* B790A8 80101F08 24020005 */ li $v0, 5 -.L80101F0C: -/* B790AC 80101F0C 263000FF */ addiu $s0, $s1, 0xff -/* B790B0 80101F10 8FB802A8 */ lw $t8, 0x2a8($sp) -/* B790B4 80101F14 8FB902B0 */ lw $t9, 0x2b0($sp) -/* B790B8 80101F18 06010003 */ bgez $s0, .L80101F28 -/* B790BC 80101F1C 00107A03 */ sra $t7, $s0, 8 -/* B790C0 80101F20 260100FF */ addiu $at, $s0, 0xff -/* B790C4 80101F24 00017A03 */ sra $t7, $at, 8 -.L80101F28: -/* B790C8 80101F28 01E08025 */ move $s0, $t7 -/* B790CC 80101F2C 01E0A025 */ move $s4, $t7 -/* B790D0 80101F30 02602025 */ move $a0, $s3 -/* B790D4 80101F34 8FA702A4 */ lw $a3, 0x2a4($sp) -/* B790D8 80101F38 A7A5029E */ sh $a1, 0x29e($sp) -/* B790DC 80101F3C AFA602A0 */ sw $a2, 0x2a0($sp) -/* B790E0 80101F40 AFB80010 */ sw $t8, 0x10($sp) -/* B790E4 80101F44 0C040C04 */ jal osPfsFindFile -/* B790E8 80101F48 AFB90014 */ sw $t9, 0x14($sp) -/* B790EC 80101F4C 10400005 */ beqz $v0, .L80101F64 -/* B790F0 80101F50 24010005 */ li $at, 5 -/* B790F4 80101F54 50410004 */ beql $v0, $at, .L80101F68 -/* B790F8 80101F58 8FA802B0 */ lw $t0, 0x2b0($sp) -/* B790FC 80101F5C 10000097 */ b .L801021BC -/* B79100 80101F60 8FBF0044 */ lw $ra, 0x44($sp) -.L80101F64: -/* B79104 80101F64 8FA802B0 */ lw $t0, 0x2b0($sp) -.L80101F68: -/* B79108 80101F68 2401FFFF */ li $at, -1 -/* B7910C 80101F6C 02602025 */ move $a0, $s3 -/* B79110 80101F70 8D090000 */ lw $t1, ($t0) -/* B79114 80101F74 11210003 */ beq $t1, $at, .L80101F84 -/* B79118 80101F78 00000000 */ nop -/* B7911C 80101F7C 1000008E */ b .L801021B8 -/* B79120 80101F80 24020009 */ li $v0, 9 -.L80101F84: -/* B79124 80101F84 0C040010 */ jal osPfsFreeBlocks -/* B79128 80101F88 27A50054 */ addiu $a1, $sp, 0x54 -/* B7912C 80101F8C 8FAA0054 */ lw $t2, 0x54($sp) -/* B79130 80101F90 0151082A */ slt $at, $t2, $s1 -/* B79134 80101F94 10200003 */ beqz $at, .L80101FA4 -/* B79138 80101F98 00000000 */ nop -/* B7913C 80101F9C 10000086 */ b .L801021B8 -/* B79140 80101FA0 24020007 */ li $v0, 7 -.L80101FA4: -/* B79144 80101FA4 16000003 */ bnez $s0, .L80101FB4 -/* B79148 80101FA8 02602025 */ move $a0, $s3 -/* B7914C 80101FAC 10000082 */ b .L801021B8 -/* B79150 80101FB0 24020005 */ li $v0, 5 -.L80101FB4: -/* B79154 80101FB4 8FAB02B0 */ lw $t3, 0x2b0($sp) -/* B79158 80101FB8 00002825 */ move $a1, $zero -/* B7915C 80101FBC 00003025 */ move $a2, $zero -/* B79160 80101FC0 00003825 */ move $a3, $zero -/* B79164 80101FC4 AFA00010 */ sw $zero, 0x10($sp) -/* B79168 80101FC8 0C040C04 */ jal osPfsFindFile -/* B7916C 80101FCC AFAB0014 */ sw $t3, 0x14($sp) -/* B79170 80101FD0 10400005 */ beqz $v0, .L80101FE8 -/* B79174 80101FD4 24010005 */ li $at, 5 -/* B79178 80101FD8 50410004 */ beql $v0, $at, .L80101FEC -/* B7917C 80101FDC 8FAC02B0 */ lw $t4, 0x2b0($sp) -/* B79180 80101FE0 10000076 */ b .L801021BC -/* B79184 80101FE4 8FBF0044 */ lw $ra, 0x44($sp) -.L80101FE8: -/* B79188 80101FE8 8FAC02B0 */ lw $t4, 0x2b0($sp) -.L80101FEC: -/* B7918C 80101FEC 2401FFFF */ li $at, -1 -/* B79190 80101FF0 8D8D0000 */ lw $t5, ($t4) -/* B79194 80101FF4 55A10004 */ bnel $t5, $at, .L80102008 -/* B79198 80101FF8 926E0064 */ lbu $t6, 0x64($s3) -/* B7919C 80101FFC 1000006E */ b .L801021B8 -/* B791A0 80102000 24020008 */ li $v0, 8 -/* B791A4 80102004 926E0064 */ lbu $t6, 0x64($s3) -.L80102008: -/* B791A8 80102008 00008025 */ move $s0, $zero -/* B791AC 8010200C 27B20180 */ addiu $s2, $sp, 0x180 -/* B791B0 80102010 19C00049 */ blez $t6, .L80102138 -/* B791B4 80102014 27B10080 */ addiu $s1, $sp, 0x80 -.L80102018: -/* B791B8 80102018 02602025 */ move $a0, $s3 -/* B791BC 8010201C 02402825 */ move $a1, $s2 -/* B791C0 80102020 00003025 */ move $a2, $zero -/* B791C4 80102024 0C040B31 */ jal func_80102CC4 -/* B791C8 80102028 320700FF */ andi $a3, $s0, 0xff -/* B791CC 8010202C 10400003 */ beqz $v0, .L8010203C -/* B791D0 80102030 02602025 */ move $a0, $s3 -/* B791D4 80102034 10000061 */ b .L801021BC -/* B791D8 80102038 8FBF0044 */ lw $ra, 0x44($sp) -.L8010203C: -/* B791DC 8010203C 27AF0290 */ addiu $t7, $sp, 0x290 -/* B791E0 80102040 27B8028C */ addiu $t8, $sp, 0x28c -/* B791E4 80102044 AFB80018 */ sw $t8, 0x18($sp) -/* B791E8 80102048 AFAF0014 */ sw $t7, 0x14($sp) -/* B791EC 8010204C 02402825 */ move $a1, $s2 -/* B791F0 80102050 02803025 */ move $a2, $s4 -/* B791F4 80102054 27A70294 */ addiu $a3, $sp, 0x294 -/* B791F8 80102058 0C040879 */ jal func_801021E4 -/* B791FC 8010205C AFB00010 */ sw $s0, 0x10($sp) -/* B79200 80102060 10400003 */ beqz $v0, .L80102070 -/* B79204 80102064 8FA30294 */ lw $v1, 0x294($sp) -/* B79208 80102068 10000054 */ b .L801021BC -/* B7920C 8010206C 8FBF0044 */ lw $ra, 0x44($sp) -.L80102070: -/* B79210 80102070 2401FFFF */ li $at, -1 -/* B79214 80102074 5061002B */ beql $v1, $at, .L80102124 -/* B79218 80102078 926B0064 */ lbu $t3, 0x64($s3) -/* B7921C 8010207C 16A00004 */ bnez $s5, .L80102090 -/* B79220 80102080 0016C840 */ sll $t9, $s6, 1 -/* B79224 80102084 A3A30051 */ sb $v1, 0x51($sp) -/* B79228 80102088 1000000D */ b .L801020C0 -/* B7922C 8010208C A3B00050 */ sb $s0, 0x50($sp) -.L80102090: -/* B79230 80102090 02391021 */ addu $v0, $s1, $t9 -/* B79234 80102094 A0500000 */ sb $s0, ($v0) -/* B79238 80102098 A0430001 */ sb $v1, 1($v0) -/* B7923C 8010209C 02602025 */ move $a0, $s3 -/* B79240 801020A0 02202825 */ move $a1, $s1 -/* B79244 801020A4 24060001 */ li $a2, 1 -/* B79248 801020A8 0C040B31 */ jal func_80102CC4 -/* B7924C 801020AC 32E700FF */ andi $a3, $s7, 0xff -/* B79250 801020B0 50400004 */ beql $v0, $zero, .L801020C4 -/* B79254 801020B4 8FA80290 */ lw $t0, 0x290($sp) -/* B79258 801020B8 10000040 */ b .L801021BC -/* B7925C 801020BC 8FBF0044 */ lw $ra, 0x44($sp) -.L801020C0: -/* B79260 801020C0 8FA80290 */ lw $t0, 0x290($sp) -.L801020C4: -/* B79264 801020C4 02402025 */ move $a0, $s2 -/* B79268 801020C8 02202825 */ move $a1, $s1 -/* B7926C 801020CC 0114082A */ slt $at, $t0, $s4 -/* B79270 801020D0 5020000A */ beql $at, $zero, .L801020FC -/* B79274 801020D4 0000A025 */ move $s4, $zero -/* B79278 801020D8 0C001BC4 */ jal bcopy -/* B7927C 801020DC 24060100 */ li $a2, 256 -/* B79280 801020E0 8FA90290 */ lw $t1, 0x290($sp) -/* B79284 801020E4 8FB6028C */ lw $s6, 0x28c($sp) -/* B79288 801020E8 321700FF */ andi $s7, $s0, 0xff -/* B7928C 801020EC 26B50001 */ addiu $s5, $s5, 1 -/* B79290 801020F0 1000000B */ b .L80102120 -/* B79294 801020F4 0289A023 */ subu $s4, $s4, $t1 -/* B79298 801020F8 0000A025 */ move $s4, $zero -.L801020FC: -/* B7929C 801020FC 02602025 */ move $a0, $s3 -/* B792A0 80102100 02402825 */ move $a1, $s2 -/* B792A4 80102104 24060001 */ li $a2, 1 -/* B792A8 80102108 0C040B31 */ jal func_80102CC4 -/* B792AC 8010210C 320700FF */ andi $a3, $s0, 0xff -/* B792B0 80102110 10400009 */ beqz $v0, .L80102138 -/* B792B4 80102114 00000000 */ nop -/* B792B8 80102118 10000028 */ b .L801021BC -/* B792BC 8010211C 8FBF0044 */ lw $ra, 0x44($sp) -.L80102120: -/* B792C0 80102120 926B0064 */ lbu $t3, 0x64($s3) -.L80102124: -/* B792C4 80102124 26100001 */ addiu $s0, $s0, 1 -/* B792C8 80102128 320A00FF */ andi $t2, $s0, 0xff -/* B792CC 8010212C 014B082A */ slt $at, $t2, $t3 -/* B792D0 80102130 1420FFB9 */ bnez $at, .L80102018 -/* B792D4 80102134 01408025 */ move $s0, $t2 -.L80102138: -/* B792D8 80102138 1E800004 */ bgtz $s4, .L8010214C -/* B792DC 8010213C 8FA30294 */ lw $v1, 0x294($sp) -/* B792E0 80102140 2401FFFF */ li $at, -1 -/* B792E4 80102144 14610003 */ bne $v1, $at, .L80102154 -/* B792E8 80102148 97AC0050 */ lhu $t4, 0x50($sp) -.L8010214C: -/* B792EC 8010214C 1000001A */ b .L801021B8 -/* B792F0 80102150 24020003 */ li $v0, 3 -.L80102154: -/* B792F4 80102154 97AD029E */ lhu $t5, 0x29e($sp) -/* B792F8 80102158 8FAE02A0 */ lw $t6, 0x2a0($sp) -/* B792FC 8010215C A7AC0066 */ sh $t4, 0x66($sp) -/* B79300 80102160 A7A0006A */ sh $zero, 0x6a($sp) -/* B79304 80102164 8FA402A4 */ lw $a0, 0x2a4($sp) -/* B79308 80102168 27A50070 */ addiu $a1, $sp, 0x70 -/* B7930C 8010216C 24060010 */ li $a2, 16 -/* B79310 80102170 A7AD0064 */ sh $t5, 0x64($sp) -/* B79314 80102174 0C001BC4 */ jal bcopy -/* B79318 80102178 AFAE0060 */ sw $t6, 0x60($sp) -/* B7931C 8010217C 8FA402A8 */ lw $a0, 0x2a8($sp) -/* B79320 80102180 27A5006C */ addiu $a1, $sp, 0x6c -/* B79324 80102184 0C001BC4 */ jal bcopy -/* B79328 80102188 24060004 */ li $a2, 4 -/* B7932C 8010218C 8FAF02B0 */ lw $t7, 0x2b0($sp) -/* B79330 80102190 8E79005C */ lw $t9, 0x5c($s3) -/* B79334 80102194 8E640004 */ lw $a0, 4($s3) -/* B79338 80102198 8DF80000 */ lw $t8, ($t7) -/* B7933C 8010219C 8E650008 */ lw $a1, 8($s3) -/* B79340 801021A0 AFA00010 */ sw $zero, 0x10($sp) -/* B79344 801021A4 03193021 */ addu $a2, $t8, $t9 -/* B79348 801021A8 30C8FFFF */ andi $t0, $a2, 0xffff -/* B7934C 801021AC 01003025 */ move $a2, $t0 -/* B79350 801021B0 0C04173C */ jal func_80105CF0 -/* B79354 801021B4 27A70060 */ addiu $a3, $sp, 0x60 -.L801021B8: -/* B79358 801021B8 8FBF0044 */ lw $ra, 0x44($sp) -.L801021BC: -/* B7935C 801021BC 8FB00024 */ lw $s0, 0x24($sp) -/* B79360 801021C0 8FB10028 */ lw $s1, 0x28($sp) -/* B79364 801021C4 8FB2002C */ lw $s2, 0x2c($sp) -/* B79368 801021C8 8FB30030 */ lw $s3, 0x30($sp) -/* B7936C 801021CC 8FB40034 */ lw $s4, 0x34($sp) -/* B79370 801021D0 8FB50038 */ lw $s5, 0x38($sp) -/* B79374 801021D4 8FB6003C */ lw $s6, 0x3c($sp) -/* B79378 801021D8 8FB70040 */ lw $s7, 0x40($sp) -/* B7937C 801021DC 03E00008 */ jr $ra -/* B79380 801021E0 27BD0298 */ addiu $sp, $sp, 0x298 - -glabel func_801021E4 -/* B79384 801021E4 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* B79388 801021E8 AFB00008 */ sw $s0, 8($sp) -/* B7938C 801021EC 93B00023 */ lbu $s0, 0x23($sp) -/* B79390 801021F0 AFB1000C */ sw $s1, 0xc($sp) -/* B79394 801021F4 00C08825 */ move $s1, $a2 -/* B79398 801021F8 1A000003 */ blez $s0, .L80102208 -/* B7939C 801021FC 240B0080 */ li $t3, 128 -/* B793A0 80102200 10000002 */ b .L8010220C -/* B793A4 80102204 24020001 */ li $v0, 1 -.L80102208: -/* B793A8 80102208 8C820060 */ lw $v0, 0x60($a0) -.L8010220C: -/* B793AC 8010220C 28410080 */ slti $at, $v0, 0x80 -/* B793B0 80102210 1020000A */ beqz $at, .L8010223C -/* B793B4 80102214 00401825 */ move $v1, $v0 -/* B793B8 80102218 00027040 */ sll $t6, $v0, 1 -/* B793BC 8010221C 00AE1021 */ addu $v0, $a1, $t6 -/* B793C0 80102220 240A0003 */ li $t2, 3 -.L80102224: -/* B793C4 80102224 944F0000 */ lhu $t7, ($v0) -/* B793C8 80102228 514F0005 */ beql $t2, $t7, .L80102240 -/* B793CC 8010222C 240B0080 */ li $t3, 128 -/* B793D0 80102230 24630001 */ addiu $v1, $v1, 1 -/* B793D4 80102234 146BFFFB */ bne $v1, $t3, .L80102224 -/* B793D8 80102238 24420002 */ addiu $v0, $v0, 2 -.L8010223C: -/* B793DC 8010223C 240B0080 */ li $t3, 128 -.L80102240: -/* B793E0 80102240 146B0005 */ bne $v1, $t3, .L80102258 -/* B793E4 80102244 240A0003 */ li $t2, 3 -/* B793E8 80102248 2418FFFF */ li $t8, -1 -/* B793EC 8010224C ACF80000 */ sw $t8, ($a3) -/* B793F0 80102250 10000030 */ b .L80102314 -/* B793F4 80102254 00001025 */ move $v0, $zero -.L80102258: -/* B793F8 80102258 8FA60024 */ lw $a2, 0x24($sp) -/* B793FC 8010225C 00602025 */ move $a0, $v1 -/* B79400 80102260 24190001 */ li $t9, 1 -/* B79404 80102264 00604025 */ move $t0, $v1 -/* B79408 80102268 2A210002 */ slti $at, $s1, 2 -/* B7940C 8010226C 24630001 */ addiu $v1, $v1, 1 -/* B79410 80102270 14200018 */ bnez $at, .L801022D4 -/* B79414 80102274 ACD90000 */ sw $t9, ($a2) -/* B79418 80102278 28610080 */ slti $at, $v1, 0x80 -/* B7941C 8010227C 10200015 */ beqz $at, .L801022D4 -/* B79420 80102280 00036040 */ sll $t4, $v1, 1 -/* B79424 80102284 00AC1021 */ addu $v0, $a1, $t4 -/* B79428 80102288 944D0000 */ lhu $t5, ($v0) -.L8010228C: -/* B7942C 8010228C 00087040 */ sll $t6, $t0, 1 -/* B79430 80102290 00AE4821 */ addu $t1, $a1, $t6 -/* B79434 80102294 554D0008 */ bnel $t2, $t5, .L801022B8 -/* B79438 80102298 8CD90000 */ lw $t9, ($a2) -/* B7943C 8010229C A1300000 */ sb $s0, ($t1) -/* B79440 801022A0 A1230001 */ sb $v1, 1($t1) -/* B79444 801022A4 8CCF0000 */ lw $t7, ($a2) -/* B79448 801022A8 00604025 */ move $t0, $v1 -/* B7944C 801022AC 25F80001 */ addiu $t8, $t7, 1 -/* B79450 801022B0 ACD80000 */ sw $t8, ($a2) -/* B79454 801022B4 8CD90000 */ lw $t9, ($a2) -.L801022B8: -/* B79458 801022B8 24630001 */ addiu $v1, $v1, 1 -/* B7945C 801022BC 24420002 */ addiu $v0, $v0, 2 -/* B79460 801022C0 0331082A */ slt $at, $t9, $s1 -/* B79464 801022C4 10200003 */ beqz $at, .L801022D4 -/* B79468 801022C8 28610080 */ slti $at, $v1, 0x80 -/* B7946C 801022CC 5420FFEF */ bnezl $at, .L8010228C -/* B79470 801022D0 944D0000 */ lhu $t5, ($v0) -.L801022D4: -/* B79474 801022D4 146B0008 */ bne $v1, $t3, .L801022F8 -/* B79478 801022D8 ACE40000 */ sw $a0, ($a3) -/* B7947C 801022DC 8CCC0000 */ lw $t4, ($a2) -/* B79480 801022E0 8FAD0028 */ lw $t5, 0x28($sp) -/* B79484 801022E4 0191082A */ slt $at, $t4, $s1 -/* B79488 801022E8 50200004 */ beql $at, $zero, .L801022FC -/* B7948C 801022EC 00087840 */ sll $t7, $t0, 1 -/* B79490 801022F0 10000007 */ b .L80102310 -/* B79494 801022F4 ADA80000 */ sw $t0, ($t5) -.L801022F8: -/* B79498 801022F8 00087840 */ sll $t7, $t0, 1 -.L801022FC: -/* B7949C 801022FC 00AFC021 */ addu $t8, $a1, $t7 -/* B794A0 80102300 240E0001 */ li $t6, 1 -/* B794A4 80102304 A70E0000 */ sh $t6, ($t8) -/* B794A8 80102308 8FB90028 */ lw $t9, 0x28($sp) -/* B794AC 8010230C AF200000 */ sw $zero, ($t9) -.L80102310: -/* B794B0 80102310 00001025 */ move $v0, $zero -.L80102314: -/* B794B4 80102314 8FB00008 */ lw $s0, 8($sp) -/* B794B8 80102318 8FB1000C */ lw $s1, 0xc($sp) -/* B794BC 8010231C 03E00008 */ jr $ra -/* B794C0 80102320 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/asm/code_80102420.s b/asm/code_80102420.s deleted file mode 100644 index c209015f4c..0000000000 --- a/asm/code_80102420.s +++ /dev/null @@ -1,836 +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 func_80102420 -/* B795C0 80102420 00001825 */ move $v1, $zero -/* B795C4 80102424 00801025 */ move $v0, $a0 -/* B795C8 80102428 18A00016 */ blez $a1, .L80102484 -/* B795CC 8010242C 00003025 */ move $a2, $zero -/* B795D0 80102430 30A70003 */ andi $a3, $a1, 3 -/* B795D4 80102434 10E00008 */ beqz $a3, .L80102458 -/* B795D8 80102438 00E02025 */ move $a0, $a3 -.L8010243C: -/* B795DC 8010243C 904E0000 */ lbu $t6, ($v0) -/* B795E0 80102440 24C60001 */ addiu $a2, $a2, 1 -/* B795E4 80102444 24420001 */ addiu $v0, $v0, 1 -/* B795E8 80102448 1486FFFC */ bne $a0, $a2, .L8010243C -/* B795EC 8010244C 006E1821 */ addu $v1, $v1, $t6 -/* B795F0 80102450 50C5000D */ beql $a2, $a1, .L80102488 -/* B795F4 80102454 00601025 */ move $v0, $v1 -.L80102458: -/* B795F8 80102458 904F0000 */ lbu $t7, ($v0) -/* B795FC 8010245C 90580001 */ lbu $t8, 1($v0) -/* B79600 80102460 90590002 */ lbu $t9, 2($v0) -/* B79604 80102464 006F1821 */ addu $v1, $v1, $t7 -/* B79608 80102468 90480003 */ lbu $t0, 3($v0) -/* B7960C 8010246C 00781821 */ addu $v1, $v1, $t8 -/* B79610 80102470 24C60004 */ addiu $a2, $a2, 4 -/* B79614 80102474 00791821 */ addu $v1, $v1, $t9 -/* B79618 80102478 24420004 */ addiu $v0, $v0, 4 -/* B7961C 8010247C 14C5FFF6 */ bne $a2, $a1, .L80102458 -/* B79620 80102480 00681821 */ addu $v1, $v1, $t0 -.L80102484: -/* B79624 80102484 00601025 */ move $v0, $v1 -.L80102488: -/* B79628 80102488 3049FFFF */ andi $t1, $v0, 0xffff -/* B7962C 8010248C 03E00008 */ jr $ra -/* B79630 80102490 01201025 */ move $v0, $t1 - -glabel func_80102494 -/* B79634 80102494 A4C00000 */ sh $zero, ($a2) -/* B79638 80102498 A4A00000 */ sh $zero, ($a1) -/* B7963C 8010249C 94820000 */ lhu $v0, ($a0) -/* B79640 801024A0 24870004 */ addiu $a3, $a0, 4 -/* B79644 801024A4 24E90002 */ addiu $t1, $a3, 2 -/* B79648 801024A8 0002C021 */ addu $t8, $zero, $v0 -/* B7964C 801024AC A4B80000 */ sh $t8, ($a1) -/* B79650 801024B0 94D90000 */ lhu $t9, ($a2) -/* B79654 801024B4 00406827 */ not $t5, $v0 -/* B79658 801024B8 24EA0004 */ addiu $t2, $a3, 4 -/* B7965C 801024BC 032D7021 */ addu $t6, $t9, $t5 -/* B79660 801024C0 A4CE0000 */ sh $t6, ($a2) -/* B79664 801024C4 94AF0000 */ lhu $t7, ($a1) -/* B79668 801024C8 94820002 */ lhu $v0, 2($a0) -/* B7966C 801024CC 2404001C */ li $a0, 28 -/* B79670 801024D0 24EB0006 */ addiu $t3, $a3, 6 -/* B79674 801024D4 01E2C021 */ addu $t8, $t7, $v0 -/* B79678 801024D8 A4B80000 */ sh $t8, ($a1) -/* B7967C 801024DC 94D90000 */ lhu $t9, ($a2) -/* B79680 801024E0 00406827 */ not $t5, $v0 -/* B79684 801024E4 24030004 */ li $v1, 4 -/* B79688 801024E8 032D7021 */ addu $t6, $t9, $t5 -/* B7968C 801024EC A4CE0000 */ sh $t6, ($a2) -.L801024F0: -/* B79690 801024F0 94E20000 */ lhu $v0, ($a3) -/* B79694 801024F4 94AF0000 */ lhu $t7, ($a1) -/* B79698 801024F8 24630008 */ addiu $v1, $v1, 8 -/* B7969C 801024FC 00406827 */ not $t5, $v0 -/* B796A0 80102500 01E2C021 */ addu $t8, $t7, $v0 -/* B796A4 80102504 A4B80000 */ sh $t8, ($a1) -/* B796A8 80102508 94D90000 */ lhu $t9, ($a2) -/* B796AC 8010250C 24E70008 */ addiu $a3, $a3, 8 -/* B796B0 80102510 25290008 */ addiu $t1, $t1, 8 -/* B796B4 80102514 032D7021 */ addu $t6, $t9, $t5 -/* B796B8 80102518 A4CE0000 */ sh $t6, ($a2) -/* B796BC 8010251C 94AF0000 */ lhu $t7, ($a1) -/* B796C0 80102520 9522FFF8 */ lhu $v0, -8($t1) -/* B796C4 80102524 254A0008 */ addiu $t2, $t2, 8 -/* B796C8 80102528 256B0008 */ addiu $t3, $t3, 8 -/* B796CC 8010252C 01E2C021 */ addu $t8, $t7, $v0 -/* B796D0 80102530 A4B80000 */ sh $t8, ($a1) -/* B796D4 80102534 94D90000 */ lhu $t9, ($a2) -/* B796D8 80102538 00406827 */ not $t5, $v0 -/* B796DC 8010253C 032D7021 */ addu $t6, $t9, $t5 -/* B796E0 80102540 A4CE0000 */ sh $t6, ($a2) -/* B796E4 80102544 94AF0000 */ lhu $t7, ($a1) -/* B796E8 80102548 9542FFF8 */ lhu $v0, -8($t2) -/* B796EC 8010254C 01E2C021 */ addu $t8, $t7, $v0 -/* B796F0 80102550 A4B80000 */ sh $t8, ($a1) -/* B796F4 80102554 94D90000 */ lhu $t9, ($a2) -/* B796F8 80102558 00406827 */ not $t5, $v0 -/* B796FC 8010255C 032D7021 */ addu $t6, $t9, $t5 -/* B79700 80102560 A4CE0000 */ sh $t6, ($a2) -/* B79704 80102564 94AF0000 */ lhu $t7, ($a1) -/* B79708 80102568 9562FFF8 */ lhu $v0, -8($t3) -/* B7970C 8010256C 01E2C021 */ addu $t8, $t7, $v0 -/* B79710 80102570 A4B80000 */ sh $t8, ($a1) -/* B79714 80102574 94D90000 */ lhu $t9, ($a2) -/* B79718 80102578 00406827 */ not $t5, $v0 -/* B7971C 8010257C 032D7021 */ addu $t6, $t9, $t5 -/* B79720 80102580 1464FFDB */ bne $v1, $a0, .L801024F0 -/* B79724 80102584 A4CE0000 */ sh $t6, ($a2) -/* B79728 80102588 03E00008 */ jr $ra -/* B7972C 8010258C 00001025 */ move $v0, $zero - -glabel func_80102590 -/* B79730 80102590 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* B79734 80102594 AFBF003C */ sw $ra, 0x3c($sp) -/* B79738 80102598 AFB60038 */ sw $s6, 0x38($sp) -/* B7973C 8010259C AFB50034 */ sw $s5, 0x34($sp) -/* B79740 801025A0 AFB40030 */ sw $s4, 0x30($sp) -/* B79744 801025A4 AFB3002C */ sw $s3, 0x2c($sp) -/* B79748 801025A8 AFB20028 */ sw $s2, 0x28($sp) -/* B7974C 801025AC AFB10024 */ sw $s1, 0x24($sp) -/* B79750 801025B0 AFB00020 */ sw $s0, 0x20($sp) -/* B79754 801025B4 240EFFFF */ li $t6, -1 -/* B79758 801025B8 00809025 */ move $s2, $a0 -/* B7975C 801025BC 00C0A025 */ move $s4, $a2 -/* B79760 801025C0 00A0B025 */ move $s6, $a1 -/* B79764 801025C4 00009825 */ move $s3, $zero -/* B79768 801025C8 0C001BA8 */ jal osGetCount -/* B7976C 801025CC ACCE0000 */ sw $t6, ($a2) -/* B79770 801025D0 AE820004 */ sw $v0, 4($s4) -/* B79774 801025D4 8ED9000C */ lw $t9, 0xc($s6) -/* B79778 801025D8 8ED80008 */ lw $t8, 8($s6) -/* B7977C 801025DC 02402025 */ move $a0, $s2 -/* B79780 801025E0 AE99000C */ sw $t9, 0xc($s4) -/* B79784 801025E4 AE980008 */ sw $t8, 8($s4) -/* B79788 801025E8 8EC90014 */ lw $t1, 0x14($s6) -/* B7978C 801025EC 8EC80010 */ lw $t0, 0x10($s6) -/* B79790 801025F0 AE890014 */ sw $t1, 0x14($s4) -/* B79794 801025F4 AE880010 */ sw $t0, 0x10($s4) -/* B79798 801025F8 924F0065 */ lbu $t7, 0x65($s2) -/* B7979C 801025FC 51E00008 */ beql $t7, $zero, .L80102620 -/* B797A0 80102600 27B1007C */ addiu $s1, $sp, 0x7c -/* B797A4 80102604 0C041320 */ jal func_80104C80 -/* B797A8 80102608 00002825 */ move $a1, $zero -/* B797AC 8010260C 50400004 */ beql $v0, $zero, .L80102620 -/* B797B0 80102610 27B1007C */ addiu $s1, $sp, 0x7c -/* B797B4 80102614 100000A9 */ b .L801028BC -/* B797B8 80102618 8FBF003C */ lw $ra, 0x3c($sp) -/* B797BC 8010261C 27B1007C */ addiu $s1, $sp, 0x7c -.L80102620: -/* B797C0 80102620 0220A825 */ move $s5, $s1 -/* B797C4 80102624 27B0009C */ addiu $s0, $sp, 0x9c -/* B797C8 80102628 02402025 */ move $a0, $s2 -.L8010262C: -/* B797CC 8010262C 0C041320 */ jal func_80104C80 -/* B797D0 80102630 326500FF */ andi $a1, $s3, 0xff -/* B797D4 80102634 10400003 */ beqz $v0, .L80102644 -/* B797D8 80102638 00003025 */ move $a2, $zero -/* B797DC 8010263C 1000009F */ b .L801028BC -/* B797E0 80102640 8FBF003C */ lw $ra, 0x3c($sp) -.L80102644: -/* B797E4 80102644 8E440004 */ lw $a0, 4($s2) -/* B797E8 80102648 8E450008 */ lw $a1, 8($s2) -/* B797EC 8010264C 0C0417D0 */ jal osReadMempak -/* B797F0 80102650 02A03825 */ move $a3, $s5 -/* B797F4 80102654 10400003 */ beqz $v0, .L80102664 -/* B797F8 80102658 366B0080 */ ori $t3, $s3, 0x80 -/* B797FC 8010265C 10000097 */ b .L801028BC -/* B79800 80102660 8FBF003C */ lw $ra, 0x3c($sp) -.L80102664: -/* B79804 80102664 A3AB007C */ sb $t3, 0x7c($sp) -/* B79808 80102668 27A2007D */ addiu $v0, $sp, 0x7d -.L8010266C: -/* B7980C 8010266C 904C0000 */ lbu $t4, ($v0) -/* B79810 80102670 24420001 */ addiu $v0, $v0, 1 -/* B79814 80102674 0050082B */ sltu $at, $v0, $s0 -/* B79818 80102678 01806827 */ not $t5, $t4 -/* B7981C 8010267C 1420FFFB */ bnez $at, .L8010266C -/* B79820 80102680 A04DFFFF */ sb $t5, -1($v0) -/* B79824 80102684 8E440004 */ lw $a0, 4($s2) -/* B79828 80102688 8E450008 */ lw $a1, 8($s2) -/* B7982C 8010268C AFA00010 */ sw $zero, 0x10($sp) -/* B79830 80102690 00003025 */ move $a2, $zero -/* B79834 80102694 0C04173C */ jal func_80105CF0 -/* B79838 80102698 02A03825 */ move $a3, $s5 -/* B7983C 8010269C 10400003 */ beqz $v0, .L801026AC -/* B79840 801026A0 00003025 */ move $a2, $zero -/* B79844 801026A4 10000085 */ b .L801028BC -/* B79848 801026A8 8FBF003C */ lw $ra, 0x3c($sp) -.L801026AC: -/* B7984C 801026AC 8E440004 */ lw $a0, 4($s2) -/* B79850 801026B0 8E450008 */ lw $a1, 8($s2) -/* B79854 801026B4 0C0417D0 */ jal osReadMempak -/* B79858 801026B8 27A7005C */ addiu $a3, $sp, 0x5c -/* B7985C 801026BC 10400003 */ beqz $v0, .L801026CC -/* B79860 801026C0 27A3005C */ addiu $v1, $sp, 0x5c -/* B79864 801026C4 1000007D */ b .L801028BC -/* B79868 801026C8 8FBF003C */ lw $ra, 0x3c($sp) -.L801026CC: -/* B7986C 801026CC 27A2007C */ addiu $v0, $sp, 0x7c -.L801026D0: -/* B79870 801026D0 906E0000 */ lbu $t6, ($v1) -/* B79874 801026D4 90580000 */ lbu $t8, ($v0) -/* B79878 801026D8 55D80006 */ bnel $t6, $t8, .L801026F4 -/* B7987C 801026DC 27B9007C */ addiu $t9, $sp, 0x7c -/* B79880 801026E0 24630001 */ addiu $v1, $v1, 1 -/* B79884 801026E4 0071082B */ sltu $at, $v1, $s1 -/* B79888 801026E8 1420FFF9 */ bnez $at, .L801026D0 -/* B7988C 801026EC 24420001 */ addiu $v0, $v0, 1 -/* B79890 801026F0 27B9007C */ addiu $t9, $sp, 0x7c -.L801026F4: -/* B79894 801026F4 14790018 */ bne $v1, $t9, .L80102758 -/* B79898 801026F8 02402025 */ move $a0, $s2 -/* B7989C 801026FC 5A600013 */ blezl $s3, .L8010274C -/* B798A0 80102700 26730001 */ addiu $s3, $s3, 1 -/* B798A4 80102704 0C041320 */ jal func_80104C80 -/* B798A8 80102708 00002825 */ move $a1, $zero -/* B798AC 8010270C 10400003 */ beqz $v0, .L8010271C -/* B798B0 80102710 00003025 */ move $a2, $zero -/* B798B4 80102714 10000069 */ b .L801028BC -/* B798B8 80102718 8FBF003C */ lw $ra, 0x3c($sp) -.L8010271C: -/* B798BC 8010271C 8E440004 */ lw $a0, 4($s2) -/* B798C0 80102720 8E450008 */ lw $a1, 8($s2) -/* B798C4 80102724 0C0417D0 */ jal osReadMempak -/* B798C8 80102728 02A03825 */ move $a3, $s5 -/* B798CC 8010272C 10400003 */ beqz $v0, .L8010273C -/* B798D0 80102730 93A8007C */ lbu $t0, 0x7c($sp) -/* B798D4 80102734 10000061 */ b .L801028BC -/* B798D8 80102738 8FBF003C */ lw $ra, 0x3c($sp) -.L8010273C: -/* B798DC 8010273C 24010080 */ li $at, 128 -/* B798E0 80102740 55010006 */ bnel $t0, $at, .L8010275C -/* B798E4 80102744 92490065 */ lbu $t1, 0x65($s2) -/* B798E8 80102748 26730001 */ addiu $s3, $s3, 1 -.L8010274C: -/* B798EC 8010274C 2A61003E */ slti $at, $s3, 0x3e -/* B798F0 80102750 5420FFB6 */ bnezl $at, .L8010262C -/* B798F4 80102754 02402025 */ move $a0, $s2 -.L80102758: -/* B798F8 80102758 92490065 */ lbu $t1, 0x65($s2) -.L8010275C: -/* B798FC 8010275C 02402025 */ move $a0, $s2 -/* B79900 80102760 11200007 */ beqz $t1, .L80102780 -/* B79904 80102764 00000000 */ nop -/* B79908 80102768 0C041320 */ jal func_80104C80 -/* B7990C 8010276C 00002825 */ move $a1, $zero -/* B79910 80102770 10400003 */ beqz $v0, .L80102780 -/* B79914 80102774 00000000 */ nop -/* B79918 80102778 10000050 */ b .L801028BC -/* B7991C 8010277C 8FBF003C */ lw $ra, 0x3c($sp) -.L80102780: -/* B79920 80102780 1A600003 */ blez $s3, .L80102790 -/* B79924 80102784 02802025 */ move $a0, $s4 -/* B79928 80102788 10000002 */ b .L80102794 -/* B7992C 8010278C 24020001 */ li $v0, 1 -.L80102790: -/* B79930 80102790 00001025 */ move $v0, $zero -.L80102794: -/* B79934 80102794 96CF0018 */ lhu $t7, 0x18($s6) -/* B79938 80102798 A293001A */ sb $s3, 0x1a($s4) -/* B7993C 8010279C 2685001C */ addiu $a1, $s4, 0x1c -/* B79940 801027A0 31EAFFFE */ andi $t2, $t7, 0xfffe -/* B79944 801027A4 01425825 */ or $t3, $t2, $v0 -/* B79948 801027A8 A68B0018 */ sh $t3, 0x18($s4) -/* B7994C 801027AC 92CC001B */ lbu $t4, 0x1b($s6) -/* B79950 801027B0 2686001E */ addiu $a2, $s4, 0x1e -/* B79954 801027B4 0C040925 */ jal func_80102494 -/* B79958 801027B8 A28C001B */ sb $t4, 0x1b($s4) -/* B7995C 801027BC 240D0001 */ li $t5, 1 -/* B79960 801027C0 240E0003 */ li $t6, 3 -/* B79964 801027C4 24180004 */ li $t8, 4 -/* B79968 801027C8 24190006 */ li $t9, 6 -/* B7996C 801027CC A7AD0048 */ sh $t5, 0x48($sp) -/* B79970 801027D0 A7AE004A */ sh $t6, 0x4a($sp) -/* B79974 801027D4 A7B8004C */ sh $t8, 0x4c($sp) -/* B79978 801027D8 A7B9004E */ sh $t9, 0x4e($sp) -/* B7997C 801027DC 27B00048 */ addiu $s0, $sp, 0x48 -/* B79980 801027E0 27B10050 */ addiu $s1, $sp, 0x50 -/* B79984 801027E4 8E440004 */ lw $a0, 4($s2) -.L801027E8: -/* B79988 801027E8 8E450008 */ lw $a1, 8($s2) -/* B7998C 801027EC 96060000 */ lhu $a2, ($s0) -/* B79990 801027F0 24080001 */ li $t0, 1 -/* B79994 801027F4 AFA80010 */ sw $t0, 0x10($sp) -/* B79998 801027F8 0C04173C */ jal func_80105CF0 -/* B7999C 801027FC 02803825 */ move $a3, $s4 -/* B799A0 80102800 10400003 */ beqz $v0, .L80102810 -/* B799A4 80102804 26100002 */ addiu $s0, $s0, 2 -/* B799A8 80102808 1000002C */ b .L801028BC -/* B799AC 8010280C 8FBF003C */ lw $ra, 0x3c($sp) -.L80102810: -/* B799B0 80102810 0211082B */ sltu $at, $s0, $s1 -/* B799B4 80102814 5420FFF4 */ bnezl $at, .L801027E8 -/* B799B8 80102818 8E440004 */ lw $a0, 4($s2) -/* B799BC 8010281C 8E440004 */ lw $a0, 4($s2) -/* B799C0 80102820 8E450008 */ lw $a1, 8($s2) -/* B799C4 80102824 24060001 */ li $a2, 1 -/* B799C8 80102828 0C0417D0 */ jal osReadMempak -/* B799CC 8010282C 02A03825 */ move $a3, $s5 -/* B799D0 80102830 10400003 */ beqz $v0, .L80102840 -/* B799D4 80102834 02801825 */ move $v1, $s4 -/* B799D8 80102838 10000020 */ b .L801028BC -/* B799DC 8010283C 8FBF003C */ lw $ra, 0x3c($sp) -.L80102840: -/* B799E0 80102840 27A2007C */ addiu $v0, $sp, 0x7c -/* B799E4 80102844 27A4009C */ addiu $a0, $sp, 0x9c -.L80102848: -/* B799E8 80102848 90490000 */ lbu $t1, ($v0) -/* B799EC 8010284C 906F0000 */ lbu $t7, ($v1) -/* B799F0 80102850 512F0004 */ beql $t1, $t7, .L80102864 -/* B799F4 80102854 904A0001 */ lbu $t2, 1($v0) -/* B799F8 80102858 10000017 */ b .L801028B8 -/* B799FC 8010285C 2402000B */ li $v0, 11 -/* B79A00 80102860 904A0001 */ lbu $t2, 1($v0) -.L80102864: -/* B79A04 80102864 906B0001 */ lbu $t3, 1($v1) -/* B79A08 80102868 514B0004 */ beql $t2, $t3, .L8010287C -/* B79A0C 8010286C 904C0002 */ lbu $t4, 2($v0) -/* B79A10 80102870 10000011 */ b .L801028B8 -/* B79A14 80102874 2402000B */ li $v0, 11 -/* B79A18 80102878 904C0002 */ lbu $t4, 2($v0) -.L8010287C: -/* B79A1C 8010287C 906D0002 */ lbu $t5, 2($v1) -/* B79A20 80102880 518D0004 */ beql $t4, $t5, .L80102894 -/* B79A24 80102884 904E0003 */ lbu $t6, 3($v0) -/* B79A28 80102888 1000000B */ b .L801028B8 -/* B79A2C 8010288C 2402000B */ li $v0, 11 -/* B79A30 80102890 904E0003 */ lbu $t6, 3($v0) -.L80102894: -/* B79A34 80102894 90780003 */ lbu $t8, 3($v1) -/* B79A38 80102898 24420004 */ addiu $v0, $v0, 4 -/* B79A3C 8010289C 11D80003 */ beq $t6, $t8, .L801028AC -/* B79A40 801028A0 00000000 */ nop -/* B79A44 801028A4 10000004 */ b .L801028B8 -/* B79A48 801028A8 2402000B */ li $v0, 11 -.L801028AC: -/* B79A4C 801028AC 1444FFE6 */ bne $v0, $a0, .L80102848 -/* B79A50 801028B0 24630004 */ addiu $v1, $v1, 4 -/* B79A54 801028B4 00001025 */ move $v0, $zero -.L801028B8: -/* B79A58 801028B8 8FBF003C */ lw $ra, 0x3c($sp) -.L801028BC: -/* B79A5C 801028BC 8FB00020 */ lw $s0, 0x20($sp) -/* B79A60 801028C0 8FB10024 */ lw $s1, 0x24($sp) -/* B79A64 801028C4 8FB20028 */ lw $s2, 0x28($sp) -/* B79A68 801028C8 8FB3002C */ lw $s3, 0x2c($sp) -/* B79A6C 801028CC 8FB40030 */ lw $s4, 0x30($sp) -/* B79A70 801028D0 8FB50034 */ lw $s5, 0x34($sp) -/* B79A74 801028D4 8FB60038 */ lw $s6, 0x38($sp) -/* B79A78 801028D8 03E00008 */ jr $ra -/* B79A7C 801028DC 27BD00A0 */ addiu $sp, $sp, 0xa0 - -glabel func_801028E0 -/* B79A80 801028E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B79A84 801028E4 AFBF003C */ sw $ra, 0x3c($sp) -/* B79A88 801028E8 AFB60038 */ sw $s6, 0x38($sp) -/* B79A8C 801028EC AFB50034 */ sw $s5, 0x34($sp) -/* B79A90 801028F0 AFB40030 */ sw $s4, 0x30($sp) -/* B79A94 801028F4 AFB3002C */ sw $s3, 0x2c($sp) -/* B79A98 801028F8 AFB20028 */ sw $s2, 0x28($sp) -/* B79A9C 801028FC AFB10024 */ sw $s1, 0x24($sp) -/* B79AA0 80102900 AFB00020 */ sw $s0, 0x20($sp) -/* B79AA4 80102904 908E0065 */ lbu $t6, 0x65($a0) -/* B79AA8 80102908 00A09025 */ move $s2, $a1 -/* B79AAC 8010290C 00809825 */ move $s3, $a0 -/* B79AB0 80102910 51C00008 */ beql $t6, $zero, .L80102934 -/* B79AB4 80102914 240F0001 */ li $t7, 1 -/* B79AB8 80102918 0C041320 */ jal func_80104C80 -/* B79ABC 8010291C 00002825 */ move $a1, $zero -/* B79AC0 80102920 50400004 */ beql $v0, $zero, .L80102934 -/* B79AC4 80102924 240F0001 */ li $t7, 1 -/* B79AC8 80102928 1000003D */ b .L80102A20 -/* B79ACC 8010292C 8FBF003C */ lw $ra, 0x3c($sp) -/* B79AD0 80102930 240F0001 */ li $t7, 1 -.L80102934: -/* B79AD4 80102934 24180003 */ li $t8, 3 -/* B79AD8 80102938 24190004 */ li $t9, 4 -/* B79ADC 8010293C 24080006 */ li $t0, 6 -/* B79AE0 80102940 A7AF0058 */ sh $t7, 0x58($sp) -/* B79AE4 80102944 A7B8005A */ sh $t8, 0x5a($sp) -/* B79AE8 80102948 A7B9005C */ sh $t9, 0x5c($sp) -/* B79AEC 8010294C A7A8005E */ sh $t0, 0x5e($sp) -/* B79AF0 80102950 24110001 */ li $s1, 1 -/* B79AF4 80102954 27B0005A */ addiu $s0, $sp, 0x5a -/* B79AF8 80102958 27B60050 */ addiu $s6, $sp, 0x50 -/* B79AFC 8010295C 24150004 */ li $s5, 4 -/* B79B00 80102960 27B40052 */ addiu $s4, $sp, 0x52 -.L80102964: -/* B79B04 80102964 8E640004 */ lw $a0, 4($s3) -/* B79B08 80102968 8E650008 */ lw $a1, 8($s3) -/* B79B0C 8010296C 96060000 */ lhu $a2, ($s0) -/* B79B10 80102970 0C0417D0 */ jal osReadMempak -/* B79B14 80102974 02403825 */ move $a3, $s2 -/* B79B18 80102978 10400003 */ beqz $v0, .L80102988 -/* B79B1C 8010297C 02402025 */ move $a0, $s2 -/* B79B20 80102980 10000027 */ b .L80102A20 -/* B79B24 80102984 8FBF003C */ lw $ra, 0x3c($sp) -.L80102988: -/* B79B28 80102988 02802825 */ move $a1, $s4 -/* B79B2C 8010298C 0C040925 */ jal func_80102494 -/* B79B30 80102990 02C03025 */ move $a2, $s6 -/* B79B34 80102994 97A90052 */ lhu $t1, 0x52($sp) -/* B79B38 80102998 964A001C */ lhu $t2, 0x1c($s2) -/* B79B3C 8010299C 97AB0050 */ lhu $t3, 0x50($sp) -/* B79B40 801029A0 552A0005 */ bnel $t1, $t2, .L801029B8 -/* B79B44 801029A4 26310001 */ addiu $s1, $s1, 1 -/* B79B48 801029A8 964C001E */ lhu $t4, 0x1e($s2) -/* B79B4C 801029AC 116C0004 */ beq $t3, $t4, .L801029C0 -/* B79B50 801029B0 00000000 */ nop -/* B79B54 801029B4 26310001 */ addiu $s1, $s1, 1 -.L801029B8: -/* B79B58 801029B8 1635FFEA */ bne $s1, $s5, .L80102964 -/* B79B5C 801029BC 26100002 */ addiu $s0, $s0, 2 -.L801029C0: -/* B79B60 801029C0 16350003 */ bne $s1, $s5, .L801029D0 -/* B79B64 801029C4 00008025 */ move $s0, $zero -/* B79B68 801029C8 10000014 */ b .L80102A1C -/* B79B6C 801029CC 2402000A */ li $v0, 10 -.L801029D0: -/* B79B70 801029D0 27B40058 */ addiu $s4, $sp, 0x58 -.L801029D4: -/* B79B74 801029D4 1211000D */ beq $s0, $s1, .L80102A0C -/* B79B78 801029D8 00106840 */ sll $t5, $s0, 1 -/* B79B7C 801029DC 028D7021 */ addu $t6, $s4, $t5 -/* B79B80 801029E0 95C60000 */ lhu $a2, ($t6) -/* B79B84 801029E4 8E640004 */ lw $a0, 4($s3) -/* B79B88 801029E8 8E650008 */ lw $a1, 8($s3) -/* B79B8C 801029EC 240F0001 */ li $t7, 1 -/* B79B90 801029F0 AFAF0010 */ sw $t7, 0x10($sp) -/* B79B94 801029F4 0C04173C */ jal func_80105CF0 -/* B79B98 801029F8 02403825 */ move $a3, $s2 -/* B79B9C 801029FC 50400004 */ beql $v0, $zero, .L80102A10 -/* B79BA0 80102A00 26100001 */ addiu $s0, $s0, 1 -/* B79BA4 80102A04 10000006 */ b .L80102A20 -/* B79BA8 80102A08 8FBF003C */ lw $ra, 0x3c($sp) -.L80102A0C: -/* B79BAC 80102A0C 26100001 */ addiu $s0, $s0, 1 -.L80102A10: -/* B79BB0 80102A10 1615FFF0 */ bne $s0, $s5, .L801029D4 -/* B79BB4 80102A14 00000000 */ nop -/* B79BB8 80102A18 00001025 */ move $v0, $zero -.L80102A1C: -/* B79BBC 80102A1C 8FBF003C */ lw $ra, 0x3c($sp) -.L80102A20: -/* B79BC0 80102A20 8FB00020 */ lw $s0, 0x20($sp) -/* B79BC4 80102A24 8FB10024 */ lw $s1, 0x24($sp) -/* B79BC8 80102A28 8FB20028 */ lw $s2, 0x28($sp) -/* B79BCC 80102A2C 8FB3002C */ lw $s3, 0x2c($sp) -/* B79BD0 80102A30 8FB40030 */ lw $s4, 0x30($sp) -/* B79BD4 80102A34 8FB50034 */ lw $s5, 0x34($sp) -/* B79BD8 80102A38 8FB60038 */ lw $s6, 0x38($sp) -/* B79BDC 80102A3C 03E00008 */ jr $ra -/* B79BE0 80102A40 27BD0060 */ addiu $sp, $sp, 0x60 - -glabel func_80102A44 -/* B79BE4 80102A44 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B79BE8 80102A48 AFBF001C */ sw $ra, 0x1c($sp) -/* B79BEC 80102A4C AFB10018 */ sw $s1, 0x18($sp) -/* B79BF0 80102A50 AFB00014 */ sw $s0, 0x14($sp) -/* B79BF4 80102A54 908E0065 */ lbu $t6, 0x65($a0) -/* B79BF8 80102A58 00808025 */ move $s0, $a0 -/* B79BFC 80102A5C 51C00008 */ beql $t6, $zero, .L80102A80 -/* B79C00 80102A60 8E040004 */ lw $a0, 4($s0) -/* B79C04 80102A64 0C041320 */ jal func_80104C80 -/* B79C08 80102A68 00002825 */ move $a1, $zero -/* B79C0C 80102A6C 50400004 */ beql $v0, $zero, .L80102A80 -/* B79C10 80102A70 8E040004 */ lw $a0, 4($s0) -/* B79C14 80102A74 1000005A */ b .L80102BE0 -/* B79C18 80102A78 8FBF001C */ lw $ra, 0x1c($sp) -/* B79C1C 80102A7C 8E040004 */ lw $a0, 4($s0) -.L80102A80: -/* B79C20 80102A80 8E050008 */ lw $a1, 8($s0) -/* B79C24 80102A84 24060001 */ li $a2, 1 -/* B79C28 80102A88 0C0417D0 */ jal osReadMempak -/* B79C2C 80102A8C 27A7004C */ addiu $a3, $sp, 0x4c -/* B79C30 80102A90 10400003 */ beqz $v0, .L80102AA0 -/* B79C34 80102A94 27A4004C */ addiu $a0, $sp, 0x4c -/* B79C38 80102A98 10000051 */ b .L80102BE0 -/* B79C3C 80102A9C 8FBF001C */ lw $ra, 0x1c($sp) -.L80102AA0: -/* B79C40 80102AA0 27A5006E */ addiu $a1, $sp, 0x6e -/* B79C44 80102AA4 0C040925 */ jal func_80102494 -/* B79C48 80102AA8 27A6006C */ addiu $a2, $sp, 0x6c -/* B79C4C 80102AAC 97AF006E */ lhu $t7, 0x6e($sp) -/* B79C50 80102AB0 97B80068 */ lhu $t8, 0x68($sp) -/* B79C54 80102AB4 27A5004C */ addiu $a1, $sp, 0x4c -/* B79C58 80102AB8 00A08825 */ move $s1, $a1 -/* B79C5C 80102ABC 15F80004 */ bne $t7, $t8, .L80102AD0 -/* B79C60 80102AC0 97B9006C */ lhu $t9, 0x6c($sp) -/* B79C64 80102AC4 97A9006A */ lhu $t1, 0x6a($sp) -/* B79C68 80102AC8 53290015 */ beql $t9, $t1, .L80102B20 -/* B79C6C 80102ACC 962A0018 */ lhu $t2, 0x18($s1) -.L80102AD0: -/* B79C70 80102AD0 0C040A38 */ jal func_801028E0 -/* B79C74 80102AD4 02002025 */ move $a0, $s0 -/* B79C78 80102AD8 2401000A */ li $at, 10 -/* B79C7C 80102ADC 1441000B */ bne $v0, $at, .L80102B0C -/* B79C80 80102AE0 00401825 */ move $v1, $v0 -/* B79C84 80102AE4 02002025 */ move $a0, $s0 -/* B79C88 80102AE8 27A5004C */ addiu $a1, $sp, 0x4c -/* B79C8C 80102AEC 0C040964 */ jal func_80102590 -/* B79C90 80102AF0 27A60028 */ addiu $a2, $sp, 0x28 -/* B79C94 80102AF4 10400003 */ beqz $v0, .L80102B04 -/* B79C98 80102AF8 00000000 */ nop -/* B79C9C 80102AFC 10000038 */ b .L80102BE0 -/* B79CA0 80102B00 8FBF001C */ lw $ra, 0x1c($sp) -.L80102B04: -/* B79CA4 80102B04 10000005 */ b .L80102B1C -/* B79CA8 80102B08 27B10028 */ addiu $s1, $sp, 0x28 -.L80102B0C: -/* B79CAC 80102B0C 50400004 */ beql $v0, $zero, .L80102B20 -/* B79CB0 80102B10 962A0018 */ lhu $t2, 0x18($s1) -/* B79CB4 80102B14 10000031 */ b .L80102BDC -/* B79CB8 80102B18 00601025 */ move $v0, $v1 -.L80102B1C: -/* B79CBC 80102B1C 962A0018 */ lhu $t2, 0x18($s1) -.L80102B20: -/* B79CC0 80102B20 02002025 */ move $a0, $s0 -/* B79CC4 80102B24 02202825 */ move $a1, $s1 -/* B79CC8 80102B28 314B0001 */ andi $t3, $t2, 1 -/* B79CCC 80102B2C 5560000D */ bnezl $t3, .L80102B64 -/* B79CD0 80102B30 02202025 */ move $a0, $s1 -/* B79CD4 80102B34 0C040964 */ jal func_80102590 -/* B79CD8 80102B38 27A60028 */ addiu $a2, $sp, 0x28 -/* B79CDC 80102B3C 10400003 */ beqz $v0, .L80102B4C -/* B79CE0 80102B40 97AC0040 */ lhu $t4, 0x40($sp) -/* B79CE4 80102B44 10000026 */ b .L80102BE0 -/* B79CE8 80102B48 8FBF001C */ lw $ra, 0x1c($sp) -.L80102B4C: -/* B79CEC 80102B4C 318D0001 */ andi $t5, $t4, 1 -/* B79CF0 80102B50 15A00003 */ bnez $t5, .L80102B60 -/* B79CF4 80102B54 27B10028 */ addiu $s1, $sp, 0x28 -/* B79CF8 80102B58 10000020 */ b .L80102BDC -/* B79CFC 80102B5C 2402000B */ li $v0, 11 -.L80102B60: -/* B79D00 80102B60 02202025 */ move $a0, $s1 -.L80102B64: -/* B79D04 80102B64 2605000C */ addiu $a1, $s0, 0xc -/* B79D08 80102B68 0C001BC4 */ jal bcopy -/* B79D0C 80102B6C 24060020 */ li $a2, 32 -/* B79D10 80102B70 922E001B */ lbu $t6, 0x1b($s1) -/* B79D14 80102B74 24090010 */ li $t1, 16 -/* B79D18 80102B78 240A0008 */ li $t2, 8 -/* B79D1C 80102B7C AE0E004C */ sw $t6, 0x4c($s0) -/* B79D20 80102B80 922F001A */ lbu $t7, 0x1a($s1) -/* B79D24 80102B84 AE090050 */ sw $t1, 0x50($s0) -/* B79D28 80102B88 AE0A0054 */ sw $t2, 0x54($s0) -/* B79D2C 80102B8C 31E200FF */ andi $v0, $t7, 0xff -/* B79D30 80102B90 000218C0 */ sll $v1, $v0, 3 -/* B79D34 80102B94 0002C040 */ sll $t8, $v0, 1 -/* B79D38 80102B98 24680008 */ addiu $t0, $v1, 8 -/* B79D3C 80102B9C 27190003 */ addiu $t9, $t8, 3 -/* B79D40 80102BA0 01035821 */ addu $t3, $t0, $v1 -/* B79D44 80102BA4 AE190060 */ sw $t9, 0x60($s0) -/* B79D48 80102BA8 AE080058 */ sw $t0, 0x58($s0) -/* B79D4C 80102BAC AE0B005C */ sw $t3, 0x5c($s0) -/* B79D50 80102BB0 8E040004 */ lw $a0, 4($s0) -/* B79D54 80102BB4 8E050008 */ lw $a1, 8($s0) -/* B79D58 80102BB8 24060007 */ li $a2, 7 -/* B79D5C 80102BBC 2607002C */ addiu $a3, $s0, 0x2c -/* B79D60 80102BC0 0C0417D0 */ jal osReadMempak -/* B79D64 80102BC4 A20F0064 */ sb $t7, 0x64($s0) -/* B79D68 80102BC8 50400004 */ beql $v0, $zero, .L80102BDC -/* B79D6C 80102BCC 00001025 */ move $v0, $zero -/* B79D70 80102BD0 10000003 */ b .L80102BE0 -/* B79D74 80102BD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B79D78 80102BD8 00001025 */ move $v0, $zero -.L80102BDC: -/* B79D7C 80102BDC 8FBF001C */ lw $ra, 0x1c($sp) -.L80102BE0: -/* B79D80 80102BE0 8FB00014 */ lw $s0, 0x14($sp) -/* B79D84 80102BE4 8FB10018 */ lw $s1, 0x18($sp) -/* B79D88 80102BE8 03E00008 */ jr $ra -/* B79D8C 80102BEC 27BD0070 */ addiu $sp, $sp, 0x70 - -glabel func_80102BF0 -/* B79D90 80102BF0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B79D94 80102BF4 AFBF001C */ sw $ra, 0x1c($sp) -/* B79D98 80102BF8 AFB00018 */ sw $s0, 0x18($sp) -/* B79D9C 80102BFC 908E0065 */ lbu $t6, 0x65($a0) -/* B79DA0 80102C00 00808025 */ move $s0, $a0 -/* B79DA4 80102C04 51C0000F */ beql $t6, $zero, .L80102C44 -/* B79DA8 80102C08 8E040004 */ lw $a0, 4($s0) -/* B79DAC 80102C0C 0C041320 */ jal func_80104C80 -/* B79DB0 80102C10 00002825 */ move $a1, $zero -/* B79DB4 80102C14 24010002 */ li $at, 2 -/* B79DB8 80102C18 14410005 */ bne $v0, $at, .L80102C30 -/* B79DBC 80102C1C 00401825 */ move $v1, $v0 -/* B79DC0 80102C20 02002025 */ move $a0, $s0 -/* B79DC4 80102C24 0C041320 */ jal func_80104C80 -/* B79DC8 80102C28 00002825 */ move $a1, $zero -/* B79DCC 80102C2C 00401825 */ move $v1, $v0 -.L80102C30: -/* B79DD0 80102C30 50400004 */ beql $v0, $zero, .L80102C44 -/* B79DD4 80102C34 8E040004 */ lw $a0, 4($s0) -/* B79DD8 80102C38 1000001D */ b .L80102CB0 -/* B79DDC 80102C3C 00601025 */ move $v0, $v1 -/* B79DE0 80102C40 8E040004 */ lw $a0, 4($s0) -.L80102C44: -/* B79DE4 80102C44 8E050008 */ lw $a1, 8($s0) -/* B79DE8 80102C48 24060001 */ li $a2, 1 -/* B79DEC 80102C4C 0C0417D0 */ jal osReadMempak -/* B79DF0 80102C50 27A70028 */ addiu $a3, $sp, 0x28 -/* B79DF4 80102C54 1040000D */ beqz $v0, .L80102C8C -/* B79DF8 80102C58 24010002 */ li $at, 2 -/* B79DFC 80102C5C 10410003 */ beq $v0, $at, .L80102C6C -/* B79E00 80102C60 24060001 */ li $a2, 1 -/* B79E04 80102C64 10000013 */ b .L80102CB4 -/* B79E08 80102C68 8FBF001C */ lw $ra, 0x1c($sp) -.L80102C6C: -/* B79E0C 80102C6C 8E040004 */ lw $a0, 4($s0) -/* B79E10 80102C70 8E050008 */ lw $a1, 8($s0) -/* B79E14 80102C74 0C0417D0 */ jal osReadMempak -/* B79E18 80102C78 27A70028 */ addiu $a3, $sp, 0x28 -/* B79E1C 80102C7C 50400004 */ beql $v0, $zero, .L80102C90 -/* B79E20 80102C80 2604000C */ addiu $a0, $s0, 0xc -/* B79E24 80102C84 1000000B */ b .L80102CB4 -/* B79E28 80102C88 8FBF001C */ lw $ra, 0x1c($sp) -.L80102C8C: -/* B79E2C 80102C8C 2604000C */ addiu $a0, $s0, 0xc -.L80102C90: -/* B79E30 80102C90 27A50028 */ addiu $a1, $sp, 0x28 -/* B79E34 80102C94 0C001A30 */ jal bcmp -/* B79E38 80102C98 24060020 */ li $a2, 32 -/* B79E3C 80102C9C 50400004 */ beql $v0, $zero, .L80102CB0 -/* B79E40 80102CA0 00001025 */ move $v0, $zero -/* B79E44 80102CA4 10000002 */ b .L80102CB0 -/* B79E48 80102CA8 24020002 */ li $v0, 2 -/* B79E4C 80102CAC 00001025 */ move $v0, $zero -.L80102CB0: -/* B79E50 80102CB0 8FBF001C */ lw $ra, 0x1c($sp) -.L80102CB4: -/* B79E54 80102CB4 8FB00018 */ lw $s0, 0x18($sp) -/* B79E58 80102CB8 27BD0048 */ addiu $sp, $sp, 0x48 -/* B79E5C 80102CBC 03E00008 */ jr $ra -/* B79E60 80102CC0 00000000 */ nop - -glabel func_80102CC4 -/* B79E64 80102CC4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B79E68 80102CC8 AFB40030 */ sw $s4, 0x30($sp) -/* B79E6C 80102CCC 30D400FF */ andi $s4, $a2, 0xff -/* B79E70 80102CD0 AFB20028 */ sw $s2, 0x28($sp) -/* B79E74 80102CD4 00809025 */ move $s2, $a0 -/* B79E78 80102CD8 AFBF0034 */ sw $ra, 0x34($sp) -/* B79E7C 80102CDC AFB3002C */ sw $s3, 0x2c($sp) -/* B79E80 80102CE0 AFB10024 */ sw $s1, 0x24($sp) -/* B79E84 80102CE4 AFB00020 */ sw $s0, 0x20($sp) -/* B79E88 80102CE8 AFA5005C */ sw $a1, 0x5c($sp) -/* B79E8C 80102CEC AFA60060 */ sw $a2, 0x60($sp) -/* B79E90 80102CF0 16800011 */ bnez $s4, .L80102D38 -/* B79E94 80102CF4 AFA70064 */ sw $a3, 0x64($sp) -/* B79E98 80102CF8 3C0F8013 */ lui $t7, %hi(__osPfsInodeCacheBank) # $t7, 0x8013 -/* B79E9C 80102CFC 91EF4CF4 */ lbu $t7, %lo(__osPfsInodeCacheBank)($t7) -/* B79EA0 80102D00 93B80067 */ lbu $t8, 0x67($sp) -/* B79EA4 80102D04 3C198013 */ lui $t9, %hi(D_80134CF0) # $t9, 0x8013 -/* B79EA8 80102D08 55F8000C */ bnel $t7, $t8, .L80102D3C -/* B79EAC 80102D0C 92490065 */ lbu $t1, 0x65($s2) -/* B79EB0 80102D10 8F394CF0 */ lw $t9, %lo(D_80134CF0)($t9) -/* B79EB4 80102D14 8C880008 */ lw $t0, 8($a0) -/* B79EB8 80102D18 3C048017 */ lui $a0, %hi(D_80175860) # $a0, 0x8017 -/* B79EBC 80102D1C 24845860 */ addiu $a0, %lo(D_80175860) # addiu $a0, $a0, 0x5860 -/* B79EC0 80102D20 57280006 */ bnel $t9, $t0, .L80102D3C -/* B79EC4 80102D24 92490065 */ lbu $t1, 0x65($s2) -/* B79EC8 80102D28 0C001BC4 */ jal bcopy -/* B79ECC 80102D2C 24060100 */ li $a2, 256 -/* B79ED0 80102D30 10000091 */ b .L80102F78 -/* B79ED4 80102D34 00001025 */ move $v0, $zero -.L80102D38: -/* B79ED8 80102D38 92490065 */ lbu $t1, 0x65($s2) -.L80102D3C: -/* B79EDC 80102D3C 02402025 */ move $a0, $s2 -/* B79EE0 80102D40 51200008 */ beql $t1, $zero, .L80102D64 -/* B79EE4 80102D44 93A30067 */ lbu $v1, 0x67($sp) -/* B79EE8 80102D48 0C041320 */ jal func_80104C80 -/* B79EEC 80102D4C 00002825 */ move $a1, $zero -/* B79EF0 80102D50 50400004 */ beql $v0, $zero, .L80102D64 -/* B79EF4 80102D54 93A30067 */ lbu $v1, 0x67($sp) -/* B79EF8 80102D58 10000088 */ b .L80102F7C -/* B79EFC 80102D5C 8FBF0034 */ lw $ra, 0x34($sp) -/* B79F00 80102D60 93A30067 */ lbu $v1, 0x67($sp) -.L80102D64: -/* B79F04 80102D64 24020001 */ li $v0, 1 -/* B79F08 80102D68 240A0001 */ li $t2, 1 -/* B79F0C 80102D6C 58600004 */ blezl $v1, .L80102D80 -/* B79F10 80102D70 8E4B0060 */ lw $t3, 0x60($s2) -/* B79F14 80102D74 10000003 */ b .L80102D84 -/* B79F18 80102D78 AFAA0048 */ sw $t2, 0x48($sp) -/* B79F1C 80102D7C 8E4B0060 */ lw $t3, 0x60($s2) -.L80102D80: -/* B79F20 80102D80 AFAB0048 */ sw $t3, 0x48($sp) -.L80102D84: -/* B79F24 80102D84 1454000C */ bne $v0, $s4, .L80102DB8 -/* B79F28 80102D88 8FAD0048 */ lw $t5, 0x48($sp) -/* B79F2C 80102D8C 8FAC005C */ lw $t4, 0x5c($sp) -/* B79F30 80102D90 000D2823 */ negu $a1, $t5 -/* B79F34 80102D94 00057840 */ sll $t7, $a1, 1 -/* B79F38 80102D98 000D7040 */ sll $t6, $t5, 1 -/* B79F3C 80102D9C 25E50100 */ addiu $a1, $t7, 0x100 -/* B79F40 80102DA0 AFA3003C */ sw $v1, 0x3c($sp) -/* B79F44 80102DA4 0C040908 */ jal func_80102420 -/* B79F48 80102DA8 018E2021 */ addu $a0, $t4, $t6 -/* B79F4C 80102DAC 8FB8005C */ lw $t8, 0x5c($sp) -/* B79F50 80102DB0 8FA3003C */ lw $v1, 0x3c($sp) -/* B79F54 80102DB4 A3020001 */ sb $v0, 1($t8) -.L80102DB8: -/* B79F58 80102DB8 00008025 */ move $s0, $zero -/* B79F5C 80102DBC 8FB1005C */ lw $s1, 0x5c($sp) -/* B79F60 80102DC0 000398C0 */ sll $s3, $v1, 3 -.L80102DC4: -/* B79F64 80102DC4 24020001 */ li $v0, 1 -/* B79F68 80102DC8 14540016 */ bne $v0, $s4, .L80102E24 -/* B79F6C 80102DCC 8E450008 */ lw $a1, 8($s2) -/* B79F70 80102DD0 8E590054 */ lw $t9, 0x54($s2) -/* B79F74 80102DD4 8E440004 */ lw $a0, 4($s2) -/* B79F78 80102DD8 AFA00010 */ sw $zero, 0x10($sp) -/* B79F7C 80102DDC 03334021 */ addu $t0, $t9, $s3 -/* B79F80 80102DE0 01103021 */ addu $a2, $t0, $s0 -/* B79F84 80102DE4 30C9FFFF */ andi $t1, $a2, 0xffff -/* B79F88 80102DE8 01203025 */ move $a2, $t1 -/* B79F8C 80102DEC 0C04173C */ jal func_80105CF0 -/* B79F90 80102DF0 02203825 */ move $a3, $s1 -/* B79F94 80102DF4 8E4A0058 */ lw $t2, 0x58($s2) -/* B79F98 80102DF8 8E440004 */ lw $a0, 4($s2) -/* B79F9C 80102DFC 8E450008 */ lw $a1, 8($s2) -/* B79FA0 80102E00 01535821 */ addu $t3, $t2, $s3 -/* B79FA4 80102E04 01703021 */ addu $a2, $t3, $s0 -/* B79FA8 80102E08 30CCFFFF */ andi $t4, $a2, 0xffff -/* B79FAC 80102E0C 01803025 */ move $a2, $t4 -/* B79FB0 80102E10 AFA00010 */ sw $zero, 0x10($sp) -/* B79FB4 80102E14 0C04173C */ jal func_80105CF0 -/* B79FB8 80102E18 02203825 */ move $a3, $s1 -/* B79FBC 80102E1C 1000000A */ b .L80102E48 -/* B79FC0 80102E20 00401825 */ move $v1, $v0 -.L80102E24: -/* B79FC4 80102E24 8E4E0054 */ lw $t6, 0x54($s2) -/* B79FC8 80102E28 8E440004 */ lw $a0, 4($s2) -/* B79FCC 80102E2C 02203825 */ move $a3, $s1 -/* B79FD0 80102E30 01D36821 */ addu $t5, $t6, $s3 -/* B79FD4 80102E34 01B03021 */ addu $a2, $t5, $s0 -/* B79FD8 80102E38 30CFFFFF */ andi $t7, $a2, 0xffff -/* B79FDC 80102E3C 0C0417D0 */ jal osReadMempak -/* B79FE0 80102E40 01E03025 */ move $a2, $t7 -/* B79FE4 80102E44 00401825 */ move $v1, $v0 -.L80102E48: -/* B79FE8 80102E48 10400003 */ beqz $v0, .L80102E58 -/* B79FEC 80102E4C 26100001 */ addiu $s0, $s0, 1 -/* B79FF0 80102E50 10000049 */ b .L80102F78 -/* B79FF4 80102E54 00601025 */ move $v0, $v1 -.L80102E58: -/* B79FF8 80102E58 2A010008 */ slti $at, $s0, 8 -/* B79FFC 80102E5C 1420FFD9 */ bnez $at, .L80102DC4 -/* B7A000 80102E60 26310020 */ addiu $s1, $s1, 0x20 -/* B7A004 80102E64 16800038 */ bnez $s4, .L80102F48 -/* B7A008 80102E68 8FB90048 */ lw $t9, 0x48($sp) -/* B7A00C 80102E6C 8FB8005C */ lw $t8, 0x5c($sp) -/* B7A010 80102E70 00192823 */ negu $a1, $t9 -/* B7A014 80102E74 00054840 */ sll $t1, $a1, 1 -/* B7A018 80102E78 00194040 */ sll $t0, $t9, 1 -/* B7A01C 80102E7C 25250100 */ addiu $a1, $t1, 0x100 -/* B7A020 80102E80 0308A021 */ addu $s4, $t8, $t0 -/* B7A024 80102E84 02802025 */ move $a0, $s4 -/* B7A028 80102E88 0C040908 */ jal func_80102420 -/* B7A02C 80102E8C AFA5003C */ sw $a1, 0x3c($sp) -/* B7A030 80102E90 8FAB005C */ lw $t3, 0x5c($sp) -/* B7A034 80102E94 304A00FF */ andi $t2, $v0, 0xff -/* B7A038 80102E98 00008025 */ move $s0, $zero -/* B7A03C 80102E9C 916C0001 */ lbu $t4, 1($t3) -/* B7A040 80102EA0 01608825 */ move $s1, $t3 -/* B7A044 80102EA4 514C0029 */ beql $t2, $t4, .L80102F4C -/* B7A048 80102EA8 93AB0067 */ lbu $t3, 0x67($sp) -.L80102EAC: -/* B7A04C 80102EAC 8E4E0058 */ lw $t6, 0x58($s2) -/* B7A050 80102EB0 8E440004 */ lw $a0, 4($s2) -/* B7A054 80102EB4 8E450008 */ lw $a1, 8($s2) -/* B7A058 80102EB8 01D36821 */ addu $t5, $t6, $s3 -/* B7A05C 80102EBC 01B03021 */ addu $a2, $t5, $s0 -/* B7A060 80102EC0 30CFFFFF */ andi $t7, $a2, 0xffff -/* B7A064 80102EC4 01E03025 */ move $a2, $t7 -/* B7A068 80102EC8 0C0417D0 */ jal osReadMempak -/* B7A06C 80102ECC 02203825 */ move $a3, $s1 -/* B7A070 80102ED0 26100001 */ addiu $s0, $s0, 1 -/* B7A074 80102ED4 2A010008 */ slti $at, $s0, 8 -/* B7A078 80102ED8 1420FFF4 */ bnez $at, .L80102EAC -/* B7A07C 80102EDC 26310020 */ addiu $s1, $s1, 0x20 -/* B7A080 80102EE0 02802025 */ move $a0, $s4 -/* B7A084 80102EE4 0C040908 */ jal func_80102420 -/* B7A088 80102EE8 8FA5003C */ lw $a1, 0x3c($sp) -/* B7A08C 80102EEC 8FA8005C */ lw $t0, 0x5c($sp) -/* B7A090 80102EF0 305800FF */ andi $t8, $v0, 0xff -/* B7A094 80102EF4 00008025 */ move $s0, $zero -/* B7A098 80102EF8 91190001 */ lbu $t9, 1($t0) -/* B7A09C 80102EFC 8FB1005C */ lw $s1, 0x5c($sp) -/* B7A0A0 80102F00 13190003 */ beq $t8, $t9, .L80102F10 -/* B7A0A4 80102F04 00000000 */ nop -/* B7A0A8 80102F08 1000001B */ b .L80102F78 -/* B7A0AC 80102F0C 24020003 */ li $v0, 3 -.L80102F10: -/* B7A0B0 80102F10 8E490054 */ lw $t1, 0x54($s2) -/* B7A0B4 80102F14 8E440004 */ lw $a0, 4($s2) -/* B7A0B8 80102F18 8E450008 */ lw $a1, 8($s2) -/* B7A0BC 80102F1C 01335021 */ addu $t2, $t1, $s3 -/* B7A0C0 80102F20 01503021 */ addu $a2, $t2, $s0 -/* B7A0C4 80102F24 30CCFFFF */ andi $t4, $a2, 0xffff -/* B7A0C8 80102F28 01803025 */ move $a2, $t4 -/* B7A0CC 80102F2C AFA00010 */ sw $zero, 0x10($sp) -/* B7A0D0 80102F30 0C04173C */ jal func_80105CF0 -/* B7A0D4 80102F34 02203825 */ move $a3, $s1 -/* B7A0D8 80102F38 26100001 */ addiu $s0, $s0, 1 -/* B7A0DC 80102F3C 24010008 */ li $at, 8 -/* B7A0E0 80102F40 1601FFF3 */ bne $s0, $at, .L80102F10 -/* B7A0E4 80102F44 26310020 */ addiu $s1, $s1, 0x20 -.L80102F48: -/* B7A0E8 80102F48 93AB0067 */ lbu $t3, 0x67($sp) -.L80102F4C: -/* B7A0EC 80102F4C 3C018013 */ lui $at, %hi(__osPfsInodeCacheBank) # $at, 0x8013 -/* B7A0F0 80102F50 3C058017 */ lui $a1, %hi(D_80175860) # $a1, 0x8017 -/* B7A0F4 80102F54 24A55860 */ addiu $a1, %lo(D_80175860) # addiu $a1, $a1, 0x5860 -/* B7A0F8 80102F58 8FA4005C */ lw $a0, 0x5c($sp) -/* B7A0FC 80102F5C 24060100 */ li $a2, 256 -/* B7A100 80102F60 0C001BC4 */ jal bcopy -/* B7A104 80102F64 A02B4CF4 */ sb $t3, %lo(__osPfsInodeCacheBank)($at) -/* B7A108 80102F68 8E4E0008 */ lw $t6, 8($s2) -/* B7A10C 80102F6C 3C018013 */ lui $at, %hi(D_80134CF0) # $at, 0x8013 -/* B7A110 80102F70 00001025 */ move $v0, $zero -/* B7A114 80102F74 AC2E4CF0 */ sw $t6, %lo(D_80134CF0)($at) -.L80102F78: -/* B7A118 80102F78 8FBF0034 */ lw $ra, 0x34($sp) -.L80102F7C: -/* B7A11C 80102F7C 8FB00020 */ lw $s0, 0x20($sp) -/* B7A120 80102F80 8FB10024 */ lw $s1, 0x24($sp) -/* B7A124 80102F84 8FB20028 */ lw $s2, 0x28($sp) -/* B7A128 80102F88 8FB3002C */ lw $s3, 0x2c($sp) -/* B7A12C 80102F8C 8FB40030 */ lw $s4, 0x30($sp) -/* B7A130 80102F90 03E00008 */ jr $ra -/* B7A134 80102F94 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/code_80103010.s b/asm/code_80103010.s deleted file mode 100644 index 665dbd35a9..0000000000 --- a/asm/code_80103010.s +++ /dev/null @@ -1,140 +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 osPfsFindFile -/* B7A1B0 80103010 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B7A1B4 80103014 AFBF003C */ sw $ra, 0x3c($sp) -/* B7A1B8 80103018 AFBE0038 */ sw $fp, 0x38($sp) -/* B7A1BC 8010301C AFB70034 */ sw $s7, 0x34($sp) -/* B7A1C0 80103020 AFB60030 */ sw $s6, 0x30($sp) -/* B7A1C4 80103024 AFB5002C */ sw $s5, 0x2c($sp) -/* B7A1C8 80103028 AFB40028 */ sw $s4, 0x28($sp) -/* B7A1CC 8010302C AFB30024 */ sw $s3, 0x24($sp) -/* B7A1D0 80103030 AFB20020 */ sw $s2, 0x20($sp) -/* B7A1D4 80103034 AFB1001C */ sw $s1, 0x1c($sp) -/* B7A1D8 80103038 AFB00018 */ sw $s0, 0x18($sp) -/* B7A1DC 8010303C AFA5007C */ sw $a1, 0x7c($sp) -/* B7A1E0 80103040 8C8E0000 */ lw $t6, ($a0) -/* B7A1E4 80103044 00809025 */ move $s2, $a0 -/* B7A1E8 80103048 00E0A825 */ move $s5, $a3 -/* B7A1EC 8010304C 31CF0001 */ andi $t7, $t6, 1 -/* B7A1F0 80103050 30B7FFFF */ andi $s7, $a1, 0xffff -/* B7A1F4 80103054 15E00003 */ bnez $t7, .L80103064 -/* B7A1F8 80103058 00C0F025 */ move $fp, $a2 -/* B7A1FC 8010305C 10000051 */ b .L801031A4 -/* B7A200 80103060 24020005 */ li $v0, 5 -.L80103064: -/* B7A204 80103064 0C040AFC */ jal func_80102BF0 -/* B7A208 80103068 02402025 */ move $a0, $s2 -/* B7A20C 8010306C 50400004 */ beql $v0, $zero, .L80103080 -/* B7A210 80103070 8E580050 */ lw $t8, 0x50($s2) -/* B7A214 80103074 1000004C */ b .L801031A8 -/* B7A218 80103078 8FBF003C */ lw $ra, 0x3c($sp) -/* B7A21C 8010307C 8E580050 */ lw $t8, 0x50($s2) -.L80103080: -/* B7A220 80103080 00009825 */ move $s3, $zero -/* B7A224 80103084 27B60050 */ addiu $s6, $sp, 0x50 -/* B7A228 80103088 1B000042 */ blez $t8, .L80103194 -/* B7A22C 8010308C 8FB40088 */ lw $s4, 0x88($sp) -/* B7A230 80103090 27B10060 */ addiu $s1, $sp, 0x60 -/* B7A234 80103094 27B00054 */ addiu $s0, $sp, 0x54 -/* B7A238 80103098 8E59005C */ lw $t9, 0x5c($s2) -.L8010309C: -/* B7A23C 8010309C 8E440004 */ lw $a0, 4($s2) -/* B7A240 801030A0 8E450008 */ lw $a1, 8($s2) -/* B7A244 801030A4 03333021 */ addu $a2, $t9, $s3 -/* B7A248 801030A8 30C8FFFF */ andi $t0, $a2, 0xffff -/* B7A24C 801030AC 01003025 */ move $a2, $t0 -/* B7A250 801030B0 0C0417D0 */ jal osReadMempak -/* B7A254 801030B4 02C03825 */ move $a3, $s6 -/* B7A258 801030B8 50400004 */ beql $v0, $zero, .L801030CC -/* B7A25C 801030BC 8E440004 */ lw $a0, 4($s2) -/* B7A260 801030C0 10000039 */ b .L801031A8 -/* B7A264 801030C4 8FBF003C */ lw $ra, 0x3c($sp) -/* B7A268 801030C8 8E440004 */ lw $a0, 4($s2) -.L801030CC: -/* B7A26C 801030CC 0C040644 */ jal __osPfsGetStatus -/* B7A270 801030D0 8E450008 */ lw $a1, 8($s2) -/* B7A274 801030D4 10400003 */ beqz $v0, .L801030E4 -/* B7A278 801030D8 00403025 */ move $a2, $v0 -/* B7A27C 801030DC 10000032 */ b .L801031A8 -/* B7A280 801030E0 8FBF003C */ lw $ra, 0x3c($sp) -.L801030E4: -/* B7A284 801030E4 97A90054 */ lhu $t1, 0x54($sp) -/* B7A288 801030E8 8FAA0050 */ lw $t2, 0x50($sp) -/* B7A28C 801030EC 56E90025 */ bnel $s7, $t1, .L80103184 -/* B7A290 801030F0 8E580050 */ lw $t8, 0x50($s2) -/* B7A294 801030F4 555E0023 */ bnel $t2, $fp, .L80103184 -/* B7A298 801030F8 8E580050 */ lw $t8, 0x50($s2) -/* B7A29C 801030FC 12A0000C */ beqz $s5, .L80103130 -/* B7A2A0 80103100 00002025 */ move $a0, $zero -/* B7A2A4 80103104 27A20050 */ addiu $v0, $sp, 0x50 -/* B7A2A8 80103108 02A01825 */ move $v1, $s5 -.L8010310C: -/* B7A2AC 8010310C 904B0010 */ lbu $t3, 0x10($v0) -/* B7A2B0 80103110 906C0000 */ lbu $t4, ($v1) -/* B7A2B4 80103114 24420001 */ addiu $v0, $v0, 1 -/* B7A2B8 80103118 116C0003 */ beq $t3, $t4, .L80103128 -/* B7A2BC 8010311C 00000000 */ nop -/* B7A2C0 80103120 10000003 */ b .L80103130 -/* B7A2C4 80103124 24040001 */ li $a0, 1 -.L80103128: -/* B7A2C8 80103128 1451FFF8 */ bne $v0, $s1, .L8010310C -/* B7A2CC 8010312C 24630001 */ addiu $v1, $v1, 1 -.L80103130: -/* B7A2D0 80103130 1280000D */ beqz $s4, .L80103168 -/* B7A2D4 80103134 00000000 */ nop -/* B7A2D8 80103138 1480000B */ bnez $a0, .L80103168 -/* B7A2DC 8010313C 27A20050 */ addiu $v0, $sp, 0x50 -/* B7A2E0 80103140 02801825 */ move $v1, $s4 -.L80103144: -/* B7A2E4 80103144 904D000C */ lbu $t5, 0xc($v0) -/* B7A2E8 80103148 906E0000 */ lbu $t6, ($v1) -/* B7A2EC 8010314C 24420001 */ addiu $v0, $v0, 1 -/* B7A2F0 80103150 11AE0003 */ beq $t5, $t6, .L80103160 -/* B7A2F4 80103154 00000000 */ nop -/* B7A2F8 80103158 10000003 */ b .L80103168 -/* B7A2FC 8010315C 24040001 */ li $a0, 1 -.L80103160: -/* B7A300 80103160 1450FFF8 */ bne $v0, $s0, .L80103144 -/* B7A304 80103164 24630001 */ addiu $v1, $v1, 1 -.L80103168: -/* B7A308 80103168 54800006 */ bnezl $a0, .L80103184 -/* B7A30C 8010316C 8E580050 */ lw $t8, 0x50($s2) -/* B7A310 80103170 8FAF008C */ lw $t7, 0x8c($sp) -/* B7A314 80103174 00C01025 */ move $v0, $a2 -/* B7A318 80103178 1000000A */ b .L801031A4 -/* B7A31C 8010317C ADF30000 */ sw $s3, ($t7) -/* B7A320 80103180 8E580050 */ lw $t8, 0x50($s2) -.L80103184: -/* B7A324 80103184 26730001 */ addiu $s3, $s3, 1 -/* B7A328 80103188 0278082A */ slt $at, $s3, $t8 -/* B7A32C 8010318C 5420FFC3 */ bnezl $at, .L8010309C -/* B7A330 80103190 8E59005C */ lw $t9, 0x5c($s2) -.L80103194: -/* B7A334 80103194 8FA8008C */ lw $t0, 0x8c($sp) -/* B7A338 80103198 2419FFFF */ li $t9, -1 -/* B7A33C 8010319C 24020005 */ li $v0, 5 -/* B7A340 801031A0 AD190000 */ sw $t9, ($t0) -.L801031A4: -/* B7A344 801031A4 8FBF003C */ lw $ra, 0x3c($sp) -.L801031A8: -/* B7A348 801031A8 8FB00018 */ lw $s0, 0x18($sp) -/* B7A34C 801031AC 8FB1001C */ lw $s1, 0x1c($sp) -/* B7A350 801031B0 8FB20020 */ lw $s2, 0x20($sp) -/* B7A354 801031B4 8FB30024 */ lw $s3, 0x24($sp) -/* B7A358 801031B8 8FB40028 */ lw $s4, 0x28($sp) -/* B7A35C 801031BC 8FB5002C */ lw $s5, 0x2c($sp) -/* B7A360 801031C0 8FB60030 */ lw $s6, 0x30($sp) -/* B7A364 801031C4 8FB70034 */ lw $s7, 0x34($sp) -/* B7A368 801031C8 8FBE0038 */ lw $fp, 0x38($sp) -/* B7A36C 801031CC 03E00008 */ jr $ra -/* B7A370 801031D0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/code_801041E0.s b/asm/code_801041E0.s deleted file mode 100644 index c52d274ddb..0000000000 --- a/asm/code_801041E0.s +++ /dev/null @@ -1,184 +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 osPfsDeleteFile -/* B7B380 801041E0 27BDFE90 */ addiu $sp, $sp, -0x170 -/* B7B384 801041E4 AFB20024 */ sw $s2, 0x24($sp) -/* B7B388 801041E8 AFA50174 */ sw $a1, 0x174($sp) -/* B7B38C 801041EC 30AEFFFF */ andi $t6, $a1, 0xffff -/* B7B390 801041F0 01C02825 */ move $a1, $t6 -/* B7B394 801041F4 00809025 */ move $s2, $a0 -/* B7B398 801041F8 AFBF0034 */ sw $ra, 0x34($sp) -/* B7B39C 801041FC AFB50030 */ sw $s5, 0x30($sp) -/* B7B3A0 80104200 AFB4002C */ sw $s4, 0x2c($sp) -/* B7B3A4 80104204 AFB30028 */ sw $s3, 0x28($sp) -/* B7B3A8 80104208 AFB10020 */ sw $s1, 0x20($sp) -/* B7B3AC 8010420C 11C00003 */ beqz $t6, .L8010421C -/* B7B3B0 80104210 AFB0001C */ sw $s0, 0x1c($sp) -/* B7B3B4 80104214 14C00003 */ bnez $a2, .L80104224 -/* B7B3B8 80104218 02402025 */ move $a0, $s2 -.L8010421C: -/* B7B3BC 8010421C 1000005D */ b .L80104394 -/* B7B3C0 80104220 24020005 */ li $v0, 5 -.L80104224: -/* B7B3C4 80104224 8FAF0180 */ lw $t7, 0x180($sp) -/* B7B3C8 80104228 27B8016C */ addiu $t8, $sp, 0x16c -/* B7B3CC 8010422C AFB80014 */ sw $t8, 0x14($sp) -/* B7B3D0 80104230 0C040C04 */ jal osPfsFindFile -/* B7B3D4 80104234 AFAF0010 */ sw $t7, 0x10($sp) -/* B7B3D8 80104238 50400004 */ beql $v0, $zero, .L8010424C -/* B7B3DC 8010423C 92590065 */ lbu $t9, 0x65($s2) -/* B7B3E0 80104240 10000055 */ b .L80104398 -/* B7B3E4 80104244 8FBF0034 */ lw $ra, 0x34($sp) -/* B7B3E8 80104248 92590065 */ lbu $t9, 0x65($s2) -.L8010424C: -/* B7B3EC 8010424C 02402025 */ move $a0, $s2 -/* B7B3F0 80104250 53200008 */ beql $t9, $zero, .L80104274 -/* B7B3F4 80104254 8E48005C */ lw $t0, 0x5c($s2) -/* B7B3F8 80104258 0C041320 */ jal func_80104C80 -/* B7B3FC 8010425C 00002825 */ move $a1, $zero -/* B7B400 80104260 50400004 */ beql $v0, $zero, .L80104274 -/* B7B404 80104264 8E48005C */ lw $t0, 0x5c($s2) -/* B7B408 80104268 1000004B */ b .L80104398 -/* B7B40C 8010426C 8FBF0034 */ lw $ra, 0x34($sp) -/* B7B410 80104270 8E48005C */ lw $t0, 0x5c($s2) -.L80104274: -/* B7B414 80104274 8FA9016C */ lw $t1, 0x16c($sp) -/* B7B418 80104278 8E440004 */ lw $a0, 4($s2) -/* B7B41C 8010427C 8E450008 */ lw $a1, 8($s2) -/* B7B420 80104280 01093021 */ addu $a2, $t0, $t1 -/* B7B424 80104284 30CAFFFF */ andi $t2, $a2, 0xffff -/* B7B428 80104288 01403025 */ move $a2, $t2 -/* B7B42C 8010428C 0C0417D0 */ jal osReadMempak -/* B7B430 80104290 27A70048 */ addiu $a3, $sp, 0x48 -/* B7B434 80104294 10400003 */ beqz $v0, .L801042A4 -/* B7B438 80104298 93B0004E */ lbu $s0, 0x4e($sp) -/* B7B43C 8010429C 1000003E */ b .L80104398 -/* B7B440 801042A0 8FBF0034 */ lw $ra, 0x34($sp) -.L801042A4: -/* B7B444 801042A4 92420064 */ lbu $v0, 0x64($s2) -/* B7B448 801042A8 93B3004F */ lbu $s3, 0x4f($sp) -/* B7B44C 801042AC 24150001 */ li $s5, 1 -/* B7B450 801042B0 0202082A */ slt $at, $s0, $v0 -/* B7B454 801042B4 10200026 */ beqz $at, .L80104350 -/* B7B458 801042B8 27B40044 */ addiu $s4, $sp, 0x44 -/* B7B45C 801042BC 27B10068 */ addiu $s1, $sp, 0x68 -/* B7B460 801042C0 02402025 */ move $a0, $s2 -.L801042C4: -/* B7B464 801042C4 02202825 */ move $a1, $s1 -/* B7B468 801042C8 00003025 */ move $a2, $zero -/* B7B46C 801042CC 0C040B31 */ jal func_80102CC4 -/* B7B470 801042D0 320700FF */ andi $a3, $s0, 0xff -/* B7B474 801042D4 10400003 */ beqz $v0, .L801042E4 -/* B7B478 801042D8 02402025 */ move $a0, $s2 -/* B7B47C 801042DC 1000002E */ b .L80104398 -/* B7B480 801042E0 8FBF0034 */ lw $ra, 0x34($sp) -.L801042E4: -/* B7B484 801042E4 02202825 */ move $a1, $s1 -/* B7B488 801042E8 326600FF */ andi $a2, $s3, 0xff -/* B7B48C 801042EC 320700FF */ andi $a3, $s0, 0xff -/* B7B490 801042F0 0C0410EE */ jal func_801043B8 -/* B7B494 801042F4 AFB40010 */ sw $s4, 0x10($sp) -/* B7B498 801042F8 10400003 */ beqz $v0, .L80104308 -/* B7B49C 801042FC 02402025 */ move $a0, $s2 -/* B7B4A0 80104300 10000025 */ b .L80104398 -/* B7B4A4 80104304 8FBF0034 */ lw $ra, 0x34($sp) -.L80104308: -/* B7B4A8 80104308 02202825 */ move $a1, $s1 -/* B7B4AC 8010430C 24060001 */ li $a2, 1 -/* B7B4B0 80104310 0C040B31 */ jal func_80102CC4 -/* B7B4B4 80104314 320700FF */ andi $a3, $s0, 0xff -/* B7B4B8 80104318 10400003 */ beqz $v0, .L80104328 -/* B7B4BC 8010431C 97AC0044 */ lhu $t4, 0x44($sp) -/* B7B4C0 80104320 1000001D */ b .L80104398 -/* B7B4C4 80104324 8FBF0034 */ lw $ra, 0x34($sp) -.L80104328: -/* B7B4C8 80104328 56AC0004 */ bnel $s5, $t4, .L8010433C -/* B7B4CC 8010432C 92420064 */ lbu $v0, 0x64($s2) -/* B7B4D0 80104330 10000007 */ b .L80104350 -/* B7B4D4 80104334 92420064 */ lbu $v0, 0x64($s2) -/* B7B4D8 80104338 92420064 */ lbu $v0, 0x64($s2) -.L8010433C: -/* B7B4DC 8010433C 93B00044 */ lbu $s0, 0x44($sp) -/* B7B4E0 80104340 93B30045 */ lbu $s3, 0x45($sp) -/* B7B4E4 80104344 0202082A */ slt $at, $s0, $v0 -/* B7B4E8 80104348 5420FFDE */ bnezl $at, .L801042C4 -/* B7B4EC 8010434C 02402025 */ move $a0, $s2 -.L80104350: -/* B7B4F0 80104350 0202082A */ slt $at, $s0, $v0 -/* B7B4F4 80104354 14200003 */ bnez $at, .L80104364 -/* B7B4F8 80104358 27A40048 */ addiu $a0, $sp, 0x48 -/* B7B4FC 8010435C 1000000D */ b .L80104394 -/* B7B500 80104360 24020003 */ li $v0, 3 -.L80104364: -/* B7B504 80104364 0C001114 */ jal bzero -/* B7B508 80104368 24050020 */ li $a1, 32 -/* B7B50C 8010436C 8E4D005C */ lw $t5, 0x5c($s2) -/* B7B510 80104370 8FAE016C */ lw $t6, 0x16c($sp) -/* B7B514 80104374 8E440004 */ lw $a0, 4($s2) -/* B7B518 80104378 8E450008 */ lw $a1, 8($s2) -/* B7B51C 8010437C 01AE3021 */ addu $a2, $t5, $t6 -/* B7B520 80104380 30CFFFFF */ andi $t7, $a2, 0xffff -/* B7B524 80104384 01E03025 */ move $a2, $t7 -/* B7B528 80104388 AFA00010 */ sw $zero, 0x10($sp) -/* B7B52C 8010438C 0C04173C */ jal func_80105CF0 -/* B7B530 80104390 27A70048 */ addiu $a3, $sp, 0x48 -.L80104394: -/* B7B534 80104394 8FBF0034 */ lw $ra, 0x34($sp) -.L80104398: -/* B7B538 80104398 8FB0001C */ lw $s0, 0x1c($sp) -/* B7B53C 8010439C 8FB10020 */ lw $s1, 0x20($sp) -/* B7B540 801043A0 8FB20024 */ lw $s2, 0x24($sp) -/* B7B544 801043A4 8FB30028 */ lw $s3, 0x28($sp) -/* B7B548 801043A8 8FB4002C */ lw $s4, 0x2c($sp) -/* B7B54C 801043AC 8FB50030 */ lw $s5, 0x30($sp) -/* B7B550 801043B0 03E00008 */ jr $ra -/* B7B554 801043B4 27BD0170 */ addiu $sp, $sp, 0x170 - -glabel func_801043B8 -/* B7B558 801043B8 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* B7B55C 801043BC 30E200FF */ andi $v0, $a3, 0xff -/* B7B560 801043C0 30CE00FF */ andi $t6, $a2, 0xff -/* B7B564 801043C4 0002C200 */ sll $t8, $v0, 8 -/* B7B568 801043C8 AFA60018 */ sw $a2, 0x18($sp) -/* B7B56C 801043CC AFA7001C */ sw $a3, 0x1c($sp) -/* B7B570 801043D0 030EC821 */ addu $t9, $t8, $t6 -/* B7B574 801043D4 A7B9000C */ sh $t9, 0xc($sp) -/* B7B578 801043D8 24070003 */ li $a3, 3 -/* B7B57C 801043DC 27A6000C */ addiu $a2, $sp, 0xc -/* B7B580 801043E0 27A30008 */ addiu $v1, $sp, 8 -/* B7B584 801043E4 94C10000 */ lhu $at, ($a2) -.L801043E8: -/* B7B588 801043E8 A4610000 */ sh $at, ($v1) -/* B7B58C 801043EC 93AB000D */ lbu $t3, 0xd($sp) -/* B7B590 801043F0 000B6040 */ sll $t4, $t3, 1 -/* B7B594 801043F4 00AC6821 */ addu $t5, $a1, $t4 -/* B7B598 801043F8 95A10000 */ lhu $at, ($t5) -/* B7B59C 801043FC A4C10000 */ sh $at, ($a2) -/* B7B5A0 80104400 93B90009 */ lbu $t9, 9($sp) -/* B7B5A4 80104404 00194840 */ sll $t1, $t9, 1 -/* B7B5A8 80104408 00A94021 */ addu $t0, $a1, $t1 -/* B7B5AC 8010440C A5070000 */ sh $a3, ($t0) -/* B7B5B0 80104410 8C8B0060 */ lw $t3, 0x60($a0) -/* B7B5B4 80104414 97AA000C */ lhu $t2, 0xc($sp) -/* B7B5B8 80104418 93AC000C */ lbu $t4, 0xc($sp) -/* B7B5BC 8010441C 014B082A */ slt $at, $t2, $t3 -/* B7B5C0 80104420 54200004 */ bnezl $at, .L80104434 -/* B7B5C4 80104424 8FAF0020 */ lw $t7, 0x20($sp) -/* B7B5C8 80104428 504CFFEF */ beql $v0, $t4, .L801043E8 -/* B7B5CC 8010442C 94C10000 */ lhu $at, ($a2) -/* B7B5D0 80104430 8FAF0020 */ lw $t7, 0x20($sp) -.L80104434: -/* B7B5D4 80104434 94C10000 */ lhu $at, ($a2) -/* B7B5D8 80104438 27BD0010 */ addiu $sp, $sp, 0x10 -/* B7B5DC 8010443C 00001025 */ move $v0, $zero -/* B7B5E0 80104440 03E00008 */ jr $ra -/* B7B5E4 80104444 A5E10000 */ sh $at, ($t7) diff --git a/asm/code_80104C80.s b/asm/code_80104C80.s deleted file mode 100644 index 0fb8e08ef7..0000000000 --- a/asm/code_80104C80.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 .text - -.balign 16 - -glabel func_80104C80 -/* B7BE20 80104C80 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B7BE24 80104C84 AFB00020 */ sw $s0, 0x20($sp) -/* B7BE28 80104C88 30B000FF */ andi $s0, $a1, 0xff -/* B7BE2C 80104C8C AFBF0024 */ sw $ra, 0x24($sp) -/* B7BE30 80104C90 AFA40058 */ sw $a0, 0x58($sp) -/* B7BE34 80104C94 AFA5005C */ sw $a1, 0x5c($sp) -/* B7BE38 80104C98 27A20038 */ addiu $v0, $sp, 0x38 -/* B7BE3C 80104C9C 27A30058 */ addiu $v1, $sp, 0x58 -.L80104CA0: -/* B7BE40 80104CA0 24420004 */ addiu $v0, $v0, 4 -/* B7BE44 80104CA4 A050FFFD */ sb $s0, -3($v0) -/* B7BE48 80104CA8 A050FFFE */ sb $s0, -2($v0) -/* B7BE4C 80104CAC A050FFFF */ sb $s0, -1($v0) -/* B7BE50 80104CB0 1443FFFB */ bne $v0, $v1, .L80104CA0 -/* B7BE54 80104CB4 A050FFFC */ sb $s0, -4($v0) -/* B7BE58 80104CB8 8FAE0058 */ lw $t6, 0x58($sp) -/* B7BE5C 80104CBC 24060400 */ li $a2, 1024 -/* B7BE60 80104CC0 27A70038 */ addiu $a3, $sp, 0x38 -/* B7BE64 80104CC4 8DC40004 */ lw $a0, 4($t6) -/* B7BE68 80104CC8 8DC50008 */ lw $a1, 8($t6) -/* B7BE6C 80104CCC 0C04173C */ jal func_80105CF0 -/* B7BE70 80104CD0 AFA00010 */ sw $zero, 0x10($sp) -/* B7BE74 80104CD4 14400003 */ bnez $v0, .L80104CE4 -/* B7BE78 80104CD8 00401825 */ move $v1, $v0 -/* B7BE7C 80104CDC 8FAF0058 */ lw $t7, 0x58($sp) -/* B7BE80 80104CE0 A1F00065 */ sb $s0, 0x65($t7) -.L80104CE4: -/* B7BE84 80104CE4 8FBF0024 */ lw $ra, 0x24($sp) -/* B7BE88 80104CE8 8FB00020 */ lw $s0, 0x20($sp) -/* B7BE8C 80104CEC 27BD0058 */ addiu $sp, $sp, 0x58 -/* B7BE90 80104CF0 03E00008 */ jr $ra -/* B7BE94 80104CF4 00601025 */ move $v0, $v1 diff --git a/asm/code_80104D60.s b/asm/code_80104D60.s index cab7a9593a..57e8f48a68 100644 --- a/asm/code_80104D60.s +++ b/asm/code_80104D60.s @@ -37,7 +37,7 @@ glabel osPfsFileState /* B7BF58 80104DB8 10000058 */ b .L80104F1C /* B7BF5C 80104DBC 24020005 */ li $v0, 5 .L80104DC0: -/* B7BF60 80104DC0 0C040AFC */ jal func_80102BF0 +/* B7BF60 80104DC0 0C040AFC */ jal __osCheckId /* B7BF64 80104DC4 02602025 */ move $a0, $s3 /* B7BF68 80104DC8 50400004 */ beql $v0, $zero, .L80104DDC /* B7BF6C 80104DCC 92790065 */ lbu $t9, 0x65($s3) @@ -48,7 +48,7 @@ glabel osPfsFileState /* B7BF7C 80104DDC 02602025 */ move $a0, $s3 /* B7BF80 80104DE0 53200008 */ beql $t9, $zero, .L80104E04 /* B7BF84 80104DE4 8E68005C */ lw $t0, 0x5c($s3) -/* B7BF88 80104DE8 0C041320 */ jal func_80104C80 +/* B7BF88 80104DE8 0C041320 */ jal __osPfsSelectBank /* B7BF8C 80104DEC 00002825 */ move $a1, $zero /* B7BF90 80104DF0 50400004 */ beql $v0, $zero, .L80104E04 /* B7BF94 80104DF4 8E68005C */ lw $t0, 0x5c($s3) @@ -61,7 +61,7 @@ glabel osPfsFileState /* B7BFAC 80104E0C 01103021 */ addu $a2, $t0, $s0 /* B7BFB0 80104E10 30C9FFFF */ andi $t1, $a2, 0xffff /* B7BFB4 80104E14 01203025 */ move $a2, $t1 -/* B7BFB8 80104E18 0C0417D0 */ jal osReadMempak +/* B7BFB8 80104E18 0C0417D0 */ jal __osContRamRead /* B7BFBC 80104E1C 27A70038 */ addiu $a3, $sp, 0x38 /* B7BFC0 80104E20 10400003 */ beqz $v0, .L80104E30 /* B7BFC4 80104E24 97AA003C */ lhu $t2, 0x3c($sp) @@ -93,7 +93,7 @@ glabel osPfsFileState /* B7C01C 80104E7C 12190008 */ beq $s0, $t9, .L80104EA0 /* B7C020 80104E80 00003025 */ move $a2, $zero /* B7C024 80104E84 03208025 */ move $s0, $t9 -/* B7C028 80104E88 0C040B31 */ jal func_80102CC4 +/* B7C028 80104E88 0C040B31 */ jal __osPfsRWInode /* B7C02C 80104E8C 332700FF */ andi $a3, $t9, 0xff /* B7C030 80104E90 50400004 */ beql $v0, $zero, .L80104EA4 /* B7C034 80104E94 93A80035 */ lbu $t0, 0x35($sp) diff --git a/asm/code_80105250.s b/asm/code_80105250.s deleted file mode 100644 index ef3cce4284..0000000000 --- a/asm/code_80105250.s +++ /dev/null @@ -1,719 +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 func_80105250 -/* B7C3F0 80105250 27BDFB38 */ addiu $sp, $sp, -0x4c8 -/* B7C3F4 80105254 AFBF0044 */ sw $ra, 0x44($sp) -/* B7C3F8 80105258 AFBE0040 */ sw $fp, 0x40($sp) -/* B7C3FC 8010525C AFB3002C */ sw $s3, 0x2c($sp) -/* B7C400 80105260 00809825 */ move $s3, $a0 -/* B7C404 80105264 AFB7003C */ sw $s7, 0x3c($sp) -/* B7C408 80105268 AFB60038 */ sw $s6, 0x38($sp) -/* B7C40C 8010526C AFB50034 */ sw $s5, 0x34($sp) -/* B7C410 80105270 AFB40030 */ sw $s4, 0x30($sp) -/* B7C414 80105274 AFB20028 */ sw $s2, 0x28($sp) -/* B7C418 80105278 AFB10024 */ sw $s1, 0x24($sp) -/* B7C41C 8010527C AFB00020 */ sw $s0, 0x20($sp) -/* B7C420 80105280 AFA00074 */ sw $zero, 0x74($sp) -/* B7C424 80105284 0C040AFC */ jal func_80102BF0 -/* B7C428 80105288 241E00FE */ li $fp, 254 -/* B7C42C 8010528C 24010002 */ li $at, 2 -/* B7C430 80105290 14410004 */ bne $v0, $at, .L801052A4 -/* B7C434 80105294 0040B825 */ move $s7, $v0 -/* B7C438 80105298 0C040A91 */ jal func_80102A44 -/* B7C43C 8010529C 02602025 */ move $a0, $s3 -/* B7C440 801052A0 0040B825 */ move $s7, $v0 -.L801052A4: -/* B7C444 801052A4 10400003 */ beqz $v0, .L801052B4 -/* B7C448 801052A8 02602025 */ move $a0, $s3 -/* B7C44C 801052AC 1000012A */ b .L80105758 -/* B7C450 801052B0 02E01025 */ move $v0, $s7 -.L801052B4: -/* B7C454 801052B4 0C0415E2 */ jal func_80105788 -/* B7C458 801052B8 27A50078 */ addiu $a1, $sp, 0x78 -/* B7C45C 801052BC 50400004 */ beql $v0, $zero, .L801052D0 -/* B7C460 801052C0 8E620050 */ lw $v0, 0x50($s3) -/* B7C464 801052C4 10000125 */ b .L8010575C -/* B7C468 801052C8 8FBF0044 */ lw $ra, 0x44($sp) -/* B7C46C 801052CC 8E620050 */ lw $v0, 0x50($s3) -.L801052D0: -/* B7C470 801052D0 0000A025 */ move $s4, $zero -/* B7C474 801052D4 27B502BC */ addiu $s5, $sp, 0x2bc -/* B7C478 801052D8 18400082 */ blez $v0, .L801054E4 -/* B7C47C 801052DC 27B204BC */ addiu $s2, $sp, 0x4bc -/* B7C480 801052E0 8E6E005C */ lw $t6, 0x5c($s3) -.L801052E4: -/* B7C484 801052E4 8E640004 */ lw $a0, 4($s3) -/* B7C488 801052E8 8E650008 */ lw $a1, 8($s3) -/* B7C48C 801052EC 01D43021 */ addu $a2, $t6, $s4 -/* B7C490 801052F0 30CFFFFF */ andi $t7, $a2, 0xffff -/* B7C494 801052F4 01E03025 */ move $a2, $t7 -/* B7C498 801052F8 0C0417D0 */ jal osReadMempak -/* B7C49C 801052FC 27A7029C */ addiu $a3, $sp, 0x29c -/* B7C4A0 80105300 10400003 */ beqz $v0, .L80105310 -/* B7C4A4 80105304 0040B825 */ move $s7, $v0 -/* B7C4A8 80105308 10000114 */ b .L8010575C -/* B7C4AC 8010530C 8FBF0044 */ lw $ra, 0x44($sp) -.L80105310: -/* B7C4B0 80105310 97A202A0 */ lhu $v0, 0x2a0($sp) -/* B7C4B4 80105314 8FB8029C */ lw $t8, 0x29c($sp) -/* B7C4B8 80105318 14400003 */ bnez $v0, .L80105328 -/* B7C4BC 8010531C 00000000 */ nop -/* B7C4C0 80105320 5300006B */ beql $t8, $zero, .L801054D0 -/* B7C4C4 80105324 8E620050 */ lw $v0, 0x50($s3) -.L80105328: -/* B7C4C8 80105328 10400003 */ beqz $v0, .L80105338 -/* B7C4CC 8010532C 8FB9029C */ lw $t9, 0x29c($sp) -/* B7C4D0 80105330 17200003 */ bnez $t9, .L80105340 -/* B7C4D4 80105334 27A902A2 */ addiu $t1, $sp, 0x2a2 -.L80105338: -/* B7C4D8 80105338 10000044 */ b .L8010544C -/* B7C4DC 8010533C 2404FFFF */ li $a0, -1 -.L80105340: -/* B7C4E0 80105340 95210000 */ lhu $at, ($t1) -/* B7C4E4 80105344 00002025 */ move $a0, $zero -/* B7C4E8 80105348 00008025 */ move $s0, $zero -/* B7C4EC 8010534C A6410000 */ sh $at, ($s2) -/* B7C4F0 80105350 8E6D0060 */ lw $t5, 0x60($s3) -/* B7C4F4 80105354 97AC04BC */ lhu $t4, 0x4bc($sp) -/* B7C4F8 80105358 241600FF */ li $s6, 255 -/* B7C4FC 8010535C 93AE04BC */ lbu $t6, 0x4bc($sp) -/* B7C500 80105360 018D082A */ slt $at, $t4, $t5 -/* B7C504 80105364 14200039 */ bnez $at, .L8010544C -/* B7C508 80105368 00000000 */ nop -/* B7C50C 8010536C 926F0064 */ lbu $t7, 0x64($s3) -/* B7C510 80105370 93B804BD */ lbu $t8, 0x4bd($sp) -/* B7C514 80105374 01CF082A */ slt $at, $t6, $t7 -/* B7C518 80105378 10200034 */ beqz $at, .L8010544C -/* B7C51C 8010537C 00000000 */ nop -/* B7C520 80105380 1B000032 */ blez $t8, .L8010544C -/* B7C524 80105384 2B010080 */ slti $at, $t8, 0x80 -/* B7C528 80105388 10200030 */ beqz $at, .L8010544C -/* B7C52C 8010538C 02C08825 */ move $s1, $s6 -/* B7C530 80105390 93B904BC */ lbu $t9, 0x4bc($sp) -.L80105394: -/* B7C534 80105394 13310010 */ beq $t9, $s1, .L801053D8 -/* B7C538 80105398 0320B025 */ move $s6, $t9 -/* B7C53C 8010539C 133E0008 */ beq $t9, $fp, .L801053C0 -/* B7C540 801053A0 03208825 */ move $s1, $t9 -/* B7C544 801053A4 02602025 */ move $a0, $s3 -/* B7C548 801053A8 02A02825 */ move $a1, $s5 -/* B7C54C 801053AC 00003025 */ move $a2, $zero -/* B7C550 801053B0 0C040B31 */ jal func_80102CC4 -/* B7C554 801053B4 332700FF */ andi $a3, $t9, 0xff -/* B7C558 801053B8 0040B825 */ move $s7, $v0 -/* B7C55C 801053BC 32DE00FF */ andi $fp, $s6, 0xff -.L801053C0: -/* B7C560 801053C0 12E00005 */ beqz $s7, .L801053D8 -/* B7C564 801053C4 24010003 */ li $at, 3 -/* B7C568 801053C8 52E10004 */ beql $s7, $at, .L801053DC -/* B7C56C 801053CC 96410000 */ lhu $at, ($s2) -/* B7C570 801053D0 100000E1 */ b .L80105758 -/* B7C574 801053D4 02E01025 */ move $v0, $s7 -.L801053D8: -/* B7C578 801053D8 96410000 */ lhu $at, ($s2) -.L801053DC: -/* B7C57C 801053DC 02602025 */ move $a0, $s3 -/* B7C580 801053E0 27A60078 */ addiu $a2, $sp, 0x78 -/* B7C584 801053E4 A7A10004 */ sh $at, 4($sp) -/* B7C588 801053E8 0C041698 */ jal func_80105A60 -/* B7C58C 801053EC 8FA50004 */ lw $a1, 4($sp) -/* B7C590 801053F0 00502023 */ subu $a0, $v0, $s0 -/* B7C594 801053F4 14800015 */ bnez $a0, .L8010544C -/* B7C598 801053F8 93AB04BD */ lbu $t3, 0x4bd($sp) -/* B7C59C 801053FC 000B6040 */ sll $t4, $t3, 1 -/* B7C5A0 80105400 02AC6821 */ addu $t5, $s5, $t4 -/* B7C5A4 80105404 95A10000 */ lhu $at, ($t5) -/* B7C5A8 80105408 24100001 */ li $s0, 1 -/* B7C5AC 8010540C A6410000 */ sh $at, ($s2) -/* B7C5B0 80105410 8E790060 */ lw $t9, 0x60($s3) -/* B7C5B4 80105414 97B804BC */ lhu $t8, 0x4bc($sp) -/* B7C5B8 80105418 93AB04BD */ lbu $t3, 0x4bd($sp) -/* B7C5BC 8010541C 93AA04BC */ lbu $t2, 0x4bc($sp) -/* B7C5C0 80105420 0319082A */ slt $at, $t8, $t9 -/* B7C5C4 80105424 14200009 */ bnez $at, .L8010544C -/* B7C5C8 80105428 00000000 */ nop -/* B7C5CC 8010542C 92690064 */ lbu $t1, 0x64($s3) -/* B7C5D0 80105430 0149082A */ slt $at, $t2, $t1 -/* B7C5D4 80105434 10200005 */ beqz $at, .L8010544C -/* B7C5D8 80105438 00000000 */ nop -/* B7C5DC 8010543C 19600003 */ blez $t3, .L8010544C -/* B7C5E0 80105440 29610080 */ slti $at, $t3, 0x80 -/* B7C5E4 80105444 5420FFD3 */ bnezl $at, .L80105394 -/* B7C5E8 80105448 93B904BC */ lbu $t9, 0x4bc($sp) -.L8010544C: -/* B7C5EC 8010544C 14800003 */ bnez $a0, .L8010545C -/* B7C5F0 80105450 97AC04BC */ lhu $t4, 0x4bc($sp) -/* B7C5F4 80105454 24010001 */ li $at, 1 -/* B7C5F8 80105458 1181001C */ beq $t4, $at, .L801054CC -.L8010545C: -/* B7C5FC 8010545C 27A4029C */ addiu $a0, $sp, 0x29c -/* B7C600 80105460 0C001114 */ jal bzero -/* B7C604 80105464 24050020 */ li $a1, 32 -/* B7C608 80105468 926E0065 */ lbu $t6, 0x65($s3) -/* B7C60C 8010546C 02602025 */ move $a0, $s3 -/* B7C610 80105470 51C00008 */ beql $t6, $zero, .L80105494 -/* B7C614 80105474 8E6D005C */ lw $t5, 0x5c($s3) -/* B7C618 80105478 0C041320 */ jal func_80104C80 -/* B7C61C 8010547C 00002825 */ move $a1, $zero -/* B7C620 80105480 50400004 */ beql $v0, $zero, .L80105494 -/* B7C624 80105484 8E6D005C */ lw $t5, 0x5c($s3) -/* B7C628 80105488 100000B4 */ b .L8010575C -/* B7C62C 8010548C 8FBF0044 */ lw $ra, 0x44($sp) -/* B7C630 80105490 8E6D005C */ lw $t5, 0x5c($s3) -.L80105494: -/* B7C634 80105494 8E640004 */ lw $a0, 4($s3) -/* B7C638 80105498 8E650008 */ lw $a1, 8($s3) -/* B7C63C 8010549C 01B43021 */ addu $a2, $t5, $s4 -/* B7C640 801054A0 30CFFFFF */ andi $t7, $a2, 0xffff -/* B7C644 801054A4 01E03025 */ move $a2, $t7 -/* B7C648 801054A8 AFA00010 */ sw $zero, 0x10($sp) -/* B7C64C 801054AC 0C04173C */ jal func_80105CF0 -/* B7C650 801054B0 27A7029C */ addiu $a3, $sp, 0x29c -/* B7C654 801054B4 10400003 */ beqz $v0, .L801054C4 -/* B7C658 801054B8 8FB80074 */ lw $t8, 0x74($sp) -/* B7C65C 801054BC 100000A7 */ b .L8010575C -/* B7C660 801054C0 8FBF0044 */ lw $ra, 0x44($sp) -.L801054C4: -/* B7C664 801054C4 27190001 */ addiu $t9, $t8, 1 -/* B7C668 801054C8 AFB90074 */ sw $t9, 0x74($sp) -.L801054CC: -/* B7C66C 801054CC 8E620050 */ lw $v0, 0x50($s3) -.L801054D0: -/* B7C670 801054D0 26940001 */ addiu $s4, $s4, 1 -/* B7C674 801054D4 0282082A */ slt $at, $s4, $v0 -/* B7C678 801054D8 5420FF82 */ bnezl $at, .L801052E4 -/* B7C67C 801054DC 8E6E005C */ lw $t6, 0x5c($s3) -/* B7C680 801054E0 0000A025 */ move $s4, $zero -.L801054E4: -/* B7C684 801054E4 18400021 */ blez $v0, .L8010556C -/* B7C688 801054E8 27B502BC */ addiu $s5, $sp, 0x2bc -/* B7C68C 801054EC 8E6A005C */ lw $t2, 0x5c($s3) -.L801054F0: -/* B7C690 801054F0 8E640004 */ lw $a0, 4($s3) -/* B7C694 801054F4 8E650008 */ lw $a1, 8($s3) -/* B7C698 801054F8 01543021 */ addu $a2, $t2, $s4 -/* B7C69C 801054FC 30C9FFFF */ andi $t1, $a2, 0xffff -/* B7C6A0 80105500 01203025 */ move $a2, $t1 -/* B7C6A4 80105504 0C0417D0 */ jal osReadMempak -/* B7C6A8 80105508 27A7029C */ addiu $a3, $sp, 0x29c -/* B7C6AC 8010550C 10400003 */ beqz $v0, .L8010551C -/* B7C6B0 80105510 97AE02A0 */ lhu $t6, 0x2a0($sp) -/* B7C6B4 80105514 10000091 */ b .L8010575C -/* B7C6B8 80105518 8FBF0044 */ lw $ra, 0x44($sp) -.L8010551C: -/* B7C6BC 8010551C 00145840 */ sll $t3, $s4, 1 -/* B7C6C0 80105520 27AC027C */ addiu $t4, $sp, 0x27c -/* B7C6C4 80105524 11C0000B */ beqz $t6, .L80105554 -/* B7C6C8 80105528 016C2021 */ addu $a0, $t3, $t4 -/* B7C6CC 8010552C 8FAD029C */ lw $t5, 0x29c($sp) -/* B7C6D0 80105530 97AF02A2 */ lhu $t7, 0x2a2($sp) -/* B7C6D4 80105534 51A00008 */ beql $t5, $zero, .L80105558 -/* B7C6D8 80105538 A4800000 */ sh $zero, ($a0) -/* B7C6DC 8010553C 96780062 */ lhu $t8, 0x62($s3) -/* B7C6E0 80105540 01F8082A */ slt $at, $t7, $t8 -/* B7C6E4 80105544 54200004 */ bnezl $at, .L80105558 -/* B7C6E8 80105548 A4800000 */ sh $zero, ($a0) -/* B7C6EC 8010554C 10000002 */ b .L80105558 -/* B7C6F0 80105550 A48F0000 */ sh $t7, ($a0) -.L80105554: -/* B7C6F4 80105554 A4800000 */ sh $zero, ($a0) -.L80105558: -/* B7C6F8 80105558 8E790050 */ lw $t9, 0x50($s3) -/* B7C6FC 8010555C 26940001 */ addiu $s4, $s4, 1 -/* B7C700 80105560 0299082A */ slt $at, $s4, $t9 -/* B7C704 80105564 5420FFE2 */ bnezl $at, .L801054F0 -/* B7C708 80105568 8E6A005C */ lw $t2, 0x5c($s3) -.L8010556C: -/* B7C70C 8010556C 926A0064 */ lbu $t2, 0x64($s3) -/* B7C710 80105570 0000B025 */ move $s6, $zero -/* B7C714 80105574 241E0003 */ li $fp, 3 -/* B7C718 80105578 1940006B */ blez $t2, .L80105728 -/* B7C71C 8010557C 27B203BC */ addiu $s2, $sp, 0x3bc -/* B7C720 80105580 27B00060 */ addiu $s0, $sp, 0x60 -.L80105584: -/* B7C724 80105584 02602025 */ move $a0, $s3 -/* B7C728 80105588 02A02825 */ move $a1, $s5 -/* B7C72C 8010558C 00003025 */ move $a2, $zero -/* B7C730 80105590 0C040B31 */ jal func_80102CC4 -/* B7C734 80105594 32C700FF */ andi $a3, $s6, 0xff -/* B7C738 80105598 10400006 */ beqz $v0, .L801055B4 -/* B7C73C 8010559C 27A804BC */ addiu $t0, $sp, 0x4bc -/* B7C740 801055A0 24010003 */ li $at, 3 -/* B7C744 801055A4 50410004 */ beql $v0, $at, .L801055B8 -/* B7C748 801055A8 02C08825 */ move $s1, $s6 -/* B7C74C 801055AC 1000006B */ b .L8010575C -/* B7C750 801055B0 8FBF0044 */ lw $ra, 0x44($sp) -.L801055B4: -/* B7C754 801055B4 02C08825 */ move $s1, $s6 -.L801055B8: -/* B7C758 801055B8 1AC00003 */ blez $s6, .L801055C8 -/* B7C75C 801055BC 0000A025 */ move $s4, $zero -/* B7C760 801055C0 10000002 */ b .L801055CC -/* B7C764 801055C4 24050001 */ li $a1, 1 -.L801055C8: -/* B7C768 801055C8 8E650060 */ lw $a1, 0x60($s3) -.L801055CC: -/* B7C76C 801055CC 18A0001C */ blez $a1, .L80105640 -/* B7C770 801055D0 30A70003 */ andi $a3, $a1, 3 -/* B7C774 801055D4 10E0000B */ beqz $a3, .L80105604 -/* B7C778 801055D8 00E02025 */ move $a0, $a3 -/* B7C77C 801055DC 00143040 */ sll $a2, $s4, 1 -/* B7C780 801055E0 02461821 */ addu $v1, $s2, $a2 -/* B7C784 801055E4 02A61021 */ addu $v0, $s5, $a2 -.L801055E8: -/* B7C788 801055E8 94490000 */ lhu $t1, ($v0) -/* B7C78C 801055EC 26940001 */ addiu $s4, $s4, 1 -/* B7C790 801055F0 24630002 */ addiu $v1, $v1, 2 -/* B7C794 801055F4 24420002 */ addiu $v0, $v0, 2 -/* B7C798 801055F8 1494FFFB */ bne $a0, $s4, .L801055E8 -/* B7C79C 801055FC A469FFFE */ sh $t1, -2($v1) -/* B7C7A0 80105600 1285000F */ beq $s4, $a1, .L80105640 -.L80105604: -/* B7C7A4 80105604 00143040 */ sll $a2, $s4, 1 -/* B7C7A8 80105608 02461821 */ addu $v1, $s2, $a2 -/* B7C7AC 8010560C 02A61021 */ addu $v0, $s5, $a2 -.L80105610: -/* B7C7B0 80105610 944C0002 */ lhu $t4, 2($v0) -/* B7C7B4 80105614 944E0004 */ lhu $t6, 4($v0) -/* B7C7B8 80105618 944D0006 */ lhu $t5, 6($v0) -/* B7C7BC 8010561C 944B0000 */ lhu $t3, ($v0) -/* B7C7C0 80105620 26940004 */ addiu $s4, $s4, 4 -/* B7C7C4 80105624 24630008 */ addiu $v1, $v1, 8 -/* B7C7C8 80105628 24420008 */ addiu $v0, $v0, 8 -/* B7C7CC 8010562C A46CFFFA */ sh $t4, -6($v1) -/* B7C7D0 80105630 A46EFFFC */ sh $t6, -4($v1) -/* B7C7D4 80105634 A46DFFFE */ sh $t5, -2($v1) -/* B7C7D8 80105638 1685FFF5 */ bne $s4, $a1, .L80105610 -/* B7C7DC 8010563C A46BFFF8 */ sh $t3, -8($v1) -.L80105640: -/* B7C7E0 80105640 2A810080 */ slti $at, $s4, 0x80 -/* B7C7E4 80105644 10200007 */ beqz $at, .L80105664 -/* B7C7E8 80105648 02402825 */ move $a1, $s2 -/* B7C7EC 8010564C 0014C040 */ sll $t8, $s4, 1 -/* B7C7F0 80105650 02581821 */ addu $v1, $s2, $t8 -.L80105654: -/* B7C7F4 80105654 24630002 */ addiu $v1, $v1, 2 -/* B7C7F8 80105658 0068082B */ sltu $at, $v1, $t0 -/* B7C7FC 8010565C 1420FFFD */ bnez $at, .L80105654 -/* B7C800 80105660 A47EFFFE */ sh $fp, -2($v1) -.L80105664: -/* B7C804 80105664 8E6F0050 */ lw $t7, 0x50($s3) -/* B7C808 80105668 0000A025 */ move $s4, $zero -/* B7C80C 8010566C 24060001 */ li $a2, 1 -/* B7C810 80105670 19E00021 */ blez $t7, .L801056F8 -/* B7C814 80105674 32C700FF */ andi $a3, $s6, 0xff -/* B7C818 80105678 27A4027C */ addiu $a0, $sp, 0x27c -/* B7C81C 8010567C 90990000 */ lbu $t9, ($a0) -.L80105680: -/* B7C820 80105680 56390018 */ bnel $s1, $t9, .L801056E4 -/* B7C824 80105684 8E6E0050 */ lw $t6, 0x50($s3) -/* B7C828 80105688 948A0000 */ lhu $t2, ($a0) -/* B7C82C 8010568C 96690062 */ lhu $t1, 0x62($s3) -/* B7C830 80105690 0149082A */ slt $at, $t2, $t1 -/* B7C834 80105694 54200013 */ bnezl $at, .L801056E4 -/* B7C838 80105698 8E6E0050 */ lw $t6, 0x50($s3) -/* B7C83C 8010569C 90830001 */ lbu $v1, 1($a0) -.L801056A0: -/* B7C840 801056A0 00031040 */ sll $v0, $v1, 1 -/* B7C844 801056A4 02A25821 */ addu $t3, $s5, $v0 -/* B7C848 801056A8 95610000 */ lhu $at, ($t3) -/* B7C84C 801056AC 02426821 */ addu $t5, $s2, $v0 -/* B7C850 801056B0 A6010000 */ sh $at, ($s0) -/* B7C854 801056B4 A5A10000 */ sh $at, ($t5) -/* B7C858 801056B8 96010000 */ lhu $at, ($s0) -/* B7C85C 801056BC A4810000 */ sh $at, ($a0) -/* B7C860 801056C0 90890000 */ lbu $t1, ($a0) -/* B7C864 801056C4 56290007 */ bnel $s1, $t1, .L801056E4 -/* B7C868 801056C8 8E6E0050 */ lw $t6, 0x50($s3) -/* B7C86C 801056CC 966B0062 */ lhu $t3, 0x62($s3) -/* B7C870 801056D0 302CFFFF */ andi $t4, $at, 0xffff -/* B7C874 801056D4 018B082A */ slt $at, $t4, $t3 -/* B7C878 801056D8 5020FFF1 */ beql $at, $zero, .L801056A0 -/* B7C87C 801056DC 90830001 */ lbu $v1, 1($a0) -/* B7C880 801056E0 8E6E0050 */ lw $t6, 0x50($s3) -.L801056E4: -/* B7C884 801056E4 26940001 */ addiu $s4, $s4, 1 -/* B7C888 801056E8 24840002 */ addiu $a0, $a0, 2 -/* B7C88C 801056EC 028E082A */ slt $at, $s4, $t6 -/* B7C890 801056F0 5420FFE3 */ bnezl $at, .L80105680 -/* B7C894 801056F4 90990000 */ lbu $t9, ($a0) -.L801056F8: -/* B7C898 801056F8 0C040B31 */ jal func_80102CC4 -/* B7C89C 801056FC 02602025 */ move $a0, $s3 -/* B7C8A0 80105700 50400004 */ beql $v0, $zero, .L80105714 -/* B7C8A4 80105704 926D0064 */ lbu $t5, 0x64($s3) -/* B7C8A8 80105708 10000014 */ b .L8010575C -/* B7C8AC 8010570C 8FBF0044 */ lw $ra, 0x44($sp) -/* B7C8B0 80105710 926D0064 */ lbu $t5, 0x64($s3) -.L80105714: -/* B7C8B4 80105714 26D60001 */ addiu $s6, $s6, 1 -/* B7C8B8 80105718 32D800FF */ andi $t8, $s6, 0xff -/* B7C8BC 8010571C 030D082A */ slt $at, $t8, $t5 -/* B7C8C0 80105720 1420FF98 */ bnez $at, .L80105584 -/* B7C8C4 80105724 0300B025 */ move $s6, $t8 -.L80105728: -/* B7C8C8 80105728 8FAF0074 */ lw $t7, 0x74($sp) -/* B7C8CC 8010572C 00001025 */ move $v0, $zero -/* B7C8D0 80105730 51E00006 */ beql $t7, $zero, .L8010574C -/* B7C8D4 80105734 8E690000 */ lw $t1, ($s3) -/* B7C8D8 80105738 8E790000 */ lw $t9, ($s3) -/* B7C8DC 8010573C 372A0002 */ ori $t2, $t9, 2 -/* B7C8E0 80105740 10000005 */ b .L80105758 -/* B7C8E4 80105744 AE6A0000 */ sw $t2, ($s3) -/* B7C8E8 80105748 8E690000 */ lw $t1, ($s3) -.L8010574C: -/* B7C8EC 8010574C 2401FFFD */ li $at, -3 -/* B7C8F0 80105750 01216024 */ and $t4, $t1, $at -/* B7C8F4 80105754 AE6C0000 */ sw $t4, ($s3) -.L80105758: -/* B7C8F8 80105758 8FBF0044 */ lw $ra, 0x44($sp) -.L8010575C: -/* B7C8FC 8010575C 8FB00020 */ lw $s0, 0x20($sp) -/* B7C900 80105760 8FB10024 */ lw $s1, 0x24($sp) -/* B7C904 80105764 8FB20028 */ lw $s2, 0x28($sp) -/* B7C908 80105768 8FB3002C */ lw $s3, 0x2c($sp) -/* B7C90C 8010576C 8FB40030 */ lw $s4, 0x30($sp) -/* B7C910 80105770 8FB50034 */ lw $s5, 0x34($sp) -/* B7C914 80105774 8FB60038 */ lw $s6, 0x38($sp) -/* B7C918 80105778 8FB7003C */ lw $s7, 0x3c($sp) -/* B7C91C 8010577C 8FBE0040 */ lw $fp, 0x40($sp) -/* B7C920 80105780 03E00008 */ jr $ra -/* B7C924 80105784 27BD04C8 */ addiu $sp, $sp, 0x4c8 - -glabel func_80105788 -/* B7C928 80105788 27BDFE98 */ addiu $sp, $sp, -0x168 -/* B7C92C 8010578C AFB30024 */ sw $s3, 0x24($sp) -/* B7C930 80105790 00809825 */ move $s3, $a0 -/* B7C934 80105794 AFB40028 */ sw $s4, 0x28($sp) -/* B7C938 80105798 00A0A025 */ move $s4, $a1 -/* B7C93C 8010579C AFBF003C */ sw $ra, 0x3c($sp) -/* B7C940 801057A0 AFBE0038 */ sw $fp, 0x38($sp) -/* B7C944 801057A4 AFB70034 */ sw $s7, 0x34($sp) -/* B7C948 801057A8 AFB60030 */ sw $s6, 0x30($sp) -/* B7C94C 801057AC AFB5002C */ sw $s5, 0x2c($sp) -/* B7C950 801057B0 AFB20020 */ sw $s2, 0x20($sp) -/* B7C954 801057B4 AFB1001C */ sw $s1, 0x1c($sp) -/* B7C958 801057B8 AFB00018 */ sw $s0, 0x18($sp) -/* B7C95C 801057BC 24040100 */ li $a0, 256 -/* B7C960 801057C0 00001025 */ move $v0, $zero -/* B7C964 801057C4 00A01825 */ move $v1, $a1 -.L801057C8: -/* B7C968 801057C8 24420004 */ addiu $v0, $v0, 4 -/* B7C96C 801057CC A0600102 */ sb $zero, 0x102($v1) -/* B7C970 801057D0 A0600103 */ sb $zero, 0x103($v1) -/* B7C974 801057D4 A0600104 */ sb $zero, 0x104($v1) -/* B7C978 801057D8 24630004 */ addiu $v1, $v1, 4 -/* B7C97C 801057DC 1444FFFA */ bne $v0, $a0, .L801057C8 -/* B7C980 801057E0 A06000FD */ sb $zero, 0xfd($v1) -/* B7C984 801057E4 240E00FF */ li $t6, 255 -/* B7C988 801057E8 A28E0100 */ sb $t6, 0x100($s4) -/* B7C98C 801057EC 926F0064 */ lbu $t7, 0x64($s3) -/* B7C990 801057F0 0000B825 */ move $s7, $zero -/* B7C994 801057F4 00008025 */ move $s0, $zero -/* B7C998 801057F8 19E0008C */ blez $t7, .L80105A2C -/* B7C99C 801057FC 241E0080 */ li $fp, 128 -/* B7C9A0 80105800 27B6015A */ addiu $s6, $sp, 0x15a -/* B7C9A4 80105804 27B50058 */ addiu $s5, $sp, 0x58 -/* B7C9A8 80105808 27B20158 */ addiu $s2, $sp, 0x158 -.L8010580C: -/* B7C9AC 8010580C 1A000003 */ blez $s0, .L8010581C -/* B7C9B0 80105810 02602025 */ move $a0, $s3 -/* B7C9B4 80105814 10000002 */ b .L80105820 -/* B7C9B8 80105818 24110001 */ li $s1, 1 -.L8010581C: -/* B7C9BC 8010581C 8E710060 */ lw $s1, 0x60($s3) -.L80105820: -/* B7C9C0 80105820 02A02825 */ move $a1, $s5 -/* B7C9C4 80105824 00003025 */ move $a2, $zero -/* B7C9C8 80105828 0C040B31 */ jal func_80102CC4 -/* B7C9CC 8010582C 32E700FF */ andi $a3, $s7, 0xff -/* B7C9D0 80105830 10400005 */ beqz $v0, .L80105848 -/* B7C9D4 80105834 24010003 */ li $at, 3 -/* B7C9D8 80105838 50410004 */ beql $v0, $at, .L8010584C -/* B7C9DC 8010583C 2A210080 */ slti $at, $s1, 0x80 -/* B7C9E0 80105840 1000007C */ b .L80105A34 -/* B7C9E4 80105844 8FBF003C */ lw $ra, 0x3c($sp) -.L80105848: -/* B7C9E8 80105848 2A210080 */ slti $at, $s1, 0x80 -.L8010584C: -/* B7C9EC 8010584C 10200071 */ beqz $at, .L80105A14 -/* B7C9F0 80105850 02201025 */ move $v0, $s1 -/* B7C9F4 80105854 03D11823 */ subu $v1, $fp, $s1 -/* B7C9F8 80105858 30780001 */ andi $t8, $v1, 1 -/* B7C9FC 8010585C 13000025 */ beqz $t8, .L801058F4 -/* B7CA00 80105860 0011C840 */ sll $t9, $s1, 1 -/* B7CA04 80105864 02B94021 */ addu $t0, $s5, $t9 -/* B7CA08 80105868 95010000 */ lhu $at, ($t0) -/* B7CA0C 8010586C A6410000 */ sh $at, ($s2) -/* B7CA10 80105870 8E6C0060 */ lw $t4, 0x60($s3) -/* B7CA14 80105874 97AB0158 */ lhu $t3, 0x158($sp) -/* B7CA18 80105878 93AD0158 */ lbu $t5, 0x158($sp) -/* B7CA1C 8010587C 016C082A */ slt $at, $t3, $t4 -/* B7CA20 80105880 5420001B */ bnezl $at, .L801058F0 -/* B7CA24 80105884 26220001 */ addiu $v0, $s1, 1 -/* B7CA28 80105888 120D0018 */ beq $s0, $t5, .L801058EC -/* B7CA2C 8010588C 93AE0159 */ lbu $t6, 0x159($sp) -/* B7CA30 80105890 31CF007F */ andi $t7, $t6, 0x7f -/* B7CA34 80105894 05E10003 */ bgez $t7, .L801058A4 -/* B7CA38 80105898 000FC083 */ sra $t8, $t7, 2 -/* B7CA3C 8010589C 25E10003 */ addiu $at, $t7, 3 -/* B7CA40 801058A0 0001C083 */ sra $t8, $at, 2 -.L801058A4: -/* B7CA44 801058A4 05A10004 */ bgez $t5, .L801058B8 -/* B7CA48 801058A8 31B90007 */ andi $t9, $t5, 7 -/* B7CA4C 801058AC 13200002 */ beqz $t9, .L801058B8 -/* B7CA50 801058B0 00000000 */ nop -/* B7CA54 801058B4 2739FFF8 */ addiu $t9, $t9, -8 -.L801058B8: -/* B7CA58 801058B8 00194940 */ sll $t1, $t9, 5 -/* B7CA5C 801058BC 03091821 */ addu $v1, $t8, $t1 -/* B7CA60 801058C0 02831021 */ addu $v0, $s4, $v1 -/* B7CA64 801058C4 90480101 */ lbu $t0, 0x101($v0) -/* B7CA68 801058C8 06010004 */ bgez $s0, .L801058DC -/* B7CA6C 801058CC 320A0007 */ andi $t2, $s0, 7 -/* B7CA70 801058D0 11400002 */ beqz $t2, .L801058DC -/* B7CA74 801058D4 00000000 */ nop -/* B7CA78 801058D8 254AFFF8 */ addiu $t2, $t2, -8 -.L801058DC: -/* B7CA7C 801058DC 240B0001 */ li $t3, 1 -/* B7CA80 801058E0 014B6004 */ sllv $t4, $t3, $t2 -/* B7CA84 801058E4 010C7025 */ or $t6, $t0, $t4 -/* B7CA88 801058E8 A04E0101 */ sb $t6, 0x101($v0) -.L801058EC: -/* B7CA8C 801058EC 26220001 */ addiu $v0, $s1, 1 -.L801058F0: -/* B7CA90 801058F0 105E0048 */ beq $v0, $fp, .L80105A14 -.L801058F4: -/* B7CA94 801058F4 00027840 */ sll $t7, $v0, 1 -/* B7CA98 801058F8 02AF2821 */ addu $a1, $s5, $t7 -/* B7CA9C 801058FC 24A40002 */ addiu $a0, $a1, 2 -.L80105900: -/* B7CAA0 80105900 94A10000 */ lhu $at, ($a1) -/* B7CAA4 80105904 A6410000 */ sh $at, ($s2) -/* B7CAA8 80105908 8E690060 */ lw $t1, 0x60($s3) -/* B7CAAC 8010590C 97B80158 */ lhu $t8, 0x158($sp) -/* B7CAB0 80105910 93AB0158 */ lbu $t3, 0x158($sp) -/* B7CAB4 80105914 0309082A */ slt $at, $t8, $t1 -/* B7CAB8 80105918 5420001B */ bnezl $at, .L80105988 -/* B7CABC 8010591C 94810000 */ lhu $at, ($a0) -/* B7CAC0 80105920 120B0018 */ beq $s0, $t3, .L80105984 -/* B7CAC4 80105924 93AA0159 */ lbu $t2, 0x159($sp) -/* B7CAC8 80105928 3148007F */ andi $t0, $t2, 0x7f -/* B7CACC 8010592C 05010003 */ bgez $t0, .L8010593C -/* B7CAD0 80105930 00086083 */ sra $t4, $t0, 2 -/* B7CAD4 80105934 25010003 */ addiu $at, $t0, 3 -/* B7CAD8 80105938 00016083 */ sra $t4, $at, 2 -.L8010593C: -/* B7CADC 8010593C 05610004 */ bgez $t3, .L80105950 -/* B7CAE0 80105940 316E0007 */ andi $t6, $t3, 7 -/* B7CAE4 80105944 11C00002 */ beqz $t6, .L80105950 -/* B7CAE8 80105948 00000000 */ nop -/* B7CAEC 8010594C 25CEFFF8 */ addiu $t6, $t6, -8 -.L80105950: -/* B7CAF0 80105950 000E7940 */ sll $t7, $t6, 5 -/* B7CAF4 80105954 018F1821 */ addu $v1, $t4, $t7 -/* B7CAF8 80105958 02831021 */ addu $v0, $s4, $v1 -/* B7CAFC 8010595C 904D0101 */ lbu $t5, 0x101($v0) -/* B7CB00 80105960 06010004 */ bgez $s0, .L80105974 -/* B7CB04 80105964 32190007 */ andi $t9, $s0, 7 -/* B7CB08 80105968 13200002 */ beqz $t9, .L80105974 -/* B7CB0C 8010596C 00000000 */ nop -/* B7CB10 80105970 2739FFF8 */ addiu $t9, $t9, -8 -.L80105974: -/* B7CB14 80105974 24180001 */ li $t8, 1 -/* B7CB18 80105978 03384804 */ sllv $t1, $t8, $t9 -/* B7CB1C 8010597C 01A95025 */ or $t2, $t5, $t1 -/* B7CB20 80105980 A04A0101 */ sb $t2, 0x101($v0) -.L80105984: -/* B7CB24 80105984 94810000 */ lhu $at, ($a0) -.L80105988: -/* B7CB28 80105988 24840004 */ addiu $a0, $a0, 4 -/* B7CB2C 8010598C A6410000 */ sh $at, ($s2) -/* B7CB30 80105990 8E6C0060 */ lw $t4, 0x60($s3) -/* B7CB34 80105994 97AE0158 */ lhu $t6, 0x158($sp) -/* B7CB38 80105998 93AF0158 */ lbu $t7, 0x158($sp) -/* B7CB3C 8010599C 01CC082A */ slt $at, $t6, $t4 -/* B7CB40 801059A0 1420001A */ bnez $at, .L80105A0C -/* B7CB44 801059A4 00000000 */ nop -/* B7CB48 801059A8 120F0018 */ beq $s0, $t7, .L80105A0C -/* B7CB4C 801059AC 93B80159 */ lbu $t8, 0x159($sp) -/* B7CB50 801059B0 3319007F */ andi $t9, $t8, 0x7f -/* B7CB54 801059B4 07210003 */ bgez $t9, .L801059C4 -/* B7CB58 801059B8 00196883 */ sra $t5, $t9, 2 -/* B7CB5C 801059BC 27210003 */ addiu $at, $t9, 3 -/* B7CB60 801059C0 00016883 */ sra $t5, $at, 2 -.L801059C4: -/* B7CB64 801059C4 05E10004 */ bgez $t7, .L801059D8 -/* B7CB68 801059C8 31E90007 */ andi $t1, $t7, 7 -/* B7CB6C 801059CC 11200002 */ beqz $t1, .L801059D8 -/* B7CB70 801059D0 00000000 */ nop -/* B7CB74 801059D4 2529FFF8 */ addiu $t1, $t1, -8 -.L801059D8: -/* B7CB78 801059D8 00095140 */ sll $t2, $t1, 5 -/* B7CB7C 801059DC 01AA1821 */ addu $v1, $t5, $t2 -/* B7CB80 801059E0 02831021 */ addu $v0, $s4, $v1 -/* B7CB84 801059E4 90480101 */ lbu $t0, 0x101($v0) -/* B7CB88 801059E8 06010004 */ bgez $s0, .L801059FC -/* B7CB8C 801059EC 320B0007 */ andi $t3, $s0, 7 -/* B7CB90 801059F0 11600002 */ beqz $t3, .L801059FC -/* B7CB94 801059F4 00000000 */ nop -/* B7CB98 801059F8 256BFFF8 */ addiu $t3, $t3, -8 -.L801059FC: -/* B7CB9C 801059FC 240E0001 */ li $t6, 1 -/* B7CBA0 80105A00 016E6004 */ sllv $t4, $t6, $t3 -/* B7CBA4 80105A04 010CC025 */ or $t8, $t0, $t4 -/* B7CBA8 80105A08 A0580101 */ sb $t8, 0x101($v0) -.L80105A0C: -/* B7CBAC 80105A0C 1496FFBC */ bne $a0, $s6, .L80105900 -/* B7CBB0 80105A10 24A50004 */ addiu $a1, $a1, 4 -.L80105A14: -/* B7CBB4 80105A14 926F0064 */ lbu $t7, 0x64($s3) -/* B7CBB8 80105A18 26F70001 */ addiu $s7, $s7, 1 -/* B7CBBC 80105A1C 32F000FF */ andi $s0, $s7, 0xff -/* B7CBC0 80105A20 020F082A */ slt $at, $s0, $t7 -/* B7CBC4 80105A24 1420FF79 */ bnez $at, .L8010580C -/* B7CBC8 80105A28 0200B825 */ move $s7, $s0 -.L80105A2C: -/* B7CBCC 80105A2C 00001025 */ move $v0, $zero -/* B7CBD0 80105A30 8FBF003C */ lw $ra, 0x3c($sp) -.L80105A34: -/* B7CBD4 80105A34 8FB00018 */ lw $s0, 0x18($sp) -/* B7CBD8 80105A38 8FB1001C */ lw $s1, 0x1c($sp) -/* B7CBDC 80105A3C 8FB20020 */ lw $s2, 0x20($sp) -/* B7CBE0 80105A40 8FB30024 */ lw $s3, 0x24($sp) -/* B7CBE4 80105A44 8FB40028 */ lw $s4, 0x28($sp) -/* B7CBE8 80105A48 8FB5002C */ lw $s5, 0x2c($sp) -/* B7CBEC 80105A4C 8FB60030 */ lw $s6, 0x30($sp) -/* B7CBF0 80105A50 8FB70034 */ lw $s7, 0x34($sp) -/* B7CBF4 80105A54 8FBE0038 */ lw $fp, 0x38($sp) -/* B7CBF8 80105A58 03E00008 */ jr $ra -/* B7CBFC 80105A5C 27BD0168 */ addiu $sp, $sp, 0x168 - -glabel func_80105A60 -/* B7CC00 80105A60 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B7CC04 80105A64 AFA5003C */ sw $a1, 0x3c($sp) -/* B7CC08 80105A68 93B8003C */ lbu $t8, 0x3c($sp) -/* B7CC0C 80105A6C AFB40028 */ sw $s4, 0x28($sp) -/* B7CC10 80105A70 93AE003D */ lbu $t6, 0x3d($sp) -/* B7CC14 80105A74 0080A025 */ move $s4, $a0 -/* B7CC18 80105A78 AFBF0034 */ sw $ra, 0x34($sp) -/* B7CC1C 80105A7C AFB60030 */ sw $s6, 0x30($sp) -/* B7CC20 80105A80 AFB5002C */ sw $s5, 0x2c($sp) -/* B7CC24 80105A84 AFB30024 */ sw $s3, 0x24($sp) -/* B7CC28 80105A88 AFB20020 */ sw $s2, 0x20($sp) -/* B7CC2C 80105A8C AFB1001C */ sw $s1, 0x1c($sp) -/* B7CC30 80105A90 AFB00018 */ sw $s0, 0x18($sp) -/* B7CC34 80105A94 92890064 */ lbu $t1, 0x64($s4) -/* B7CC38 80105A98 00C09825 */ move $s3, $a2 -/* B7CC3C 80105A9C 00008025 */ move $s0, $zero -/* B7CC40 80105AA0 05C10003 */ bgez $t6, .L80105AB0 -/* B7CC44 80105AA4 000E7883 */ sra $t7, $t6, 2 -/* B7CC48 80105AA8 25C10003 */ addiu $at, $t6, 3 -/* B7CC4C 80105AAC 00017883 */ sra $t7, $at, 2 -.L80105AB0: -/* B7CC50 80105AB0 07010004 */ bgez $t8, .L80105AC4 -/* B7CC54 80105AB4 33190007 */ andi $t9, $t8, 7 -/* B7CC58 80105AB8 13200002 */ beqz $t9, .L80105AC4 -/* B7CC5C 80105ABC 00000000 */ nop -/* B7CC60 80105AC0 2739FFF8 */ addiu $t9, $t9, -8 -.L80105AC4: -/* B7CC64 80105AC4 00194140 */ sll $t0, $t9, 5 -/* B7CC68 80105AC8 01E8B021 */ addu $s6, $t7, $t0 -/* B7CC6C 80105ACC 19200040 */ blez $t1, .L80105BD0 -/* B7CC70 80105AD0 00009025 */ move $s2, $zero -/* B7CC74 80105AD4 00001025 */ move $v0, $zero -/* B7CC78 80105AD8 24150003 */ li $s5, 3 -.L80105ADC: -/* B7CC7C 80105ADC 18400003 */ blez $v0, .L80105AEC -/* B7CC80 80105AE0 93AA003C */ lbu $t2, 0x3c($sp) -/* B7CC84 80105AE4 10000002 */ b .L80105AF0 -/* B7CC88 80105AE8 24110001 */ li $s1, 1 -.L80105AEC: -/* B7CC8C 80105AEC 8E910060 */ lw $s1, 0x60($s4) -.L80105AF0: -/* B7CC90 80105AF0 1142000C */ beq $t2, $v0, .L80105B24 -/* B7CC94 80105AF4 02765821 */ addu $t3, $s3, $s6 -/* B7CC98 80105AF8 916C0101 */ lbu $t4, 0x101($t3) -/* B7CC9C 80105AFC 04410004 */ bgez $v0, .L80105B10 -/* B7CCA0 80105B00 304D0007 */ andi $t5, $v0, 7 -/* B7CCA4 80105B04 11A00002 */ beqz $t5, .L80105B10 -/* B7CCA8 80105B08 00000000 */ nop -/* B7CCAC 80105B0C 25ADFFF8 */ addiu $t5, $t5, -8 -.L80105B10: -/* B7CCB0 80105B10 240E0001 */ li $t6, 1 -/* B7CCB4 80105B14 01AEC004 */ sllv $t8, $t6, $t5 -/* B7CCB8 80105B18 0198C824 */ and $t9, $t4, $t8 -/* B7CCBC 80105B1C 53200027 */ beql $t9, $zero, .L80105BBC -/* B7CCC0 80105B20 928B0064 */ lbu $t3, 0x64($s4) -.L80105B24: -/* B7CCC4 80105B24 926F0100 */ lbu $t7, 0x100($s3) -/* B7CCC8 80105B28 02802025 */ move $a0, $s4 -/* B7CCCC 80105B2C 02602825 */ move $a1, $s3 -/* B7CCD0 80105B30 11E2000A */ beq $t7, $v0, .L80105B5C -/* B7CCD4 80105B34 00003025 */ move $a2, $zero -/* B7CCD8 80105B38 0C040B31 */ jal func_80102CC4 -/* B7CCDC 80105B3C 324700FF */ andi $a3, $s2, 0xff -/* B7CCE0 80105B40 50400006 */ beql $v0, $zero, .L80105B5C -/* B7CCE4 80105B44 A2720100 */ sb $s2, 0x100($s3) -/* B7CCE8 80105B48 50550004 */ beql $v0, $s5, .L80105B5C -/* B7CCEC 80105B4C A2720100 */ sb $s2, 0x100($s3) -/* B7CCF0 80105B50 10000021 */ b .L80105BD8 -/* B7CCF4 80105B54 8FBF0034 */ lw $ra, 0x34($sp) -/* B7CCF8 80105B58 A2720100 */ sb $s2, 0x100($s3) -.L80105B5C: -/* B7CCFC 80105B5C 2A010002 */ slti $at, $s0, 2 -/* B7CD00 80105B60 10200010 */ beqz $at, .L80105BA4 -/* B7CD04 80105B64 2A210080 */ slti $at, $s1, 0x80 -/* B7CD08 80105B68 1020000E */ beqz $at, .L80105BA4 -/* B7CD0C 80105B6C 00111040 */ sll $v0, $s1, 1 -/* B7CD10 80105B70 02621821 */ addu $v1, $s3, $v0 -/* B7CD14 80105B74 97A8003C */ lhu $t0, 0x3c($sp) -.L80105B78: -/* B7CD18 80105B78 94690000 */ lhu $t1, ($v1) -/* B7CD1C 80105B7C 24420002 */ addiu $v0, $v0, 2 -/* B7CD20 80105B80 55090003 */ bnel $t0, $t1, .L80105B90 -/* B7CD24 80105B84 2A010002 */ slti $at, $s0, 2 -/* B7CD28 80105B88 26100001 */ addiu $s0, $s0, 1 -/* B7CD2C 80105B8C 2A010002 */ slti $at, $s0, 2 -.L80105B90: -/* B7CD30 80105B90 10200004 */ beqz $at, .L80105BA4 -/* B7CD34 80105B94 24630002 */ addiu $v1, $v1, 2 -/* B7CD38 80105B98 28410100 */ slti $at, $v0, 0x100 -/* B7CD3C 80105B9C 5420FFF6 */ bnezl $at, .L80105B78 -/* B7CD40 80105BA0 97A8003C */ lhu $t0, 0x3c($sp) -.L80105BA4: -/* B7CD44 80105BA4 2A010002 */ slti $at, $s0, 2 -/* B7CD48 80105BA8 54200004 */ bnezl $at, .L80105BBC -/* B7CD4C 80105BAC 928B0064 */ lbu $t3, 0x64($s4) -/* B7CD50 80105BB0 10000008 */ b .L80105BD4 -/* B7CD54 80105BB4 24020002 */ li $v0, 2 -/* B7CD58 80105BB8 928B0064 */ lbu $t3, 0x64($s4) -.L80105BBC: -/* B7CD5C 80105BBC 26520001 */ addiu $s2, $s2, 1 -/* B7CD60 80105BC0 324200FF */ andi $v0, $s2, 0xff -/* B7CD64 80105BC4 004B082A */ slt $at, $v0, $t3 -/* B7CD68 80105BC8 1420FFC4 */ bnez $at, .L80105ADC -/* B7CD6C 80105BCC 00409025 */ move $s2, $v0 -.L80105BD0: -/* B7CD70 80105BD0 02001025 */ move $v0, $s0 -.L80105BD4: -/* B7CD74 80105BD4 8FBF0034 */ lw $ra, 0x34($sp) -.L80105BD8: -/* B7CD78 80105BD8 8FB00018 */ lw $s0, 0x18($sp) -/* B7CD7C 80105BDC 8FB1001C */ lw $s1, 0x1c($sp) -/* B7CD80 80105BE0 8FB20020 */ lw $s2, 0x20($sp) -/* B7CD84 80105BE4 8FB30024 */ lw $s3, 0x24($sp) -/* B7CD88 80105BE8 8FB40028 */ lw $s4, 0x28($sp) -/* B7CD8C 80105BEC 8FB5002C */ lw $s5, 0x2c($sp) -/* B7CD90 80105BF0 8FB60030 */ lw $s6, 0x30($sp) -/* B7CD94 80105BF4 03E00008 */ jr $ra -/* B7CD98 80105BF8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/code_80105CF0.s b/asm/code_80105CF0.s deleted file mode 100644 index eb37294c9d..0000000000 --- a/asm/code_80105CF0.s +++ /dev/null @@ -1,171 +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 func_80105CF0 -/* B7CE90 80105CF0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B7CE94 80105CF4 8FAF0078 */ lw $t7, 0x78($sp) -/* B7CE98 80105CF8 AFB5002C */ sw $s5, 0x2c($sp) -/* B7CE9C 80105CFC AFB40028 */ sw $s4, 0x28($sp) -/* B7CEA0 80105D00 AFB1001C */ sw $s1, 0x1c($sp) -/* B7CEA4 80105D04 AFA60070 */ sw $a2, 0x70($sp) -/* B7CEA8 80105D08 30CEFFFF */ andi $t6, $a2, 0xffff -/* B7CEAC 80105D0C 24010001 */ li $at, 1 -/* B7CEB0 80105D10 01C03025 */ move $a2, $t6 -/* B7CEB4 80105D14 00A08825 */ move $s1, $a1 -/* B7CEB8 80105D18 0080A825 */ move $s5, $a0 -/* B7CEBC 80105D1C AFBF003C */ sw $ra, 0x3c($sp) -/* B7CEC0 80105D20 AFBE0038 */ sw $fp, 0x38($sp) -/* B7CEC4 80105D24 AFB70034 */ sw $s7, 0x34($sp) -/* B7CEC8 80105D28 AFB60030 */ sw $s6, 0x30($sp) -/* B7CECC 80105D2C AFB30024 */ sw $s3, 0x24($sp) -/* B7CED0 80105D30 AFB20020 */ sw $s2, 0x20($sp) -/* B7CED4 80105D34 AFB00018 */ sw $s0, 0x18($sp) -/* B7CED8 80105D38 AFA70074 */ sw $a3, 0x74($sp) -/* B7CEDC 80105D3C 11E10008 */ beq $t7, $at, .L80105D60 -/* B7CEE0 80105D40 24140002 */ li $s4, 2 -/* B7CEE4 80105D44 29C10007 */ slti $at, $t6, 7 -/* B7CEE8 80105D48 50200006 */ beql $at, $zero, .L80105D64 -/* B7CEEC 80105D4C 00C08025 */ move $s0, $a2 -/* B7CEF0 80105D50 51C00004 */ beql $t6, $zero, .L80105D64 -/* B7CEF4 80105D54 00C08025 */ move $s0, $a2 -/* B7CEF8 80105D58 1000006C */ b .L80105F0C -/* B7CEFC 80105D5C 00001025 */ move $v0, $zero -.L80105D60: -/* B7CF00 80105D60 00C08025 */ move $s0, $a2 -.L80105D64: -/* B7CF04 80105D64 0C0402E8 */ jal __osSiGetAccess -/* B7CF08 80105D68 A7A60072 */ sh $a2, 0x72($sp) -/* B7CF0C 80105D6C 0010C0C3 */ sra $t8, $s0, 3 -/* B7CF10 80105D70 0010C940 */ sll $t9, $s0, 5 -/* B7CF14 80105D74 3C178013 */ lui $s7, %hi(__osPfsLastChannel) # $s7, 0x8013 -/* B7CF18 80105D78 3C168017 */ lui $s6, %hi(__osContLastPoll) # $s6, 0x8017 -/* B7CF1C 80105D7C 3C138017 */ lui $s3, %hi(pifMempakBuf) # $s3, 0x8017 -/* B7CF20 80105D80 26735960 */ addiu $s3, %lo(pifMempakBuf) # addiu $s3, $s3, 0x5960 -/* B7CF24 80105D84 26D65810 */ addiu $s6, %lo(__osContLastPoll) # addiu $s6, $s6, 0x5810 -/* B7CF28 80105D88 26F74D20 */ addiu $s7, %lo(__osPfsLastChannel) # addiu $s7, $s7, 0x4d20 -/* B7CF2C 80105D8C AFB90040 */ sw $t9, 0x40($sp) -/* B7CF30 80105D90 AFB80044 */ sw $t8, 0x44($sp) -/* B7CF34 80105D94 241E0003 */ li $fp, 3 -.L80105D98: -/* B7CF38 80105D98 92C80000 */ lbu $t0, ($s6) -/* B7CF3C 80105D9C 24010003 */ li $at, 3 -/* B7CF40 80105DA0 02608025 */ move $s0, $s3 -/* B7CF44 80105DA4 15010004 */ bne $t0, $at, .L80105DB8 -/* B7CF48 80105DA8 00001025 */ move $v0, $zero -/* B7CF4C 80105DAC 8EE90000 */ lw $t1, ($s7) -/* B7CF50 80105DB0 52290022 */ beql $s1, $t1, .L80105E3C -/* B7CF54 80105DB4 02718021 */ addu $s0, $s3, $s1 -.L80105DB8: -/* B7CF58 80105DB8 A2DE0000 */ sb $fp, ($s6) -/* B7CF5C 80105DBC 1A200010 */ blez $s1, .L80105E00 -/* B7CF60 80105DC0 AEF10000 */ sw $s1, ($s7) -/* B7CF64 80105DC4 32240003 */ andi $a0, $s1, 3 -/* B7CF68 80105DC8 10800006 */ beqz $a0, .L80105DE4 -/* B7CF6C 80105DCC 00801825 */ move $v1, $a0 -.L80105DD0: -/* B7CF70 80105DD0 24420001 */ addiu $v0, $v0, 1 -/* B7CF74 80105DD4 A2000000 */ sb $zero, ($s0) -/* B7CF78 80105DD8 1462FFFD */ bne $v1, $v0, .L80105DD0 -/* B7CF7C 80105DDC 26100001 */ addiu $s0, $s0, 1 -/* B7CF80 80105DE0 10510007 */ beq $v0, $s1, .L80105E00 -.L80105DE4: -/* B7CF84 80105DE4 24420004 */ addiu $v0, $v0, 4 -/* B7CF88 80105DE8 A2000000 */ sb $zero, ($s0) -/* B7CF8C 80105DEC A2000001 */ sb $zero, 1($s0) -/* B7CF90 80105DF0 A2000002 */ sb $zero, 2($s0) -/* B7CF94 80105DF4 A2000003 */ sb $zero, 3($s0) -/* B7CF98 80105DF8 1451FFFA */ bne $v0, $s1, .L80105DE4 -/* B7CF9C 80105DFC 26100004 */ addiu $s0, $s0, 4 -.L80105E00: -/* B7CFA0 80105E00 240A0001 */ li $t2, 1 -/* B7CFA4 80105E04 AE6A003C */ sw $t2, 0x3c($s3) -/* B7CFA8 80105E08 240B00FF */ li $t3, 255 -/* B7CFAC 80105E0C 240C0023 */ li $t4, 35 -/* B7CFB0 80105E10 240D0001 */ li $t5, 1 -/* B7CFB4 80105E14 240E00FF */ li $t6, 255 -/* B7CFB8 80105E18 240F00FE */ li $t7, 254 -/* B7CFBC 80105E1C A20B0000 */ sb $t3, ($s0) -/* B7CFC0 80105E20 A20C0001 */ sb $t4, 1($s0) -/* B7CFC4 80105E24 A20D0002 */ sb $t5, 2($s0) -/* B7CFC8 80105E28 A21E0003 */ sb $fp, 3($s0) -/* B7CFCC 80105E2C A20E0026 */ sb $t6, 0x26($s0) -/* B7CFD0 80105E30 10000002 */ b .L80105E3C -/* B7CFD4 80105E34 A20F0027 */ sb $t7, 0x27($s0) -/* B7CFD8 80105E38 02718021 */ addu $s0, $s3, $s1 -.L80105E3C: -/* B7CFDC 80105E3C 8FB80044 */ lw $t8, 0x44($sp) -/* B7CFE0 80105E40 A2180004 */ sb $t8, 4($s0) -/* B7CFE4 80105E44 0C04185C */ jal osMempakAddrCRC -/* B7CFE8 80105E48 97A40072 */ lhu $a0, 0x72($sp) -/* B7CFEC 80105E4C 8FB90040 */ lw $t9, 0x40($sp) -/* B7CFF0 80105E50 26050006 */ addiu $a1, $s0, 6 -/* B7CFF4 80105E54 24060020 */ li $a2, 32 -/* B7CFF8 80105E58 00594025 */ or $t0, $v0, $t9 -/* B7CFFC 80105E5C A2080005 */ sb $t0, 5($s0) -/* B7D000 80105E60 0C001BC4 */ jal bcopy -/* B7D004 80105E64 8FA40074 */ lw $a0, 0x74($sp) -/* B7D008 80105E68 24040001 */ li $a0, 1 -/* B7D00C 80105E6C 0C0404FC */ jal __osSiRawStartDma /*(s32 dir, void *addr)*/ -/* B7D010 80105E70 02602825 */ move $a1, $s3 -/* B7D014 80105E74 0C041890 */ jal osMempakDataCRC -/* B7D018 80105E78 8FA40074 */ lw $a0, 0x74($sp) -/* B7D01C 80105E7C 305200FF */ andi $s2, $v0, 0xff -/* B7D020 80105E80 02A02025 */ move $a0, $s5 -/* B7D024 80105E84 00002825 */ move $a1, $zero -/* B7D028 80105E88 0C000CA0 */ jal osRecvMesg -/* B7D02C 80105E8C 24060001 */ li $a2, 1 -/* B7D030 80105E90 00002025 */ move $a0, $zero -/* B7D034 80105E94 0C0404FC */ jal __osSiRawStartDma /*(s32 dir, void *addr)*/ -/* B7D038 80105E98 02602825 */ move $a1, $s3 -/* B7D03C 80105E9C 02A02025 */ move $a0, $s5 -/* B7D040 80105EA0 00002825 */ move $a1, $zero -/* B7D044 80105EA4 0C000CA0 */ jal osRecvMesg -/* B7D048 80105EA8 24060001 */ li $a2, 1 -/* B7D04C 80105EAC 92030002 */ lbu $v1, 2($s0) -/* B7D050 80105EB0 306900C0 */ andi $t1, $v1, 0xc0 -/* B7D054 80105EB4 00091903 */ sra $v1, $t1, 4 -/* B7D058 80105EB8 5460000C */ bnezl $v1, .L80105EEC -/* B7D05C 80105EBC 24030001 */ li $v1, 1 -/* B7D060 80105EC0 920B0026 */ lbu $t3, 0x26($s0) -/* B7D064 80105EC4 02A02025 */ move $a0, $s5 -/* B7D068 80105EC8 51720009 */ beql $t3, $s2, .L80105EF0 -/* B7D06C 80105ECC 24010004 */ li $at, 4 -/* B7D070 80105ED0 0C040644 */ jal __osPfsGetStatus -/* B7D074 80105ED4 02202825 */ move $a1, $s1 -/* B7D078 80105ED8 14400009 */ bnez $v0, .L80105F00 -/* B7D07C 80105EDC 00401825 */ move $v1, $v0 -/* B7D080 80105EE0 10000002 */ b .L80105EEC -/* B7D084 80105EE4 24030004 */ li $v1, 4 -/* B7D088 80105EE8 24030001 */ li $v1, 1 -.L80105EEC: -/* B7D08C 80105EEC 24010004 */ li $at, 4 -.L80105EF0: -/* B7D090 80105EF0 14610003 */ bne $v1, $at, .L80105F00 -/* B7D094 80105EF4 2A820000 */ slti $v0, $s4, 0 -/* B7D098 80105EF8 1040FFA7 */ beqz $v0, .L80105D98 -/* B7D09C 80105EFC 2694FFFF */ addiu $s4, $s4, -1 -.L80105F00: -/* B7D0A0 80105F00 0C0402F9 */ jal __osSiRelAccess -/* B7D0A4 80105F04 AFA30064 */ sw $v1, 0x64($sp) -/* B7D0A8 80105F08 8FA20064 */ lw $v0, 0x64($sp) -.L80105F0C: -/* B7D0AC 80105F0C 8FBF003C */ lw $ra, 0x3c($sp) -/* B7D0B0 80105F10 8FB00018 */ lw $s0, 0x18($sp) -/* B7D0B4 80105F14 8FB1001C */ lw $s1, 0x1c($sp) -/* B7D0B8 80105F18 8FB20020 */ lw $s2, 0x20($sp) -/* B7D0BC 80105F1C 8FB30024 */ lw $s3, 0x24($sp) -/* B7D0C0 80105F20 8FB40028 */ lw $s4, 0x28($sp) -/* B7D0C4 80105F24 8FB5002C */ lw $s5, 0x2c($sp) -/* B7D0C8 80105F28 8FB60030 */ lw $s6, 0x30($sp) -/* B7D0CC 80105F2C 8FB70034 */ lw $s7, 0x34($sp) -/* B7D0D0 80105F30 8FBE0038 */ lw $fp, 0x38($sp) -/* B7D0D4 80105F34 03E00008 */ jr $ra -/* B7D0D8 80105F38 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/non_matchings/code/code_80110450/func_801104C8.s b/asm/non_matchings/code/code_80110450/func_801104C8.s index 85f0530234..665b57b042 100644 --- a/asm/non_matchings/code/code_80110450/func_801104C8.s +++ b/asm/non_matchings/code/code_80110450/func_801104C8.s @@ -233,7 +233,7 @@ glabel L8011079C /* B8795C 801107BC A4600000 */ sh $zero, ($v1) /* B87960 801107C0 0C01D7C5 */ jal func_80075F14 /* B87964 801107C4 02A02025 */ move $a0, $s5 -/* B87968 801107C8 0C02CE10 */ jal func_800B3840 +/* B87968 801107C8 0C02CE10 */ jal ShrinkWindow_SetVal /* B8796C 801107CC 24040020 */ li $a0, 32 /* B87970 801107D0 10000064 */ b .L80110964 /* B87974 801107D4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/contpfs/__osGetId.s b/asm/non_matchings/code/contpfs/__osGetId.s new file mode 100644 index 0000000000..a3b29e8e6c --- /dev/null +++ b/asm/non_matchings/code/contpfs/__osGetId.s @@ -0,0 +1,121 @@ +glabel __osGetId +/* B79BE4 80102A44 27BDFF90 */ addiu $sp, $sp, -0x70 +/* B79BE8 80102A48 AFBF001C */ sw $ra, 0x1c($sp) +/* B79BEC 80102A4C AFB10018 */ sw $s1, 0x18($sp) +/* B79BF0 80102A50 AFB00014 */ sw $s0, 0x14($sp) +/* B79BF4 80102A54 908E0065 */ lbu $t6, 0x65($a0) +/* B79BF8 80102A58 00808025 */ move $s0, $a0 +/* B79BFC 80102A5C 51C00008 */ beql $t6, $zero, .L80102A80 +/* B79C00 80102A60 8E040004 */ lw $a0, 4($s0) +/* B79C04 80102A64 0C041320 */ jal __osPfsSelectBank +/* B79C08 80102A68 00002825 */ move $a1, $zero +/* B79C0C 80102A6C 50400004 */ beql $v0, $zero, .L80102A80 +/* B79C10 80102A70 8E040004 */ lw $a0, 4($s0) +/* B79C14 80102A74 1000005A */ b .L80102BE0 +/* B79C18 80102A78 8FBF001C */ lw $ra, 0x1c($sp) +/* B79C1C 80102A7C 8E040004 */ lw $a0, 4($s0) +.L80102A80: +/* B79C20 80102A80 8E050008 */ lw $a1, 8($s0) +/* B79C24 80102A84 24060001 */ li $a2, 1 +/* B79C28 80102A88 0C0417D0 */ jal __osContRamRead +/* B79C2C 80102A8C 27A7004C */ addiu $a3, $sp, 0x4c +/* B79C30 80102A90 10400003 */ beqz $v0, .L80102AA0 +/* B79C34 80102A94 27A4004C */ addiu $a0, $sp, 0x4c +/* B79C38 80102A98 10000051 */ b .L80102BE0 +/* B79C3C 80102A9C 8FBF001C */ lw $ra, 0x1c($sp) +.L80102AA0: +/* B79C40 80102AA0 27A5006E */ addiu $a1, $sp, 0x6e +/* B79C44 80102AA4 0C040925 */ jal __osIdCheckSum +/* B79C48 80102AA8 27A6006C */ addiu $a2, $sp, 0x6c +/* B79C4C 80102AAC 97AF006E */ lhu $t7, 0x6e($sp) +/* B79C50 80102AB0 97B80068 */ lhu $t8, 0x68($sp) +/* B79C54 80102AB4 27A5004C */ addiu $a1, $sp, 0x4c +/* B79C58 80102AB8 00A08825 */ move $s1, $a1 +/* B79C5C 80102ABC 15F80004 */ bne $t7, $t8, .L80102AD0 +/* B79C60 80102AC0 97B9006C */ lhu $t9, 0x6c($sp) +/* B79C64 80102AC4 97A9006A */ lhu $t1, 0x6a($sp) +/* B79C68 80102AC8 53290015 */ beql $t9, $t1, .L80102B20 +/* B79C6C 80102ACC 962A0018 */ lhu $t2, 0x18($s1) +.L80102AD0: +/* B79C70 80102AD0 0C040A38 */ jal __osCheckPackId +/* B79C74 80102AD4 02002025 */ move $a0, $s0 +/* B79C78 80102AD8 2401000A */ li $at, 10 +/* B79C7C 80102ADC 1441000B */ bne $v0, $at, .L80102B0C +/* B79C80 80102AE0 00401825 */ move $v1, $v0 +/* B79C84 80102AE4 02002025 */ move $a0, $s0 +/* B79C88 80102AE8 27A5004C */ addiu $a1, $sp, 0x4c +/* B79C8C 80102AEC 0C040964 */ jal __osRepairPackId +/* B79C90 80102AF0 27A60028 */ addiu $a2, $sp, 0x28 +/* B79C94 80102AF4 10400003 */ beqz $v0, .L80102B04 +/* B79C98 80102AF8 00000000 */ nop +/* B79C9C 80102AFC 10000038 */ b .L80102BE0 +/* B79CA0 80102B00 8FBF001C */ lw $ra, 0x1c($sp) +.L80102B04: +/* B79CA4 80102B04 10000005 */ b .L80102B1C +/* B79CA8 80102B08 27B10028 */ addiu $s1, $sp, 0x28 +.L80102B0C: +/* B79CAC 80102B0C 50400004 */ beql $v0, $zero, .L80102B20 +/* B79CB0 80102B10 962A0018 */ lhu $t2, 0x18($s1) +/* B79CB4 80102B14 10000031 */ b .L80102BDC +/* B79CB8 80102B18 00601025 */ move $v0, $v1 +.L80102B1C: +/* B79CBC 80102B1C 962A0018 */ lhu $t2, 0x18($s1) +.L80102B20: +/* B79CC0 80102B20 02002025 */ move $a0, $s0 +/* B79CC4 80102B24 02202825 */ move $a1, $s1 +/* B79CC8 80102B28 314B0001 */ andi $t3, $t2, 1 +/* B79CCC 80102B2C 5560000D */ bnezl $t3, .L80102B64 +/* B79CD0 80102B30 02202025 */ move $a0, $s1 +/* B79CD4 80102B34 0C040964 */ jal __osRepairPackId +/* B79CD8 80102B38 27A60028 */ addiu $a2, $sp, 0x28 +/* B79CDC 80102B3C 10400003 */ beqz $v0, .L80102B4C +/* B79CE0 80102B40 97AC0040 */ lhu $t4, 0x40($sp) +/* B79CE4 80102B44 10000026 */ b .L80102BE0 +/* B79CE8 80102B48 8FBF001C */ lw $ra, 0x1c($sp) +.L80102B4C: +/* B79CEC 80102B4C 318D0001 */ andi $t5, $t4, 1 +/* B79CF0 80102B50 15A00003 */ bnez $t5, .L80102B60 +/* B79CF4 80102B54 27B10028 */ addiu $s1, $sp, 0x28 +/* B79CF8 80102B58 10000020 */ b .L80102BDC +/* B79CFC 80102B5C 2402000B */ li $v0, 11 +.L80102B60: +/* B79D00 80102B60 02202025 */ move $a0, $s1 +.L80102B64: +/* B79D04 80102B64 2605000C */ addiu $a1, $s0, 0xc +/* B79D08 80102B68 0C001BC4 */ jal bcopy +/* B79D0C 80102B6C 24060020 */ li $a2, 32 +/* B79D10 80102B70 922E001B */ lbu $t6, 0x1b($s1) +/* B79D14 80102B74 24090010 */ li $t1, 16 +/* B79D18 80102B78 240A0008 */ li $t2, 8 +/* B79D1C 80102B7C AE0E004C */ sw $t6, 0x4c($s0) +/* B79D20 80102B80 922F001A */ lbu $t7, 0x1a($s1) +/* B79D24 80102B84 AE090050 */ sw $t1, 0x50($s0) +/* B79D28 80102B88 AE0A0054 */ sw $t2, 0x54($s0) +/* B79D2C 80102B8C 31E200FF */ andi $v0, $t7, 0xff +/* B79D30 80102B90 000218C0 */ sll $v1, $v0, 3 +/* B79D34 80102B94 0002C040 */ sll $t8, $v0, 1 +/* B79D38 80102B98 24680008 */ addiu $t0, $v1, 8 +/* B79D3C 80102B9C 27190003 */ addiu $t9, $t8, 3 +/* B79D40 80102BA0 01035821 */ addu $t3, $t0, $v1 +/* B79D44 80102BA4 AE190060 */ sw $t9, 0x60($s0) +/* B79D48 80102BA8 AE080058 */ sw $t0, 0x58($s0) +/* B79D4C 80102BAC AE0B005C */ sw $t3, 0x5c($s0) +/* B79D50 80102BB0 8E040004 */ lw $a0, 4($s0) +/* B79D54 80102BB4 8E050008 */ lw $a1, 8($s0) +/* B79D58 80102BB8 24060007 */ li $a2, 7 +/* B79D5C 80102BBC 2607002C */ addiu $a3, $s0, 0x2c +/* B79D60 80102BC0 0C0417D0 */ jal __osContRamRead +/* B79D64 80102BC4 A20F0064 */ sb $t7, 0x64($s0) +/* B79D68 80102BC8 50400004 */ beql $v0, $zero, .L80102BDC +/* B79D6C 80102BCC 00001025 */ move $v0, $zero +/* B79D70 80102BD0 10000003 */ b .L80102BE0 +/* B79D74 80102BD4 8FBF001C */ lw $ra, 0x1c($sp) +/* B79D78 80102BD8 00001025 */ move $v0, $zero +.L80102BDC: +/* B79D7C 80102BDC 8FBF001C */ lw $ra, 0x1c($sp) +.L80102BE0: +/* B79D80 80102BE0 8FB00014 */ lw $s0, 0x14($sp) +/* B79D84 80102BE4 8FB10018 */ lw $s1, 0x18($sp) +/* B79D88 80102BE8 03E00008 */ jr $ra +/* B79D8C 80102BEC 27BD0070 */ addiu $sp, $sp, 0x70 + diff --git a/asm/non_matchings/code/cosf/cosf.s b/asm/non_matchings/code/cosf/cosf.s deleted file mode 100644 index 7e25f61b00..0000000000 --- a/asm/non_matchings/code/cosf/cosf.s +++ /dev/null @@ -1,117 +0,0 @@ -.late_rodata -glabel D_8014B280 - .incbin "baserom.z64", 0xBC2420, 0x28 - -glabel D_8014B2A8 - .incbin "baserom.z64", 0xBC2448, 0x8 # .double 0.318309886183791 - -glabel D_8014B2B0 - .incbin "baserom.z64", 0xBC2450, 0x8 # Pi - -glabel D_8014B2B8 - .incbin "baserom.z64", 0xBC2458, 0x8 # 3.17865095470564E-8 - -glabel D_8014B2C0 - .incbin "baserom.z64", 0xBC2460, 0x10 # Nothing? - -glabel D_8014B2D0 - .incbin "baserom.z64", 0xBC2470, 0x10 # Called as a float, but contains a invalid number? - -.text -glabel cosf -/* B7B7B0 80104610 E7AC0000 */ swc1 $f12, ($sp) -/* B7B7B4 80104614 8FA20000 */ lw $v0, ($sp) -/* B7B7B8 80104618 C7A60000 */ lwc1 $f6, ($sp) -/* B7B7BC 8010461C C7AA0000 */ lwc1 $f10, ($sp) -/* B7B7C0 80104620 00027583 */ sra $t6, $v0, 0x16 -/* B7B7C4 80104624 31CF01FF */ andi $t7, $t6, 0x1ff -/* B7B7C8 80104628 29E10136 */ slti $at, $t7, 0x136 -/* B7B7CC 8010462C 50200049 */ beql $at, $zero, .L80104754 -/* B7B7D0 80104630 460A5032 */ c.eq.s $f10, $f10 -/* B7B7D4 80104634 44802000 */ mtc1 $zero, $f4 -/* B7B7D8 80104638 3C013FE0 */ li $at, 0x3FE00000 # 0.000000 -/* B7B7DC 8010463C 44819800 */ mtc1 $at, $f19 -/* B7B7E0 80104640 4606203C */ c.lt.s $f4, $f6 -/* B7B7E4 80104644 C7A00000 */ lwc1 $f0, ($sp) -/* B7B7E8 80104648 3C018015 */ lui $at, %hi(D_8014B2A8) -/* B7B7EC 8010464C 45020004 */ bc1fl .L80104660 -/* B7B7F0 80104650 46000007 */ neg.s $f0, $f0 -/* B7B7F4 80104654 10000002 */ b .L80104660 -/* B7B7F8 80104658 46003006 */ mov.s $f0, $f6 -/* B7B7FC 8010465C 46000007 */ neg.s $f0, $f0 -.L80104660: -/* B7B800 80104660 D428B2A8 */ ldc1 $f8, %lo(D_8014B2A8)($at) -/* B7B804 80104664 46000321 */ cvt.d.s $f12, $f0 -/* B7B808 80104668 44809000 */ mtc1 $zero, $f18 -/* B7B80C 8010466C 46286282 */ mul.d $f10, $f12, $f8 -/* B7B810 80104670 44802800 */ mtc1 $zero, $f5 -/* B7B814 80104674 44802000 */ mtc1 $zero, $f4 -/* B7B818 80104678 46325380 */ add.d $f14, $f10, $f18 -/* B7B81C 8010467C 462E203E */ c.le.d $f4, $f14 -/* B7B820 80104680 00000000 */ nop -/* B7B824 80104684 45020007 */ bc1fl .L801046A4 -/* B7B828 80104688 46327281 */ sub.d $f10, $f14, $f18 -/* B7B82C 8010468C 46327180 */ add.d $f6, $f14, $f18 -/* B7B830 80104690 4620320D */ trunc.w.d $f8, $f6 -/* B7B834 80104694 44024000 */ mfc1 $v0, $f8 -/* B7B838 80104698 10000006 */ b .L801046B4 -/* B7B83C 8010469C 44823000 */ mtc1 $v0, $f6 -/* B7B840 801046A0 46327281 */ sub.d $f10, $f14, $f18 -.L801046A4: -/* B7B844 801046A4 4620510D */ trunc.w.d $f4, $f10 -/* B7B848 801046A8 44022000 */ mfc1 $v0, $f4 -/* B7B84C 801046AC 00000000 */ nop -/* B7B850 801046B0 44823000 */ mtc1 $v0, $f6 -.L801046B4: -/* B7B854 801046B4 3C018015 */ lui $at, %hi(D_8014B2B0) -/* B7B858 801046B8 D42AB2B0 */ ldc1 $f10, %lo(D_8014B2B0)($at) -/* B7B85C 801046BC 46803221 */ cvt.d.w $f8, $f6 -/* B7B860 801046C0 3C018015 */ lui $at, %hi(D_8014B2B8) -/* B7B864 801046C4 D426B2B8 */ ldc1 $f6, %lo(D_8014B2B8)($at) -/* B7B868 801046C8 3C038015 */ lui $v1, %hi(D_8014B280) # $v1, 0x8015 -/* B7B86C 801046CC 2463B280 */ addiu $v1, %lo(D_8014B280) # addiu $v1, $v1, -0x4d80 -/* B7B870 801046D0 46324001 */ sub.d $f0, $f8, $f18 -/* B7B874 801046D4 30480001 */ andi $t0, $v0, 1 -/* B7B878 801046D8 462A0102 */ mul.d $f4, $f0, $f10 -/* B7B87C 801046DC D46A0020 */ ldc1 $f10, 0x20($v1) -/* B7B880 801046E0 46260202 */ mul.d $f8, $f0, $f6 -/* B7B884 801046E4 D4660018 */ ldc1 $f6, 0x18($v1) -/* B7B888 801046E8 46246081 */ sub.d $f2, $f12, $f4 -/* B7B88C 801046EC 46281081 */ sub.d $f2, $f2, $f8 -/* B7B890 801046F0 46221382 */ mul.d $f14, $f2, $f2 -/* B7B894 801046F4 00000000 */ nop -/* B7B898 801046F8 462E5102 */ mul.d $f4, $f10, $f14 -/* B7B89C 801046FC 46262200 */ add.d $f8, $f4, $f6 -/* B7B8A0 80104700 D4640010 */ ldc1 $f4, 0x10($v1) -/* B7B8A4 80104704 462E4282 */ mul.d $f10, $f8, $f14 -/* B7B8A8 80104708 46245180 */ add.d $f6, $f10, $f4 -/* B7B8AC 8010470C D46A0008 */ ldc1 $f10, 8($v1) -/* B7B8B0 80104710 462E3202 */ mul.d $f8, $f6, $f14 -/* B7B8B4 80104714 15000007 */ bnez $t0, .L80104734 -/* B7B8B8 80104718 46285400 */ add.d $f16, $f10, $f8 -/* B7B8BC 8010471C 462E1102 */ mul.d $f4, $f2, $f14 -/* B7B8C0 80104720 00000000 */ nop -/* B7B8C4 80104724 46302182 */ mul.d $f6, $f4, $f16 -/* B7B8C8 80104728 46223280 */ add.d $f10, $f6, $f2 -/* B7B8CC 8010472C 03E00008 */ jr $ra -/* B7B8D0 80104730 46205020 */ cvt.s.d $f0, $f10 -.L80104734: -/* B7B8D4 80104734 462E1202 */ mul.d $f8, $f2, $f14 -/* B7B8D8 80104738 00000000 */ nop -/* B7B8DC 8010473C 46304102 */ mul.d $f4, $f8, $f16 -/* B7B8E0 80104740 46222180 */ add.d $f6, $f4, $f2 -/* B7B8E4 80104744 46203020 */ cvt.s.d $f0, $f6 -/* B7B8E8 80104748 03E00008 */ jr $ra -/* B7B8EC 8010474C 46000007 */ neg.s $f0, $f0 -/* B7B8F0 80104750 460A5032 */ c.eq.s $f10, $f10 -.L80104754: -/* B7B8F4 80104754 3C018015 */ lui $at, %hi(D_8014B2C0) -/* B7B8F8 80104758 45010004 */ bc1t .L8010476C -/* B7B8FC 8010475C 00000000 */ nop -/* B7B900 80104760 3C018015 */ lui $at, %hi(D_8014B2D0) -/* B7B904 80104764 03E00008 */ jr $ra -/* B7B908 80104768 C420B2D0 */ lwc1 $f0, %lo(D_8014B2D0)($at) -.L8010476C: -/* B7B90C 8010476C C420B2C0 */ lwc1 $f0, %lo(D_8014B2C0)($at) -/* B7B910 80104770 03E00008 */ jr $ra -/* B7B914 80104774 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/db_camera/func_800B3840.s b/asm/non_matchings/code/db_camera/func_800B3840.s deleted file mode 100644 index 9c051bd8e7..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3840.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800B3840 -/* B2A9E0 800B3840 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2A9E4 800B3844 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2A9E8 800B3848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2A9EC 800B384C AFBF0014 */ sw $ra, 0x14($sp) -/* B2A9F0 800B3850 AFA40018 */ sw $a0, 0x18($sp) -/* B2A9F4 800B3854 844E1074 */ lh $t6, 0x1074($v0) -/* B2A9F8 800B3858 24010013 */ li $at, 19 -/* B2A9FC 800B385C 55C10009 */ bnel $t6, $at, .L800B3884 -/* B2AA00 800B3860 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AA04 800B3864 844F1076 */ lh $t7, 0x1076($v0) -/* B2AA08 800B3868 24010001 */ li $at, 1 -/* B2AA0C 800B386C 3C048014 */ lui $a0, %hi(D_80143100) # $a0, 0x8014 -/* B2AA10 800B3870 15E10003 */ bne $t7, $at, .L800B3880 -/* B2AA14 800B3874 24843100 */ addiu $a0, %lo(D_80143100) # addiu $a0, $a0, 0x3100 -/* B2AA18 800B3878 0C00084C */ jal osSyncPrintf -/* B2AA1C 800B387C 8FA50018 */ lw $a1, 0x18($sp) -.L800B3880: -/* B2AA20 800B3880 8FBF0014 */ lw $ra, 0x14($sp) -.L800B3884: -/* B2AA24 800B3884 8FB80018 */ lw $t8, 0x18($sp) -/* B2AA28 800B3888 3C018013 */ lui $at, %hi(D_8012CED4) -/* B2AA2C 800B388C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2AA30 800B3890 03E00008 */ jr $ra -/* B2AA34 800B3894 AC38CED4 */ sw $t8, %lo(D_8012CED4)($at) - diff --git a/asm/non_matchings/code/db_camera/func_800B3898.s b/asm/non_matchings/code/db_camera/func_800B3898.s deleted file mode 100644 index bd6de8566b..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3898.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800B3898 -/* B2AA38 800B3898 3C028013 */ lui $v0, %hi(D_8012CED4) -/* B2AA3C 800B389C 03E00008 */ jr $ra -/* B2AA40 800B38A0 8C42CED4 */ lw $v0, %lo(D_8012CED4)($v0) - diff --git a/asm/non_matchings/code/db_camera/func_800B38A4.s b/asm/non_matchings/code/db_camera/func_800B38A4.s deleted file mode 100644 index 37db99631b..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B38A4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800B38A4 -/* B2AA44 800B38A4 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AA48 800B38A8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AA4C 800B38AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AA50 800B38B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AA54 800B38B4 AFA40018 */ sw $a0, 0x18($sp) -/* B2AA58 800B38B8 844E1074 */ lh $t6, 0x1074($v0) -/* B2AA5C 800B38BC 24010013 */ li $at, 19 -/* B2AA60 800B38C0 55C10009 */ bnel $t6, $at, .L800B38E8 -/* B2AA64 800B38C4 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AA68 800B38C8 844F1076 */ lh $t7, 0x1076($v0) -/* B2AA6C 800B38CC 24010001 */ li $at, 1 -/* B2AA70 800B38D0 3C048014 */ lui $a0, %hi(D_8014311C) # $a0, 0x8014 -/* B2AA74 800B38D4 15E10003 */ bne $t7, $at, .L800B38E4 -/* B2AA78 800B38D8 2484311C */ addiu $a0, %lo(D_8014311C) # addiu $a0, $a0, 0x311c -/* B2AA7C 800B38DC 0C00084C */ jal osSyncPrintf -/* B2AA80 800B38E0 8FA50018 */ lw $a1, 0x18($sp) -.L800B38E4: -/* B2AA84 800B38E4 8FBF0014 */ lw $ra, 0x14($sp) -.L800B38E8: -/* B2AA88 800B38E8 8FB80018 */ lw $t8, 0x18($sp) -/* B2AA8C 800B38EC 3C018013 */ lui $at, %hi(D_8012CED8) -/* B2AA90 800B38F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2AA94 800B38F4 03E00008 */ jr $ra -/* B2AA98 800B38F8 AC38CED8 */ sw $t8, %lo(D_8012CED8)($at) - diff --git a/asm/non_matchings/code/db_camera/func_800B38FC.s b/asm/non_matchings/code/db_camera/func_800B38FC.s deleted file mode 100644 index 8a0b006588..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B38FC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800B38FC -/* B2AA9C 800B38FC 3C028013 */ lui $v0, %hi(D_8012CED8) -/* B2AAA0 800B3900 03E00008 */ jr $ra -/* B2AAA4 800B3904 8C42CED8 */ lw $v0, %lo(D_8012CED8)($v0) - diff --git a/asm/non_matchings/code/db_camera/func_800B3908.s b/asm/non_matchings/code/db_camera/func_800B3908.s deleted file mode 100644 index fe24436ebc..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3908.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800B3908 -/* B2AAA8 800B3908 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AAAC 800B390C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AAB0 800B3910 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AAB4 800B3914 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AAB8 800B3918 844E1074 */ lh $t6, 0x1074($v0) -/* B2AABC 800B391C 24010013 */ li $at, 19 -/* B2AAC0 800B3920 15C10008 */ bne $t6, $at, .L800B3944 -/* B2AAC4 800B3924 00000000 */ nop -/* B2AAC8 800B3928 844F1076 */ lh $t7, 0x1076($v0) -/* B2AACC 800B392C 24010001 */ li $at, 1 -/* B2AAD0 800B3930 3C048014 */ lui $a0, %hi(D_8014313C) # $a0, 0x8014 -/* B2AAD4 800B3934 15E10003 */ bne $t7, $at, .L800B3944 -/* B2AAD8 800B3938 00000000 */ nop -/* B2AADC 800B393C 0C00084C */ jal osSyncPrintf -/* B2AAE0 800B3940 2484313C */ addiu $a0, %lo(D_8014313C) # addiu $a0, $a0, 0x313c -.L800B3944: -/* B2AAE4 800B3944 3C018013 */ lui $at, %hi(D_8012CED0) # $at, 0x8013 -/* B2AAE8 800B3948 AC20CED0 */ sw $zero, %lo(D_8012CED0)($at) -/* B2AAEC 800B394C 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AAF0 800B3950 3C018013 */ lui $at, %hi(D_8012CED4) # $at, 0x8013 -/* B2AAF4 800B3954 AC20CED4 */ sw $zero, %lo(D_8012CED4)($at) -/* B2AAF8 800B3958 3C018013 */ lui $at, %hi(D_8012CED8) # $at, 0x8013 -/* B2AAFC 800B395C AC20CED8 */ sw $zero, %lo(D_8012CED8)($at) -/* B2AB00 800B3960 03E00008 */ jr $ra -/* B2AB04 800B3964 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/db_camera/func_800B3968.s b/asm/non_matchings/code/db_camera/func_800B3968.s deleted file mode 100644 index 67ad5e72e3..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B3968.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800B3968 -/* B2AB08 800B3968 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B2AB0C 800B396C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B2AB10 800B3970 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2AB14 800B3974 AFBF0014 */ sw $ra, 0x14($sp) -/* B2AB18 800B3978 844E1074 */ lh $t6, 0x1074($v0) -/* B2AB1C 800B397C 24010013 */ li $at, 19 -/* B2AB20 800B3980 55C10009 */ bnel $t6, $at, .L800B39A8 -/* B2AB24 800B3984 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AB28 800B3988 844F1076 */ lh $t7, 0x1076($v0) -/* B2AB2C 800B398C 24010001 */ li $at, 1 -/* B2AB30 800B3990 3C048014 */ lui $a0, %hi(D_80143154) # $a0, 0x8014 -/* B2AB34 800B3994 55E10004 */ bnel $t7, $at, .L800B39A8 -/* B2AB38 800B3998 8FBF0014 */ lw $ra, 0x14($sp) -/* B2AB3C 800B399C 0C00084C */ jal osSyncPrintf -/* B2AB40 800B39A0 24843154 */ addiu $a0, %lo(D_80143154) # addiu $a0, $a0, 0x3154 -/* B2AB44 800B39A4 8FBF0014 */ lw $ra, 0x14($sp) -.L800B39A8: -/* B2AB48 800B39A8 3C018013 */ lui $at, %hi(D_8012CED8) # $at, 0x8013 -/* B2AB4C 800B39AC AC20CED8 */ sw $zero, %lo(D_8012CED8)($at) -/* B2AB50 800B39B0 03E00008 */ jr $ra -/* B2AB54 800B39B4 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/db_camera/func_800B39B8.s b/asm/non_matchings/code/db_camera/func_800B39B8.s deleted file mode 100644 index cc8f849b75..0000000000 --- a/asm/non_matchings/code/db_camera/func_800B39B8.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_800B39B8 -/* B2AB58 800B39B8 24010003 */ li $at, 3 -/* B2AB5C 800B39BC 14810003 */ bne $a0, $at, .L800B39CC -/* B2AB60 800B39C0 3C068013 */ lui $a2, %hi(D_8012CED8) # $a2, 0x8013 -/* B2AB64 800B39C4 1000000D */ b .L800B39FC -/* B2AB68 800B39C8 2402000A */ li $v0, 10 -.L800B39CC: -/* B2AB6C 800B39CC 240E001E */ li $t6, 30 -/* B2AB70 800B39D0 01C4001A */ div $zero, $t6, $a0 -/* B2AB74 800B39D4 00001012 */ mflo $v0 -/* B2AB78 800B39D8 14800002 */ bnez $a0, .L800B39E4 -/* B2AB7C 800B39DC 00000000 */ nop -/* B2AB80 800B39E0 0007000D */ break 7 -.L800B39E4: -/* B2AB84 800B39E4 2401FFFF */ li $at, -1 -/* B2AB88 800B39E8 14810004 */ bne $a0, $at, .L800B39FC -/* B2AB8C 800B39EC 3C018000 */ lui $at, 0x8000 -/* B2AB90 800B39F0 15C10002 */ bne $t6, $at, .L800B39FC -/* B2AB94 800B39F4 00000000 */ nop -/* B2AB98 800B39F8 0006000D */ break 6 -.L800B39FC: -/* B2AB9C 800B39FC 3C078013 */ lui $a3, %hi(D_8012CED4) # $a3, 0x8013 -/* B2ABA0 800B3A00 24E7CED4 */ addiu $a3, %lo(D_8012CED4) # addiu $a3, $a3, -0x312c -/* B2ABA4 800B3A04 24C6CED8 */ addiu $a2, %lo(D_8012CED8) # addiu $a2, $a2, -0x3128 -/* B2ABA8 800B3A08 8CC30000 */ lw $v1, ($a2) -/* B2ABAC 800B3A0C 8CE40000 */ lw $a0, ($a3) -/* B2ABB0 800B3A10 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2ABB4 800B3A14 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2ABB8 800B3A18 0064082A */ slt $at, $v1, $a0 -/* B2ABBC 800B3A1C 5020000F */ beql $at, $zero, .L800B3A5C -/* B2ABC0 800B3A20 0083082A */ slt $at, $a0, $v1 -/* B2ABC4 800B3A24 8D0F0000 */ lw $t7, ($t0) -/* B2ABC8 800B3A28 24050001 */ li $a1, 1 -/* B2ABCC 800B3A2C 50AF0003 */ beql $a1, $t7, .L800B3A3C -/* B2ABD0 800B3A30 00622821 */ addu $a1, $v1, $v0 -/* B2ABD4 800B3A34 AD050000 */ sw $a1, ($t0) -/* B2ABD8 800B3A38 00622821 */ addu $a1, $v1, $v0 -.L800B3A3C: -/* B2ABDC 800B3A3C 00A4082A */ slt $at, $a1, $a0 -/* B2ABE0 800B3A40 10200003 */ beqz $at, .L800B3A50 -/* B2ABE4 800B3A44 00000000 */ nop -/* B2ABE8 800B3A48 10000017 */ b .L800B3AA8 -/* B2ABEC 800B3A4C ACC50000 */ sw $a1, ($a2) -.L800B3A50: -/* B2ABF0 800B3A50 10000015 */ b .L800B3AA8 -/* B2ABF4 800B3A54 ACC40000 */ sw $a0, ($a2) -/* B2ABF8 800B3A58 0083082A */ slt $at, $a0, $v1 -.L800B3A5C: -/* B2ABFC 800B3A5C 1020000F */ beqz $at, .L800B3A9C -/* B2AC00 800B3A60 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2AC04 800B3A64 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2AC08 800B3A68 8D180000 */ lw $t8, ($t0) -/* B2AC0C 800B3A6C 24050002 */ li $a1, 2 -/* B2AC10 800B3A70 50B80003 */ beql $a1, $t8, .L800B3A80 -/* B2AC14 800B3A74 00622823 */ subu $a1, $v1, $v0 -/* B2AC18 800B3A78 AD050000 */ sw $a1, ($t0) -/* B2AC1C 800B3A7C 00622823 */ subu $a1, $v1, $v0 -.L800B3A80: -/* B2AC20 800B3A80 0085082A */ slt $at, $a0, $a1 -/* B2AC24 800B3A84 10200003 */ beqz $at, .L800B3A94 -/* B2AC28 800B3A88 00000000 */ nop -/* B2AC2C 800B3A8C 10000006 */ b .L800B3AA8 -/* B2AC30 800B3A90 ACC50000 */ sw $a1, ($a2) -.L800B3A94: -/* B2AC34 800B3A94 10000004 */ b .L800B3AA8 -/* B2AC38 800B3A98 ACC40000 */ sw $a0, ($a2) -.L800B3A9C: -/* B2AC3C 800B3A9C 3C088013 */ lui $t0, %hi(D_8012CED0) # $t0, 0x8013 -/* B2AC40 800B3AA0 2508CED0 */ addiu $t0, %lo(D_8012CED0) # addiu $t0, $t0, -0x3130 -/* B2AC44 800B3AA4 AD000000 */ sw $zero, ($t0) -.L800B3AA8: -/* B2AC48 800B3AA8 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B2AC4C 800B3AAC 24A5FA90 */ addiu $a1, %lo(gGameInfo) # addiu $a1, $a1, -0x570 -/* B2AC50 800B3AB0 8CA30000 */ lw $v1, ($a1) -/* B2AC54 800B3AB4 24040013 */ li $a0, 19 -/* B2AC58 800B3AB8 84791074 */ lh $t9, 0x1074($v1) -/* B2AC5C 800B3ABC 14990022 */ bne $a0, $t9, .L800B3B48 -/* B2AC60 800B3AC0 00000000 */ nop -/* B2AC64 800B3AC4 84691090 */ lh $t1, 0x1090($v1) -/* B2AC68 800B3AC8 50890016 */ beql $a0, $t1, .L800B3B24 -/* B2AC6C 800B3ACC 8D0A0000 */ lw $t2, ($t0) -/* B2AC70 800B3AD0 A4641090 */ sh $a0, 0x1090($v1) -/* B2AC74 800B3AD4 8CAA0000 */ lw $t2, ($a1) -/* B2AC78 800B3AD8 A5401076 */ sh $zero, 0x1076($t2) -/* B2AC7C 800B3ADC 8CAB0000 */ lw $t3, ($a1) -/* B2AC80 800B3AE0 A5601078 */ sh $zero, 0x1078($t3) -/* B2AC84 800B3AE4 8CAC0000 */ lw $t4, ($a1) -/* B2AC88 800B3AE8 A580107A */ sh $zero, 0x107a($t4) -/* B2AC8C 800B3AEC 8CAD0000 */ lw $t5, ($a1) -/* B2AC90 800B3AF0 A5A0107C */ sh $zero, 0x107c($t5) -/* B2AC94 800B3AF4 8CAE0000 */ lw $t6, ($a1) -/* B2AC98 800B3AF8 A5C0107E */ sh $zero, 0x107e($t6) -/* B2AC9C 800B3AFC 8CAF0000 */ lw $t7, ($a1) -/* B2ACA0 800B3B00 A5E01080 */ sh $zero, 0x1080($t7) -/* B2ACA4 800B3B04 8CB80000 */ lw $t8, ($a1) -/* B2ACA8 800B3B08 A7001082 */ sh $zero, 0x1082($t8) -/* B2ACAC 800B3B0C 8CB90000 */ lw $t9, ($a1) -/* B2ACB0 800B3B10 A7201084 */ sh $zero, 0x1084($t9) -/* B2ACB4 800B3B14 8CA90000 */ lw $t1, ($a1) -/* B2ACB8 800B3B18 A5201086 */ sh $zero, 0x1086($t1) -/* B2ACBC 800B3B1C 8CA30000 */ lw $v1, ($a1) -/* B2ACC0 800B3B20 8D0A0000 */ lw $t2, ($t0) -.L800B3B24: -/* B2ACC4 800B3B24 A46A107A */ sh $t2, 0x107a($v1) -/* B2ACC8 800B3B28 8CAC0000 */ lw $t4, ($a1) -/* B2ACCC 800B3B2C 8CCB0000 */ lw $t3, ($a2) -/* B2ACD0 800B3B30 A58B107C */ sh $t3, 0x107c($t4) -/* B2ACD4 800B3B34 8CAE0000 */ lw $t6, ($a1) -/* B2ACD8 800B3B38 8CED0000 */ lw $t5, ($a3) -/* B2ACDC 800B3B3C A5CD107E */ sh $t5, 0x107e($t6) -/* B2ACE0 800B3B40 8CAF0000 */ lw $t7, ($a1) -/* B2ACE4 800B3B44 A5E21080 */ sh $v0, 0x1080($t7) -.L800B3B48: -/* B2ACE8 800B3B48 03E00008 */ jr $ra -/* B2ACEC 800B3B4C 00000000 */ nop - diff --git a/asm/non_matchings/code/db_camera/func_800B9638.s b/asm/non_matchings/code/db_camera/func_800B9638.s index 2ca0a8e5bf..e3e9d36ff0 100644 --- a/asm/non_matchings/code/db_camera/func_800B9638.s +++ b/asm/non_matchings/code/db_camera/func_800B9638.s @@ -1031,7 +1031,7 @@ glabel func_800B9638 /* B31708 800BA568 A420111A */ sh $zero, %lo(D_8016111A)($at) /* B3170C 800BA56C 0C020978 */ jal Interface_ChangeAlpha /* B31710 800BA570 24040002 */ li $a0, 2 -/* B31714 800BA574 0C02CE10 */ jal func_800B3840 +/* B31714 800BA574 0C02CE10 */ jal ShrinkWindow_SetVal /* B31718 800BA578 00002025 */ move $a0, $zero /* B3171C 800BA57C 3C018016 */ lui $at, %hi(D_8016110C) # $at, 0x8016 /* B31720 800BA580 A420110C */ sh $zero, %lo(D_8016110C)($at) @@ -1045,7 +1045,7 @@ glabel func_800B9638 /* B3173C 800BA59C 27A4005C */ addiu $a0, $sp, 0x5c /* B31740 800BA5A0 0C020978 */ jal Interface_ChangeAlpha /* B31744 800BA5A4 24040002 */ li $a0, 2 -/* B31748 800BA5A8 0C02CE10 */ jal func_800B3840 +/* B31748 800BA5A8 0C02CE10 */ jal ShrinkWindow_SetVal /* B3174C 800BA5AC 00002025 */ move $a0, $zero /* B31750 800BA5B0 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 /* B31754 800BA5B4 3C0C8013 */ lui $t4, %hi(D_801333E8) # $t4, 0x8013 @@ -1706,7 +1706,7 @@ glabel func_800B9638 /* B320F8 800BAF58 A420111C */ sh $zero, %lo(D_8016111C)($at) /* B320FC 800BAF5C 0C020978 */ jal Interface_ChangeAlpha /* B32100 800BAF60 24040032 */ li $a0, 50 -/* B32104 800BAF64 0C02CE10 */ jal func_800B3840 +/* B32104 800BAF64 0C02CE10 */ jal ShrinkWindow_SetVal /* B32108 800BAF68 24040020 */ li $a0, 32 /* B3210C 800BAF6C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 /* B32110 800BAF70 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 diff --git a/asm/non_matchings/code/guLookAt/guLookAt.s b/asm/non_matchings/code/guLookAt/guLookAt.s deleted file mode 100644 index 8e2c26fae5..0000000000 --- a/asm/non_matchings/code/guLookAt/guLookAt.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel guLookAt -/* B78FD4 80101E34 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B78FD8 80101E38 44856000 */ mtc1 $a1, $f12 -/* B78FDC 80101E3C 44867000 */ mtc1 $a2, $f14 -/* B78FE0 80101E40 C7A40080 */ lwc1 $f4, 0x80($sp) -/* B78FE4 80101E44 C7A60084 */ lwc1 $f6, 0x84($sp) -/* B78FE8 80101E48 C7A80088 */ lwc1 $f8, 0x88($sp) -/* B78FEC 80101E4C C7AA008C */ lwc1 $f10, 0x8c($sp) -/* B78FF0 80101E50 C7B00090 */ lwc1 $f16, 0x90($sp) -/* B78FF4 80101E54 C7B20094 */ lwc1 $f18, 0x94($sp) -/* B78FF8 80101E58 AFBF002C */ sw $ra, 0x2c($sp) -/* B78FFC 80101E5C AFA40070 */ sw $a0, 0x70($sp) -/* B79000 80101E60 44056000 */ mfc1 $a1, $f12 -/* B79004 80101E64 44067000 */ mfc1 $a2, $f14 -/* B79008 80101E68 AFA7007C */ sw $a3, 0x7c($sp) -/* B7900C 80101E6C 27A40030 */ addiu $a0, $sp, 0x30 -/* B79010 80101E70 E7A40010 */ swc1 $f4, 0x10($sp) -/* B79014 80101E74 E7A60014 */ swc1 $f6, 0x14($sp) -/* B79018 80101E78 E7A80018 */ swc1 $f8, 0x18($sp) -/* B7901C 80101E7C E7AA001C */ swc1 $f10, 0x1c($sp) -/* B79020 80101E80 E7B00020 */ swc1 $f16, 0x20($sp) -/* B79024 80101E84 0C0406E4 */ jal guLookAtF -/* B79028 80101E88 E7B20024 */ swc1 $f18, 0x24($sp) -/* B7902C 80101E8C 27A40030 */ addiu $a0, $sp, 0x30 -/* B79030 80101E90 0C041938 */ jal guMtxF2L -/* B79034 80101E94 8FA50070 */ lw $a1, 0x70($sp) -/* B79038 80101E98 8FBF002C */ lw $ra, 0x2c($sp) -/* B7903C 80101E9C 27BD0070 */ addiu $sp, $sp, 0x70 -/* B79040 80101EA0 03E00008 */ jr $ra -/* B79044 80101EA4 00000000 */ nop diff --git a/asm/non_matchings/code/guLookAt/guLookAtF.s b/asm/non_matchings/code/guLookAt/guLookAtF.s deleted file mode 100644 index 9b8e89820e..0000000000 --- a/asm/non_matchings/code/guLookAt/guLookAtF.s +++ /dev/null @@ -1,170 +0,0 @@ -glabel guLookAtF -/* B78D30 80101B90 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B78D34 80101B94 AFBF0044 */ sw $ra, 0x44($sp) -/* B78D38 80101B98 F7BE0038 */ sdc1 $f30, 0x38($sp) -/* B78D3C 80101B9C F7BC0030 */ sdc1 $f28, 0x30($sp) -/* B78D40 80101BA0 F7BA0028 */ sdc1 $f26, 0x28($sp) -/* B78D44 80101BA4 F7B80020 */ sdc1 $f24, 0x20($sp) -/* B78D48 80101BA8 F7B60018 */ sdc1 $f22, 0x18($sp) -/* B78D4C 80101BAC F7B40010 */ sdc1 $f20, 0x10($sp) -/* B78D50 80101BB0 AFA5007C */ sw $a1, 0x7c($sp) -/* B78D54 80101BB4 AFA60080 */ sw $a2, 0x80($sp) -/* B78D58 80101BB8 AFA70084 */ sw $a3, 0x84($sp) -/* B78D5C 80101BBC 0C0406D0 */ jal guMtxIdentF -/* B78D60 80101BC0 AFA40078 */ sw $a0, 0x78($sp) -/* B78D64 80101BC4 C7A40088 */ lwc1 $f4, 0x88($sp) -/* B78D68 80101BC8 C7A6007C */ lwc1 $f6, 0x7c($sp) -/* B78D6C 80101BCC C7A8008C */ lwc1 $f8, 0x8c($sp) -/* B78D70 80101BD0 C7AA0080 */ lwc1 $f10, 0x80($sp) -/* B78D74 80101BD4 46062081 */ sub.s $f2, $f4, $f6 -/* B78D78 80101BD8 C7A60084 */ lwc1 $f6, 0x84($sp) -/* B78D7C 80101BDC C7A40090 */ lwc1 $f4, 0x90($sp) -/* B78D80 80101BE0 460A4301 */ sub.s $f12, $f8, $f10 -/* B78D84 80101BE4 46021202 */ mul.s $f8, $f2, $f2 -/* B78D88 80101BE8 3C01BFF0 */ li $at, 0xBFF00000 # 0.000000 -/* B78D8C 80101BEC 46062381 */ sub.s $f14, $f4, $f6 -/* B78D90 80101BF0 460C6282 */ mul.s $f10, $f12, $f12 -/* B78D94 80101BF4 44814800 */ mtc1 $at, $f9 -/* B78D98 80101BF8 3C013FF0 */ li $at, 0x3FF00000 # 0.000000 -/* B78D9C 80101BFC 460E7182 */ mul.s $f6, $f14, $f14 -/* B78DA0 80101C00 8FA40078 */ lw $a0, 0x78($sp) -/* B78DA4 80101C04 460A4100 */ add.s $f4, $f8, $f10 -/* B78DA8 80101C08 44804000 */ mtc1 $zero, $f8 -/* B78DAC 80101C0C 46062000 */ add.s $f0, $f4, $f6 -/* B78DB0 80101C10 46000004 */ sqrt.s $f0, $f0 -/* B78DB4 80101C14 460002A1 */ cvt.d.s $f10, $f0 -/* B78DB8 80101C18 462A4103 */ div.d $f4, $f8, $f10 -/* B78DBC 80101C1C 46202420 */ cvt.s.d $f16, $f4 -/* B78DC0 80101C20 46101702 */ mul.s $f28, $f2, $f16 -/* B78DC4 80101C24 00000000 */ nop -/* B78DC8 80101C28 46106182 */ mul.s $f6, $f12, $f16 -/* B78DCC 80101C2C 00000000 */ nop -/* B78DD0 80101C30 46107282 */ mul.s $f10, $f14, $f16 -/* B78DD4 80101C34 E7A60054 */ swc1 $f6, 0x54($sp) -/* B78DD8 80101C38 C7A60098 */ lwc1 $f6, 0x98($sp) -/* B78DDC 80101C3C C7BE0054 */ lwc1 $f30, 0x54($sp) -/* B78DE0 80101C40 E7AA0050 */ swc1 $f10, 0x50($sp) -/* B78DE4 80101C44 C7A40050 */ lwc1 $f4, 0x50($sp) -/* B78DE8 80101C48 46043282 */ mul.s $f10, $f6, $f4 -/* B78DEC 80101C4C C7A6009C */ lwc1 $f6, 0x9c($sp) -/* B78DF0 80101C50 E7A40068 */ swc1 $f4, 0x68($sp) -/* B78DF4 80101C54 C7B00068 */ lwc1 $f16, 0x68($sp) -/* B78DF8 80101C58 461E3182 */ mul.s $f6, $f6, $f30 -/* B78DFC 80101C5C 46065281 */ sub.s $f10, $f10, $f6 -/* B78E00 80101C60 C7A60094 */ lwc1 $f6, 0x94($sp) -/* B78E04 80101C64 E7AA004C */ swc1 $f10, 0x4c($sp) -/* B78E08 80101C68 46043282 */ mul.s $f10, $f6, $f4 -/* B78E0C 80101C6C C7A6009C */ lwc1 $f6, 0x9c($sp) -/* B78E10 80101C70 C7B6004C */ lwc1 $f22, 0x4c($sp) -/* B78E14 80101C74 461C3102 */ mul.s $f4, $f6, $f28 -/* B78E18 80101C78 C7A6004C */ lwc1 $f6, 0x4c($sp) -/* B78E1C 80101C7C 460A2601 */ sub.s $f24, $f4, $f10 -/* B78E20 80101C80 C7A40094 */ lwc1 $f4, 0x94($sp) -/* B78E24 80101C84 461E2282 */ mul.s $f10, $f4, $f30 -/* B78E28 80101C88 C7A40098 */ lwc1 $f4, 0x98($sp) -/* B78E2C 80101C8C E7B80050 */ swc1 $f24, 0x50($sp) -/* B78E30 80101C90 461C2202 */ mul.s $f8, $f4, $f28 -/* B78E34 80101C94 46085681 */ sub.s $f26, $f10, $f8 -/* B78E38 80101C98 4618C282 */ mul.s $f10, $f24, $f24 -/* B78E3C 80101C9C C7A8004C */ lwc1 $f8, 0x4c($sp) -/* B78E40 80101CA0 44815800 */ mtc1 $at, $f11 -/* B78E44 80101CA4 E7BA0058 */ swc1 $f26, 0x58($sp) -/* B78E48 80101CA8 46064202 */ mul.s $f8, $f8, $f6 -/* B78E4C 80101CAC 460A4180 */ add.s $f6, $f8, $f10 -/* B78E50 80101CB0 461AD202 */ mul.s $f8, $f26, $f26 -/* B78E54 80101CB4 44805000 */ mtc1 $zero, $f10 -/* B78E58 80101CB8 46083000 */ add.s $f0, $f6, $f8 -/* B78E5C 80101CBC 46000004 */ sqrt.s $f0, $f0 -/* B78E60 80101CC0 46000121 */ cvt.d.s $f4, $f0 -/* B78E64 80101CC4 46245183 */ div.d $f6, $f10, $f4 -/* B78E68 80101CC8 46203520 */ cvt.s.d $f20, $f6 -/* B78E6C 80101CCC 4614B582 */ mul.s $f22, $f22, $f20 -/* B78E70 80101CD0 00000000 */ nop -/* B78E74 80101CD4 4614C602 */ mul.s $f24, $f24, $f20 -/* B78E78 80101CD8 00000000 */ nop -/* B78E7C 80101CDC 4614D682 */ mul.s $f26, $f26, $f20 -/* B78E80 80101CE0 00000000 */ nop -/* B78E84 80101CE4 461AF202 */ mul.s $f8, $f30, $f26 -/* B78E88 80101CE8 00000000 */ nop -/* B78E8C 80101CEC 46188282 */ mul.s $f10, $f16, $f24 -/* B78E90 80101CF0 00000000 */ nop -/* B78E94 80101CF4 46168102 */ mul.s $f4, $f16, $f22 -/* B78E98 80101CF8 00000000 */ nop -/* B78E9C 80101CFC 461AE182 */ mul.s $f6, $f28, $f26 -/* B78EA0 80101D00 460A4081 */ sub.s $f2, $f8, $f10 -/* B78EA4 80101D04 4618E202 */ mul.s $f8, $f28, $f24 -/* B78EA8 80101D08 00000000 */ nop -/* B78EAC 80101D0C 4616F282 */ mul.s $f10, $f30, $f22 -/* B78EB0 80101D10 46062301 */ sub.s $f12, $f4, $f6 -/* B78EB4 80101D14 46021102 */ mul.s $f4, $f2, $f2 -/* B78EB8 80101D18 44812800 */ mtc1 $at, $f5 -/* B78EBC 80101D1C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B78EC0 80101D20 460C6182 */ mul.s $f6, $f12, $f12 -/* B78EC4 80101D24 460A4381 */ sub.s $f14, $f8, $f10 -/* B78EC8 80101D28 460E7282 */ mul.s $f10, $f14, $f14 -/* B78ECC 80101D2C 46062200 */ add.s $f8, $f4, $f6 -/* B78ED0 80101D30 44802000 */ mtc1 $zero, $f4 -/* B78ED4 80101D34 460A4000 */ add.s $f0, $f8, $f10 -/* B78ED8 80101D38 46000004 */ sqrt.s $f0, $f0 -/* B78EDC 80101D3C 460001A1 */ cvt.d.s $f6, $f0 -/* B78EE0 80101D40 46262203 */ div.d $f8, $f4, $f6 -/* B78EE4 80101D44 46204520 */ cvt.s.d $f20, $f8 -/* B78EE8 80101D48 46141282 */ mul.s $f10, $f2, $f20 -/* B78EEC 80101D4C E7AA0094 */ swc1 $f10, 0x94($sp) -/* B78EF0 80101D50 E4960000 */ swc1 $f22, ($a0) -/* B78EF4 80101D54 E4980010 */ swc1 $f24, 0x10($a0) -/* B78EF8 80101D58 E49A0020 */ swc1 $f26, 0x20($a0) -/* B78EFC 80101D5C C7A4007C */ lwc1 $f4, 0x7c($sp) -/* B78F00 80101D60 C7A80080 */ lwc1 $f8, 0x80($sp) -/* B78F04 80101D64 46162182 */ mul.s $f6, $f4, $f22 -/* B78F08 80101D68 00000000 */ nop -/* B78F0C 80101D6C 46184282 */ mul.s $f10, $f8, $f24 -/* B78F10 80101D70 C7A80084 */ lwc1 $f8, 0x84($sp) -/* B78F14 80101D74 460A3100 */ add.s $f4, $f6, $f10 -/* B78F18 80101D78 461A4182 */ mul.s $f6, $f8, $f26 -/* B78F1C 80101D7C 46062280 */ add.s $f10, $f4, $f6 -/* B78F20 80101D80 46146002 */ mul.s $f0, $f12, $f20 -/* B78F24 80101D84 46005207 */ neg.s $f8, $f10 -/* B78F28 80101D88 46147082 */ mul.s $f2, $f14, $f20 -/* B78F2C 80101D8C E4880030 */ swc1 $f8, 0x30($a0) -/* B78F30 80101D90 C7BA007C */ lwc1 $f26, 0x7c($sp) -/* B78F34 80101D94 C7B00094 */ lwc1 $f16, 0x94($sp) -/* B78F38 80101D98 C7B80080 */ lwc1 $f24, 0x80($sp) -/* B78F3C 80101D9C C7B60084 */ lwc1 $f22, 0x84($sp) -/* B78F40 80101DA0 4610D102 */ mul.s $f4, $f26, $f16 -/* B78F44 80101DA4 C7B20068 */ lwc1 $f18, 0x68($sp) -/* B78F48 80101DA8 E4800014 */ swc1 $f0, 0x14($a0) -/* B78F4C 80101DAC 4600C182 */ mul.s $f6, $f24, $f0 -/* B78F50 80101DB0 44800000 */ mtc1 $zero, $f0 -/* B78F54 80101DB4 E4820024 */ swc1 $f2, 0x24($a0) -/* B78F58 80101DB8 4602B202 */ mul.s $f8, $f22, $f2 -/* B78F5C 80101DBC E49C0008 */ swc1 $f28, 8($a0) -/* B78F60 80101DC0 E49E0018 */ swc1 $f30, 0x18($a0) -/* B78F64 80101DC4 E4900004 */ swc1 $f16, 4($a0) -/* B78F68 80101DC8 E4920028 */ swc1 $f18, 0x28($a0) -/* B78F6C 80101DCC 46062280 */ add.s $f10, $f4, $f6 -/* B78F70 80101DD0 E480000C */ swc1 $f0, 0xc($a0) -/* B78F74 80101DD4 E480001C */ swc1 $f0, 0x1c($a0) -/* B78F78 80101DD8 E480002C */ swc1 $f0, 0x2c($a0) -/* B78F7C 80101DDC 46085100 */ add.s $f4, $f10, $f8 -/* B78F80 80101DE0 461CD282 */ mul.s $f10, $f26, $f28 -/* B78F84 80101DE4 00000000 */ nop -/* B78F88 80101DE8 461EC202 */ mul.s $f8, $f24, $f30 -/* B78F8C 80101DEC 46002187 */ neg.s $f6, $f4 -/* B78F90 80101DF0 E4860034 */ swc1 $f6, 0x34($a0) -/* B78F94 80101DF4 4612B182 */ mul.s $f6, $f22, $f18 -/* B78F98 80101DF8 46085100 */ add.s $f4, $f10, $f8 -/* B78F9C 80101DFC 46062280 */ add.s $f10, $f4, $f6 -/* B78FA0 80101E00 44812000 */ mtc1 $at, $f4 -/* B78FA4 80101E04 46005207 */ neg.s $f8, $f10 -/* B78FA8 80101E08 E484003C */ swc1 $f4, 0x3c($a0) -/* B78FAC 80101E0C E4880038 */ swc1 $f8, 0x38($a0) -/* B78FB0 80101E10 8FBF0044 */ lw $ra, 0x44($sp) -/* B78FB4 80101E14 D7BE0038 */ ldc1 $f30, 0x38($sp) -/* B78FB8 80101E18 D7BC0030 */ ldc1 $f28, 0x30($sp) -/* B78FBC 80101E1C D7BA0028 */ ldc1 $f26, 0x28($sp) -/* B78FC0 80101E20 D7B80020 */ ldc1 $f24, 0x20($sp) -/* B78FC4 80101E24 D7B60018 */ ldc1 $f22, 0x18($sp) -/* B78FC8 80101E28 D7B40010 */ ldc1 $f20, 0x10($sp) -/* B78FCC 80101E2C 03E00008 */ jr $ra -/* B78FD0 80101E30 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/code_80104F40.s b/asm/non_matchings/code/pfsinitpak/osPfsInitPak.s similarity index 61% rename from asm/code_80104F40.s rename to asm/non_matchings/code/pfsinitpak/osPfsInitPak.s index 13dc7931f4..dc45ed2c33 100644 --- a/asm/code_80104F40.s +++ b/asm/non_matchings/code/pfsinitpak/osPfsInitPak.s @@ -1,14 +1,3 @@ -.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 osPfsInitPak /* B7C0E0 80104F40 27BDFF90 */ addiu $sp, $sp, -0x70 /* B7C0E4 80104F44 AFBF001C */ sw $ra, 0x1c($sp) @@ -33,14 +22,14 @@ glabel osPfsInitPak .L80104F90: /* B7C130 80104F90 8FAF0078 */ lw $t7, 0x78($sp) /* B7C134 80104F94 AE000000 */ sw $zero, ($s0) -/* B7C138 80104F98 0C041452 */ jal func_80105148 +/* B7C138 80104F98 0C041452 */ jal __osPfsCheckRamArea /* B7C13C 80104F9C AE0F0008 */ sw $t7, 8($s0) /* B7C140 80104FA0 10400003 */ beqz $v0, .L80104FB0 /* B7C144 80104FA4 02002025 */ move $a0, $s0 /* B7C148 80104FA8 10000063 */ b .L80105138 /* B7C14C 80104FAC 8FBF001C */ lw $ra, 0x1c($sp) .L80104FB0: -/* B7C150 80104FB0 0C041320 */ jal func_80104C80 +/* B7C150 80104FB0 0C041320 */ jal __osPfsSelectBank /* B7C154 80104FB4 00002825 */ move $a1, $zero /* B7C158 80104FB8 10400003 */ beqz $v0, .L80104FC8 /* B7C15C 80104FBC 24060001 */ li $a2, 1 @@ -49,7 +38,7 @@ glabel osPfsInitPak .L80104FC8: /* B7C168 80104FC8 8E040004 */ lw $a0, 4($s0) /* B7C16C 80104FCC 8E050008 */ lw $a1, 8($s0) -/* B7C170 80104FD0 0C0417D0 */ jal osReadMempak +/* B7C170 80104FD0 0C0417D0 */ jal __osContRamRead /* B7C174 80104FD4 27A70048 */ addiu $a3, $sp, 0x48 /* B7C178 80104FD8 10400003 */ beqz $v0, .L80104FE8 /* B7C17C 80104FDC 27A40048 */ addiu $a0, $sp, 0x48 @@ -57,7 +46,7 @@ glabel osPfsInitPak /* B7C184 80104FE4 8FBF001C */ lw $ra, 0x1c($sp) .L80104FE8: /* B7C188 80104FE8 27A5006A */ addiu $a1, $sp, 0x6a -/* B7C18C 80104FEC 0C040925 */ jal func_80102494 +/* B7C18C 80104FEC 0C040925 */ jal __osIdCheckSum /* B7C190 80104FF0 27A60068 */ addiu $a2, $sp, 0x68 /* B7C194 80104FF4 97B8006A */ lhu $t8, 0x6a($sp) /* B7C198 80104FF8 97B90064 */ lhu $t9, 0x64($sp) @@ -69,7 +58,7 @@ glabel osPfsInitPak /* B7C1B0 80105010 512A000A */ beql $t1, $t2, .L8010503C /* B7C1B4 80105014 97AD0060 */ lhu $t5, 0x60($sp) .L80105018: -/* B7C1B8 80105018 0C040A38 */ jal func_801028E0 +/* B7C1B8 80105018 0C040A38 */ jal __osCheckPackId /* B7C1BC 8010501C 02002025 */ move $a0, $s0 /* B7C1C0 80105020 50400006 */ beql $v0, $zero, .L8010503C /* B7C1C4 80105024 97AD0060 */ lhu $t5, 0x60($sp) @@ -84,7 +73,7 @@ glabel osPfsInitPak /* B7C1E4 80105044 31AE0001 */ andi $t6, $t5, 1 /* B7C1E8 80105048 55C00016 */ bnezl $t6, .L801050A4 /* B7C1EC 8010504C 8FA40044 */ lw $a0, 0x44($sp) -/* B7C1F0 80105050 0C040964 */ jal func_80102590 +/* B7C1F0 80105050 0C040964 */ jal __osRepairPackId /* B7C1F4 80105054 27A60020 */ addiu $a2, $sp, 0x20 /* B7C1F8 80105058 10400009 */ beqz $v0, .L80105080 /* B7C1FC 8010505C 00401825 */ move $v1, $v0 @@ -133,14 +122,14 @@ glabel osPfsInitPak /* B7C29C 801050FC AE180060 */ sw $t8, 0x60($s0) /* B7C2A0 80105100 AE080058 */ sw $t0, 0x58($s0) /* B7C2A4 80105104 AE0A005C */ sw $t2, 0x5c($s0) -/* B7C2A8 80105108 0C0417D0 */ jal osReadMempak +/* B7C2A8 80105108 0C0417D0 */ jal __osContRamRead /* B7C2AC 8010510C A20E0064 */ sb $t6, 0x64($s0) /* B7C2B0 80105110 10400003 */ beqz $v0, .L80105120 /* B7C2B4 80105114 00000000 */ nop /* B7C2B8 80105118 10000007 */ b .L80105138 /* B7C2BC 8010511C 8FBF001C */ lw $ra, 0x1c($sp) .L80105120: -/* B7C2C0 80105120 0C041494 */ jal func_80105250 +/* B7C2C0 80105120 0C041494 */ jal osPfsChecker /* B7C2C4 80105124 02002025 */ move $a0, $s0 /* B7C2C8 80105128 8E0B0000 */ lw $t3, ($s0) /* B7C2CC 8010512C 356C0001 */ ori $t4, $t3, 1 @@ -153,77 +142,3 @@ glabel osPfsInitPak /* B7C2E0 80105140 03E00008 */ jr $ra /* B7C2E4 80105144 00000000 */ nop -glabel func_80105148 -/* B7C2E8 80105148 27BDFF68 */ addiu $sp, $sp, -0x98 -/* B7C2EC 8010514C AFBF0024 */ sw $ra, 0x24($sp) -/* B7C2F0 80105150 AFB00020 */ sw $s0, 0x20($sp) -/* B7C2F4 80105154 00808025 */ move $s0, $a0 -/* B7C2F8 80105158 0C041320 */ jal func_80104C80 -/* B7C2FC 8010515C 00002825 */ move $a1, $zero -/* B7C300 80105160 10400003 */ beqz $v0, .L80105170 -/* B7C304 80105164 00003025 */ move $a2, $zero -/* B7C308 80105168 10000034 */ b .L8010523C -/* B7C30C 8010516C 8FBF0024 */ lw $ra, 0x24($sp) -.L80105170: -/* B7C310 80105170 8E040004 */ lw $a0, 4($s0) -/* B7C314 80105174 8E050008 */ lw $a1, 8($s0) -/* B7C318 80105178 0C0417D0 */ jal osReadMempak -/* B7C31C 8010517C 27A70030 */ addiu $a3, $sp, 0x30 -/* B7C320 80105180 10400003 */ beqz $v0, .L80105190 -/* B7C324 80105184 27A30070 */ addiu $v1, $sp, 0x70 -/* B7C328 80105188 1000002C */ b .L8010523C -/* B7C32C 8010518C 8FBF0024 */ lw $ra, 0x24($sp) -.L80105190: -/* B7C330 80105190 00001025 */ move $v0, $zero -/* B7C334 80105194 24040020 */ li $a0, 32 -.L80105198: -/* B7C338 80105198 244E0001 */ addiu $t6, $v0, 1 -/* B7C33C 8010519C 244F0002 */ addiu $t7, $v0, 2 -/* B7C340 801051A0 24580003 */ addiu $t8, $v0, 3 -/* B7C344 801051A4 A0620000 */ sb $v0, ($v1) -/* B7C348 801051A8 24420004 */ addiu $v0, $v0, 4 -/* B7C34C 801051AC A0780003 */ sb $t8, 3($v1) -/* B7C350 801051B0 A06F0002 */ sb $t7, 2($v1) -/* B7C354 801051B4 A06E0001 */ sb $t6, 1($v1) -/* B7C358 801051B8 1444FFF7 */ bne $v0, $a0, .L80105198 -/* B7C35C 801051BC 24630004 */ addiu $v1, $v1, 4 -/* B7C360 801051C0 8E040004 */ lw $a0, 4($s0) -/* B7C364 801051C4 8E050008 */ lw $a1, 8($s0) -/* B7C368 801051C8 AFA00010 */ sw $zero, 0x10($sp) -/* B7C36C 801051CC 00003025 */ move $a2, $zero -/* B7C370 801051D0 0C04173C */ jal func_80105CF0 -/* B7C374 801051D4 27A70070 */ addiu $a3, $sp, 0x70 -/* B7C378 801051D8 10400003 */ beqz $v0, .L801051E8 -/* B7C37C 801051DC 00003025 */ move $a2, $zero -/* B7C380 801051E0 10000016 */ b .L8010523C -/* B7C384 801051E4 8FBF0024 */ lw $ra, 0x24($sp) -.L801051E8: -/* B7C388 801051E8 8E040004 */ lw $a0, 4($s0) -/* B7C38C 801051EC 8E050008 */ lw $a1, 8($s0) -/* B7C390 801051F0 0C0417D0 */ jal osReadMempak -/* B7C394 801051F4 27A70050 */ addiu $a3, $sp, 0x50 -/* B7C398 801051F8 10400003 */ beqz $v0, .L80105208 -/* B7C39C 801051FC 27A40070 */ addiu $a0, $sp, 0x70 -/* B7C3A0 80105200 1000000E */ b .L8010523C -/* B7C3A4 80105204 8FBF0024 */ lw $ra, 0x24($sp) -.L80105208: -/* B7C3A8 80105208 27A50050 */ addiu $a1, $sp, 0x50 -/* B7C3AC 8010520C 0C001A30 */ jal bcmp -/* B7C3B0 80105210 24060020 */ li $a2, 32 -/* B7C3B4 80105214 10400003 */ beqz $v0, .L80105224 -/* B7C3B8 80105218 00003025 */ move $a2, $zero -/* B7C3BC 8010521C 10000006 */ b .L80105238 -/* B7C3C0 80105220 2402000B */ li $v0, 11 -.L80105224: -/* B7C3C4 80105224 8E040004 */ lw $a0, 4($s0) -/* B7C3C8 80105228 8E050008 */ lw $a1, 8($s0) -/* B7C3CC 8010522C AFA00010 */ sw $zero, 0x10($sp) -/* B7C3D0 80105230 0C04173C */ jal func_80105CF0 -/* B7C3D4 80105234 27A70030 */ addiu $a3, $sp, 0x30 -.L80105238: -/* B7C3D8 80105238 8FBF0024 */ lw $ra, 0x24($sp) -.L8010523C: -/* B7C3DC 8010523C 8FB00020 */ lw $s0, 0x20($sp) -/* B7C3E0 80105240 27BD0098 */ addiu $sp, $sp, 0x98 -/* B7C3E4 80105244 03E00008 */ jr $ra -/* B7C3E8 80105248 00000000 */ nop diff --git a/asm/non_matchings/code/sinf/sinf.s b/asm/non_matchings/code/sinf/sinf.s deleted file mode 100644 index 00fd837089..0000000000 --- a/asm/non_matchings/code/sinf/sinf.s +++ /dev/null @@ -1,143 +0,0 @@ -.late_rodata - -glabel D_8014B210 - .incbin "baserom.z64", 0xBC23B0, 0x28 - -glabel D_8014B238 - .incbin "baserom.z64", 0xBC23D8, 0x8 # probably 0.01 / M_PI - -glabel D_8014B240 - .incbin "baserom.z64", 0xBC23E0, 0x8 # Pi - -glabel D_8014B248 - .incbin "baserom.z64", 0xBC23E8, 0x8 # .double 3.17865095470564E-8 - -glabel D_8014B250 - .incbin "baserom.z64", 0xBC23F0, 0x10 - -.text -glabel sinf -/* B77430 80100290 E7AC0000 */ swc1 $f12, ($sp) -/* B77434 80100294 8FA20000 */ lw $v0, ($sp) -/* B77438 80100298 C7A40000 */ lwc1 $f4, ($sp) -/* B7743C 8010029C 00021D83 */ sra $v1, $v0, 0x16 -/* B77440 801002A0 306E01FF */ andi $t6, $v1, 0x1ff -/* B77444 801002A4 29C100FF */ slti $at, $t6, 0xff -/* B77448 801002A8 10200019 */ beqz $at, .L80100310 -/* B7744C 801002AC 01C01825 */ move $v1, $t6 -/* B77450 801002B0 29C100E6 */ slti $at, $t6, 0xe6 -/* B77454 801002B4 14200014 */ bnez $at, .L80100308 -/* B77458 801002B8 460020A1 */ cvt.d.s $f2, $f4 -/* B7745C 801002BC 46221302 */ mul.d $f12, $f2, $f2 -/* B77460 801002C0 3C038015 */ lui $v1, %hi(D_8014B210) # $v1, 0x8015 -/* B77464 801002C4 2463B210 */ addiu $v1, %lo(D_8014B210) # addiu $v1, $v1, -0x4df0 -/* B77468 801002C8 D4660020 */ ldc1 $f6, 0x20($v1) -/* B7746C 801002CC D46A0018 */ ldc1 $f10, 0x18($v1) -/* B77470 801002D0 D4640010 */ ldc1 $f4, 0x10($v1) -/* B77474 801002D4 462C3202 */ mul.d $f8, $f6, $f12 -/* B77478 801002D8 462A4400 */ add.d $f16, $f8, $f10 -/* B7747C 801002DC D46A0008 */ ldc1 $f10, 8($v1) -/* B77480 801002E0 462C8482 */ mul.d $f18, $f16, $f12 -/* B77484 801002E4 46249180 */ add.d $f6, $f18, $f4 -/* B77488 801002E8 462C3202 */ mul.d $f8, $f6, $f12 -/* B7748C 801002EC 46285380 */ add.d $f14, $f10, $f8 -/* B77490 801002F0 462C1402 */ mul.d $f16, $f2, $f12 -/* B77494 801002F4 00000000 */ nop -/* B77498 801002F8 462E8482 */ mul.d $f18, $f16, $f14 -/* B7749C 801002FC 46229100 */ add.d $f4, $f18, $f2 -/* B774A0 80100300 03E00008 */ jr $ra -/* B774A4 80100304 46202020 */ cvt.s.d $f0, $f4 - -.L80100308: -/* B774A8 80100308 03E00008 */ jr $ra -/* B774AC 8010030C C7A00000 */ lwc1 $f0, ($sp) - -.L80100310: -/* B774B0 80100310 28610136 */ slti $at, $v1, 0x136 -/* B774B4 80100314 10200044 */ beqz $at, .L80100428 -/* B774B8 80100318 C7A40000 */ lwc1 $f4, ($sp) -/* B774BC 8010031C C7A60000 */ lwc1 $f6, ($sp) -/* B774C0 80100320 3C018015 */ lui $at, %hi(D_8014B238) -/* B774C4 80100324 D42AB238 */ ldc1 $f10, %lo(D_8014B238)($at) -/* B774C8 80100328 460030A1 */ cvt.d.s $f2, $f6 -/* B774CC 8010032C 44804800 */ mtc1 $zero, $f9 -/* B774D0 80100330 462A1002 */ mul.d $f0, $f2, $f10 -/* B774D4 80100334 44804000 */ mtc1 $zero, $f8 -/* B774D8 80100338 3C013FE0 */ li $at, 0x3FE00000 # 0.000000 -/* B774DC 8010033C 4620403E */ c.le.d $f8, $f0 -/* B774E0 80100340 00000000 */ nop -/* B774E4 80100344 4502000B */ bc1fl .L80100374 -/* B774E8 80100348 44813800 */ mtc1 $at, $f7 -/* B774EC 8010034C 3C013FE0 */ li $at, 0x3FE00000 # 0.000000 -/* B774F0 80100350 44818800 */ mtc1 $at, $f17 -/* B774F4 80100354 44808000 */ mtc1 $zero, $f16 -/* B774F8 80100358 00000000 */ nop -/* B774FC 8010035C 46300480 */ add.d $f18, $f0, $f16 -/* B77500 80100360 4620910D */ trunc.w.d $f4, $f18 -/* B77504 80100364 44022000 */ mfc1 $v0, $f4 -/* B77508 80100368 10000009 */ b .L80100390 -/* B7750C 8010036C 44828000 */ mtc1 $v0, $f16 -/* B77510 80100370 44813800 */ mtc1 $at, $f7 -.L80100374: -/* B77514 80100374 44803000 */ mtc1 $zero, $f6 -/* B77518 80100378 00000000 */ nop -/* B7751C 8010037C 46260281 */ sub.d $f10, $f0, $f6 -/* B77520 80100380 4620520D */ trunc.w.d $f8, $f10 -/* B77524 80100384 44024000 */ mfc1 $v0, $f8 -/* B77528 80100388 00000000 */ nop -/* B7752C 8010038C 44828000 */ mtc1 $v0, $f16 -.L80100390: -/* B77530 80100390 3C018015 */ lui $at, %hi(D_8014B240) -/* B77534 80100394 D432B240 */ ldc1 $f18, %lo(D_8014B240)($at) -/* B77538 80100398 46808021 */ cvt.d.w $f0, $f16 -/* B7753C 8010039C 3C018015 */ lui $at, %hi(D_8014B248) -/* B77540 801003A0 D426B248 */ ldc1 $f6, %lo(D_8014B248)($at) -/* B77544 801003A4 3C038015 */ lui $v1, %hi(D_8014B210) # $v1, 0x8015 -/* B77548 801003A8 2463B210 */ addiu $v1, %lo(D_8014B210) # addiu $v1, $v1, -0x4df0 -/* B7754C 801003AC 46320102 */ mul.d $f4, $f0, $f18 -/* B77550 801003B0 D4680020 */ ldc1 $f8, 0x20($v1) -/* B77554 801003B4 D4720018 */ ldc1 $f18, 0x18($v1) -/* B77558 801003B8 30590001 */ andi $t9, $v0, 1 -/* B7755C 801003BC 46260282 */ mul.d $f10, $f0, $f6 -/* B77560 801003C0 46241081 */ sub.d $f2, $f2, $f4 -/* B77564 801003C4 462A1081 */ sub.d $f2, $f2, $f10 -/* B77568 801003C8 D46A0010 */ ldc1 $f10, 0x10($v1) -/* B7756C 801003CC 46221302 */ mul.d $f12, $f2, $f2 -/* B77570 801003D0 00000000 */ nop -/* B77574 801003D4 462C4402 */ mul.d $f16, $f8, $f12 -/* B77578 801003D8 46328100 */ add.d $f4, $f16, $f18 -/* B7757C 801003DC D4720008 */ ldc1 $f18, 8($v1) -/* B77580 801003E0 462C2182 */ mul.d $f6, $f4, $f12 -/* B77584 801003E4 462A3200 */ add.d $f8, $f6, $f10 -/* B77588 801003E8 462C4402 */ mul.d $f16, $f8, $f12 -/* B7758C 801003EC 17200007 */ bnez $t9, .L8010040C -/* B77590 801003F0 46309380 */ add.d $f14, $f18, $f16 -/* B77594 801003F4 462C1102 */ mul.d $f4, $f2, $f12 -/* B77598 801003F8 00000000 */ nop -/* B7759C 801003FC 462E2182 */ mul.d $f6, $f4, $f14 -/* B775A0 80100400 46223280 */ add.d $f10, $f6, $f2 -/* B775A4 80100404 03E00008 */ jr $ra -/* B775A8 80100408 46205020 */ cvt.s.d $f0, $f10 - -.L8010040C: -/* B775AC 8010040C 462C1202 */ mul.d $f8, $f2, $f12 -/* B775B0 80100410 00000000 */ nop -/* B775B4 80100414 462E4482 */ mul.d $f18, $f8, $f14 -/* B775B8 80100418 46229400 */ add.d $f16, $f18, $f2 -/* B775BC 8010041C 46208020 */ cvt.s.d $f0, $f16 -/* B775C0 80100420 03E00008 */ jr $ra -/* B775C4 80100424 46000007 */ neg.s $f0, $f0 - -.L80100428: -/* B775C8 80100428 46042032 */ c.eq.s $f4, $f4 -/* B775CC 8010042C 3C018015 */ lui $at, %hi(D_8014B250) -/* B775D0 80100430 45010004 */ bc1t .L80100444 -/* B775D4 80100434 00000000 */ nop -/* B775D8 80100438 3C018015 */ lui $at, %hi(D_8014B2D0) -/* B775DC 8010043C 03E00008 */ jr $ra -/* B775E0 80100440 C420B2D0 */ lwc1 $f0, %lo(D_8014B2D0)($at) - -.L80100444: -/* B775E4 80100444 C420B250 */ lwc1 $f0, %lo(D_8014B250)($at) -/* B775E8 80100448 03E00008 */ jr $ra -/* B775EC 8010044C 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/sins/sins.s b/asm/non_matchings/code/sins/sins.s deleted file mode 100644 index 4db1e244ec..0000000000 --- a/asm/non_matchings/code/sins/sins.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel sins -/* B775F0 80100450 308EFFFF */ andi $t6, $a0, 0xffff -/* B775F4 80100454 000E7902 */ srl $t7, $t6, 4 -/* B775F8 80100458 31F8FFFF */ andi $t8, $t7, 0xffff -/* B775FC 8010045C 33190400 */ andi $t9, $t8, 0x400 -/* B77600 80100460 AFA40000 */ sw $a0, ($sp) -/* B77604 80100464 13200008 */ beqz $t9, .L80100488 -/* B77608 80100468 03001025 */ move $v0, $t8 -/* B7760C 8010046C 330803FF */ andi $t0, $t8, 0x3ff -/* B77610 80100470 00084840 */ sll $t1, $t0, 1 -/* B77614 80100474 00095023 */ negu $t2, $t1 -/* B77618 80100478 3C038013 */ lui $v1, %hi(D_80134CCE) -/* B7761C 8010047C 006A1821 */ addu $v1, $v1, $t2 -/* B77620 80100480 10000006 */ b .L8010049C -/* B77624 80100484 84634CCE */ lh $v1, %lo(D_80134CCE)($v1) -.L80100488: -/* B77628 80100488 304B03FF */ andi $t3, $v0, 0x3ff -/* B7762C 8010048C 000B6040 */ sll $t4, $t3, 1 -/* B77630 80100490 3C038013 */ lui $v1, %hi(D_801344D0) -/* B77634 80100494 006C1821 */ addu $v1, $v1, $t4 -/* B77638 80100498 846344D0 */ lh $v1, %lo(D_801344D0)($v1) -.L8010049C: -/* B7763C 8010049C 304D0800 */ andi $t5, $v0, 0x800 -/* B77640 801004A0 11A00005 */ beqz $t5, .L801004B8 -/* B77644 801004A4 00601025 */ move $v0, $v1 -/* B77648 801004A8 00031023 */ negu $v0, $v1 -/* B7764C 801004AC 00027400 */ sll $t6, $v0, 0x10 -/* B77650 801004B0 03E00008 */ jr $ra -/* B77654 801004B4 000E1403 */ sra $v0, $t6, 0x10 - -.L801004B8: -/* B77658 801004B8 03E00008 */ jr $ra -/* B7765C 801004BC 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/z_actor/func_8002EFC0.s b/asm/non_matchings/code/z_actor/func_8002EFC0.s deleted file mode 100644 index fe01d94dc8..0000000000 --- a/asm/non_matchings/code/z_actor/func_8002EFC0.s +++ /dev/null @@ -1,71 +0,0 @@ -.late_rodata -glabel D_80136B0C - .float 340282346638528859811704183484516925440 # FLT_MAX - -glabel D_80136B10 - .float 0.8 - -glabel D_80136B14 - .float 340282346638528859811704183484516925440 # FLT_MAX - -.text -glabel func_8002EFC0 -/* AA6160 8002EFC0 AFA60008 */ sw $a2, 8($sp) -/* AA6164 8002EFC4 848E008A */ lh $t6, 0x8a($a0) -/* AA6168 8002EFC8 00063400 */ sll $a2, $a2, 0x10 -/* AA616C 8002EFCC 24018000 */ li $at, -32768 -/* AA6170 8002EFD0 00063403 */ sra $a2, $a2, 0x10 -/* AA6174 8002EFD4 01C1C821 */ addu $t9, $t6, $at -/* AA6178 8002EFD8 03261023 */ subu $v0, $t9, $a2 -/* AA617C 8002EFDC 00021400 */ sll $v0, $v0, 0x10 -/* AA6180 8002EFE0 00021403 */ sra $v0, $v0, 0x10 -/* AA6184 8002EFE4 04400004 */ bltz $v0, .L8002EFF8 -/* AA6188 8002EFE8 00021823 */ negu $v1, $v0 -/* AA618C 8002EFEC 00021C00 */ sll $v1, $v0, 0x10 -/* AA6190 8002EFF0 10000003 */ b .L8002F000 -/* AA6194 8002EFF4 00031C03 */ sra $v1, $v1, 0x10 -.L8002EFF8: -/* AA6198 8002EFF8 00031C00 */ sll $v1, $v1, 0x10 -/* AA619C 8002EFFC 00031C03 */ sra $v1, $v1, 0x10 -.L8002F000: -/* AA61A0 8002F000 8CA80664 */ lw $t0, 0x664($a1) -/* AA61A4 8002F004 28612AAB */ slti $at, $v1, 0x2aab -/* AA61A8 8002F008 1100001A */ beqz $t0, .L8002F074 -/* AA61AC 8002F00C 00000000 */ nop -/* AA61B0 8002F010 28614001 */ slti $at, $v1, 0x4001 -/* AA61B4 8002F014 10200006 */ beqz $at, .L8002F030 -/* AA61B8 8002F018 00000000 */ nop -/* AA61BC 8002F01C 8C890004 */ lw $t1, 4($a0) -/* AA61C0 8002F020 240B4000 */ li $t3, 16384 -/* AA61C4 8002F024 01636023 */ subu $t4, $t3, $v1 -/* AA61C8 8002F028 00095100 */ sll $t2, $t1, 4 -/* AA61CC 8002F02C 05410003 */ bgez $t2, .L8002F03C -.L8002F030: -/* AA61D0 8002F030 3C018013 */ lui $at, %hi(D_80136B0C) -/* AA61D4 8002F034 03E00008 */ jr $ra -/* AA61D8 8002F038 C4206B0C */ lwc1 $f0, %lo(D_80136B0C)($at) -.L8002F03C: -/* AA61DC 8002F03C 448C2000 */ mtc1 $t4, $f4 -/* AA61E0 8002F040 3C013800 */ li $at, 0x38000000 # 0.000000 -/* AA61E4 8002F044 44814000 */ mtc1 $at, $f8 -/* AA61E8 8002F048 468021A0 */ cvt.s.w $f6, $f4 -/* AA61EC 8002F04C 3C018013 */ lui $at, %hi(D_80136B10) -/* AA61F0 8002F050 C4306B10 */ lwc1 $f16, %lo(D_80136B10)($at) -/* AA61F4 8002F054 C48C008C */ lwc1 $f12, 0x8c($a0) -/* AA61F8 8002F058 46083282 */ mul.s $f10, $f6, $f8 -/* AA61FC 8002F05C 00000000 */ nop -/* AA6200 8002F060 46106482 */ mul.s $f18, $f12, $f16 -/* AA6204 8002F064 00000000 */ nop -/* AA6208 8002F068 460A9102 */ mul.s $f4, $f18, $f10 -/* AA620C 8002F06C 03E00008 */ jr $ra -/* AA6210 8002F070 46046001 */ sub.s $f0, $f12, $f4 -.L8002F074: -/* AA6214 8002F074 14200003 */ bnez $at, .L8002F084 -/* AA6218 8002F078 3C018013 */ lui $at, %hi(D_80136B14) -/* AA621C 8002F07C 03E00008 */ jr $ra -/* AA6220 8002F080 C4206B14 */ lwc1 $f0, %lo(D_80136B14)($at) -.L8002F084: -/* AA6224 8002F084 C480008C */ lwc1 $f0, 0x8c($a0) -/* AA6228 8002F088 03E00008 */ jr $ra -/* AA622C 8002F08C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_camera/func_80045350.s b/asm/non_matchings/code/z_camera/func_80045350.s index 7723eb59de..7b89c781c5 100644 --- a/asm/non_matchings/code/z_camera/func_80045350.s +++ b/asm/non_matchings/code/z_camera/func_80045350.s @@ -40,13 +40,13 @@ glabel func_80045350 /* ABC578 800453D8 51000007 */ beql $t0, $zero, .L800453F8 /* ABC57C 800453DC 8C440000 */ lw $a0, ($v0) /* ABC580 800453E0 8C440000 */ lw $a0, ($v0) -/* ABC584 800453E4 0C02CE29 */ jal func_800B38A4 +/* ABC584 800453E4 0C02CE29 */ jal ShrinkWindow_SetCurrentVal /* ABC588 800453E8 A7A5001A */ sh $a1, 0x1a($sp) /* ABC58C 800453EC 10000005 */ b .L80045404 /* ABC590 800453F0 87A5001A */ lh $a1, 0x1a($sp) /* ABC594 800453F4 8C440000 */ lw $a0, ($v0) .L800453F8: -/* ABC598 800453F8 0C02CE10 */ jal func_800B3840 +/* ABC598 800453F8 0C02CE10 */ jal ShrinkWindow_SetVal /* ABC59C 800453FC A7A5001A */ sh $a1, 0x1a($sp) /* ABC5A0 80045400 87A5001A */ lh $a1, 0x1a($sp) .L80045404: diff --git a/asm/non_matchings/code/z_demo/Cutscene_HandleConditionalTriggers.s b/asm/non_matchings/code/z_demo/Cutscene_HandleConditionalTriggers.s deleted file mode 100644 index 08fcc6ad44..0000000000 --- a/asm/non_matchings/code/z_demo/Cutscene_HandleConditionalTriggers.s +++ /dev/null @@ -1,149 +0,0 @@ -.rdata -glabel D_8013AEC8 - .asciz "\ngame_info.mode=[%d] restart_flag" - .balign 4 - -.text -glabel Cutscene_HandleConditionalTriggers -/* AE0360 800691C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AE0364 800691C4 AFB00018 */ sw $s0, 0x18($sp) -/* AE0368 800691C8 3C108016 */ lui $s0, %hi(gSaveContext) # $s0, 0x8016 -/* AE036C 800691CC AFA40020 */ sw $a0, 0x20($sp) -/* AE0370 800691D0 2610E660 */ addiu $s0, %lo(gSaveContext) # addiu $s0, $s0, -0x19a0 -/* AE0374 800691D4 AFBF001C */ sw $ra, 0x1c($sp) -/* AE0378 800691D8 3C048014 */ lui $a0, %hi(D_8013AEC8) # $a0, 0x8014 -/* AE037C 800691DC 2484AEC8 */ addiu $a0, %lo(D_8013AEC8) # addiu $a0, $a0, -0x5138 -/* AE0380 800691E0 0C00084C */ jal osSyncPrintf -/* AE0384 800691E4 8E051364 */ lw $a1, 0x1364($s0) -/* AE0388 800691E8 8E0E135C */ lw $t6, 0x135c($s0) -/* AE038C 800691EC 55C00076 */ bnezl $t6, .L800693C8 -/* AE0390 800691F0 8FBF001C */ lw $ra, 0x1c($sp) -/* AE0394 800691F4 8E0F1364 */ lw $t7, 0x1364($s0) -/* AE0398 800691F8 5DE00073 */ bgtzl $t7, .L800693C8 -/* AE039C 800691FC 8FBF001C */ lw $ra, 0x1c($sp) -/* AE03A0 80069200 8E180008 */ lw $t8, 8($s0) -/* AE03A4 80069204 3401FFF0 */ li $at, 65520 -/* AE03A8 80069208 0301082A */ slt $at, $t8, $at -/* AE03AC 8006920C 5020006E */ beql $at, $zero, .L800693C8 -/* AE03B0 80069210 8FBF001C */ lw $ra, 0x1c($sp) -/* AE03B4 80069214 8E190000 */ lw $t9, ($s0) -/* AE03B8 80069218 240101E1 */ li $at, 481 -/* AE03BC 8006921C 5721000D */ bnel $t9, $at, .L80069254 -/* AE03C0 80069220 8E0A0000 */ lw $t2, ($s0) -/* AE03C4 80069224 0C00D6D3 */ jal Flags_GetEventChkInf -/* AE03C8 80069228 240400AC */ li $a0, 172 -/* AE03CC 8006922C 54400009 */ bnezl $v0, .L80069254 -/* AE03D0 80069230 8E0A0000 */ lw $t2, ($s0) -/* AE03D4 80069234 0C00D6DD */ jal Flags_SetEventChkInf -/* AE03D8 80069238 240400AC */ li $a0, 172 -/* AE03DC 8006923C 24080123 */ li $t0, 291 -/* AE03E0 80069240 3409FFF0 */ li $t1, 65520 -/* AE03E4 80069244 AE080000 */ sw $t0, ($s0) -/* AE03E8 80069248 1000005E */ b .L800693C4 -/* AE03EC 8006924C AE090008 */ sw $t1, 8($s0) -/* AE03F0 80069250 8E0A0000 */ lw $t2, ($s0) -.L80069254: -/* AE03F4 80069254 240100DB */ li $at, 219 -/* AE03F8 80069258 55410016 */ bnel $t2, $at, .L800692B4 -/* AE03FC 8006925C 8E180000 */ lw $t8, ($s0) -/* AE0400 80069260 8E0B0004 */ lw $t3, 4($s0) -/* AE0404 80069264 55600013 */ bnezl $t3, .L800692B4 -/* AE0408 80069268 8E180000 */ lw $t8, ($s0) -/* AE040C 8006926C 96020EDC */ lhu $v0, 0xedc($s0) -/* AE0410 80069270 304C0100 */ andi $t4, $v0, 0x100 -/* AE0414 80069274 1180000E */ beqz $t4, .L800692B0 -/* AE0418 80069278 304D0200 */ andi $t5, $v0, 0x200 -/* AE041C 8006927C 11A0000C */ beqz $t5, .L800692B0 -/* AE0420 80069280 304E0400 */ andi $t6, $v0, 0x400 -/* AE0424 80069284 51C0000B */ beql $t6, $zero, .L800692B4 -/* AE0428 80069288 8E180000 */ lw $t8, ($s0) -/* AE042C 8006928C 0C00D6D3 */ jal Flags_GetEventChkInf -/* AE0430 80069290 240400AA */ li $a0, 170 -/* AE0434 80069294 54400007 */ bnezl $v0, .L800692B4 -/* AE0438 80069298 8E180000 */ lw $t8, ($s0) -/* AE043C 8006929C 0C00D6DD */ jal Flags_SetEventChkInf -/* AE0440 800692A0 240400AA */ li $a0, 170 -/* AE0444 800692A4 340FFFF0 */ li $t7, 65520 -/* AE0448 800692A8 10000046 */ b .L800693C4 -/* AE044C 800692AC AE0F0008 */ sw $t7, 8($s0) -.L800692B0: -/* AE0450 800692B0 8E180000 */ lw $t8, ($s0) -.L800692B4: -/* AE0454 800692B4 240105E0 */ li $at, 1504 -/* AE0458 800692B8 1701000F */ bne $t8, $at, .L800692F8 -/* AE045C 800692BC 00000000 */ nop -/* AE0460 800692C0 0C00D6D3 */ jal Flags_GetEventChkInf -/* AE0464 800692C4 240400C1 */ li $a0, 193 -/* AE0468 800692C8 1440000B */ bnez $v0, .L800692F8 -/* AE046C 800692CC 00000000 */ nop -/* AE0470 800692D0 0C00D6DD */ jal Flags_SetEventChkInf -/* AE0474 800692D4 240400C1 */ li $a0, 193 -/* AE0478 800692D8 8FA40020 */ lw $a0, 0x20($sp) -/* AE047C 800692DC 0C021344 */ jal Item_Give -/* AE0480 800692E0 24050007 */ li $a1, 7 -/* AE0484 800692E4 2419011E */ li $t9, 286 -/* AE0488 800692E8 3408FFF0 */ li $t0, 65520 -/* AE048C 800692EC AE190000 */ sw $t9, ($s0) -/* AE0490 800692F0 10000034 */ b .L800693C4 -/* AE0494 800692F4 AE080008 */ sw $t0, 8($s0) -.L800692F8: -/* AE0498 800692F8 3C038012 */ lui $v1, %hi(gBitFlags) # $v1, 0x8012 -/* AE049C 800692FC 24637120 */ addiu $v1, %lo(gBitFlags) # addiu $v1, $v1, 0x7120 -/* AE04A0 80069300 8C69000C */ lw $t1, 0xc($v1) -/* AE04A4 80069304 8E0200A4 */ lw $v0, 0xa4($s0) -/* AE04A8 80069308 01225024 */ and $t2, $t1, $v0 -/* AE04AC 8006930C 1140001B */ beqz $t2, .L8006937C -/* AE04B0 80069310 00000000 */ nop -/* AE04B4 80069314 8C6B0010 */ lw $t3, 0x10($v1) -/* AE04B8 80069318 01626024 */ and $t4, $t3, $v0 -/* AE04BC 8006931C 11800017 */ beqz $t4, .L8006937C -/* AE04C0 80069320 00000000 */ nop -/* AE04C4 80069324 8E0D0004 */ lw $t5, 4($s0) -/* AE04C8 80069328 15A00014 */ bnez $t5, .L8006937C -/* AE04CC 8006932C 00000000 */ nop -/* AE04D0 80069330 0C00D6D3 */ jal Flags_GetEventChkInf -/* AE04D4 80069334 240400C4 */ li $a0, 196 -/* AE04D8 80069338 14400010 */ bnez $v0, .L8006937C -/* AE04DC 8006933C 00000000 */ nop -/* AE04E0 80069340 8E050000 */ lw $a1, ($s0) -/* AE04E4 80069344 3C0F8013 */ lui $t7, %hi(gEntranceTable) -/* AE04E8 80069348 24010043 */ li $at, 67 -/* AE04EC 8006934C 00057080 */ sll $t6, $a1, 2 -/* AE04F0 80069350 01EE7821 */ addu $t7, $t7, $t6 -/* AE04F4 80069354 81EF81C0 */ lb $t7, %lo(gEntranceTable)($t7) -/* AE04F8 80069358 15E10008 */ bne $t7, $at, .L8006937C -/* AE04FC 8006935C 00000000 */ nop -/* AE0500 80069360 0C00D6DD */ jal Flags_SetEventChkInf -/* AE0504 80069364 240400C4 */ li $a0, 196 -/* AE0508 80069368 24180053 */ li $t8, 83 -/* AE050C 8006936C 3419FFF8 */ li $t9, 65528 -/* AE0510 80069370 AE180000 */ sw $t8, ($s0) -/* AE0514 80069374 10000013 */ b .L800693C4 -/* AE0518 80069378 AE190008 */ sw $t9, 8($s0) -.L8006937C: -/* AE051C 8006937C 0C00D6D3 */ jal Flags_GetEventChkInf -/* AE0520 80069380 240400C7 */ li $a0, 199 -/* AE0524 80069384 54400010 */ bnezl $v0, .L800693C8 -/* AE0528 80069388 8FBF001C */ lw $ra, 0x1c($sp) -/* AE052C 8006938C 8E050000 */ lw $a1, ($s0) -/* AE0530 80069390 3C098013 */ lui $t1, %hi(gEntranceTable) -/* AE0534 80069394 2401004F */ li $at, 79 -/* AE0538 80069398 00054080 */ sll $t0, $a1, 2 -/* AE053C 8006939C 01284821 */ addu $t1, $t1, $t0 -/* AE0540 800693A0 812981C0 */ lb $t1, %lo(gEntranceTable)($t1) -/* AE0544 800693A4 55210008 */ bnel $t1, $at, .L800693C8 -/* AE0548 800693A8 8FBF001C */ lw $ra, 0x1c($sp) -/* AE054C 800693AC 0C00D6DD */ jal Flags_SetEventChkInf -/* AE0550 800693B0 240400C7 */ li $a0, 199 -/* AE0554 800693B4 240A0517 */ li $t2, 1303 -/* AE0558 800693B8 340BFFF0 */ li $t3, 65520 -/* AE055C 800693BC AE0A0000 */ sw $t2, ($s0) -/* AE0560 800693C0 AE0B0008 */ sw $t3, 8($s0) -.L800693C4: -/* AE0564 800693C4 8FBF001C */ lw $ra, 0x1c($sp) -.L800693C8: -/* AE0568 800693C8 8FB00018 */ lw $s0, 0x18($sp) -/* AE056C 800693CC 27BD0020 */ addiu $sp, $sp, 0x20 -/* AE0570 800693D0 03E00008 */ jr $ra -/* AE0574 800693D4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s deleted file mode 100644 index c003a1cfda..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80029CF0 -/* AA0E90 80029CF0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA0E94 80029CF4 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0E98 80029CF8 AFA40048 */ sw $a0, 0x48($sp) -/* AA0E9C 80029CFC AFA60050 */ sw $a2, 0x50($sp) -/* AA0EA0 80029D00 AFA70054 */ sw $a3, 0x54($sp) -/* AA0EA4 80029D04 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0EA8 80029D08 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0EAC 80029D0C 27A40024 */ addiu $a0, $sp, 0x24 -/* AA0EB0 80029D10 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0EB4 80029D14 8FA50050 */ lw $a1, 0x50($sp) -/* AA0EB8 80029D18 27A40030 */ addiu $a0, $sp, 0x30 -/* AA0EBC 80029D1C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0EC0 80029D20 8FA50054 */ lw $a1, 0x54($sp) -/* AA0EC4 80029D24 87AE005A */ lh $t6, 0x5a($sp) -/* AA0EC8 80029D28 93AF005F */ lbu $t7, 0x5f($sp) -/* AA0ECC 80029D2C A3A00044 */ sb $zero, 0x44($sp) -/* AA0ED0 80029D30 8FA40048 */ lw $a0, 0x48($sp) -/* AA0ED4 80029D34 24050016 */ li $a1, 22 -/* AA0ED8 80029D38 24060080 */ li $a2, 128 -/* AA0EDC 80029D3C 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0EE0 80029D40 A7AE003C */ sh $t6, 0x3c($sp) -/* AA0EE4 80029D44 0C009DE6 */ jal EffectSs_Spawn -/* AA0EE8 80029D48 A3AF003E */ sb $t7, 0x3e($sp) -/* AA0EEC 80029D4C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0EF0 80029D50 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA0EF4 80029D54 03E00008 */ jr $ra -/* AA0EF8 80029D58 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s deleted file mode 100644 index 712cf996b6..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80029D5C -/* AA0EFC 80029D5C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA0F00 80029D60 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0F04 80029D64 AFA40048 */ sw $a0, 0x48($sp) -/* AA0F08 80029D68 AFA5004C */ sw $a1, 0x4c($sp) -/* AA0F0C 80029D6C AFA50040 */ sw $a1, 0x40($sp) -/* AA0F10 80029D70 AFA70054 */ sw $a3, 0x54($sp) -/* AA0F14 80029D74 00C02825 */ move $a1, $a2 -/* AA0F18 80029D78 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0F1C 80029D7C 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0F20 80029D80 87AF0056 */ lh $t7, 0x56($sp) -/* AA0F24 80029D84 93B8005B */ lbu $t8, 0x5b($sp) -/* AA0F28 80029D88 24190001 */ li $t9, 1 -/* AA0F2C 80029D8C A3B90044 */ sb $t9, 0x44($sp) -/* AA0F30 80029D90 8FA40048 */ lw $a0, 0x48($sp) -/* AA0F34 80029D94 24050016 */ li $a1, 22 -/* AA0F38 80029D98 24060080 */ li $a2, 128 -/* AA0F3C 80029D9C 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0F40 80029DA0 A7AF003C */ sh $t7, 0x3c($sp) -/* AA0F44 80029DA4 0C009DE6 */ jal EffectSs_Spawn -/* AA0F48 80029DA8 A3B8003E */ sb $t8, 0x3e($sp) -/* AA0F4C 80029DAC 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0F50 80029DB0 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA0F54 80029DB4 03E00008 */ jr $ra -/* AA0F58 80029DB8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s deleted file mode 100644 index 2a87599ac1..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80029E24 -/* AA0FC4 80029E24 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA0FC8 80029E28 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0FCC 80029E2C AFA40048 */ sw $a0, 0x48($sp) -/* AA0FD0 80029E30 AFA60050 */ sw $a2, 0x50($sp) -/* AA0FD4 80029E34 AFA70054 */ sw $a3, 0x54($sp) -/* AA0FD8 80029E38 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0FDC 80029E3C 27A4001C */ addiu $a0, $sp, 0x1c -/* AA0FE0 80029E40 27A40028 */ addiu $a0, $sp, 0x28 -/* AA0FE4 80029E44 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0FE8 80029E48 8FA50050 */ lw $a1, 0x50($sp) -/* AA0FEC 80029E4C 27A40034 */ addiu $a0, $sp, 0x34 -/* AA0FF0 80029E50 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0FF4 80029E54 8FA50054 */ lw $a1, 0x54($sp) -/* AA0FF8 80029E58 87AE005A */ lh $t6, 0x5a($sp) -/* AA0FFC 80029E5C 8FAF005C */ lw $t7, 0x5c($sp) -/* AA1000 80029E60 8FA40048 */ lw $a0, 0x48($sp) -/* AA1004 80029E64 24050018 */ li $a1, 24 -/* AA1008 80029E68 24060080 */ li $a2, 128 -/* AA100C 80029E6C 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1010 80029E70 A7AE0040 */ sh $t6, 0x40($sp) -/* AA1014 80029E74 0C009DE6 */ jal EffectSs_Spawn -/* AA1018 80029E78 AFAF0044 */ sw $t7, 0x44($sp) -/* AA101C 80029E7C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1020 80029E80 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA1024 80029E84 03E00008 */ jr $ra -/* AA1028 80029E88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s b/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s index 69ae720608..1ca4caece8 100644 --- a/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s +++ b/asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s @@ -68,7 +68,7 @@ glabel KaleidoScopeCall_Update /* B33358 800BC1B8 24010008 */ li $at, 8 /* B3335C 800BC1BC 14820016 */ bne $a0, $v0, .L800BC218 /* B33360 800BC1C0 00000000 */ nop -/* B33364 800BC1C4 0C02CE3F */ jal func_800B38FC +/* B33364 800BC1C4 0C02CE3F */ jal ShrinkWindow_GetCurrentVal /* B33368 800BC1C8 AFA3001C */ sw $v1, 0x1c($sp) /* B3336C 800BC1CC 8FA3001C */ lw $v1, 0x1c($sp) /* B33370 800BC1D0 1440007B */ bnez $v0, .L800BC3C0 diff --git a/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s b/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s index 8402556c4a..01fa3527cf 100644 --- a/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s +++ b/asm/non_matchings/code/z_lifemeter/Health_UpdateData.s @@ -54,26 +54,26 @@ glabel Health_UpdateData /* AEFC88 80078AE8 A44C0222 */ sh $t4, 0x222($v0) /* AEFC8C 80078AEC 3C0D8012 */ lui $t5, %hi(D_8011FF10) # $t5, 0x8012 /* AEFC90 80078AF0 85ADFF10 */ lh $t5, %lo(D_8011FF10)($t5) -/* AEFC94 80078AF4 3C0E8012 */ lui $t6, %hi(D_8011FF12) # $t6, 0x8012 -/* AEFC98 80078AF8 3C0F8012 */ lui $t7, %hi(D_8011FF14) # $t7, 0x8012 +/* AEFC94 80078AF4 3C0E8012 */ lui $t6, %hi(D_8011FF10+2) # $t6, 0x8012 +/* AEFC98 80078AF8 3C0F8012 */ lui $t7, %hi(D_8011FF10+4) # $t7, 0x8012 /* AEFC9C 80078AFC A44D0210 */ sh $t5, 0x210($v0) -/* AEFCA0 80078B00 85CEFF12 */ lh $t6, %lo(D_8011FF12)($t6) +/* AEFCA0 80078B00 85CEFF12 */ lh $t6, %lo(D_8011FF10+2)($t6) /* AEFCA4 80078B04 3C188012 */ lui $t8, %hi(D_8011FF24) # $t8, 0x8012 -/* AEFCA8 80078B08 3C198012 */ lui $t9, %hi(D_8011FF26) # $t9, 0x8012 +/* AEFCA8 80078B08 3C198012 */ lui $t9, %hi(D_8011FF24+2) # $t9, 0x8012 /* AEFCAC 80078B0C A44E0214 */ sh $t6, 0x214($v0) -/* AEFCB0 80078B10 85EFFF14 */ lh $t7, %lo(D_8011FF14)($t7) -/* AEFCB4 80078B14 3C0B8012 */ lui $t3, %hi(D_8011FF28) # $t3, 0x8012 +/* AEFCB0 80078B10 85EFFF14 */ lh $t7, %lo(D_8011FF10+4)($t7) +/* AEFCB4 80078B14 3C0B8012 */ lui $t3, %hi(D_8011FF24+4) # $t3, 0x8012 /* AEFCB8 80078B18 3C078012 */ lui $a3, %hi(D_8011FF38) # $a3, 0x8012 /* AEFCBC 80078B1C A44F0218 */ sh $t7, 0x218($v0) /* AEFCC0 80078B20 8718FF24 */ lh $t8, %lo(D_8011FF24)($t8) /* AEFCC4 80078B24 24E7FF38 */ addiu $a3, %lo(D_8011FF38) # addiu $a3, $a3, -0xc8 /* AEFCC8 80078B28 3C088012 */ lui $t0, %hi(D_8011FF4C) # $t0, 0x8012 /* AEFCCC 80078B2C A458021C */ sh $t8, 0x21c($v0) -/* AEFCD0 80078B30 8739FF26 */ lh $t9, %lo(D_8011FF26)($t9) +/* AEFCD0 80078B30 8739FF26 */ lh $t9, %lo(D_8011FF24+2)($t9) /* AEFCD4 80078B34 2508FF4C */ addiu $t0, %lo(D_8011FF4C) # addiu $t0, $t0, -0xb4 /* AEFCD8 80078B38 3C018016 */ lui $at, %hi(D_8015FDD0+6) # $at, 0x8016 /* AEFCDC 80078B3C A4590220 */ sh $t9, 0x220($v0) -/* AEFCE0 80078B40 856BFF28 */ lh $t3, %lo(D_8011FF28)($t3) +/* AEFCE0 80078B40 856BFF28 */ lh $t3, %lo(D_8011FF24+4)($t3) /* AEFCE4 80078B44 3C098016 */ lui $t1, %hi(D_8015FDC0) # $t1, 0x8016 /* AEFCE8 80078B48 2529FDC0 */ addiu $t1, %lo(D_8015FDC0) # addiu $t1, $t1, -0x240 /* AEFCEC 80078B4C A44B0224 */ sh $t3, 0x224($v0) @@ -151,7 +151,7 @@ glabel Health_UpdateData /* AEFE0C 80078C6C 331900FF */ andi $t9, $t8, 0xff /* AEFE10 80078C70 44054000 */ mfc1 $a1, $f8 /* AEFE14 80078C74 A459020A */ sh $t9, 0x20a($v0) -/* AEFE18 80078C78 3C188012 */ lui $t8, %hi(D_8011FF62) # $t8, 0x8012 +/* AEFE18 80078C78 3C188012 */ lui $t8, %hi(D_8011FF60+2) # $t8, 0x8012 /* AEFE1C 80078C7C 00052C00 */ sll $a1, $a1, 0x10 /* AEFE20 80078C80 00052C03 */ sra $a1, $a1, 0x10 /* AEFE24 80078C84 24AC003C */ addiu $t4, $a1, 0x3c @@ -166,32 +166,32 @@ glabel Health_UpdateData /* AEFE48 80078CA8 3C0E8012 */ lui $t6, %hi(D_8011FF88) # $t6, 0x8012 /* AEFE4C 80078CAC 85CEFF88 */ lh $t6, %lo(D_8011FF88)($t6) /* AEFE50 80078CB0 85EFFF60 */ lh $t7, %lo(D_8011FF60)($t7) -/* AEFE54 80078CB4 8718FF62 */ lh $t8, %lo(D_8011FF62)($t8) +/* AEFE54 80078CB4 8718FF62 */ lh $t8, %lo(D_8011FF60+2)($t8) /* AEFE58 80078CB8 448E5000 */ mtc1 $t6, $f10 -/* AEFE5C 80078CBC 3C198012 */ lui $t9, %hi(D_8011FF64) # $t9, 0x8012 -/* AEFE60 80078CC0 8739FF64 */ lh $t9, %lo(D_8011FF64)($t9) +/* AEFE5C 80078CBC 3C198012 */ lui $t9, %hi(D_8011FF60+4) # $t9, 0x8012 +/* AEFE60 80078CC0 8739FF64 */ lh $t9, %lo(D_8011FF60+4)($t9) /* AEFE64 80078CC4 46805420 */ cvt.s.w $f16, $f10 /* AEFE68 80078CC8 A42FFDD6 */ sh $t7, %lo(D_8015FDD0+6)($at) /* AEFE6C 80078CCC 3C018016 */ lui $at, %hi(D_8015FDD0+8) # $at, 0x8016 /* AEFE70 80078CD0 856BFF74 */ lh $t3, %lo(D_8011FF74)($t3) /* AEFE74 80078CD4 A438FDD8 */ sh $t8, %lo(D_8015FDD0+8)($at) -/* AEFE78 80078CD8 3C188012 */ lui $t8, %hi(D_8011FF8A) # $t8, 0x8012 +/* AEFE78 80078CD8 3C188012 */ lui $t8, %hi(D_8011FF88+2) # $t8, 0x8012 /* AEFE7C 80078CDC 46008482 */ mul.s $f18, $f16, $f0 /* AEFE80 80078CE0 A439FDDA */ sh $t9, %lo(D_8015FDD0+0xa)($at) -/* AEFE84 80078CE4 8718FF8A */ lh $t8, %lo(D_8011FF8A)($t8) +/* AEFE84 80078CE4 8718FF8A */ lh $t8, %lo(D_8011FF88+2)($t8) /* AEFE88 80078CE8 3C018016 */ lui $at, %hi(D_8015FDE0+6) # $at, 0x8016 /* AEFE8C 80078CEC A42BFDE6 */ sh $t3, %lo(D_8015FDE0+6)($at) -/* AEFE90 80078CF0 3C0B8012 */ lui $t3, %hi(D_8011FF8C) -/* AEFE94 80078CF4 856BFF8C */ lh $t3, %lo(D_8011FF8C)($t3) +/* AEFE90 80078CF0 3C0B8012 */ lui $t3, %hi(D_8011FF88+4) +/* AEFE94 80078CF4 856BFF8C */ lh $t3, %lo(D_8011FF88+4)($t3) /* AEFE98 80078CF8 44983000 */ mtc1 $t8, $f6 /* AEFE9C 80078CFC 4600910D */ trunc.w.s $f4, $f18 /* AEFEA0 80078D00 448B9000 */ mtc1 $t3, $f18 -/* AEFEA4 80078D04 3C0D8012 */ lui $t5, %hi(D_8011FF78) # $t5, 0x8012 +/* AEFEA4 80078D04 3C0D8012 */ lui $t5, %hi(D_8011FF74+4) # $t5, 0x8012 /* AEFEA8 80078D08 46803220 */ cvt.s.w $f8, $f6 /* AEFEAC 80078D0C 44032000 */ mfc1 $v1, $f4 -/* AEFEB0 80078D10 85ADFF78 */ lh $t5, %lo(D_8011FF78)($t5) -/* AEFEB4 80078D14 3C0C8012 */ lui $t4, %hi(D_8011FF76) # $t4, 0x8012 -/* AEFEB8 80078D18 858CFF76 */ lh $t4, %lo(D_8011FF76)($t4) +/* AEFEB0 80078D10 85ADFF78 */ lh $t5, %lo(D_8011FF74+4)($t5) +/* AEFEB4 80078D14 3C0C8012 */ lui $t4, %hi(D_8011FF74+2) # $t4, 0x8012 +/* AEFEB8 80078D18 858CFF76 */ lh $t4, %lo(D_8011FF74+2)($t4) /* AEFEBC 80078D1C 46809120 */ cvt.s.w $f4, $f18 /* AEFEC0 80078D20 46004282 */ mul.s $f10, $f8, $f0 /* AEFEC4 80078D24 00031C00 */ sll $v1, $v1, 0x10 @@ -205,7 +205,7 @@ glabel Health_UpdateData /* AEFEE4 80078D44 A52F0000 */ sh $t7, ($t1) /* AEFEE8 80078D48 3C0F8012 */ lui $t7, %hi(D_8011FF9C) # $t7, 0x8012 /* AEFEEC 80078D4C 4600540D */ trunc.w.s $f16, $f10 -/* AEFEF0 80078D50 3C0C8012 */ lui $t4, %hi(D_8011FFA0) # $t4, 0x8012 +/* AEFEF0 80078D50 3C0C8012 */ lui $t4, %hi(D_8011FF9C+4) # $t4, 0x8012 /* AEFEF4 80078D54 4600320D */ trunc.w.s $f8, $f6 /* AEFEF8 80078D58 44048000 */ mfc1 $a0, $f16 /* AEFEFC 80078D5C 44054000 */ mfc1 $a1, $f8 @@ -220,10 +220,10 @@ glabel Health_UpdateData /* AEFF20 80078D80 A52B0002 */ sh $t3, 2($t1) /* AEFF24 80078D84 A52E0004 */ sh $t6, 4($t1) /* AEFF28 80078D88 85EFFF9C */ lh $t7, %lo(D_8011FF9C)($t7) -/* AEFF2C 80078D8C 3C198012 */ lui $t9, %hi(D_8011FF9E) -/* AEFF30 80078D90 8739FF9E */ lh $t9, %lo(D_8011FF9E)($t9) +/* AEFF2C 80078D8C 3C198012 */ lui $t9, %hi(D_8011FF9C+2) +/* AEFF30 80078D90 8739FF9E */ lh $t9, %lo(D_8011FF9C+2)($t9) /* AEFF34 80078D94 448F5000 */ mtc1 $t7, $f10 -/* AEFF38 80078D98 858CFFA0 */ lh $t4, %lo(D_8011FFA0)($t4) +/* AEFF38 80078D98 858CFFA0 */ lh $t4, %lo(D_8011FF9C+4)($t4) /* AEFF3C 80078D9C 44993000 */ mtc1 $t9, $f6 /* AEFF40 80078DA0 46805420 */ cvt.s.w $f16, $f10 /* AEFF44 80078DA4 46803220 */ cvt.s.w $f8, $f6 diff --git a/asm/non_matchings/code/z_play/Gameplay_Init.s b/asm/non_matchings/code/z_play/Gameplay_Init.s index d894c54634..a5e73b6db3 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Init.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -458,7 +458,7 @@ glabel Gameplay_Init /* B34224 800BD084 240F0006 */ li $t7, 6 /* B34228 800BD088 A02F1E5E */ sb $t7, 0x1e5e($at) .L800BD08C: -/* B3422C 800BD08C 0C02CE42 */ jal func_800B3908 +/* B3422C 800BD08C 0C02CE42 */ jal ShrinkWindow_Init /* B34230 800BD090 00000000 */ nop /* B34234 800BD094 3C010001 */ lui $at, (0x0001241C >> 16) # lui $at, 1 /* B34238 800BD098 3421241C */ ori $at, (0x0001241C & 0xFFFF) # ori $at, $at, 0x241c diff --git a/asm/non_matchings/code/z_play/Gameplay_Update.s b/asm/non_matchings/code/z_play/Gameplay_Update.s index 6ca4c77de5..89457fb481 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Update.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -2024,7 +2024,7 @@ glabel L800BE148 /* B35C70 800BEAD0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* B35C74 800BEAD4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) .L800BEAD8: -/* B35C78 800BEAD8 0C02CE6E */ jal func_800B39B8 +/* B35C78 800BEAD8 0C02CE6E */ jal ShrinkWindow_Update /* B35C7C 800BEADC 84440110 */ lh $a0, 0x110($v0) /* B35C80 800BEAE0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* B35C84 800BEAE4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s index 2c5a8559ef..ea56710486 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s @@ -264,7 +264,7 @@ glabel BossGanondrof_Update /* 03BE0 80914220 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03BE4 80914224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03BE8 80914228 8FA60048 */ lw $a2, 0x0048($sp) -/* 03BEC 8091422C 0C00A757 */ jal func_80029D5C +/* 03BEC 8091422C 0C00A757 */ jal EffectSsFhgFlash_Spawn2 /* 03BF0 80914230 2407002D */ addiu $a3, $zero, 0x002D ## $a3 = 0000002D /* 03BF4 80914234 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 03BF8 80914238 00108400 */ sll $s0, $s0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s index f75089cdd8..b7bcf474fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s @@ -485,7 +485,7 @@ glabel func_8091156C /* 01604 80911C44 00095400 */ sll $t2, $t1, 16 /* 01608 80911C48 000A5C03 */ sra $t3, $t2, 16 /* 0160C 80911C4C 256C0096 */ addiu $t4, $t3, 0x0096 ## $t4 = 00000096 -/* 01610 80911C50 0C00A73C */ jal func_80029CF0 +/* 01610 80911C50 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 01614 80911C54 AFAC0010 */ sw $t4, 0x0010($sp) /* 01618 80911C58 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0161C 80911C5C 00108400 */ sll $s0, $s0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index 6c93c7793e..5f11320fe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -436,7 +436,7 @@ glabel func_80912594 /* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 /* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 /* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 025A8 80912BE8 0C00A73C */ jal func_80029CF0 +/* 025A8 80912BE8 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 025B0 80912BF0 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 025B4 80912BF4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index a106f26a06..2bf5c5bee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -1624,7 +1624,7 @@ glabel L8091D918 /* 01E30 8091D930 AFAA0088 */ sw $t2, 0x0088($sp) /* 01E34 8091D934 14410006 */ bne $v0, $at, .L8091D950 /* 01E38 8091D938 265001C8 */ addiu $s0, $s2, 0x01C8 ## $s0 = 000001C8 -/* 01E3C 8091D93C 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 01E3C 8091D93C 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 01E40 8091D940 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 01E44 8091D944 0C020978 */ jal Interface_ChangeAlpha /* 01E48 8091D948 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s deleted file mode 100644 index b3fd8a5cdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel DemoSa_Destroy -/* 00000 8098E460 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8098E468 0C0295BC */ jal SkelAnime_Free -/* 0000C 8098E46C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 8098E474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8098E478 03E00008 */ jr $ra -/* 0001C 8098E47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s deleted file mode 100644 index 7d596f83d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_80990EFC - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel DemoSa_Draw -/* 01C18 80990078 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C1C 8099007C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C20 80990080 8C82019C */ lw $v0, 0x019C($a0) ## 0000019C -/* 01C24 80990084 04400008 */ bltz $v0, .L809900A8 -/* 01C28 80990088 28410003 */ slti $at, $v0, 0x0003 -/* 01C2C 8099008C 10200006 */ beq $at, $zero, .L809900A8 -/* 01C30 80990090 00027080 */ sll $t6, $v0, 2 -/* 01C34 80990094 3C038099 */ lui $v1, %hi(D_80990DB0) ## $v1 = 80990000 -/* 01C38 80990098 006E1821 */ addu $v1, $v1, $t6 -/* 01C3C 8099009C 8C630DB0 */ lw $v1, %lo(D_80990DB0)($v1) -/* 01C40 809900A0 14600006 */ bne $v1, $zero, .L809900BC -/* 01C44 809900A4 00000000 */ nop -.L809900A8: -/* 01C48 809900A8 3C048099 */ lui $a0, %hi(D_80990EFC) ## $a0 = 80990000 -/* 01C4C 809900AC 0C00084C */ jal osSyncPrintf - -/* 01C50 809900B0 24840EFC */ addiu $a0, $a0, %lo(D_80990EFC) ## $a0 = 80990EFC -/* 01C54 809900B4 10000004 */ beq $zero, $zero, .L809900C8 -/* 01C58 809900B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809900BC: -/* 01C5C 809900BC 0060F809 */ jalr $ra, $v1 -/* 01C60 809900C0 00000000 */ nop -/* 01C64 809900C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809900C8: -/* 01C68 809900C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C6C 809900CC 03E00008 */ jr $ra -/* 01C70 809900D0 00000000 */ nop -/* 01C74 809900D4 00000000 */ nop -/* 01C78 809900D8 00000000 */ nop -/* 01C7C 809900DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s deleted file mode 100644 index 30719fb9bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel DemoSa_Init -/* 0194C 8098FDAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01950 8098FDB0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01954 8098FDB4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01958 8098FDB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0195C 8098FDBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01960 8098FDC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01964 8098FDC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01968 8098FDC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0196C 8098FDCC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01970 8098FDD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01974 8098FDD4 0C00AC78 */ jal ActorShape_Init - -/* 01978 8098FDD8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0197C 8098FDDC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01980 8098FDE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01984 8098FDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01988 8098FDE8 1041000B */ beq $v0, $at, .L8098FE18 -/* 0198C 8098FDEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01990 8098FDF0 1041000D */ beq $v0, $at, .L8098FE28 -/* 01994 8098FDF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01998 8098FDF8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0199C 8098FDFC 1041000E */ beq $v0, $at, .L8098FE38 -/* 019A0 8098FE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019A4 8098FE04 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 019A8 8098FE08 1041000F */ beq $v0, $at, .L8098FE48 -/* 019AC 8098FE0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019B0 8098FE10 10000011 */ beq $zero, $zero, .L8098FE58 -/* 019B4 8098FE14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8098FE18: -/* 019B8 8098FE18 0C263B3D */ jal func_8098ECF4 -/* 019BC 8098FE1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019C0 8098FE20 10000010 */ beq $zero, $zero, .L8098FE64 -/* 019C4 8098FE24 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE28: -/* 019C8 8098FE28 0C263CE4 */ jal func_8098F390 -/* 019CC 8098FE2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019D0 8098FE30 1000000C */ beq $zero, $zero, .L8098FE64 -/* 019D4 8098FE34 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE38: -/* 019D8 8098FE38 0C263D08 */ jal func_8098F420 -/* 019DC 8098FE3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019E0 8098FE40 10000008 */ beq $zero, $zero, .L8098FE64 -/* 019E4 8098FE44 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE48: -/* 019E8 8098FE48 0C263E0F */ jal func_8098F83C -/* 019EC 8098FE4C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019F0 8098FE50 10000004 */ beq $zero, $zero, .L8098FE64 -/* 019F4 8098FE54 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE58: -/* 019F8 8098FE58 0C2639FF */ jal func_8098E7FC -/* 019FC 8098FE5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01A00 8098FE60 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FE64: -/* 01A04 8098FE64 8FB00014 */ lw $s0, 0x0014($sp) -/* 01A08 8098FE68 8FB10018 */ lw $s1, 0x0018($sp) -/* 01A0C 8098FE6C 03E00008 */ jr $ra -/* 01A10 8098FE70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s deleted file mode 100644 index d2fe71e814..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80990EA0 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel DemoSa_Update -/* 018F0 8098FD50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018F4 8098FD54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018F8 8098FD58 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 018FC 8098FD5C 04400008 */ bltz $v0, .L8098FD80 -/* 01900 8098FD60 28410015 */ slti $at, $v0, 0x0015 -/* 01904 8098FD64 10200006 */ beq $at, $zero, .L8098FD80 -/* 01908 8098FD68 00027080 */ sll $t6, $v0, 2 -/* 0190C 8098FD6C 3C038099 */ lui $v1, %hi(D_80990D5C) ## $v1 = 80990000 -/* 01910 8098FD70 006E1821 */ addu $v1, $v1, $t6 -/* 01914 8098FD74 8C630D5C */ lw $v1, %lo(D_80990D5C)($v1) -/* 01918 8098FD78 14600006 */ bne $v1, $zero, .L8098FD94 -/* 0191C 8098FD7C 00000000 */ nop -.L8098FD80: -/* 01920 8098FD80 3C048099 */ lui $a0, %hi(D_80990EA0) ## $a0 = 80990000 -/* 01924 8098FD84 0C00084C */ jal osSyncPrintf - -/* 01928 8098FD88 24840EA0 */ addiu $a0, $a0, %lo(D_80990EA0) ## $a0 = 80990EA0 -/* 0192C 8098FD8C 10000004 */ beq $zero, $zero, .L8098FDA0 -/* 01930 8098FD90 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098FD94: -/* 01934 8098FD94 0060F809 */ jalr $ra, $v1 -/* 01938 8098FD98 00000000 */ nop -/* 0193C 8098FD9C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098FDA0: -/* 01940 8098FDA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01944 8098FDA4 03E00008 */ jr $ra -/* 01948 8098FDA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s deleted file mode 100644 index 09a7f09f9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8098E480 -/* 00020 8098E480 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00024 8098E484 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 8098E488 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 8098E48C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 8098E490 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 8098E494 15C00003 */ bne $t6, $zero, .L8098E4A4 -/* 00038 8098E498 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 8098E49C 10000005 */ beq $zero, $zero, .L8098E4B4 -/* 00040 8098E4A0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L8098E4A4: -/* 00044 8098E4A4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 8098E4A8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 8098E4AC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 8098E4B0 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L8098E4B4: -/* 00054 8098E4B4 14400008 */ bne $v0, $zero, .L8098E4D8 -/* 00058 8098E4B8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 8098E4BC 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 8098E4C0 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 8098E4C4 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 8098E4C8 AFA60038 */ sw $a2, 0x0038($sp) -/* 0006C 8098E4CC 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 8098E4D0 8FA60038 */ lw $a2, 0x0038($sp) -/* 00074 8098E4D4 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L8098E4D8: -/* 00078 8098E4D8 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 8098E4DC 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 8098E4E0 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 8098E4E4 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00088 8098E4E8 29010003 */ slti $at, $t0, 0x0003 -/* 0008C 8098E4EC 54200003 */ bnel $at, $zero, .L8098E4FC -/* 00090 8098E4F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 8098E4F4 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 8098E4F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098E4FC: -/* 0009C 8098E4FC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A0 8098E500 03E00008 */ jr $ra -/* 000A4 8098E504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s deleted file mode 100644 index 6b327e4797..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098E508 -/* 000A8 8098E508 AFA50004 */ sw $a1, 0x0004($sp) -/* 000AC 8098E50C 00052C00 */ sll $a1, $a1, 16 -/* 000B0 8098E510 00052C03 */ sra $a1, $a1, 16 -/* 000B4 8098E514 03E00008 */ jr $ra -/* 000B8 8098E518 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s deleted file mode 100644 index 3f8cd6e5b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098E51C -/* 000BC 8098E51C AFA50004 */ sw $a1, 0x0004($sp) -/* 000C0 8098E520 00052C00 */ sll $a1, $a1, 16 -/* 000C4 8098E524 00052C03 */ sra $a1, $a1, 16 -/* 000C8 8098E528 03E00008 */ jr $ra -/* 000CC 8098E52C A4850194 */ sh $a1, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s deleted file mode 100644 index bd3e2a1c8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8098E530 -/* 000D0 8098E530 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 000D4 8098E534 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 000D8 8098E538 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 000DC 8098E53C AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 000E0 8098E540 AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 000E4 8098E544 AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 000E8 8098E548 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 000EC 8098E54C 03E00008 */ jr $ra -/* 000F0 8098E550 E48401A0 */ swc1 $f4, 0x01A0($a0) ## 000001A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s deleted file mode 100644 index 6a06a71d21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098E554 -/* 000F4 8098E554 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 8098E558 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000FC 8098E55C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00100 8098E560 3C0F8099 */ lui $t7, %hi(D_80990108) ## $t7 = 80990000 -/* 00104 8098E564 3C198099 */ lui $t9, %hi(D_80990108) ## $t9 = 80990000 -/* 00108 8098E568 15C0000D */ bne $t6, $zero, .L8098E5A0 -/* 0010C 8098E56C 00000000 */ nop -/* 00110 8098E570 8DEF0108 */ lw $t7, %lo(D_80990108)($t7) -/* 00114 8098E574 51E00011 */ beql $t7, $zero, .L8098E5BC -/* 00118 8098E578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0011C 8098E57C 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00120 8098E580 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00124 8098E584 17010003 */ bne $t8, $at, .L8098E594 -/* 00128 8098E588 00000000 */ nop -/* 0012C 8098E58C 0C26394C */ jal func_8098E530 -/* 00130 8098E590 00000000 */ nop -.L8098E594: -/* 00134 8098E594 3C018099 */ lui $at, %hi(D_80990108) ## $at = 80990000 -/* 00138 8098E598 10000007 */ beq $zero, $zero, .L8098E5B8 -/* 0013C 8098E59C AC200108 */ sw $zero, %lo(D_80990108)($at) -.L8098E5A0: -/* 00140 8098E5A0 8F390108 */ lw $t9, %lo(D_80990108)($t9) -/* 00144 8098E5A4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00148 8098E5A8 3C018099 */ lui $at, %hi(D_80990108) ## $at = 80990000 -/* 0014C 8098E5AC 57200003 */ bnel $t9, $zero, .L8098E5BC -/* 00150 8098E5B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00154 8098E5B4 AC280108 */ sw $t0, %lo(D_80990108)($at) -.L8098E5B8: -/* 00158 8098E5B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098E5BC: -/* 0015C 8098E5BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00160 8098E5C0 03E00008 */ jr $ra -/* 00164 8098E5C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s deleted file mode 100644 index 275fa0dba1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098E5C8 -/* 00168 8098E5C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0016C 8098E5CC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00170 8098E5D0 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00174 8098E5D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00178 8098E5D8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0017C 8098E5DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00180 8098E5E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00184 8098E5E4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00188 8098E5E8 44070000 */ mfc1 $a3, $f0 -/* 0018C 8098E5EC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00190 8098E5F0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00194 8098E5F4 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00198 8098E5F8 0C00B92D */ jal func_8002E4B4 -/* 0019C 8098E5FC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001A0 8098E600 8FBF001C */ lw $ra, 0x001C($sp) -/* 001A4 8098E604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001A8 8098E608 03E00008 */ jr $ra -/* 001AC 8098E60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s deleted file mode 100644 index a7a9f235dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8098E610 -/* 001B0 8098E610 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001B4 8098E614 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001B8 8098E618 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001BC 8098E61C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 8098E620 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C4 8098E624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 8098E628 03E00008 */ jr $ra -/* 001CC 8098E62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s deleted file mode 100644 index a3ede9690b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8098E630 -/* 001D0 8098E630 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 001D4 8098E634 00057880 */ sll $t7, $a1, 2 -/* 001D8 8098E638 008FC021 */ addu $t8, $a0, $t7 -/* 001DC 8098E63C 11C00003 */ beq $t6, $zero, .L8098E64C -/* 001E0 8098E640 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001E4 8098E644 03E00008 */ jr $ra -/* 001E8 8098E648 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L8098E64C: -/* 001EC 8098E64C 03E00008 */ jr $ra -/* 001F0 8098E650 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s deleted file mode 100644 index e4a9852ceb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E654 -/* 001F4 8098E654 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 8098E658 AFA40018 */ sw $a0, 0x0018($sp) -/* 001FC 8098E65C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00200 8098E660 AFA5001C */ sw $a1, 0x001C($sp) -/* 00204 8098E664 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00208 8098E668 AFA60020 */ sw $a2, 0x0020($sp) -/* 0020C 8098E66C 0C26398C */ jal func_8098E630 -/* 00210 8098E670 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00214 8098E674 10400007 */ beq $v0, $zero, .L8098E694 -/* 00218 8098E678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0021C 8098E67C 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00220 8098E680 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00224 8098E684 55CF0004 */ bnel $t6, $t7, .L8098E698 -/* 00228 8098E688 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0022C 8098E68C 10000002 */ beq $zero, $zero, .L8098E698 -/* 00230 8098E690 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8098E694: -/* 00234 8098E694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8098E698: -/* 00238 8098E698 03E00008 */ jr $ra -/* 0023C 8098E69C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s deleted file mode 100644 index 22a21ae7ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E6A0 -/* 00240 8098E6A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00244 8098E6A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00248 8098E6A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0024C 8098E6AC AFA5001C */ sw $a1, 0x001C($sp) -/* 00250 8098E6B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00254 8098E6B4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00258 8098E6B8 0C26398C */ jal func_8098E630 -/* 0025C 8098E6BC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00260 8098E6C0 10400007 */ beq $v0, $zero, .L8098E6E0 -/* 00264 8098E6C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00268 8098E6C8 97AE0022 */ lhu $t6, 0x0022($sp) -/* 0026C 8098E6CC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00270 8098E6D0 51CF0004 */ beql $t6, $t7, .L8098E6E4 -/* 00274 8098E6D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00278 8098E6D8 10000002 */ beq $zero, $zero, .L8098E6E4 -/* 0027C 8098E6DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8098E6E0: -/* 00280 8098E6E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8098E6E4: -/* 00284 8098E6E4 03E00008 */ jr $ra -/* 00288 8098E6E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s deleted file mode 100644 index 1c11c0fcf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098E6EC -/* 0028C 8098E6EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00290 8098E6F0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00294 8098E6F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00298 8098E6F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0029C 8098E6FC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A0 8098E700 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 002A4 8098E704 0C26398C */ jal func_8098E630 -/* 002A8 8098E708 AFA70018 */ sw $a3, 0x0018($sp) -/* 002AC 8098E70C 10400013 */ beq $v0, $zero, .L8098E75C -/* 002B0 8098E710 8FA70018 */ lw $a3, 0x0018($sp) -/* 002B4 8098E714 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 002B8 8098E718 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 002BC 8098E71C 00000000 */ nop -/* 002C0 8098E720 468021A0 */ cvt.s.w $f6, $f4 -/* 002C4 8098E724 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 002C8 8098E728 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 002CC 8098E72C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 002D0 8098E730 00000000 */ nop -/* 002D4 8098E734 468042A0 */ cvt.s.w $f10, $f8 -/* 002D8 8098E738 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 002DC 8098E73C 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 002E0 8098E740 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 002E4 8098E744 00000000 */ nop -/* 002E8 8098E748 468084A0 */ cvt.s.w $f18, $f16 -/* 002EC 8098E74C E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 002F0 8098E750 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 002F4 8098E754 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 002F8 8098E758 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L8098E75C: -/* 002FC 8098E75C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00300 8098E760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00304 8098E764 03E00008 */ jr $ra -/* 00308 8098E768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s deleted file mode 100644 index c83b662efd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8098E76C -/* 0030C 8098E76C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00310 8098E770 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 8098E774 AFA40028 */ sw $a0, 0x0028($sp) -/* 00318 8098E778 AFA5002C */ sw $a1, 0x002C($sp) -/* 0031C 8098E77C AFA60030 */ sw $a2, 0x0030($sp) -/* 00320 8098E780 AFA70034 */ sw $a3, 0x0034($sp) -/* 00324 8098E784 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00328 8098E788 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 8098E78C 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00330 8098E790 8FA40028 */ lw $a0, 0x0028($sp) -/* 00334 8098E794 8FA5002C */ lw $a1, 0x002C($sp) -/* 00338 8098E798 15C00007 */ bne $t6, $zero, .L8098E7B8 -/* 0033C 8098E79C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00340 8098E7A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00344 8098E7A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 8098E7A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0034C 8098E7AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00350 8098E7B0 10000006 */ beq $zero, $zero, .L8098E7CC -/* 00354 8098E7B4 468020A0 */ cvt.s.w $f2, $f4 -.L8098E7B8: -/* 00358 8098E7B8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0035C 8098E7BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00360 8098E7C0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00364 8098E7C4 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00368 8098E7C8 46803020 */ cvt.s.w $f0, $f6 -.L8098E7CC: -/* 0036C 8098E7CC 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00370 8098E7D0 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00374 8098E7D4 44066000 */ mfc1 $a2, $f12 -/* 00378 8098E7D8 44070000 */ mfc1 $a3, $f0 -/* 0037C 8098E7DC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 8098E7E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00384 8098E7E4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00388 8098E7E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0038C 8098E7EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00390 8098E7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 8098E7F4 03E00008 */ jr $ra -/* 00398 8098E7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s deleted file mode 100644 index 427de3c762..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s +++ /dev/null @@ -1,34 +0,0 @@ -.late_rodata -glabel D_80990F34 - .word 0xC61C4000 - -.text -glabel func_8098E7FC -/* 0039C 8098E7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 8098E808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B4 8098E814 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 003B8 8098E818 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 003BC 8098E81C 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 -/* 003C0 8098E820 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 8098E830 0C0291BE */ jal SkelAnime_InitSV -/* 003D4 8098E834 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 003D8 8098E838 3C018099 */ lui $at, %hi(D_80990F34) ## $at = 80990000 -/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) -/* 003E4 8098E844 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 8098E848 0C263942 */ jal func_8098E508 -/* 003EC 8098E84C E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 8098E854 0C263947 */ jal func_8098E51C -/* 003F8 8098E858 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 8098E860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 8098E864 03E00008 */ jr $ra -/* 00408 8098E868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s deleted file mode 100644 index fcdf2c0ef0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098E86C -/* 0040C 8098E86C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00410 8098E870 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00414 8098E874 AFA40038 */ sw $a0, 0x0038($sp) -/* 00418 8098E878 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0041C 8098E87C C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 00420 8098E880 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 00424 8098E884 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00428 8098E888 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0042C 8098E88C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00430 8098E890 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00434 8098E894 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00438 8098E898 AFA00024 */ sw $zero, 0x0024($sp) -/* 0043C 8098E89C AFA00020 */ sw $zero, 0x0020($sp) -/* 00440 8098E8A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00444 8098E8A4 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 00448 8098E8A8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0044C 8098E8AC E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00450 8098E8B0 0C00C916 */ jal Actor_SpawnAttached - -/* 00454 8098E8B4 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00458 8098E8B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0045C 8098E8BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00460 8098E8C0 03E00008 */ jr $ra -/* 00464 8098E8C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s deleted file mode 100644 index 9ce213d6bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8098E8C8 -/* 00468 8098E8C8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0046C 8098E8CC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00470 8098E8D0 AFA40038 */ sw $a0, 0x0038($sp) -/* 00474 8098E8D4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00478 8098E8D8 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 0047C 8098E8DC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00480 8098E8E0 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 00484 8098E8E4 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00488 8098E8E8 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0048C 8098E8EC C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00490 8098E8F0 46062080 */ add.s $f2, $f4, $f6 -/* 00494 8098E8F4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00498 8098E8F8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 0049C 8098E8FC AFAE0028 */ sw $t6, 0x0028($sp) -/* 004A0 8098E900 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004A4 8098E904 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004A8 8098E908 AFA6003C */ sw $a2, 0x003C($sp) -/* 004AC 8098E90C AFA00024 */ sw $zero, 0x0024($sp) -/* 004B0 8098E910 AFA00020 */ sw $zero, 0x0020($sp) -/* 004B4 8098E914 AFA0001C */ sw $zero, 0x001C($sp) -/* 004B8 8098E918 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 004BC 8098E91C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004C0 8098E920 0C00C916 */ jal Actor_SpawnAttached - -/* 004C4 8098E924 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004C8 8098E928 8FA4003C */ lw $a0, 0x003C($sp) -/* 004CC 8098E92C 0C021344 */ jal Item_Give -/* 004D0 8098E930 24050066 */ addiu $a1, $zero, 0x0066 ## $a1 = 00000066 -/* 004D4 8098E934 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004D8 8098E938 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004DC 8098E93C 03E00008 */ jr $ra -/* 004E0 8098E940 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s deleted file mode 100644 index 48f4478332..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_80990F38 - .word 0x42A6AAAB, 0x00000000 - -.text -glabel func_8098E944 -/* 004E4 8098E944 AFA50004 */ sw $a1, 0x0004($sp) -/* 004E8 8098E948 3C018099 */ lui $at, %hi(D_80990F38) ## $at = 80990000 -/* 004EC 8098E94C C4260F38 */ lwc1 $f6, %lo(D_80990F38)($at) -/* 004F0 8098E950 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 004F4 8098E954 46062200 */ add.s $f8, $f4, $f6 -/* 004F8 8098E958 03E00008 */ jr $ra -/* 004FC 8098E95C E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s deleted file mode 100644 index f73793e8da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8098E960 -/* 00500 8098E960 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00504 8098E964 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00508 8098E968 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 0050C 8098E96C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00510 8098E970 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 8098E974 15C00019 */ bne $t6, $zero, .L8098E9DC -/* 00518 8098E978 AFA40028 */ sw $a0, 0x0028($sp) -/* 0051C 8098E97C 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00520 8098E980 3C088099 */ lui $t0, %hi(D_8099010C) ## $t0 = 80990000 -/* 00524 8098E984 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00528 8098E988 29E10004 */ slti $at, $t7, 0x0004 -/* 0052C 8098E98C 10200013 */ beq $at, $zero, .L8098E9DC -/* 00530 8098E990 2508010C */ addiu $t0, $t0, %lo(D_8099010C) ## $t0 = 8099010C -/* 00534 8098E994 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00538 8098E998 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 0053C 8098E99C ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 00540 8098E9A0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00544 8098E9A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00548 8098E9A8 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 0054C 8098E9AC 24050066 */ addiu $a1, $zero, 0x0066 ## $a1 = 00000066 -/* 00550 8098E9B0 0C021344 */ jal Item_Give -/* 00554 8098E9B4 AFA3001C */ sw $v1, 0x001C($sp) -/* 00558 8098E9B8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0055C 8098E9BC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00560 8098E9C0 8FA3001C */ lw $v1, 0x001C($sp) -/* 00564 8098E9C4 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 00568 8098E9C8 00411021 */ addu $v0, $v0, $at -/* 0056C 8098E9CC 00021400 */ sll $v0, $v0, 16 -/* 00570 8098E9D0 00021403 */ sra $v0, $v0, 16 -/* 00574 8098E9D4 A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 00578 8098E9D8 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L8098E9DC: -/* 0057C 8098E9DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00580 8098E9E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00584 8098E9E4 03E00008 */ jr $ra -/* 00588 8098E9E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s deleted file mode 100644 index d81b00b961..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098E9EC -/* 0058C 8098E9EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00590 8098E9F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00594 8098E9F4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00598 8098E9F8 51C0000D */ beql $t6, $zero, .L8098EA30 -/* 0059C 8098E9FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005A0 8098EA00 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 005A4 8098EA04 5040000A */ beql $v0, $zero, .L8098EA30 -/* 005A8 8098EA08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005AC 8098EA0C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 005B0 8098EA10 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 005B4 8098EA14 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 005B8 8098EA18 546F0005 */ bnel $v1, $t7, .L8098EA30 -/* 005BC 8098EA1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C0 8098EA20 AC830198 */ sw $v1, 0x0198($a0) ## 00000198 -/* 005C4 8098EA24 0C263A1B */ jal func_8098E86C -/* 005C8 8098EA28 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C -/* 005CC 8098EA2C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EA30: -/* 005D0 8098EA30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D4 8098EA34 03E00008 */ jr $ra -/* 005D8 8098EA38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s deleted file mode 100644 index 0435307a2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098EA3C -/* 005DC 8098EA3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005E0 8098EA40 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 005E4 8098EA44 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 005E8 8098EA48 4604003E */ c.le.s $f0, $f4 -/* 005EC 8098EA4C 00000000 */ nop -/* 005F0 8098EA50 45000003 */ bc1f .L8098EA60 -/* 005F4 8098EA54 00000000 */ nop -/* 005F8 8098EA58 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 005FC 8098EA5C E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L8098EA60: -/* 00600 8098EA60 03E00008 */ jr $ra -/* 00604 8098EA64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s deleted file mode 100644 index 280375226b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8098EA68 -/* 00608 8098EA68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0060C 8098EA6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00610 8098EA70 AFA40028 */ sw $a0, 0x0028($sp) -/* 00614 8098EA74 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00618 8098EA78 51C0001E */ beql $t6, $zero, .L8098EAF4 -/* 0061C 8098EA7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00620 8098EA80 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 00624 8098EA84 5040001B */ beql $v0, $zero, .L8098EAF4 -/* 00628 8098EA88 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0062C 8098EA8C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00630 8098EA90 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00634 8098EA94 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00638 8098EA98 55E10016 */ bnel $t7, $at, .L8098EAF4 -/* 0063C 8098EA9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00640 8098EAA0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00644 8098EAA4 2484DF80 */ addiu $a0, $a0, 0xDF80 ## $a0 = 0600DF80 -/* 00648 8098EAA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0064C 8098EAAC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00650 8098EAB0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00654 8098EAB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 8098EAB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0065C 8098EABC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00660 8098EAC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00664 8098EAC4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00668 8098EAC8 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 0066C 8098EACC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00670 8098EAD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00674 8098EAD4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00678 8098EAD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0067C 8098EADC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00680 8098EAE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00684 8098EAE4 8FA80028 */ lw $t0, 0x0028($sp) -/* 00688 8098EAE8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 0068C 8098EAEC AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 00690 8098EAF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8098EAF4: -/* 00694 8098EAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00698 8098EAF8 03E00008 */ jr $ra -/* 0069C 8098EAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s deleted file mode 100644 index c66830f1af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8098EB00 -/* 006A0 8098EB00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 8098EB04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A8 8098EB08 10A00014 */ beq $a1, $zero, .L8098EB5C -/* 006AC 8098EB0C AFA40028 */ sw $a0, 0x0028($sp) -/* 006B0 8098EB10 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 006B4 8098EB14 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006B8 8098EB18 2484E500 */ addiu $a0, $a0, 0xE500 ## $a0 = 0600E500 -/* 006BC 8098EB1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006C0 8098EB20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C4 8098EB24 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C8 8098EB28 468021A0 */ cvt.s.w $f6, $f4 -/* 006CC 8098EB2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006D0 8098EB30 44070000 */ mfc1 $a3, $f0 -/* 006D4 8098EB34 24A5E500 */ addiu $a1, $a1, 0xE500 ## $a1 = 0600E500 -/* 006D8 8098EB38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 8098EB3C AFA00014 */ sw $zero, 0x0014($sp) -/* 006E0 8098EB40 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006E4 8098EB44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E8 8098EB48 0C029468 */ jal SkelAnime_ChangeAnim - -/* 006EC 8098EB4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006F0 8098EB50 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 8098EB54 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 006F8 8098EB58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8098EB5C: -/* 006FC 8098EB5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00700 8098EB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00704 8098EB64 03E00008 */ jr $ra -/* 00708 8098EB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s deleted file mode 100644 index 14ff1b41ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098EB6C -/* 0070C 8098EB6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00710 8098EB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 8098EB74 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00718 8098EB78 51C0000C */ beql $t6, $zero, .L8098EBAC -/* 0071C 8098EB7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00720 8098EB80 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00724 8098EB84 50400009 */ beql $v0, $zero, .L8098EBAC -/* 00728 8098EB88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0072C 8098EB8C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00730 8098EB90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00734 8098EB94 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00738 8098EB98 55E10004 */ bnel $t7, $at, .L8098EBAC -/* 0073C 8098EB9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00740 8098EBA0 0C263A32 */ jal func_8098E8C8 -/* 00744 8098EBA4 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 00748 8098EBA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EBAC: -/* 0074C 8098EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00750 8098EBB0 03E00008 */ jr $ra -/* 00754 8098EBB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s deleted file mode 100644 index 85261851a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EBB8 -/* 00758 8098EBB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0075C 8098EBBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00760 8098EBC0 0C263A58 */ jal func_8098E960 -/* 00764 8098EBC4 00000000 */ nop -/* 00768 8098EBC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0076C 8098EBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00770 8098EBD0 03E00008 */ jr $ra -/* 00774 8098EBD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s deleted file mode 100644 index 05e98bd0f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EBD8 -/* 00778 8098EBD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0077C 8098EBDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00780 8098EBE0 0C263A7B */ jal func_8098E9EC -/* 00784 8098EBE4 00000000 */ nop -/* 00788 8098EBE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0078C 8098EBEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00790 8098EBF0 03E00008 */ jr $ra -/* 00794 8098EBF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s deleted file mode 100644 index 50200ac757..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098EBF8 -/* 00798 8098EBF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 8098EBFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 007A0 8098EC00 0C263A51 */ jal func_8098E944 -/* 007A4 8098EC04 AFA40018 */ sw $a0, 0x0018($sp) -/* 007A8 8098EC08 0C263984 */ jal func_8098E610 -/* 007AC 8098EC0C 8FA40018 */ lw $a0, 0x0018($sp) -/* 007B0 8098EC10 0C263A8F */ jal func_8098EA3C -/* 007B4 8098EC14 8FA40018 */ lw $a0, 0x0018($sp) -/* 007B8 8098EC18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007BC 8098EC1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C0 8098EC20 03E00008 */ jr $ra -/* 007C4 8098EC24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s deleted file mode 100644 index b9aec7996a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098EC28 -/* 007C8 8098EC28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007CC 8098EC2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 007D0 8098EC30 AFA40018 */ sw $a0, 0x0018($sp) -/* 007D4 8098EC34 0C263972 */ jal func_8098E5C8 -/* 007D8 8098EC38 AFA5001C */ sw $a1, 0x001C($sp) -/* 007DC 8098EC3C 0C263984 */ jal func_8098E610 -/* 007E0 8098EC40 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E4 8098EC44 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E8 8098EC48 0C263A9A */ jal func_8098EA68 -/* 007EC 8098EC4C 8FA5001C */ lw $a1, 0x001C($sp) -/* 007F0 8098EC50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F4 8098EC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F8 8098EC58 03E00008 */ jr $ra -/* 007FC 8098EC5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s deleted file mode 100644 index 11844bc17c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8098EC60 -/* 00800 8098EC60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00804 8098EC64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00808 8098EC68 0C263972 */ jal func_8098E5C8 -/* 0080C 8098EC6C AFA40018 */ sw $a0, 0x0018($sp) -/* 00810 8098EC70 0C263984 */ jal func_8098E610 -/* 00814 8098EC74 8FA40018 */ lw $a0, 0x0018($sp) -/* 00818 8098EC78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0081C 8098EC7C 0C263AC0 */ jal func_8098EB00 -/* 00820 8098EC80 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00824 8098EC84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00828 8098EC88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0082C 8098EC8C 03E00008 */ jr $ra -/* 00830 8098EC90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s deleted file mode 100644 index 46b69f810f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098EC94 -/* 00834 8098EC94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00838 8098EC98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0083C 8098EC9C AFA40018 */ sw $a0, 0x0018($sp) -/* 00840 8098ECA0 0C263972 */ jal func_8098E5C8 -/* 00844 8098ECA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00848 8098ECA8 0C263984 */ jal func_8098E610 -/* 0084C 8098ECAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00850 8098ECB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00854 8098ECB4 0C263ADB */ jal func_8098EB6C -/* 00858 8098ECB8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0085C 8098ECBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00860 8098ECC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00864 8098ECC4 03E00008 */ jr $ra -/* 00868 8098ECC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s deleted file mode 100644 index 67db0d921a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8098ECCC -/* 0086C 8098ECCC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00870 8098ECD0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00874 8098ECD4 0C263972 */ jal func_8098E5C8 -/* 00878 8098ECD8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0087C 8098ECDC 0C263984 */ jal func_8098E610 -/* 00880 8098ECE0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00884 8098ECE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00888 8098ECE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0088C 8098ECEC 03E00008 */ jr $ra -/* 00890 8098ECF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s deleted file mode 100644 index 5f51cec9f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_8098ECF4 -/* 00894 8098ECF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0089C 8098ECFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) -/* 008A4 8098ED04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) -/* 008AC 8098ED0C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008B0 8098ED10 24841334 */ addiu $a0, $a0, 0x1334 ## $a0 = 06001334 -/* 008B4 8098ED14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008B8 8098ED18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 008BC 8098ED1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 -/* 008C4 8098ED24 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) -/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) -/* 008D0 8098ED30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) -/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) -/* 008E0 8098ED40 0C0291BE */ jal SkelAnime_InitSV -/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) -/* 008E8 8098ED48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 008F0 8098ED50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008F4 8098ED54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 -/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00900 8098ED60 24A51334 */ addiu $a1, $a1, 0x1334 ## $a1 = 06001334 -/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) -/* 00908 8098ED68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00918 8098ED78 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 0091C 8098ED7C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00920 8098ED80 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00924 8098ED84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 8098ED88 0C263942 */ jal func_8098E508 -/* 0092C 8098ED8C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00930 8098ED90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00934 8098ED94 0C263947 */ jal func_8098E51C -/* 00938 8098ED98 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00944 8098EDA4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00948 8098EDA8 03E00008 */ jr $ra -/* 0094C 8098EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s deleted file mode 100644 index ce469475e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098EDB0 -/* 00950 8098EDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00954 8098EDB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00958 8098EDB8 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 0095C 8098EDBC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00960 8098EDC0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00964 8098EDC4 15C1000C */ bne $t6, $at, .L8098EDF8 -/* 00968 8098EDC8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 0096C 8098EDCC 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 00970 8098EDD0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00974 8098EDD4 4600203E */ c.le.s $f4, $f0 -/* 00978 8098EDD8 00000000 */ nop -/* 0097C 8098EDDC 45020007 */ bc1fl .L8098EDFC -/* 00980 8098EDE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00984 8098EDE4 0C263942 */ jal func_8098E508 -/* 00988 8098EDE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0098C 8098EDEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00990 8098EDF0 0C263947 */ jal func_8098E51C -/* 00994 8098EDF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L8098EDF8: -/* 00998 8098EDF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098EDFC: -/* 0099C 8098EDFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A0 8098EE00 03E00008 */ jr $ra -/* 009A4 8098EE04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s deleted file mode 100644 index e5c9c83b0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098EE08 -/* 009A8 8098EE08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009AC 8098EE0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009B0 8098EE10 0C01E233 */ jal func_800788CC -/* 009B4 8098EE14 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 009B8 8098EE18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009BC 8098EE1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009C0 8098EE20 03E00008 */ jr $ra -/* 009C4 8098EE24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s deleted file mode 100644 index d5a502493b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8098EE28 -/* 009C8 8098EE28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 009CC 8098EE2C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 009D0 8098EE30 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 009D4 8098EE34 AFBF0034 */ sw $ra, 0x0034($sp) -/* 009D8 8098EE38 AFA40038 */ sw $a0, 0x0038($sp) -/* 009DC 8098EE3C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 009E0 8098EE40 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 009E4 8098EE44 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 009E8 8098EE48 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009EC 8098EE4C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 009F0 8098EE50 85CF1482 */ lh $t7, 0x1482($t6) ## 80161482 -/* 009F4 8098EE54 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 009F8 8098EE58 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 009FC 8098EE5C 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00A00 8098EE60 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00A04 8098EE64 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00A08 8098EE68 46803220 */ cvt.s.w $f8, $f6 -/* 00A0C 8098EE6C 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00A10 8098EE70 460A4400 */ add.s $f16, $f8, $f10 -/* 00A14 8098EE74 46128100 */ add.s $f4, $f16, $f18 -/* 00A18 8098EE78 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00A1C 8098EE7C C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 00A20 8098EE80 AFB80028 */ sw $t8, 0x0028($sp) -/* 00A24 8098EE84 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A28 8098EE88 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A2C 8098EE8C AFA0001C */ sw $zero, 0x001C($sp) -/* 00A30 8098EE90 0C00C916 */ jal Actor_SpawnAttached - -/* 00A34 8098EE94 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00A38 8098EE98 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00A3C 8098EE9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A40 8098EEA0 03E00008 */ jr $ra -/* 00A44 8098EEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s deleted file mode 100644 index 99bedf2855..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8098EEA8 -/* 00A48 8098EEA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A4C 8098EEAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A50 8098EEB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A54 8098EEB4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A58 8098EEB8 0C263995 */ jal func_8098E654 -/* 00A5C 8098EEBC 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00A60 8098EEC0 1040000A */ beq $v0, $zero, .L8098EEEC -/* 00A64 8098EEC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A68 8098EEC8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00A6C 8098EECC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00A70 8098EED0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00A74 8098EED4 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 00A78 8098EED8 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 00A7C 8098EEDC AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 00A80 8098EEE0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00A84 8098EEE4 0C263B82 */ jal func_8098EE08 -/* 00A88 8098EEE8 E48401A0 */ swc1 $f4, 0x01A0($a0) ## 000001A0 -.L8098EEEC: -/* 00A8C 8098EEEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A90 8098EEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A94 8098EEF4 03E00008 */ jr $ra -/* 00A98 8098EEF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s deleted file mode 100644 index 69b68a9876..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_8098EEFC -/* 00A9C 8098EEFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA0 8098EF00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AA4 8098EF04 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AA8 8098EF08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00AAC 8098EF0C 0C263995 */ jal func_8098E654 -/* 00AB0 8098EF10 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00AB4 8098EF14 10400025 */ beq $v0, $zero, .L8098EFAC -/* 00AB8 8098EF18 8FA40018 */ lw $a0, 0x0018($sp) -/* 00ABC 8098EF1C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AC0 8098EF20 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00AC4 8098EF24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AC8 8098EF28 248201A0 */ addiu $v0, $a0, 0x01A0 ## $v0 = 000001A0 -/* 00ACC 8098EF2C C4440000 */ lwc1 $f4, 0x0000($v0) ## 000001A0 -/* 00AD0 8098EF30 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00AD4 8098EF34 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00AD8 8098EF38 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00ADC 8098EF3C 46062200 */ add.s $f8, $f4, $f6 -/* 00AE0 8098EF40 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00AE4 8098EF44 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00AE8 8098EF48 E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A0 -/* 00AEC 8098EF4C 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00AF0 8098EF50 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A0 -/* 00AF4 8098EF54 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00AF8 8098EF58 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00AFC 8098EF5C 00000000 */ nop -/* 00B00 8098EF60 46805420 */ cvt.s.w $f16, $f10 -/* 00B04 8098EF64 46028480 */ add.s $f18, $f16, $f2 -/* 00B08 8098EF68 4600903E */ c.le.s $f18, $f0 -/* 00B0C 8098EF6C 00000000 */ nop -/* 00B10 8098EF70 45000020 */ bc1f .L8098EFF4 -/* 00B14 8098EF74 00000000 */ nop -/* 00B18 8098EF78 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 00B1C 8098EF7C AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 00B20 8098EF80 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00B24 8098EF84 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00B28 8098EF88 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00B2C 8098EF8C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00B30 8098EF90 00000000 */ nop -/* 00B34 8098EF94 468021A0 */ cvt.s.w $f6, $f4 -/* 00B38 8098EF98 46023200 */ add.s $f8, $f6, $f2 -/* 00B3C 8098EF9C E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A0 -/* 00B40 8098EFA0 AC8301A4 */ sw $v1, 0x01A4($a0) ## 000001A4 -/* 00B44 8098EFA4 10000026 */ beq $zero, $zero, .L8098F040 -/* 00B48 8098EFA8 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L8098EFAC: -/* 00B4C 8098EFAC 248201A0 */ addiu $v0, $a0, 0x01A0 ## $v0 = 000001A0 -/* 00B50 8098EFB0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00B54 8098EFB4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00B58 8098EFB8 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000001A0 -/* 00B5C 8098EFBC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00B60 8098EFC0 46105481 */ sub.s $f18, $f10, $f16 -/* 00B64 8098EFC4 E4520000 */ swc1 $f18, 0x0000($v0) ## 000001A0 -/* 00B68 8098EFC8 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A0 -/* 00B6C 8098EFCC 4602003E */ c.le.s $f0, $f2 -/* 00B70 8098EFD0 00000000 */ nop -/* 00B74 8098EFD4 45000007 */ bc1f .L8098EFF4 -/* 00B78 8098EFD8 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00B7C 8098EFDC AC8A0198 */ sw $t2, 0x0198($a0) ## 00000198 -/* 00B80 8098EFE0 AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 00B84 8098EFE4 E4420000 */ swc1 $f2, 0x0000($v0) ## 000001A0 -/* 00B88 8098EFE8 AC8001A4 */ sw $zero, 0x01A4($a0) ## 000001A4 -/* 00B8C 8098EFEC 10000014 */ beq $zero, $zero, .L8098F040 -/* 00B90 8098EFF0 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L8098EFF4: -/* 00B94 8098EFF4 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00B98 8098EFF8 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00B9C 8098EFFC 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00BA0 8098F000 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BA4 8098F004 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00BA8 8098F008 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00BAC 8098F00C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00BB0 8098F010 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00BB4 8098F014 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00BB8 8098F018 00000000 */ nop -/* 00BBC 8098F01C 468021A0 */ cvt.s.w $f6, $f4 -/* 00BC0 8098F020 46023200 */ add.s $f8, $f6, $f2 -/* 00BC4 8098F024 46080283 */ div.s $f10, $f0, $f8 -/* 00BC8 8098F028 46105482 */ mul.s $f18, $f10, $f16 -/* 00BCC 8098F02C 4600910D */ trunc.w.s $f4, $f18 -/* 00BD0 8098F030 44022000 */ mfc1 $v0, $f4 -/* 00BD4 8098F034 00000000 */ nop -/* 00BD8 8098F038 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 00BDC 8098F03C A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F040: -/* 00BE0 8098F040 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE4 8098F044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BE8 8098F048 03E00008 */ jr $ra -/* 00BEC 8098F04C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s deleted file mode 100644 index cd5b81e055..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8098F050 -/* 00BF0 8098F050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF4 8098F054 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BF8 8098F058 AFA5001C */ sw $a1, 0x001C($sp) -/* 00BFC 8098F05C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 8098F060 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00C04 8098F064 0C2639A8 */ jal func_8098E6A0 -/* 00C08 8098F068 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 00C0C 8098F06C 1040001A */ beq $v0, $zero, .L8098F0D8 -/* 00C10 8098F070 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C14 8098F074 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00C18 8098F078 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00C1C 8098F07C AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 00C20 8098F080 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 00C24 8098F084 3C188016 */ lui $t8, %hi(gGameInfo) -/* 00C28 8098F088 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 00C2C 8098F08C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C30 8098F090 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00C34 8098F094 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 00C38 8098F098 8C8901A8 */ lw $t1, 0x01A8($a0) ## 000001A8 -/* 00C3C 8098F09C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00C40 8098F0A0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00C44 8098F0A4 AC8801A4 */ sw $t0, 0x01A4($a0) ## 000001A4 -/* 00C48 8098F0A8 468021A0 */ cvt.s.w $f6, $f4 -/* 00C4C 8098F0AC 46083280 */ add.s $f10, $f6, $f8 -/* 00C50 8098F0B0 15200007 */ bne $t1, $zero, .L8098F0D0 -/* 00C54 8098F0B4 E48A01A0 */ swc1 $f10, 0x01A0($a0) ## 000001A0 -/* 00C58 8098F0B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C5C 8098F0BC 0C263B8A */ jal func_8098EE28 -/* 00C60 8098F0C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C64 8098F0C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C68 8098F0C8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00C6C 8098F0CC AC8A01A8 */ sw $t2, 0x01A8($a0) ## 000001A8 -.L8098F0D0: -/* 00C70 8098F0D0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00C74 8098F0D4 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L8098F0D8: -/* 00C78 8098F0D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C7C 8098F0DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C80 8098F0E0 03E00008 */ jr $ra -/* 00C84 8098F0E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s deleted file mode 100644 index 7fb1d3e90b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098F0E8 -/* 00C88 8098F0E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C8C 8098F0EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C90 8098F0F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C94 8098F0F4 0C263BAA */ jal func_8098EEA8 -/* 00C98 8098F0F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C9C 8098F0FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CA0 8098F100 0C263955 */ jal func_8098E554 -/* 00CA4 8098F104 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CA8 8098F108 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CAC 8098F10C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CB0 8098F110 03E00008 */ jr $ra -/* 00CB4 8098F114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s deleted file mode 100644 index f57b5f1d57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098F118 -/* 00CB8 8098F118 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CBC 8098F11C AFBF001C */ sw $ra, 0x001C($sp) -/* 00CC0 8098F120 AFB00018 */ sw $s0, 0x0018($sp) -/* 00CC4 8098F124 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CC8 8098F128 0C263972 */ jal func_8098E5C8 -/* 00CCC 8098F12C AFA50024 */ sw $a1, 0x0024($sp) -/* 00CD0 8098F130 0C263984 */ jal func_8098E610 -/* 00CD4 8098F134 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CD8 8098F138 0C263920 */ jal func_8098E480 -/* 00CDC 8098F13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CE0 8098F140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CE4 8098F144 0C263BBF */ jal func_8098EEFC -/* 00CE8 8098F148 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CEC 8098F14C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF0 8098F150 0C263955 */ jal func_8098E554 -/* 00CF4 8098F154 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CF8 8098F158 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CFC 8098F15C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D00 8098F160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D04 8098F164 03E00008 */ jr $ra -/* 00D08 8098F168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s deleted file mode 100644 index e82112e246..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098F16C -/* 00D0C 8098F16C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D10 8098F170 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D14 8098F174 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D18 8098F178 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D1C 8098F17C 0C263972 */ jal func_8098E5C8 -/* 00D20 8098F180 AFA50024 */ sw $a1, 0x0024($sp) -/* 00D24 8098F184 0C263984 */ jal func_8098E610 -/* 00D28 8098F188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D2C 8098F18C 0C263B6C */ jal func_8098EDB0 -/* 00D30 8098F190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D34 8098F194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D38 8098F198 0C263C14 */ jal func_8098F050 -/* 00D3C 8098F19C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D40 8098F1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D44 8098F1A4 0C263955 */ jal func_8098E554 -/* 00D48 8098F1A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D4C 8098F1AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D50 8098F1B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D54 8098F1B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D58 8098F1B8 03E00008 */ jr $ra -/* 00D5C 8098F1BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s deleted file mode 100644 index f6b3fa3537..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80990DE0 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80990E04 - .asciz "../z_demo_sa_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_8098F1C0 -/* 00D60 8098F1C0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) -/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) -/* 00D74 8098F1D4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00D78 8098F1D8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 -/* 00D7C 8098F1DC 3C0A8099 */ lui $t2, %hi(D_809900F4) ## $t2 = 80990000 -/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 -/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 -/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) -/* 00D8C 8098F1EC 3C068099 */ lui $a2, %hi(D_80990DE0) ## $a2 = 80990000 -/* 00D90 8098F1F0 24C60DE0 */ addiu $a2, $a2, %lo(D_80990DE0) ## $a2 = 80990DE0 -/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) -/* 00D98 8098F1F8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 00D9C 8098F1FC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 00DA0 8098F200 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 -/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 -/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) -/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) -/* 00DB4 8098F214 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DB8 8098F218 0C031AB1 */ jal Graph_OpenDisps -/* 00DBC 8098F21C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) -/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 -/* 00DC8 8098F228 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) -/* 00DD0 8098F230 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DD4 8098F234 3C078016 */ lui $a3, %hi(gSegments) -/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 -/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 -/* 00DE0 8098F240 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00DE4 8098F244 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00DE8 8098F248 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00DEC 8098F24C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 -/* 00DF4 8098F254 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 -/* 00DFC 8098F25C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E00 8098F260 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 00E04 8098F264 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 00E08 8098F268 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 -/* 00E10 8098F270 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 -/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 -/* 00E1C 8098F27C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00E20 8098F280 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E24 8098F284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00E28 8098F288 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 00E2C 8098F28C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00E30 8098F290 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00E34 8098F294 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E38 8098F298 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00E3C 8098F29C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00E40 8098F2A0 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 -/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 -/* 00E4C 8098F2AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) -/* 00E54 8098F2B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 -/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 -/* 00E60 8098F2C0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00E64 8098F2C4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 -/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 -/* 00E70 8098F2D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00E74 8098F2D4 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 -/* 00E7C 8098F2DC 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 -/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 -/* 00E88 8098F2E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00E8C 8098F2EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) -/* 00E94 8098F2F4 3C0A8011 */ lui $t2, %hi(D_80116280) -/* 00E98 8098F2F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00E9C 8098F2FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00EA0 8098F300 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00EA4 8098F304 8D0F01A4 */ lw $t7, 0x01A4($t0) ## 010001A3 -/* 00EA8 8098F308 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00EAC 8098F30C 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 -/* 00EB0 8098F310 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000024 -/* 00EB4 8098F314 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00EB8 8098F318 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00EBC 8098F31C 254A6280 */ addiu $t2, %lo(D_80116280) -/* 00EC0 8098F320 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00EC4 8098F324 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00EC8 8098F328 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00ECC 8098F32C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00ED0 8098F330 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0100014B -/* 00ED4 8098F334 8C450004 */ lw $a1, 0x0004($v0) ## 0100014F -/* 00ED8 8098F338 8C460020 */ lw $a2, 0x0020($v0) ## 0100016B -/* 00EDC 8098F33C 90470002 */ lbu $a3, 0x0002($v0) ## 0100014D -/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) -/* 00EEC 8098F34C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) -/* 00EF4 8098F354 0C0289CF */ jal SkelAnime_DrawSV2 -/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) -/* 00EFC 8098F35C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) -/* 00F04 8098F364 3C068099 */ lui $a2, %hi(D_80990E04) ## $a2 = 80990000 -/* 00F08 8098F368 24C60E04 */ addiu $a2, $a2, %lo(D_80990E04) ## $a2 = 80990E04 -/* 00F0C 8098F36C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 00F10 8098F370 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 -/* 00F14 8098F374 0C031AD5 */ jal Graph_CloseDisps -/* 00F18 8098F378 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F24 8098F384 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00F28 8098F388 03E00008 */ jr $ra -/* 00F2C 8098F38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s deleted file mode 100644 index df68cb4a3b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098F390 -/* 00F30 8098F390 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) -/* 00F3C 8098F39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F48 8098F3A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00F4C 8098F3AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00F50 8098F3B0 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 -/* 00F54 8098F3B4 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) -/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F64 8098F3C4 0C0291BE */ jal SkelAnime_InitSV -/* 00F68 8098F3C8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) -/* 00F70 8098F3D0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00F74 8098F3D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00F78 8098F3D8 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 -/* 00F7C 8098F3DC AC4F019C */ sw $t7, 0x019C($v0) ## 0000019C -/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F84 8098F3E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F88 8098F3E8 03E00008 */ jr $ra -/* 00F8C 8098F3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s deleted file mode 100644 index 8a68e04134..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8098F3F0 -/* 00F90 8098F3F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F94 8098F3F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F98 8098F3F8 0C263972 */ jal func_8098E5C8 -/* 00F9C 8098F3FC AFA40018 */ sw $a0, 0x0018($sp) -/* 00FA0 8098F400 0C263984 */ jal func_8098E610 -/* 00FA4 8098F404 8FA40018 */ lw $a0, 0x0018($sp) -/* 00FA8 8098F408 0C263920 */ jal func_8098E480 -/* 00FAC 8098F40C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00FB0 8098F410 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FB4 8098F414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FB8 8098F418 03E00008 */ jr $ra -/* 00FBC 8098F41C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s deleted file mode 100644 index 2fec2267c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8098F420 -/* 00FC0 8098F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FCC 8098F42C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) -/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FD8 8098F438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00FDC 8098F43C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 00FE0 8098F440 24E7FFD4 */ addiu $a3, $a3, 0xFFD4 ## $a3 = 0600FFD4 -/* 00FE4 8098F444 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) -/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FF4 8098F454 0C0291BE */ jal SkelAnime_InitSV -/* 00FF8 8098F458 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) -/* 01000 8098F460 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 01004 8098F464 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 -/* 01008 8098F468 AC40019C */ sw $zero, 0x019C($v0) ## 0000019C -/* 0100C 8098F46C A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01014 8098F474 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01018 8098F478 03E00008 */ jr $ra -/* 0101C 8098F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s deleted file mode 100644 index 33a07c4d8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8098F480 -/* 01020 8098F480 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01024 8098F484 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01028 8098F488 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 0102C 8098F48C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01030 8098F490 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01034 8098F494 46062200 */ add.s $f8, $f4, $f6 -/* 01038 8098F498 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 0103C 8098F49C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 01040 8098F4A0 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 01044 8098F4A4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01048 8098F4A8 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 0104C 8098F4AC 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 01050 8098F4B0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01054 8098F4B4 00000000 */ nop -/* 01058 8098F4B8 46805420 */ cvt.s.w $f16, $f10 -/* 0105C 8098F4BC 46128000 */ add.s $f0, $f16, $f18 -/* 01060 8098F4C0 4604003E */ c.le.s $f0, $f4 -/* 01064 8098F4C4 00000000 */ nop -/* 01068 8098F4C8 45020005 */ bc1fl .L8098F4E0 -/* 0106C 8098F4CC C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -/* 01070 8098F4D0 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 01074 8098F4D4 03E00008 */ jr $ra -/* 01078 8098F4D8 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F4DC: -/* 0107C 8098F4DC C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -.L8098F4E0: -/* 01080 8098F4E0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01084 8098F4E4 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 01088 8098F4E8 46003203 */ div.s $f8, $f6, $f0 -/* 0108C 8098F4EC 460A4402 */ mul.s $f16, $f8, $f10 -/* 01090 8098F4F0 4600848D */ trunc.w.s $f18, $f16 -/* 01094 8098F4F4 44029000 */ mfc1 $v0, $f18 -/* 01098 8098F4F8 00000000 */ nop -/* 0109C 8098F4FC AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 010A0 8098F500 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 010A4 8098F504 03E00008 */ jr $ra -/* 010A8 8098F508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s deleted file mode 100644 index a6e7d7140e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098F50C -/* 010AC 8098F50C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B0 8098F510 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010B4 8098F514 AFA40018 */ sw $a0, 0x0018($sp) -/* 010B8 8098F518 0C2639BB */ jal func_8098E6EC -/* 010BC 8098F51C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 010C0 8098F520 8FA40018 */ lw $a0, 0x0018($sp) -/* 010C4 8098F524 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 010C8 8098F528 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 010CC 8098F52C AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 010D0 8098F530 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 010D4 8098F534 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010D8 8098F538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010DC 8098F53C 03E00008 */ jr $ra -/* 010E0 8098F540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s deleted file mode 100644 index 628044ce90..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8098F544 -/* 010E4 8098F544 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 010E8 8098F548 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 010EC 8098F54C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 010F0 8098F550 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 010F4 8098F554 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 010F8 8098F558 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 010FC 8098F55C 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 01100 8098F560 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01104 8098F564 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01108 8098F568 46803220 */ cvt.s.w $f8, $f6 -/* 0110C 8098F56C 460A4400 */ add.s $f16, $f8, $f10 -/* 01110 8098F570 4604803E */ c.le.s $f16, $f4 -/* 01114 8098F574 00000000 */ nop -/* 01118 8098F578 45000003 */ bc1f .L8098F588 -/* 0111C 8098F57C 00000000 */ nop -/* 01120 8098F580 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 01124 8098F584 AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -.L8098F588: -/* 01128 8098F588 03E00008 */ jr $ra -/* 0112C 8098F58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s deleted file mode 100644 index 3dd89376d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F590 -/* 01130 8098F590 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01134 8098F594 AFBF001C */ sw $ra, 0x001C($sp) -/* 01138 8098F598 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0113C 8098F59C AFA40020 */ sw $a0, 0x0020($sp) -/* 01140 8098F5A0 24A5F580 */ addiu $a1, $a1, 0xF580 ## $a1 = 0600F580 -/* 01144 8098F5A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01148 8098F5A8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0114C 8098F5AC 0C2639DB */ jal func_8098E76C -/* 01150 8098F5B0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01154 8098F5B4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01158 8098F5B8 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 0115C 8098F5BC ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 01160 8098F5C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01164 8098F5C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01168 8098F5C8 03E00008 */ jr $ra -/* 0116C 8098F5CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s deleted file mode 100644 index 3c35d2dcbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F5D0 -/* 01170 8098F5D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01174 8098F5D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01178 8098F5D8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0117C 8098F5DC AFA40020 */ sw $a0, 0x0020($sp) -/* 01180 8098F5E0 24A5FCE0 */ addiu $a1, $a1, 0xFCE0 ## $a1 = 0600FCE0 -/* 01184 8098F5E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01188 8098F5E8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0118C 8098F5EC 0C2639DB */ jal func_8098E76C -/* 01190 8098F5F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01194 8098F5F4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01198 8098F5F8 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 0119C 8098F5FC ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 011A0 8098F600 8FBF001C */ lw $ra, 0x001C($sp) -/* 011A4 8098F604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 011A8 8098F608 03E00008 */ jr $ra -/* 011AC 8098F60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s deleted file mode 100644 index 014b760da3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098F610 -/* 011B0 8098F610 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011B4 8098F614 AFBF001C */ sw $ra, 0x001C($sp) -/* 011B8 8098F618 10A0000A */ beq $a1, $zero, .L8098F644 -/* 011BC 8098F61C AFA40020 */ sw $a0, 0x0020($sp) -/* 011C0 8098F620 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 011C4 8098F624 24A5FFD4 */ addiu $a1, $a1, 0xFFD4 ## $a1 = 0600FFD4 -/* 011C8 8098F628 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011CC 8098F62C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 011D0 8098F630 0C2639DB */ jal func_8098E76C -/* 011D4 8098F634 AFA00010 */ sw $zero, 0x0010($sp) -/* 011D8 8098F638 8FAF0020 */ lw $t7, 0x0020($sp) -/* 011DC 8098F63C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 011E0 8098F640 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8098F644: -/* 011E4 8098F644 8FBF001C */ lw $ra, 0x001C($sp) -/* 011E8 8098F648 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 011EC 8098F64C 03E00008 */ jr $ra -/* 011F0 8098F650 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s deleted file mode 100644 index 8a91cc2ff6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_80990E28 - .asciz "Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8098F654 -/* 011F4 8098F654 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011F8 8098F658 AFB00018 */ sw $s0, 0x0018($sp) -/* 011FC 8098F65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01200 8098F660 AFBF001C */ sw $ra, 0x001C($sp) -/* 01204 8098F664 AFA5002C */ sw $a1, 0x002C($sp) -/* 01208 8098F668 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0120C 8098F66C 0C26398C */ jal func_8098E630 -/* 01210 8098F670 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01214 8098F674 50400023 */ beql $v0, $zero, .L8098F704 -/* 01218 8098F678 8FBF001C */ lw $ra, 0x001C($sp) -/* 0121C 8098F67C 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01220 8098F680 8E0301AC */ lw $v1, 0x01AC($s0) ## 000001AC -/* 01224 8098F684 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01228 8098F688 50C3001E */ beql $a2, $v1, .L8098F704 -/* 0122C 8098F68C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01230 8098F690 10C10009 */ beq $a2, $at, .L8098F6B8 -/* 01234 8098F694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01238 8098F698 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0123C 8098F69C 10C1000B */ beq $a2, $at, .L8098F6CC -/* 01240 8098F6A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01244 8098F6A4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01248 8098F6A8 10C1000C */ beq $a2, $at, .L8098F6DC -/* 0124C 8098F6AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01250 8098F6B0 1000000E */ beq $zero, $zero, .L8098F6EC -/* 01254 8098F6B4 3C048099 */ lui $a0, %hi(D_80990E28) ## $a0 = 80990000 -.L8098F6B8: -/* 01258 8098F6B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0125C 8098F6BC 0C263D43 */ jal func_8098F50C -/* 01260 8098F6C0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01264 8098F6C4 1000000D */ beq $zero, $zero, .L8098F6FC -/* 01268 8098F6C8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6CC: -/* 0126C 8098F6CC 0C263D64 */ jal func_8098F590 -/* 01270 8098F6D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01274 8098F6D4 10000009 */ beq $zero, $zero, .L8098F6FC -/* 01278 8098F6D8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6DC: -/* 0127C 8098F6DC 0C263D74 */ jal func_8098F5D0 -/* 01280 8098F6E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01284 8098F6E4 10000005 */ beq $zero, $zero, .L8098F6FC -/* 01288 8098F6E8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6EC: -/* 0128C 8098F6EC 24840E28 */ addiu $a0, $a0, %lo(D_80990E28) ## $a0 = 00000E28 -/* 01290 8098F6F0 0C00084C */ jal osSyncPrintf - -/* 01294 8098F6F4 AFA60020 */ sw $a2, 0x0020($sp) -/* 01298 8098F6F8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098F6FC: -/* 0129C 8098F6FC AE0601AC */ sw $a2, 0x01AC($s0) ## 000001AC -/* 012A0 8098F700 8FBF001C */ lw $ra, 0x001C($sp) -.L8098F704: -/* 012A4 8098F704 8FB00018 */ lw $s0, 0x0018($sp) -/* 012A8 8098F708 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012AC 8098F70C 03E00008 */ jr $ra -/* 012B0 8098F710 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s deleted file mode 100644 index ffac5a2226..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098F714 -/* 012B4 8098F714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012B8 8098F718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012BC 8098F71C 0C263D95 */ jal func_8098F654 -/* 012C0 8098F720 00000000 */ nop -/* 012C4 8098F724 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012C8 8098F728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012CC 8098F72C 03E00008 */ jr $ra -/* 012D0 8098F730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s deleted file mode 100644 index f8c8c5655a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8098F734 -/* 012D4 8098F734 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012D8 8098F738 AFBF001C */ sw $ra, 0x001C($sp) -/* 012DC 8098F73C AFB00018 */ sw $s0, 0x0018($sp) -/* 012E0 8098F740 0C263972 */ jal func_8098E5C8 -/* 012E4 8098F744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012E8 8098F748 0C263984 */ jal func_8098E610 -/* 012EC 8098F74C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012F0 8098F750 0C263920 */ jal func_8098E480 -/* 012F4 8098F754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012F8 8098F758 0C263D20 */ jal func_8098F480 -/* 012FC 8098F75C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 8098F760 0C263D51 */ jal func_8098F544 -/* 01304 8098F764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01308 8098F768 8FBF001C */ lw $ra, 0x001C($sp) -/* 0130C 8098F76C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01310 8098F770 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01314 8098F774 03E00008 */ jr $ra -/* 01318 8098F778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s deleted file mode 100644 index c107002763..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F77C -/* 0131C 8098F77C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01320 8098F780 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01324 8098F784 AFA40018 */ sw $a0, 0x0018($sp) -/* 01328 8098F788 0C263972 */ jal func_8098E5C8 -/* 0132C 8098F78C AFA5001C */ sw $a1, 0x001C($sp) -/* 01330 8098F790 0C263984 */ jal func_8098E610 -/* 01334 8098F794 8FA40018 */ lw $a0, 0x0018($sp) -/* 01338 8098F798 0C263920 */ jal func_8098E480 -/* 0133C 8098F79C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01340 8098F7A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01344 8098F7A4 0C263D95 */ jal func_8098F654 -/* 01348 8098F7A8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0134C 8098F7AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01350 8098F7B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01354 8098F7B4 03E00008 */ jr $ra -/* 01358 8098F7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s deleted file mode 100644 index 0e662cbb60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F7BC -/* 0135C 8098F7BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01360 8098F7C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01364 8098F7C4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01368 8098F7C8 0C263972 */ jal func_8098E5C8 -/* 0136C 8098F7CC AFA5001C */ sw $a1, 0x001C($sp) -/* 01370 8098F7D0 0C263984 */ jal func_8098E610 -/* 01374 8098F7D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01378 8098F7D8 0C263920 */ jal func_8098E480 -/* 0137C 8098F7DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01380 8098F7E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01384 8098F7E4 0C263D95 */ jal func_8098F654 -/* 01388 8098F7E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0138C 8098F7EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01390 8098F7F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01394 8098F7F4 03E00008 */ jr $ra -/* 01398 8098F7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s deleted file mode 100644 index 19f40e4237..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8098F7FC -/* 0139C 8098F7FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013A0 8098F800 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013A4 8098F804 0C263972 */ jal func_8098E5C8 -/* 013A8 8098F808 AFA40020 */ sw $a0, 0x0020($sp) -/* 013AC 8098F80C 0C263984 */ jal func_8098E610 -/* 013B0 8098F810 8FA40020 */ lw $a0, 0x0020($sp) -/* 013B4 8098F814 AFA2001C */ sw $v0, 0x001C($sp) -/* 013B8 8098F818 0C263920 */ jal func_8098E480 -/* 013BC 8098F81C 8FA40020 */ lw $a0, 0x0020($sp) -/* 013C0 8098F820 8FA40020 */ lw $a0, 0x0020($sp) -/* 013C4 8098F824 0C263D84 */ jal func_8098F610 -/* 013C8 8098F828 8FA5001C */ lw $a1, 0x001C($sp) -/* 013CC 8098F82C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013D0 8098F830 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013D4 8098F834 03E00008 */ jr $ra -/* 013D8 8098F838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s deleted file mode 100644 index c542919cfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_8098F83C -/* 013DC 8098F83C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) -/* 013E4 8098F844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) -/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) -/* 013F0 8098F850 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 013F4 8098F854 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 013F8 8098F858 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 013FC 8098F85C 24E7113C */ addiu $a3, $a3, 0x113C ## $a3 = 0601113C -/* 01400 8098F860 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 01404 8098F864 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) -/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) -/* 01410 8098F870 0C0291BE */ jal SkelAnime_InitSV -/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) -/* 01418 8098F878 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 -/* 0141C 8098F87C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000024 -/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) -/* 01424 8098F884 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0142C 8098F88C C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000028 -/* 01430 8098F890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01434 8098F894 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0143C 8098F89C C4480008 */ lwc1 $f8, 0x0008($v0) ## 0000002C -/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) -/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) -/* 01450 8098F8B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01454 8098F8B4 0C00C916 */ jal Actor_SpawnAttached - -/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0145C 8098F8BC 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 01460 8098F8C0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 01464 8098F8C4 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C -/* 01468 8098F8C8 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 0146C 8098F8CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 8098F8D0 0C263942 */ jal func_8098E508 -/* 01474 8098F8D4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01478 8098F8D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C -/* 01480 8098F8E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) -/* 0148C 8098F8EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01490 8098F8F0 03E00008 */ jr $ra -/* 01494 8098F8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s deleted file mode 100644 index 2863b949ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8098F8F8 -/* 01498 8098F8F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0149C 8098F8FC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 014A0 8098F900 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 014A4 8098F904 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 014A8 8098F908 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 014AC 8098F90C 46062200 */ add.s $f8, $f4, $f6 -/* 014B0 8098F910 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 014B4 8098F914 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 014B8 8098F918 E48801A0 */ swc1 $f8, 0x01A0($a0) ## 000001A0 -/* 014BC 8098F91C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 014C0 8098F920 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 014C4 8098F924 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 014C8 8098F928 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 014CC 8098F92C 00000000 */ nop -/* 014D0 8098F930 46805420 */ cvt.s.w $f16, $f10 -/* 014D4 8098F934 46128000 */ add.s $f0, $f16, $f18 -/* 014D8 8098F938 4604003E */ c.le.s $f0, $f4 -/* 014DC 8098F93C 00000000 */ nop -/* 014E0 8098F940 45020005 */ bc1fl .L8098F958 -/* 014E4 8098F944 C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -/* 014E8 8098F948 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 014EC 8098F94C 03E00008 */ jr $ra -/* 014F0 8098F950 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8098F954: -/* 014F4 8098F954 C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -.L8098F958: -/* 014F8 8098F958 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 014FC 8098F95C 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 01500 8098F960 46003203 */ div.s $f8, $f6, $f0 -/* 01504 8098F964 460A4402 */ mul.s $f16, $f8, $f10 -/* 01508 8098F968 4600848D */ trunc.w.s $f18, $f16 -/* 0150C 8098F96C 44029000 */ mfc1 $v0, $f18 -/* 01510 8098F970 00000000 */ nop -/* 01514 8098F974 AC8201A4 */ sw $v0, 0x01A4($a0) ## 000001A4 -/* 01518 8098F978 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 0151C 8098F97C 03E00008 */ jr $ra -/* 01520 8098F980 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s deleted file mode 100644 index db0efb4441..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8098F984 -/* 01524 8098F984 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01528 8098F988 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 0152C 8098F98C AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 01530 8098F990 03E00008 */ jr $ra -/* 01534 8098F994 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s deleted file mode 100644 index a0579dd32c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8098F998 -/* 01538 8098F998 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0153C 8098F99C AFBF001C */ sw $ra, 0x001C($sp) -/* 01540 8098F9A0 8C8E01AC */ lw $t6, 0x01AC($a0) ## 000001AC -/* 01544 8098F9A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01548 8098F9A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0154C 8098F9AC 15C1000C */ bne $t6, $at, .L8098F9E0 -/* 01550 8098F9B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01554 8098F9B4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01558 8098F9B8 0C2639BB */ jal func_8098E6EC -/* 0155C 8098F9BC AFA40020 */ sw $a0, 0x0020($sp) -/* 01560 8098F9C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01564 8098F9C4 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 -/* 01568 8098F9C8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0156C 8098F9CC AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 01570 8098F9D0 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C -/* 01574 8098F9D4 AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 01578 8098F9D8 1000000E */ beq $zero, $zero, .L8098FA14 -/* 0157C 8098F9DC A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L8098F9E0: -/* 01580 8098F9E0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01584 8098F9E4 24A5113C */ addiu $a1, $a1, 0x113C ## $a1 = 0601113C -/* 01588 8098F9E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0158C 8098F9EC 0C2639DB */ jal func_8098E76C -/* 01590 8098F9F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01594 8098F9F4 8FA40020 */ lw $a0, 0x0020($sp) -/* 01598 8098F9F8 24190012 */ addiu $t9, $zero, 0x0012 ## $t9 = 00000012 -/* 0159C 8098F9FC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 015A0 8098FA00 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 015A4 8098FA04 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 015A8 8098FA08 AC88019C */ sw $t0, 0x019C($a0) ## 0000019C -/* 015AC 8098FA0C AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 015B0 8098FA10 A08900C8 */ sb $t1, 0x00C8($a0) ## 000000C8 -.L8098FA14: -/* 015B4 8098FA14 0C263942 */ jal func_8098E508 -/* 015B8 8098FA18 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 015BC 8098FA1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 015C0 8098FA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015C4 8098FA24 03E00008 */ jr $ra -/* 015C8 8098FA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s deleted file mode 100644 index da7737f5fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8098FA2C -/* 015CC 8098FA2C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 015D0 8098FA30 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 015D4 8098FA34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 015D8 8098FA38 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 015DC 8098FA3C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 015E0 8098FA40 C48401A0 */ lwc1 $f4, 0x01A0($a0) ## 000001A0 -/* 015E4 8098FA44 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 015E8 8098FA48 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 015EC 8098FA4C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015F0 8098FA50 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 015F4 8098FA54 46803220 */ cvt.s.w $f8, $f6 -/* 015F8 8098FA58 460A4400 */ add.s $f16, $f8, $f10 -/* 015FC 8098FA5C 4604803E */ c.le.s $f16, $f4 -/* 01600 8098FA60 00000000 */ nop -/* 01604 8098FA64 45000005 */ bc1f .L8098FA7C -/* 01608 8098FA68 00000000 */ nop -/* 0160C 8098FA6C AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 01610 8098FA70 AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 01614 8098FA74 AC8001B0 */ sw $zero, 0x01B0($a0) ## 000001B0 -/* 01618 8098FA78 A08800C8 */ sb $t0, 0x00C8($a0) ## 000000C8 -.L8098FA7C: -/* 0161C 8098FA7C 03E00008 */ jr $ra -/* 01620 8098FA80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s deleted file mode 100644 index b6cd889231..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8098FA84 -/* 01624 8098FA84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01628 8098FA88 AFBF001C */ sw $ra, 0x001C($sp) -/* 0162C 8098FA8C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01630 8098FA90 24A540BC */ addiu $a1, $a1, 0x40BC ## $a1 = 060140BC -/* 01634 8098FA94 AFA00010 */ sw $zero, 0x0010($sp) -/* 01638 8098FA98 AFA40020 */ sw $a0, 0x0020($sp) -/* 0163C 8098FA9C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01640 8098FAA0 0C2639DB */ jal func_8098E76C -/* 01644 8098FAA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01648 8098FAA8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0164C 8098FAAC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01650 8098FAB0 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 01654 8098FAB4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01658 8098FAB8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0165C 8098FABC AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 01660 8098FAC0 AC82019C */ sw $v0, 0x019C($a0) ## 0000019C -/* 01664 8098FAC4 AC8201B0 */ sw $v0, 0x01B0($a0) ## 000001B0 -/* 01668 8098FAC8 0C263942 */ jal func_8098E508 -/* 0166C 8098FACC A08F00C8 */ sb $t7, 0x00C8($a0) ## 000000C8 -/* 01670 8098FAD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01674 8098FAD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01678 8098FAD8 03E00008 */ jr $ra -/* 0167C 8098FADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s deleted file mode 100644 index 6a926a8e5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8098FAE0 -/* 01680 8098FAE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01684 8098FAE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01688 8098FAE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0168C 8098FAEC 24A535EC */ addiu $a1, $a1, 0x35EC ## $a1 = 060135EC -/* 01690 8098FAF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01694 8098FAF4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01698 8098FAF8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0169C 8098FAFC 0C2639DB */ jal func_8098E76C -/* 016A0 8098FB00 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 016A4 8098FB04 8FA40020 */ lw $a0, 0x0020($sp) -/* 016A8 8098FB08 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 016AC 8098FB0C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 016B0 8098FB10 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 016B4 8098FB14 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 016B8 8098FB18 AC82019C */ sw $v0, 0x019C($a0) ## 0000019C -/* 016BC 8098FB1C AC8201B0 */ sw $v0, 0x01B0($a0) ## 000001B0 -/* 016C0 8098FB20 A08F00C8 */ sb $t7, 0x00C8($a0) ## 000000C8 -/* 016C4 8098FB24 8FBF001C */ lw $ra, 0x001C($sp) -/* 016C8 8098FB28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 016CC 8098FB2C 03E00008 */ jr $ra -/* 016D0 8098FB30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s deleted file mode 100644 index 7d4f5f8ce0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FB34 -/* 016D4 8098FB34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016D8 8098FB38 10A00007 */ beq $a1, $zero, .L8098FB58 -/* 016DC 8098FB3C AFBF001C */ sw $ra, 0x001C($sp) -/* 016E0 8098FB40 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 016E4 8098FB44 24A53CD8 */ addiu $a1, $a1, 0x3CD8 ## $a1 = 06013CD8 -/* 016E8 8098FB48 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 016EC 8098FB4C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 016F0 8098FB50 0C2639DB */ jal func_8098E76C -/* 016F4 8098FB54 AFA00010 */ sw $zero, 0x0010($sp) -.L8098FB58: -/* 016F8 8098FB58 8FBF001C */ lw $ra, 0x001C($sp) -/* 016FC 8098FB5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01700 8098FB60 03E00008 */ jr $ra -/* 01704 8098FB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s deleted file mode 100644 index e3d7b0a511..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s +++ /dev/null @@ -1,70 +0,0 @@ -.rdata -glabel D_80990E64 - .asciz "Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8098FB68 -/* 01708 8098FB68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0170C 8098FB6C AFB00018 */ sw $s0, 0x0018($sp) -/* 01710 8098FB70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01714 8098FB74 AFBF001C */ sw $ra, 0x001C($sp) -/* 01718 8098FB78 AFA5002C */ sw $a1, 0x002C($sp) -/* 0171C 8098FB7C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01720 8098FB80 0C26398C */ jal func_8098E630 -/* 01724 8098FB84 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01728 8098FB88 5040002A */ beql $v0, $zero, .L8098FC34 -/* 0172C 8098FB8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01730 8098FB90 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01734 8098FB94 8E0301AC */ lw $v1, 0x01AC($s0) ## 000001AC -/* 01738 8098FB98 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0173C 8098FB9C 50C30025 */ beql $a2, $v1, .L8098FC34 -/* 01740 8098FBA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01744 8098FBA4 10C1000C */ beq $a2, $at, .L8098FBD8 -/* 01748 8098FBA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 8098FBAC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01750 8098FBB0 10C1000D */ beq $a2, $at, .L8098FBE8 -/* 01754 8098FBB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01758 8098FBB8 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0175C 8098FBBC 10C1000F */ beq $a2, $at, .L8098FBFC -/* 01760 8098FBC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01764 8098FBC4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01768 8098FBC8 10C10010 */ beq $a2, $at, .L8098FC0C -/* 0176C 8098FBCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 8098FBD0 10000012 */ beq $zero, $zero, .L8098FC1C -/* 01774 8098FBD4 3C048099 */ lui $a0, %hi(D_80990E64) ## $a0 = 80990000 -.L8098FBD8: -/* 01778 8098FBD8 0C263E61 */ jal func_8098F984 -/* 0177C 8098FBDC AFA60020 */ sw $a2, 0x0020($sp) -/* 01780 8098FBE0 10000012 */ beq $zero, $zero, .L8098FC2C -/* 01784 8098FBE4 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FBE8: -/* 01788 8098FBE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0178C 8098FBEC 0C263E66 */ jal func_8098F998 -/* 01790 8098FBF0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01794 8098FBF4 1000000D */ beq $zero, $zero, .L8098FC2C -/* 01798 8098FBF8 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FBFC: -/* 0179C 8098FBFC 0C263EA1 */ jal func_8098FA84 -/* 017A0 8098FC00 AFA60020 */ sw $a2, 0x0020($sp) -/* 017A4 8098FC04 10000009 */ beq $zero, $zero, .L8098FC2C -/* 017A8 8098FC08 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC0C: -/* 017AC 8098FC0C 0C263EB8 */ jal func_8098FAE0 -/* 017B0 8098FC10 AFA60020 */ sw $a2, 0x0020($sp) -/* 017B4 8098FC14 10000005 */ beq $zero, $zero, .L8098FC2C -/* 017B8 8098FC18 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC1C: -/* 017BC 8098FC1C 24840E64 */ addiu $a0, $a0, %lo(D_80990E64) ## $a0 = 00000E64 -/* 017C0 8098FC20 0C00084C */ jal osSyncPrintf - -/* 017C4 8098FC24 AFA60020 */ sw $a2, 0x0020($sp) -/* 017C8 8098FC28 8FA60020 */ lw $a2, 0x0020($sp) -.L8098FC2C: -/* 017CC 8098FC2C AE0601AC */ sw $a2, 0x01AC($s0) ## 000001AC -/* 017D0 8098FC30 8FBF001C */ lw $ra, 0x001C($sp) -.L8098FC34: -/* 017D4 8098FC34 8FB00018 */ lw $s0, 0x0018($sp) -/* 017D8 8098FC38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017DC 8098FC3C 03E00008 */ jr $ra -/* 017E0 8098FC40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s deleted file mode 100644 index b895ecf77e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8098FC44 -/* 017E4 8098FC44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017E8 8098FC48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017EC 8098FC4C 0C263EDA */ jal func_8098FB68 -/* 017F0 8098FC50 00000000 */ nop -/* 017F4 8098FC54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017F8 8098FC58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017FC 8098FC5C 03E00008 */ jr $ra -/* 01800 8098FC60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s deleted file mode 100644 index 2ceaa492cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FC64 -/* 01804 8098FC64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01808 8098FC68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0180C 8098FC6C 0C263972 */ jal func_8098E5C8 -/* 01810 8098FC70 AFA40018 */ sw $a0, 0x0018($sp) -/* 01814 8098FC74 0C263984 */ jal func_8098E610 -/* 01818 8098FC78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0181C 8098FC7C 0C263E3E */ jal func_8098F8F8 -/* 01820 8098FC80 8FA40018 */ lw $a0, 0x0018($sp) -/* 01824 8098FC84 0C263E8B */ jal func_8098FA2C -/* 01828 8098FC88 8FA40018 */ lw $a0, 0x0018($sp) -/* 0182C 8098FC8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01830 8098FC90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01834 8098FC94 03E00008 */ jr $ra -/* 01838 8098FC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s deleted file mode 100644 index 9f667fd8f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FC9C -/* 0183C 8098FC9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01840 8098FCA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01844 8098FCA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01848 8098FCA8 0C263972 */ jal func_8098E5C8 -/* 0184C 8098FCAC AFA5001C */ sw $a1, 0x001C($sp) -/* 01850 8098FCB0 0C263984 */ jal func_8098E610 -/* 01854 8098FCB4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01858 8098FCB8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0185C 8098FCBC 0C263EDA */ jal func_8098FB68 -/* 01860 8098FCC0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01864 8098FCC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01868 8098FCC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0186C 8098FCCC 03E00008 */ jr $ra -/* 01870 8098FCD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s deleted file mode 100644 index e8710d10cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FCD4 -/* 01874 8098FCD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01878 8098FCD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0187C 8098FCDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01880 8098FCE0 0C263972 */ jal func_8098E5C8 -/* 01884 8098FCE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01888 8098FCE8 0C263984 */ jal func_8098E610 -/* 0188C 8098FCEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01890 8098FCF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01894 8098FCF4 0C263EDA */ jal func_8098FB68 -/* 01898 8098FCF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0189C 8098FCFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018A0 8098FD00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018A4 8098FD04 03E00008 */ jr $ra -/* 018A8 8098FD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s deleted file mode 100644 index 7180d30728..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8098FD0C -/* 018AC 8098FD0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018B0 8098FD10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018B4 8098FD14 AFA40018 */ sw $a0, 0x0018($sp) -/* 018B8 8098FD18 0C263972 */ jal func_8098E5C8 -/* 018BC 8098FD1C AFA5001C */ sw $a1, 0x001C($sp) -/* 018C0 8098FD20 0C263984 */ jal func_8098E610 -/* 018C4 8098FD24 8FA40018 */ lw $a0, 0x0018($sp) -/* 018C8 8098FD28 8FA40018 */ lw $a0, 0x0018($sp) -/* 018CC 8098FD2C 0C263ECD */ jal func_8098FB34 -/* 018D0 8098FD30 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 018D4 8098FD34 8FA40018 */ lw $a0, 0x0018($sp) -/* 018D8 8098FD38 0C263EDA */ jal func_8098FB68 -/* 018DC 8098FD3C 8FA5001C */ lw $a1, 0x001C($sp) -/* 018E0 8098FD40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018E4 8098FD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018E8 8098FD48 03E00008 */ jr $ra -/* 018EC 8098FD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s deleted file mode 100644 index d5119a433e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8098FE74 -/* 01A14 8098FE74 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01A18 8098FE78 AFA40000 */ sw $a0, 0x0000($sp) -/* 01A1C 8098FE7C 14A10008 */ bne $a1, $at, .L8098FEA0 -/* 01A20 8098FE80 AFA7000C */ sw $a3, 0x000C($sp) -/* 01A24 8098FE84 8FAE0014 */ lw $t6, 0x0014($sp) -/* 01A28 8098FE88 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 01A2C 8098FE8C 27187B80 */ addiu $t8, $t8, 0x7B80 ## $t8 = 06007B80 -/* 01A30 8098FE90 8DCF01B0 */ lw $t7, 0x01B0($t6) ## 000001B0 -/* 01A34 8098FE94 11E00002 */ beq $t7, $zero, .L8098FEA0 -/* 01A38 8098FE98 00000000 */ nop -/* 01A3C 8098FE9C ACD80000 */ sw $t8, 0x0000($a2) ## 00000000 -.L8098FEA0: -/* 01A40 8098FEA0 03E00008 */ jr $ra -/* 01A44 8098FEA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s deleted file mode 100644 index 274baa2179..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8098FEA8 -/* 01A48 8098FEA8 AFA40000 */ sw $a0, 0x0000($sp) -/* 01A4C 8098FEAC 03E00008 */ jr $ra -/* 01A50 8098FEB0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s deleted file mode 100644 index d6e0b014dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ /dev/null @@ -1,124 +0,0 @@ -.rdata -glabel D_80990EDC - .asciz "../z_demo_sa.c" - .balign 4 - -glabel D_80990EEC - .asciz "../z_demo_sa.c" - .balign 4 - -.text -glabel func_8098FEB4 -/* 01A54 8098FEB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) -/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) -/* 01A64 8098FEC4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01A68 8098FEC8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 -/* 01A6C 8098FECC 3C0B8099 */ lui $t3, %hi(D_809900F4) ## $t3 = 80990000 -/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 -/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 -/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) -/* 01A7C 8098FEDC 3C068099 */ lui $a2, %hi(D_80990EDC) ## $a2 = 80990000 -/* 01A80 8098FEE0 24C60EDC */ addiu $a2, $a2, %lo(D_80990EDC) ## $a2 = 80990EDC -/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) -/* 01A88 8098FEE8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 01A8C 8098FEEC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01A90 8098FEF0 2407025A */ addiu $a3, $zero, 0x025A ## $a3 = 0000025A -/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 -/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 -/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) -/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) -/* 01AA4 8098FF04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01AA8 8098FF08 0C031AB1 */ jal Graph_OpenDisps -/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) -/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) -/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 -/* 01AB8 8098FF18 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) -/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) -/* 01AC4 8098FF24 3C078016 */ lui $a3, %hi(gSegments) -/* 01AC8 8098FF28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 -/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 -/* 01AD4 8098FF34 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01AD8 8098FF38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01ADC 8098FF3C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 -/* 01AE4 8098FF44 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 01AE8 8098FF48 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 -/* 01AF0 8098FF50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01AF4 8098FF54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 01AF8 8098FF58 3C0900FF */ lui $t1, 0x00FF ## $t1 = 00FF0000 -/* 01AFC 8098FF5C 3529FFFF */ ori $t1, $t1, 0xFFFF ## $t1 = 00FFFFFF -/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 -/* 01B04 8098FF64 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 -/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 -/* 01B10 8098FF70 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01B14 8098FF74 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B18 8098FF78 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01B1C 8098FF7C 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 01B20 8098FF80 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01B24 8098FF84 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01B28 8098FF88 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01B2C 8098FF8C 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 01B30 8098FF90 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01B34 8098FF94 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 -/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 -/* 01B40 8098FFA0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) -/* 01B48 8098FFA8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 -/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 -/* 01B54 8098FFB4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 -/* 01B5C 8098FFBC AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 -/* 01B64 8098FFC4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01B68 8098FFC8 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 -/* 01B70 8098FFD0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 -/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 -/* 01B7C 8098FFDC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 01B80 8098FFE0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B84 8098FFE4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01B88 8098FFE8 3C0F8011 */ lui $t7, %hi(D_80116280+0x10) -/* 01B8C 8098FFEC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01B90 8098FFF0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 01B94 8098FFF4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01B98 8098FFF8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01B9C 8098FFFC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01BA0 80990000 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01BA4 80990004 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 -/* 01BA8 80990008 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01BAC 8099000C AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 01BB0 80990010 25EF6290 */ addiu $t7, %lo(D_80116280+0x10) -/* 01BB4 80990014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01BB8 80990018 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) -/* 01BC0 80990020 3C188099 */ lui $t8, %hi(func_8098FE74) ## $t8 = 80990000 -/* 01BC4 80990024 2718FE74 */ addiu $t8, $t8, %lo(func_8098FE74) ## $t8 = 8098FE74 -/* 01BC8 80990028 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 01BCC 8099002C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01BD0 80990030 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01BD4 80990034 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) -/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) -/* 01BE4 80990044 0C0286B2 */ jal SkelAnime_DrawSV -/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) -/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) -/* 01BF0 80990050 3C068099 */ lui $a2, %hi(D_80990EEC) ## $a2 = 80990000 -/* 01BF4 80990054 24C60EEC */ addiu $a2, $a2, %lo(D_80990EEC) ## $a2 = 80990EEC -/* 01BF8 80990058 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01BFC 8099005C 24070272 */ addiu $a3, $zero, 0x0272 ## $a3 = 00000272 -/* 01C00 80990060 0C031AD5 */ jal Graph_CloseDisps -/* 01C04 80990064 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01C10 80990070 03E00008 */ jr $ra -/* 01C14 80990074 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s deleted file mode 100644 index ed4a657053..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnBlkobj_Destroy -/* 000B8 809C2118 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000BC 809C211C AFA40018 */ sw $a0, 0x0018($sp) -/* 000C0 809C2120 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000C4 809C2124 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C8 809C2128 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000CC 809C212C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 000D0 809C2130 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 000D4 809C2134 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 000D8 809C2138 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000DC 809C213C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E0 809C2140 03E00008 */ jr $ra -/* 000E4 809C2144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s deleted file mode 100644 index fd4d9c1b79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s +++ /dev/null @@ -1,107 +0,0 @@ -.rdata -glabel D_809C25D8 - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C25EC - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C2600 - .asciz "../z_en_blkobj.c" - .balign 4 - -.text -glabel EnBlkobj_Draw -/* 00398 809C23F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0039C 809C23FC AFB10038 */ sw $s1, 0x0038($sp) -/* 003A0 809C2400 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003A4 809C2404 AFBF003C */ sw $ra, 0x003C($sp) -/* 003A8 809C2408 AFB00034 */ sw $s0, 0x0034($sp) -/* 003AC 809C240C AFA40070 */ sw $a0, 0x0070($sp) -/* 003B0 809C2410 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 003B4 809C2414 3C06809C */ lui $a2, %hi(D_809C25D8) ## $a2 = 809C0000 -/* 003B8 809C2418 24C625D8 */ addiu $a2, $a2, %lo(D_809C25D8) ## $a2 = 809C25D8 -/* 003BC 809C241C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC -/* 003C0 809C2420 2407015D */ addiu $a3, $zero, 0x015D ## $a3 = 0000015D -/* 003C4 809C2424 0C031AB1 */ jal Graph_OpenDisps -/* 003C8 809C2428 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 003CC 809C242C 0C024F61 */ jal func_80093D84 -/* 003D0 809C2430 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 003D4 809C2434 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003D8 809C2438 3C060001 */ lui $a2, 0x0001 ## $a2 = 00010000 -/* 003DC 809C243C 00D13021 */ addu $a2, $a2, $s1 -/* 003E0 809C2440 8CC61DE4 */ lw $a2, 0x1DE4($a2) ## 00011DE4 -/* 003E4 809C2444 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 003E8 809C2448 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 003EC 809C244C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 003F0 809C2450 35EF0034 */ ori $t7, $t7, 0x0034 ## $t7 = DB060034 -/* 003F4 809C2454 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 003F8 809C2458 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 003FC 809C245C 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00400 809C2460 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00404 809C2464 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00408 809C2468 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 0040C 809C246C 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 00410 809C2470 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 00414 809C2474 AFA6001C */ sw $a2, 0x001C($sp) -/* 00418 809C2478 AFAA0028 */ sw $t2, 0x0028($sp) -/* 0041C 809C247C AFA90024 */ sw $t1, 0x0024($sp) -/* 00420 809C2480 AFA80018 */ sw $t0, 0x0018($sp) -/* 00424 809C2484 AFB90014 */ sw $t9, 0x0014($sp) -/* 00428 809C2488 AFB80010 */ sw $t8, 0x0010($sp) -/* 0042C 809C248C AFA00020 */ sw $zero, 0x0020($sp) -/* 00430 809C2490 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00434 809C2494 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00438 809C2498 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0043C 809C249C AFA20048 */ sw $v0, 0x0048($sp) -/* 00440 809C24A0 8FA30048 */ lw $v1, 0x0048($sp) -/* 00444 809C24A4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00448 809C24A8 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 0044C 809C24AC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00450 809C24B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00454 809C24B4 3C05809C */ lui $a1, %hi(D_809C25EC) ## $a1 = 809C0000 -/* 00458 809C24B8 24A525EC */ addiu $a1, $a1, %lo(D_809C25EC) ## $a1 = 809C25EC -/* 0045C 809C24BC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00460 809C24C0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00464 809C24C4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00468 809C24C8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0046C 809C24CC 2406016B */ addiu $a2, $zero, 0x016B ## $a2 = 0000016B -/* 00470 809C24D0 0C0346A2 */ jal Matrix_NewMtx -/* 00474 809C24D4 AFA20044 */ sw $v0, 0x0044($sp) -/* 00478 809C24D8 8FA30044 */ lw $v1, 0x0044($sp) -/* 0047C 809C24DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00480 809C24E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00484 809C24E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00488 809C24E8 8FA20070 */ lw $v0, 0x0070($sp) -/* 0048C 809C24EC 84460164 */ lh $a2, 0x0164($v0) ## 00000164 -/* 00490 809C24F0 50C00006 */ beql $a2, $zero, .L809C250C -/* 00494 809C24F4 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00498 809C24F8 0C2708C9 */ jal func_809C2324 -/* 0049C 809C24FC 24A514E0 */ addiu $a1, $a1, 0x14E0 ## $a1 = 060014E0 -/* 004A0 809C2500 8FAD0070 */ lw $t5, 0x0070($sp) -/* 004A4 809C2504 85A60164 */ lh $a2, 0x0164($t5) ## 00000164 -/* 004A8 809C2508 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -.L809C250C: -/* 004AC 809C250C 01C63823 */ subu $a3, $t6, $a2 -/* 004B0 809C2510 10E00005 */ beq $a3, $zero, .L809C2528 -/* 004B4 809C2514 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004B8 809C2518 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004BC 809C251C 24A553D0 */ addiu $a1, $a1, 0x53D0 ## $a1 = 060053D0 -/* 004C0 809C2520 0C2708C9 */ jal func_809C2324 -/* 004C4 809C2524 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -.L809C2528: -/* 004C8 809C2528 3C06809C */ lui $a2, %hi(D_809C2600) ## $a2 = 809C0000 -/* 004CC 809C252C 24C62600 */ addiu $a2, $a2, %lo(D_809C2600) ## $a2 = 809C2600 -/* 004D0 809C2530 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC -/* 004D4 809C2534 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 004D8 809C2538 0C031AD5 */ jal Graph_CloseDisps -/* 004DC 809C253C 24070177 */ addiu $a3, $zero, 0x0177 ## $a3 = 00000177 -/* 004E0 809C2540 8FBF003C */ lw $ra, 0x003C($sp) -/* 004E4 809C2544 8FB00034 */ lw $s0, 0x0034($sp) -/* 004E8 809C2548 8FB10038 */ lw $s1, 0x0038($sp) -/* 004EC 809C254C 03E00008 */ jr $ra -/* 004F0 809C2550 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 004F4 809C2554 00000000 */ nop -/* 004F8 809C2558 00000000 */ nop -/* 004FC 809C255C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s deleted file mode 100644 index ee14d968aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel EnBlkobj_Init -/* 0000C 809C206C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00010 809C2070 AFA50034 */ sw $a1, 0x0034($sp) -/* 00014 809C2074 AFBF001C */ sw $ra, 0x001C($sp) -/* 00018 809C2078 AFB00018 */ sw $s0, 0x0018($sp) -/* 0001C 809C207C 3C05809C */ lui $a1, %hi(D_809C2580) ## $a1 = 809C0000 -/* 00020 809C2080 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 809C2084 AFA00024 */ sw $zero, 0x0024($sp) -/* 00028 809C2088 0C01E037 */ jal Actor_ProcessInitChain - -/* 0002C 809C208C 24A52580 */ addiu $a1, $a1, %lo(D_809C2580) ## $a1 = 809C2580 -/* 00030 809C2090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00034 809C2094 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00038 809C2098 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0003C 809C209C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00040 809C20A0 0C00B337 */ jal Flags_GetClear - -/* 00044 809C20A4 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00048 809C20A8 10400009 */ beq $v0, $zero, .L809C20D0 -/* 0004C 809C20AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00050 809C20B0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00054 809C20B4 3C05809C */ lui $a1, %hi(func_809C22F4) ## $a1 = 809C0000 -/* 00058 809C20B8 A60E0164 */ sh $t6, 0x0164($s0) ## 00000164 -/* 0005C 809C20BC 24A522F4 */ addiu $a1, $a1, %lo(func_809C22F4) ## $a1 = 809C22F4 -/* 00060 809C20C0 0C270818 */ jal func_809C2060 -/* 00064 809C20C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00068 809C20C8 1000000F */ beq $zero, $zero, .L809C2108 -/* 0006C 809C20CC 8FBF001C */ lw $ra, 0x001C($sp) -.L809C20D0: -/* 00070 809C20D0 24847564 */ addiu $a0, $a0, 0x7564 ## $a0 = 00007564 -/* 00074 809C20D4 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00078 809C20D8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 0007C 809C20DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00080 809C20E0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00084 809C20E4 8FA70024 */ lw $a3, 0x0024($sp) -/* 00088 809C20E8 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 0008C 809C20EC 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00090 809C20F0 3C05809C */ lui $a1, %hi(func_809C2148) ## $a1 = 809C0000 -/* 00094 809C20F4 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00098 809C20F8 24A52148 */ addiu $a1, $a1, %lo(func_809C2148) ## $a1 = 809C2148 -/* 0009C 809C20FC 0C270818 */ jal func_809C2060 -/* 000A0 809C2100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A4 809C2104 8FBF001C */ lw $ra, 0x001C($sp) -.L809C2108: -/* 000A8 809C2108 8FB00018 */ lw $s0, 0x0018($sp) -/* 000AC 809C210C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000B0 809C2110 03E00008 */ jr $ra -/* 000B4 809C2114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s deleted file mode 100644 index 8727b18949..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel EnBlkobj_Update -/* 002A0 809C2300 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 809C2304 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A8 809C2308 8C990168 */ lw $t9, 0x0168($a0) ## 00000168 -/* 002AC 809C230C 0320F809 */ jalr $ra, $t9 -/* 002B0 809C2310 00000000 */ nop -/* 002B4 809C2314 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002B8 809C2318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002BC 809C231C 03E00008 */ jr $ra -/* 002C0 809C2320 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s deleted file mode 100644 index ea2a29337a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809C2060 -/* 00000 809C2060 AC850168 */ sw $a1, 0x0168($a0) ## 00000168 -/* 00004 809C2064 03E00008 */ jr $ra -/* 00008 809C2068 A4800166 */ sh $zero, 0x0166($a0) ## 00000166 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s deleted file mode 100644 index d8f1d91bd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809C2148 -/* 000E8 809C2148 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000EC 809C214C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F0 809C2150 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 000F4 809C2154 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 000F8 809C2158 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 000FC 809C215C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00100 809C2160 3C05809C */ lui $a1, %hi(func_809C21A0) ## $a1 = 809C0000 -/* 00104 809C2164 4606203C */ c.lt.s $f4, $f6 -/* 00108 809C2168 24A521A0 */ addiu $a1, $a1, %lo(func_809C21A0) ## $a1 = 809C21A0 -/* 0010C 809C216C 45020005 */ bc1fl .L809C2184 -/* 00110 809C2170 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 00114 809C2174 0C270818 */ jal func_809C2060 -/* 00118 809C2178 AFA2001C */ sw $v0, 0x001C($sp) -/* 0011C 809C217C 8FA2001C */ lw $v0, 0x001C($sp) -/* 00120 809C2180 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -.L809C2184: -/* 00124 809C2184 3C010400 */ lui $at, 0x0400 ## $at = 04000000 -/* 00128 809C2188 01C17825 */ or $t7, $t6, $at ## $t7 = 04000000 -/* 0012C 809C218C AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 -/* 00130 809C2190 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00134 809C2194 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00138 809C2198 03E00008 */ jr $ra -/* 0013C 809C219C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s deleted file mode 100644 index 32a313427d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809C21A0 -/* 00140 809C21A0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00144 809C21A4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00148 809C21A8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0014C 809C21AC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00150 809C21B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00154 809C21B4 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 00158 809C21B8 55E00013 */ bnel $t7, $zero, .L809C2208 -/* 0015C 809C21BC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00160 809C21C0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00164 809C21C4 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00168 809C21C8 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0016C 809C21CC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00170 809C21D0 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00174 809C21D4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00178 809C21D8 24060033 */ addiu $a2, $zero, 0x0033 ## $a2 = 00000033 -/* 0017C 809C21DC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00180 809C21E0 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 00184 809C21E4 AFA00024 */ sw $zero, 0x0024($sp) -/* 00188 809C21E8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0018C 809C21EC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00190 809C21F0 AFB8001C */ sw $t8, 0x001C($sp) -/* 00194 809C21F4 3C05809C */ lui $a1, %hi(func_809C2218) ## $a1 = 809C0000 -/* 00198 809C21F8 24A52218 */ addiu $a1, $a1, %lo(func_809C2218) ## $a1 = 809C2218 -/* 0019C 809C21FC 0C270818 */ jal func_809C2060 -/* 001A0 809C2200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A4 809C2204 8FBF0034 */ lw $ra, 0x0034($sp) -.L809C2208: -/* 001A8 809C2208 8FB00030 */ lw $s0, 0x0030($sp) -/* 001AC 809C220C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 001B0 809C2210 03E00008 */ jr $ra -/* 001B4 809C2214 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s deleted file mode 100644 index 5a9176ce46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_809C2218 -/* 001B8 809C2218 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001BC 809C221C AFBF001C */ sw $ra, 0x001C($sp) -/* 001C0 809C2220 AFB00018 */ sw $s0, 0x0018($sp) -/* 001C4 809C2224 84820166 */ lh $v0, 0x0166($a0) ## 00000166 -/* 001C8 809C2228 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001CC 809C222C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 001D0 809C2230 1440000F */ bne $v0, $zero, .L809C2270 -/* 001D4 809C2234 28430065 */ slti $v1, $v0, 0x0065 -/* 001D8 809C2238 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 001DC 809C223C 24050033 */ addiu $a1, $zero, 0x0033 ## $a1 = 00000033 -/* 001E0 809C2240 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 001E4 809C2244 0C00CB0F */ jal Actor_Find - -/* 001E8 809C2248 AFA70024 */ sw $a3, 0x0024($sp) -/* 001EC 809C224C 14400024 */ bne $v0, $zero, .L809C22E0 -/* 001F0 809C2250 8FA70024 */ lw $a3, 0x0024($sp) -/* 001F4 809C2254 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 001F8 809C2258 0C00B33C */ jal Flags_SetClear - -/* 001FC 809C225C 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00200 809C2260 860E0166 */ lh $t6, 0x0166($s0) ## 00000166 -/* 00204 809C2264 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00208 809C2268 1000001D */ beq $zero, $zero, .L809C22E0 -/* 0020C 809C226C A60F0166 */ sh $t7, 0x0166($s0) ## 00000166 -.L809C2270: -/* 00210 809C2270 38630001 */ xori $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00214 809C2274 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 00218 809C2278 10600019 */ beq $v1, $zero, .L809C22E0 -/* 0021C 809C227C A6180166 */ sh $t8, 0x0166($s0) ## 00000166 -/* 00220 809C2280 86020166 */ lh $v0, 0x0166($s0) ## 00000166 -/* 00224 809C2284 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00228 809C2288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0022C 809C228C 2442FF9C */ addiu $v0, $v0, 0xFF9C ## $v0 = FFFFFF9C -/* 00230 809C2290 00021083 */ sra $v0, $v0, 2 -/* 00234 809C2294 28410006 */ slti $at, $v0, 0x0006 -/* 00238 809C2298 14200002 */ bne $at, $zero, .L809C22A4 -/* 0023C 809C229C 3C05809C */ lui $a1, %hi(func_809C22F4) ## $a1 = 809C0000 -/* 00240 809C22A0 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L809C22A4: -/* 00244 809C22A4 86190164 */ lh $t9, 0x0164($s0) ## 00000164 -/* 00248 809C22A8 24A522F4 */ addiu $a1, $a1, %lo(func_809C22F4) ## $a1 = 809C22F4 -/* 0024C 809C22AC 03224021 */ addu $t0, $t9, $v0 -/* 00250 809C22B0 A6080164 */ sh $t0, 0x0164($s0) ## 00000164 -/* 00254 809C22B4 86090164 */ lh $t1, 0x0164($s0) ## 00000164 -/* 00258 809C22B8 29210100 */ slti $at, $t1, 0x0100 -/* 0025C 809C22BC 54200009 */ bnel $at, $zero, .L809C22E4 -/* 00260 809C22C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00264 809C22C4 A60A0164 */ sh $t2, 0x0164($s0) ## 00000164 -/* 00268 809C22C8 0C270818 */ jal func_809C2060 -/* 0026C 809C22CC AFA70024 */ sw $a3, 0x0024($sp) -/* 00270 809C22D0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00274 809C22D4 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 00278 809C22D8 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 0027C 809C22DC 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -.L809C22E0: -/* 00280 809C22E0 8FBF001C */ lw $ra, 0x001C($sp) -.L809C22E4: -/* 00284 809C22E4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00288 809C22E8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0028C 809C22EC 03E00008 */ jr $ra -/* 00290 809C22F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s deleted file mode 100644 index ce94644a09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809C22F4 -/* 00294 809C22F4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00298 809C22F8 03E00008 */ jr $ra -/* 0029C 809C22FC AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s deleted file mode 100644 index af0a78e1b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s +++ /dev/null @@ -1,66 +0,0 @@ -.rdata -glabel D_809C25B0 - .asciz "../z_en_blkobj.c" - .balign 4 - -glabel D_809C25C4 - .asciz "../z_en_blkobj.c" - .balign 4 - -.text -glabel func_809C2324 -/* 002C4 809C2324 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 002C8 809C2328 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002CC 809C232C AFA40040 */ sw $a0, 0x0040($sp) -/* 002D0 809C2330 AFA50044 */ sw $a1, 0x0044($sp) -/* 002D4 809C2334 AFA60048 */ sw $a2, 0x0048($sp) -/* 002D8 809C2338 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 002DC 809C233C 3C06809C */ lui $a2, %hi(D_809C25B0) ## $a2 = 809C0000 -/* 002E0 809C2340 24C625B0 */ addiu $a2, $a2, %lo(D_809C25B0) ## $a2 = 809C25B0 -/* 002E4 809C2344 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 002E8 809C2348 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 002EC 809C234C 0C031AB1 */ jal Graph_OpenDisps -/* 002F0 809C2350 AFA50038 */ sw $a1, 0x0038($sp) -/* 002F4 809C2354 8FA50048 */ lw $a1, 0x0048($sp) -/* 002F8 809C2358 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 002FC 809C235C 8FA80038 */ lw $t0, 0x0038($sp) -/* 00300 809C2360 14A10004 */ bne $a1, $at, .L809C2374 -/* 00304 809C2364 3C04809C */ lui $a0, %hi(D_809C25A0) ## $a0 = 809C0000 -/* 00308 809C2368 3C04809C */ lui $a0, %hi(D_809C2590) ## $a0 = 809C0000 -/* 0030C 809C236C 10000002 */ beq $zero, $zero, .L809C2378 -/* 00310 809C2370 24842590 */ addiu $a0, $a0, %lo(D_809C2590) ## $a0 = 809C2590 -.L809C2374: -/* 00314 809C2374 248425A0 */ addiu $a0, $a0, %lo(D_809C25A0) ## $a0 = 809C4B30 -.L809C2378: -/* 00318 809C2378 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 0031C 809C237C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00320 809C2380 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00324 809C2384 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00328 809C2388 AD0F02D0 */ sw $t7, 0x02D0($t0) ## 000002D0 -/* 0032C 809C238C AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 00330 809C2390 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00334 809C2394 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 00338 809C2398 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 0033C 809C239C 30AA00FF */ andi $t2, $a1, 0x00FF ## $t2 = 00000000 -/* 00340 809C23A0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00344 809C23A4 AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 -/* 00348 809C23A8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 0034C 809C23AC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00350 809C23B0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 00354 809C23B4 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00358 809C23B8 3C06809C */ lui $a2, %hi(D_809C25C4) ## $a2 = 809C0000 -/* 0035C 809C23BC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00360 809C23C0 AD0B02D0 */ sw $t3, 0x02D0($t0) ## 000002D0 -/* 00364 809C23C4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00368 809C23C8 8FAD0044 */ lw $t5, 0x0044($sp) -/* 0036C 809C23CC 24C625C4 */ addiu $a2, $a2, %lo(D_809C25C4) ## $a2 = 809C25C4 -/* 00370 809C23D0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 00374 809C23D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00378 809C23D8 8FAE0040 */ lw $t6, 0x0040($sp) -/* 0037C 809C23DC 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 00380 809C23E0 0C031AD5 */ jal Graph_CloseDisps -/* 00384 809C23E4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00388 809C23E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0038C 809C23EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00390 809C23F0 03E00008 */ jr $ra -/* 00394 809C23F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s deleted file mode 100644 index 191c6efbbd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel EnFhgFire_Destroy -/* 0042C 80A0F68C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00430 80A0F690 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00434 80A0F694 AFA5001C */ sw $a1, 0x001C($sp) -/* 00438 80A0F698 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0043C 80A0F69C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00440 80A0F6A0 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 00444 80A0F6A4 10410005 */ beq $v0, $at, .L80A0F6BC -/* 00448 80A0F6A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0044C 80A0F6AC 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 -/* 00450 80A0F6B0 10410002 */ beq $v0, $at, .L80A0F6BC -/* 00454 80A0F6B4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00458 80A0F6B8 14410005 */ bne $v0, $at, .L80A0F6D0 -.L80A0F6BC: -/* 0045C 80A0F6BC 24E501B0 */ addiu $a1, $a3, 0x01B0 ## $a1 = 000001B0 -/* 00460 80A0F6C0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00464 80A0F6C4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00468 80A0F6C8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0046C 80A0F6CC 84E2001C */ lh $v0, 0x001C($a3) ## 0000001C -.L80A0F6D0: -/* 00470 80A0F6D0 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00474 80A0F6D4 14410004 */ bne $v0, $at, .L80A0F6E8 -/* 00478 80A0F6D8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0047C 80A0F6DC 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 00480 80A0F6E0 0C01E9F1 */ jal Lights_Remove - -/* 00484 80A0F6E4 8CE6019C */ lw $a2, 0x019C($a3) ## 0000019C -.L80A0F6E8: -/* 00488 80A0F6E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0048C 80A0F6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00490 80A0F6F0 03E00008 */ jr $ra -/* 00494 80A0F6F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s deleted file mode 100644 index c1e8b68945..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s +++ /dev/null @@ -1,311 +0,0 @@ -.rdata -glabel D_80A11840 - .asciz "yari hikari ct 1\n" - .balign 4 - -glabel D_80A11854 - .asciz "yari hikari ct 2\n" - .balign 4 - -.late_rodata -glabel D_80A119C4 - .word 0x3E051EB8 -glabel D_80A119C8 - .word 0x4622F983 -glabel D_80A119CC - .word 0x4622F983 - -.text -glabel EnFhgFire_Init -/* 00008 80A0F268 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0000C 80A0F26C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00010 80A0F270 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 80A0F274 AFB00028 */ sw $s0, 0x0028($sp) -/* 00018 80A0F278 AFA5005C */ sw $a1, 0x005C($sp) -/* 0001C 80A0F27C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00020 80A0F280 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80A0F284 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00028 80A0F288 44050000 */ mfc1 $a1, $f0 -/* 0002C 80A0F28C 44070000 */ mfc1 $a3, $f0 -/* 00030 80A0F290 AFA40038 */ sw $a0, 0x0038($sp) -/* 00034 80A0F294 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00038 80A0F298 0C00AC78 */ jal ActorShape_Init - -/* 0003C 80A0F29C AFAF004C */ sw $t7, 0x004C($sp) -/* 00040 80A0F2A0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00044 80A0F2A4 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 00048 80A0F2A8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0004C 80A0F2AC 10410006 */ beq $v0, $at, .L80A0F2C8 -/* 00050 80A0F2B0 260501B0 */ addiu $a1, $s0, 0x01B0 ## $a1 = 000001B0 -/* 00054 80A0F2B4 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 -/* 00058 80A0F2B8 10410003 */ beq $v0, $at, .L80A0F2C8 -/* 0005C 80A0F2BC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00060 80A0F2C0 5441000A */ bnel $v0, $at, .L80A0F2EC -/* 00064 80A0F2C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80A0F2C8: -/* 00068 80A0F2C8 0C0170D9 */ jal Collider_InitCylinder - -/* 0006C 80A0F2CC AFA50034 */ sw $a1, 0x0034($sp) -/* 00070 80A0F2D0 3C0780A1 */ lui $a3, %hi(D_80A11790) ## $a3 = 80A10000 -/* 00074 80A0F2D4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00078 80A0F2D8 24E71790 */ addiu $a3, $a3, %lo(D_80A11790) ## $a3 = 80A11790 -/* 0007C 80A0F2DC 8FA4005C */ lw $a0, 0x005C($sp) -/* 00080 80A0F2E0 0C01712B */ jal Collider_SetCylinder - -/* 00084 80A0F2E4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00088 80A0F2E8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80A0F2EC: -/* 0008C 80A0F2EC 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 00090 80A0F2F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 80A0F2F4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00098 80A0F2F8 0C00B58B */ jal Actor_SetScale - -/* 0009C 80A0F2FC E6040160 */ swc1 $f4, 0x0160($s0) ## 00000160 -/* 000A0 80A0F300 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 000A4 80A0F304 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000A8 80A0F308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000AC 80A0F30C 14410008 */ bne $v0, $at, .L80A0F330 -/* 000B0 80A0F310 3C0580A1 */ lui $a1, %hi(func_80A0F6F8) ## $a1 = 80A10000 -/* 000B4 80A0F314 0C283C98 */ jal func_80A0F260 -/* 000B8 80A0F318 24A5F6F8 */ addiu $a1, $a1, %lo(func_80A0F6F8) ## $a1 = 80A0F6F8 -/* 000BC 80A0F31C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 80A0F320 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 000C4 80A0F324 240538A2 */ addiu $a1, $zero, 0x38A2 ## $a1 = 000038A2 -/* 000C8 80A0F328 1000000F */ beq $zero, $zero, .L80A0F368 -/* 000CC 80A0F32C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A0F330: -/* 000D0 80A0F330 28410064 */ slti $at, $v0, 0x0064 -/* 000D4 80A0F334 1420000C */ bne $at, $zero, .L80A0F368 -/* 000D8 80A0F338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000DC 80A0F33C 3C0580A1 */ lui $a1, %hi(func_80A0FA90) ## $a1 = 80A10000 -/* 000E0 80A0F340 0C283C98 */ jal func_80A0F260 -/* 000E4 80A0F344 24A5FA90 */ addiu $a1, $a1, %lo(func_80A0FA90) ## $a1 = 80A0FA90 -/* 000E8 80A0F348 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 000EC 80A0F34C 8FB80038 */ lw $t8, 0x0038($sp) -/* 000F0 80A0F350 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 -/* 000F4 80A0F354 AB080000 */ swl $t0, 0x0000($t8) ## 00000000 -/* 000F8 80A0F358 BB080003 */ swr $t0, 0x0003($t8) ## 00000003 -/* 000FC 80A0F35C 96080034 */ lhu $t0, 0x0034($s0) ## 00000034 -/* 00100 80A0F360 A7080004 */ sh $t0, 0x0004($t8) ## 00000004 -/* 00104 80A0F364 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A0F368: -/* 00108 80A0F368 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 0010C 80A0F36C 1441000D */ bne $v0, $at, .L80A0F3A4 -/* 00110 80A0F370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 80A0F374 3C0580A1 */ lui $a1, %hi(func_80A0FC48) ## $a1 = 80A10000 -/* 00118 80A0F378 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 0011C 80A0F37C 0C283C98 */ jal func_80A0F260 -/* 00120 80A0F380 24A5FC48 */ addiu $a1, $a1, %lo(func_80A0FC48) ## $a1 = 80A0FC48 -/* 00124 80A0F384 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00128 80A0F388 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 0012C 80A0F38C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00130 80A0F390 240538A3 */ addiu $a1, $zero, 0x38A3 ## $a1 = 000038A3 -/* 00134 80A0F394 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00138 80A0F398 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 0013C 80A0F39C 100000B7 */ beq $zero, $zero, .L80A0F67C -/* 00140 80A0F3A0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A0F3A4: -/* 00144 80A0F3A4 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 -/* 00148 80A0F3A8 1441001E */ bne $v0, $at, .L80A0F424 -/* 0014C 80A0F3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00150 80A0F3B0 3C0580A1 */ lui $a1, %hi(func_80A0FD8C) ## $a1 = 80A10000 -/* 00154 80A0F3B4 0C283C98 */ jal func_80A0F260 -/* 00158 80A0F3B8 24A5FD8C */ addiu $a1, $a1, %lo(func_80A0FD8C) ## $a1 = 80A0FD8C -/* 0015C 80A0F3BC 860C0030 */ lh $t4, 0x0030($s0) ## 00000030 -/* 00160 80A0F3C0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00164 80A0F3C4 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 -/* 00168 80A0F3C8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0016C 80A0F3CC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00170 80A0F3D0 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 00174 80A0F3D4 46805020 */ cvt.s.w $f0, $f10 -/* 00178 80A0F3D8 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 0017C 80A0F3DC 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 00180 80A0F3E0 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 00184 80A0F3E4 A6090150 */ sh $t1, 0x0150($s0) ## 00000150 -/* 00188 80A0F3E8 A60A0152 */ sh $t2, 0x0152($s0) ## 00000152 -/* 0018C 80A0F3EC 46120103 */ div.s $f4, $f0, $f18 -/* 00190 80A0F3F0 A60B01FE */ sh $t3, 0x01FE($s0) ## 000001FE -/* 00194 80A0F3F4 3C0180A1 */ lui $at, %hi(D_80A119C4) ## $at = 80A10000 -/* 00198 80A0F3F8 E6080160 */ swc1 $f8, 0x0160($s0) ## 00000160 -/* 0019C 80A0F3FC E604018C */ swc1 $f4, 0x018C($s0) ## 0000018C -/* 001A0 80A0F400 C42619C4 */ lwc1 $f6, %lo(D_80A119C4)($at) -/* 001A4 80A0F404 A60001F4 */ sh $zero, 0x01F4($s0) ## 000001F4 -/* 001A8 80A0F408 46060202 */ mul.s $f8, $f0, $f6 -/* 001AC 80A0F40C 4600428D */ trunc.w.s $f10, $f8 -/* 001B0 80A0F410 44025000 */ mfc1 $v0, $f10 -/* 001B4 80A0F414 00000000 */ nop -/* 001B8 80A0F418 A60201F0 */ sh $v0, 0x01F0($s0) ## 000001F0 -/* 001BC 80A0F41C 10000096 */ beq $zero, $zero, .L80A0F678 -/* 001C0 80A0F420 A60201F2 */ sh $v0, 0x01F2($s0) ## 000001F2 -.L80A0F424: -/* 001C4 80A0F424 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 001C8 80A0F428 1441000F */ bne $v0, $at, .L80A0F468 -/* 001CC 80A0F42C 3C0480A1 */ lui $a0, %hi(D_80A11840) ## $a0 = 80A10000 -/* 001D0 80A0F430 0C00084C */ jal osSyncPrintf - -/* 001D4 80A0F434 24841840 */ addiu $a0, $a0, %lo(D_80A11840) ## $a0 = 80A11840 -/* 001D8 80A0F438 3C0580A1 */ lui $a1, %hi(func_80A10008) ## $a1 = 80A10000 -/* 001DC 80A0F43C 24A50008 */ addiu $a1, $a1, %lo(func_80A10008) ## $a1 = 80A10008 -/* 001E0 80A0F440 0C283C98 */ jal func_80A0F260 -/* 001E4 80A0F444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E8 80A0F448 3C0480A1 */ lui $a0, %hi(D_80A11854) ## $a0 = 80A10000 -/* 001EC 80A0F44C 0C00084C */ jal osSyncPrintf - -/* 001F0 80A0F450 24841854 */ addiu $a0, $a0, %lo(D_80A11854) ## $a0 = 80A11854 -/* 001F4 80A0F454 860E0030 */ lh $t6, 0x0030($s0) ## 00000030 -/* 001F8 80A0F458 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 001FC 80A0F45C A60E0150 */ sh $t6, 0x0150($s0) ## 00000150 -/* 00200 80A0F460 10000085 */ beq $zero, $zero, .L80A0F678 -/* 00204 80A0F464 A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 -.L80A0F468: -/* 00208 80A0F468 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 0020C 80A0F46C 10410006 */ beq $v0, $at, .L80A0F488 -/* 00210 80A0F470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00214 80A0F474 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 00218 80A0F478 10410003 */ beq $v0, $at, .L80A0F488 -/* 0021C 80A0F47C 24010029 */ addiu $at, $zero, 0x0029 ## $at = 00000029 -/* 00220 80A0F480 5441001B */ bnel $v0, $at, .L80A0F4F0 -/* 00224 80A0F484 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -.L80A0F488: -/* 00228 80A0F488 0C00B58B */ jal Actor_SetScale - -/* 0022C 80A0F48C 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 00230 80A0F490 3C0580A1 */ lui $a1, %hi(func_80A10F18) ## $a1 = 80A10000 -/* 00234 80A0F494 24A50F18 */ addiu $a1, $a1, %lo(func_80A10F18) ## $a1 = 80A10F18 -/* 00238 80A0F498 0C283C98 */ jal func_80A0F260 -/* 0023C 80A0F49C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00240 80A0F4A0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00244 80A0F4A4 24010029 */ addiu $at, $zero, 0x0029 ## $at = 00000029 -/* 00248 80A0F4A8 2408004C */ addiu $t0, $zero, 0x004C ## $t0 = 0000004C -/* 0024C 80A0F4AC 17010007 */ bne $t8, $at, .L80A0F4CC -/* 00250 80A0F4B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00254 80A0F4B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00258 80A0F4B8 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0025C 80A0F4BC 241901B8 */ addiu $t9, $zero, 0x01B8 ## $t9 = 000001B8 -/* 00260 80A0F4C0 A6190150 */ sh $t9, 0x0150($s0) ## 00000150 -/* 00264 80A0F4C4 1000006C */ beq $zero, $zero, .L80A0F678 -/* 00268 80A0F4C8 E6120058 */ swc1 $f18, 0x0058($s0) ## 00000058 -.L80A0F4CC: -/* 0026C 80A0F4CC A6080150 */ sh $t0, 0x0150($s0) ## 00000150 -/* 00270 80A0F4D0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00274 80A0F4D4 2405283F */ addiu $a1, $zero, 0x283F ## $a1 = 0000283F -/* 00278 80A0F4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0027C 80A0F4DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00280 80A0F4E0 24052853 */ addiu $a1, $zero, 0x2853 ## $a1 = 00002853 -/* 00284 80A0F4E4 10000065 */ beq $zero, $zero, .L80A0F67C -/* 00288 80A0F4E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0028C 80A0F4EC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -.L80A0F4F0: -/* 00290 80A0F4F0 14410061 */ bne $v0, $at, .L80A0F678 -/* 00294 80A0F4F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00298 80A0F4F8 86090030 */ lh $t1, 0x0030($s0) ## 00000030 -/* 0029C 80A0F4FC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 002A0 80A0F500 3C0580A1 */ lui $a1, %hi(func_80A10220) ## $a1 = 80A10000 -/* 002A4 80A0F504 55200006 */ bnel $t1, $zero, .L80A0F520 -/* 002A8 80A0F508 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 002AC 80A0F50C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 002B0 80A0F510 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 002B4 80A0F514 10000004 */ beq $zero, $zero, .L80A0F528 -/* 002B8 80A0F518 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 002BC 80A0F51C 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -.L80A0F520: -/* 002C0 80A0F520 00000000 */ nop -/* 002C4 80A0F524 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80A0F528: -/* 002C8 80A0F528 0C283C98 */ jal func_80A0F260 -/* 002CC 80A0F52C 24A50220 */ addiu $a1, $a1, %lo(func_80A10220) ## $a1 = 80A10220 -/* 002D0 80A0F530 8FA2004C */ lw $v0, 0x004C($sp) -/* 002D4 80A0F534 240A0046 */ addiu $t2, $zero, 0x0046 ## $t2 = 00000046 -/* 002D8 80A0F538 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 002DC 80A0F53C A60A0150 */ sh $t2, 0x0150($s0) ## 00000150 -/* 002E0 80A0F540 A60B0152 */ sh $t3, 0x0152($s0) ## 00000152 -/* 002E4 80A0F544 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 002E8 80A0F548 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 002EC 80A0F54C 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 002F0 80A0F550 C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 002F4 80A0F554 C4520028 */ lwc1 $f18, 0x0028($v0) ## 00000028 -/* 002F8 80A0F558 460A4301 */ sub.s $f12, $f8, $f10 -/* 002FC 80A0F55C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00300 80A0F560 46049180 */ add.s $f6, $f18, $f4 -/* 00304 80A0F564 46083281 */ sub.s $f10, $f6, $f8 -/* 00308 80A0F568 E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 0030C 80A0F56C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00310 80A0F570 C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 00314 80A0F574 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 00318 80A0F578 46049381 */ sub.s $f14, $f18, $f4 -/* 0031C 80A0F57C 0C03F494 */ jal Math_atan2f -/* 00320 80A0F580 E7AE0040 */ swc1 $f14, 0x0040($sp) -/* 00324 80A0F584 3C0180A1 */ lui $at, %hi(D_80A119C8) ## $at = 80A10000 -/* 00328 80A0F588 C42619C8 */ lwc1 $f6, %lo(D_80A119C8)($at) -/* 0032C 80A0F58C C7A20048 */ lwc1 $f2, 0x0048($sp) -/* 00330 80A0F590 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 00334 80A0F594 46060202 */ mul.s $f8, $f0, $f6 -/* 00338 80A0F598 00000000 */ nop -/* 0033C 80A0F59C 46021482 */ mul.s $f18, $f2, $f2 -/* 00340 80A0F5A0 00000000 */ nop -/* 00344 80A0F5A4 46108102 */ mul.s $f4, $f16, $f16 -/* 00348 80A0F5A8 4600428D */ trunc.w.s $f10, $f8 -/* 0034C 80A0F5AC 46049000 */ add.s $f0, $f18, $f4 -/* 00350 80A0F5B0 440D5000 */ mfc1 $t5, $f10 -/* 00354 80A0F5B4 00000000 */ nop -/* 00358 80A0F5B8 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 0035C 80A0F5BC 46000384 */ sqrt.s $f14, $f0 -/* 00360 80A0F5C0 0C03F494 */ jal Math_atan2f -/* 00364 80A0F5C4 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 00368 80A0F5C8 3C0180A1 */ lui $at, %hi(D_80A119CC) ## $at = 80A10000 -/* 0036C 80A0F5CC C42619CC */ lwc1 $f6, %lo(D_80A119CC)($at) -/* 00370 80A0F5D0 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 00374 80A0F5D4 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 00378 80A0F5D8 46060202 */ mul.s $f8, $f0, $f6 -/* 0037C 80A0F5DC 2408FFE7 */ addiu $t0, $zero, 0xFFE7 ## $t0 = FFFFFFE7 -/* 00380 80A0F5E0 A61801F0 */ sh $t8, 0x01F0($s0) ## 000001F0 -/* 00384 80A0F5E4 A61901F2 */ sh $t9, 0x01F2($s0) ## 000001F2 -/* 00388 80A0F5E8 A60801F4 */ sh $t0, 0x01F4($s0) ## 000001F4 -/* 0038C 80A0F5EC 260601A0 */ addiu $a2, $s0, 0x01A0 ## $a2 = 000001A0 -/* 00390 80A0F5F0 4600428D */ trunc.w.s $f10, $f8 -/* 00394 80A0F5F4 440F5000 */ mfc1 $t7, $f10 -/* 00398 80A0F5F8 00000000 */ nop -/* 0039C 80A0F5FC A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 -/* 003A0 80A0F600 8FA4005C */ lw $a0, 0x005C($sp) -/* 003A4 80A0F604 AFA60038 */ sw $a2, 0x0038($sp) -/* 003A8 80A0F608 0C01E9D9 */ jal Lights_Insert - -/* 003AC 80A0F60C 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 003B0 80A0F610 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 003B4 80A0F614 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 003B8 80A0F618 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 003BC 80A0F61C 4600910D */ trunc.w.s $f4, $f18 -/* 003C0 80A0F620 AE02019C */ sw $v0, 0x019C($s0) ## 0000019C -/* 003C4 80A0F624 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 003C8 80A0F628 4600320D */ trunc.w.s $f8, $f6 -/* 003CC 80A0F62C 44052000 */ mfc1 $a1, $f4 -/* 003D0 80A0F630 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 003D4 80A0F634 4600548D */ trunc.w.s $f18, $f10 -/* 003D8 80A0F638 44064000 */ mfc1 $a2, $f8 -/* 003DC 80A0F63C 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 003E0 80A0F640 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 003E4 80A0F644 44079000 */ mfc1 $a3, $f18 -/* 003E8 80A0F648 00052C00 */ sll $a1, $a1, 16 -/* 003EC 80A0F64C 00063400 */ sll $a2, $a2, 16 -/* 003F0 80A0F650 00073C00 */ sll $a3, $a3, 16 -/* 003F4 80A0F654 00073C03 */ sra $a3, $a3, 16 -/* 003F8 80A0F658 00063403 */ sra $a2, $a2, 16 -/* 003FC 80A0F65C 00052C03 */ sra $a1, $a1, 16 -/* 00400 80A0F660 AFB8001C */ sw $t8, 0x001C($sp) -/* 00404 80A0F664 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00408 80A0F668 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0040C 80A0F66C AFAD0010 */ sw $t5, 0x0010($sp) -/* 00410 80A0F670 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 00414 80A0F674 8FA40038 */ lw $a0, 0x0038($sp) -.L80A0F678: -/* 00418 80A0F678 8FBF002C */ lw $ra, 0x002C($sp) -.L80A0F67C: -/* 0041C 80A0F67C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00420 80A0F680 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00424 80A0F684 03E00008 */ jr $ra -/* 00428 80A0F688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s deleted file mode 100644 index e680213d19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnFhgFire_Update -/* 01E88 80A110E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E8C 80A110EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E90 80A110F0 848E0156 */ lh $t6, 0x0156($a0) ## 00000156 -/* 01E94 80A110F4 84820150 */ lh $v0, 0x0150($a0) ## 00000150 -/* 01E98 80A110F8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01E9C 80A110FC 10400003 */ beq $v0, $zero, .L80A1110C -/* 01EA0 80A11100 A48F0156 */ sh $t7, 0x0156($a0) ## 00000156 -/* 01EA4 80A11104 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 01EA8 80A11108 A4980150 */ sh $t8, 0x0150($a0) ## 00000150 -.L80A1110C: -/* 01EAC 80A1110C 84820152 */ lh $v0, 0x0152($a0) ## 00000152 -/* 01EB0 80A11110 10400002 */ beq $v0, $zero, .L80A1111C -/* 01EB4 80A11114 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01EB8 80A11118 A4990152 */ sh $t9, 0x0152($a0) ## 00000152 -.L80A1111C: -/* 01EBC 80A1111C 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 01EC0 80A11120 0320F809 */ jalr $ra, $t9 -/* 01EC4 80A11124 00000000 */ nop -/* 01EC8 80A11128 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01ECC 80A1112C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01ED0 80A11130 03E00008 */ jr $ra -/* 01ED4 80A11134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s deleted file mode 100644 index c4e857ed23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A0F260 -/* 00000 80A0F260 03E00008 */ jr $ra -/* 00004 80A0F264 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s deleted file mode 100644 index 8f4aa6c511..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s +++ /dev/null @@ -1,258 +0,0 @@ -.late_rodata -glabel D_80A119D0 - .word 0xBE4CCCCD - -.text -glabel func_80A0F6F8 -/* 00498 80A0F6F8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 0049C 80A0F6FC AFB10044 */ sw $s1, 0x0044($sp) -/* 004A0 80A0F700 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 004A4 80A0F704 AFB40050 */ sw $s4, 0x0050($sp) -/* 004A8 80A0F708 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 004AC 80A0F70C AFBF0054 */ sw $ra, 0x0054($sp) -/* 004B0 80A0F710 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004B4 80A0F714 AFB3004C */ sw $s3, 0x004C($sp) -/* 004B8 80A0F718 AFB20048 */ sw $s2, 0x0048($sp) -/* 004BC 80A0F71C AFB00040 */ sw $s0, 0x0040($sp) -/* 004C0 80A0F720 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 004C4 80A0F724 0C030129 */ jal Gameplay_GetCamera -/* 004C8 80A0F728 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004CC 80A0F72C 86230158 */ lh $v1, 0x0158($s1) ## 00000158 -/* 004D0 80A0F730 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 004D4 80A0F734 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 004D8 80A0F738 10600008 */ beq $v1, $zero, .L80A0F75C -/* 004DC 80A0F73C 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 004E0 80A0F740 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 004E4 80A0F744 10610008 */ beq $v1, $at, .L80A0F768 -/* 004E8 80A0F748 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 004EC 80A0F74C 1061006F */ beq $v1, $at, .L80A0F90C -/* 004F0 80A0F750 00000000 */ nop -/* 004F4 80A0F754 100000C3 */ beq $zero, $zero, .L80A0FA64 -/* 004F8 80A0F758 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0F75C: -/* 004FC 80A0F75C A62E0158 */ sh $t6, 0x0158($s1) ## 00000158 -/* 00500 80A0F760 100000BF */ beq $zero, $zero, .L80A0FA60 -/* 00504 80A0F764 A62F0150 */ sh $t7, 0x0150($s1) ## 00000150 -.L80A0F768: -/* 00508 80A0F768 0C016A52 */ jal func_8005A948 -/* 0050C 80A0F76C 00000000 */ nop -/* 00510 80A0F770 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00514 80A0F774 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00518 80A0F778 86390156 */ lh $t9, 0x0156($s1) ## 00000156 -/* 0051C 80A0F77C 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 00520 80A0F780 44050000 */ mfc1 $a1, $f0 -/* 00524 80A0F784 001943C0 */ sll $t0, $t9, 15 -/* 00528 80A0F788 01024821 */ addu $t1, $t0, $v0 -/* 0052C 80A0F78C 44060000 */ mfc1 $a2, $f0 -/* 00530 80A0F790 A62900B6 */ sh $t1, 0x00B6($s1) ## 000000B6 -/* 00534 80A0F794 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 00538 80A0F798 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0053C 80A0F79C 2624016C */ addiu $a0, $s1, 0x016C ## $a0 = 0000016C -/* 00540 80A0F7A0 862A0150 */ lh $t2, 0x0150($s1) ## 00000150 -/* 00544 80A0F7A4 240B000B */ addiu $t3, $zero, 0x000B ## $t3 = 0000000B -/* 00548 80A0F7A8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0054C 80A0F7AC 154000AC */ bne $t2, $zero, .L80A0FA60 -/* 00550 80A0F7B0 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 -/* 00554 80A0F7B4 862C00B8 */ lh $t4, 0x00B8($s1) ## 000000B8 -/* 00558 80A0F7B8 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 0055C 80A0F7BC C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 -/* 00560 80A0F7C0 01816821 */ addu $t5, $t4, $at -/* 00564 80A0F7C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00568 80A0F7C8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 0056C 80A0F7CC A62B0158 */ sh $t3, 0x0158($s1) ## 00000158 -/* 00570 80A0F7D0 A62D00B8 */ sh $t5, 0x00B8($s1) ## 000000B8 -/* 00574 80A0F7D4 46062201 */ sub.s $f8, $f4, $f6 -/* 00578 80A0F7D8 A62E0150 */ sh $t6, 0x0150($s1) ## 00000150 -/* 0057C 80A0F7DC 240F01F4 */ addiu $t7, $zero, 0x01F4 ## $t7 = 000001F4 -/* 00580 80A0F7E0 24180024 */ addiu $t8, $zero, 0x0024 ## $t8 = 00000024 -/* 00584 80A0F7E4 E6280028 */ swc1 $f8, 0x0028($s1) ## 00000028 -/* 00588 80A0F7E8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0058C 80A0F7EC C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 00590 80A0F7F0 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 -/* 00594 80A0F7F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00598 80A0F7F8 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 0059C 80A0F7FC C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 005A0 80A0F800 AFB80028 */ sw $t8, 0x0028($sp) -/* 005A4 80A0F804 AFA00024 */ sw $zero, 0x0024($sp) -/* 005A8 80A0F808 AFA00020 */ sw $zero, 0x0020($sp) -/* 005AC 80A0F80C AFAF001C */ sw $t7, 0x001C($sp) -/* 005B0 80A0F810 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 -/* 005B4 80A0F814 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 005B8 80A0F818 0C00C916 */ jal Actor_SpawnAttached - -/* 005BC 80A0F81C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 005C0 80A0F820 3C1980A1 */ lui $t9, %hi(D_80A117BC) ## $t9 = 80A10000 -/* 005C4 80A0F824 273917BC */ addiu $t9, $t9, %lo(D_80A117BC) ## $t9 = 80A117BC -/* 005C8 80A0F828 8F290000 */ lw $t1, 0x0000($t9) ## 80A117BC -/* 005CC 80A0F82C 27B30070 */ addiu $s3, $sp, 0x0070 ## $s3 = FFFFFFE0 -/* 005D0 80A0F830 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005D4 80A0F834 AE690000 */ sw $t1, 0x0000($s3) ## FFFFFFE0 -/* 005D8 80A0F838 8F280004 */ lw $t0, 0x0004($t9) ## 80A117C0 -/* 005DC 80A0F83C 4481A000 */ mtc1 $at, $f20 ## $f20 = 30.00 -/* 005E0 80A0F840 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 005E4 80A0F844 AE680004 */ sw $t0, 0x0004($s3) ## FFFFFFE4 -/* 005E8 80A0F848 8F290008 */ lw $t1, 0x0008($t9) ## 80A117C4 -/* 005EC 80A0F84C 26320024 */ addiu $s2, $s1, 0x0024 ## $s2 = 00000024 -/* 005F0 80A0F850 AE690008 */ sw $t1, 0x0008($s3) ## FFFFFFE8 -.L80A0F854: -/* 005F4 80A0F854 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 005F8 80A0F858 4600A306 */ mov.s $f12, $f20 -/* 005FC 80A0F85C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00600 80A0F860 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 00604 80A0F864 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00608 80A0F868 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 0060C 80A0F86C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00610 80A0F870 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 00614 80A0F874 4600A306 */ mov.s $f12, $f20 -/* 00618 80A0F878 46040180 */ add.s $f6, $f0, $f4 -/* 0061C 80A0F87C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00620 80A0F880 E7A60080 */ swc1 $f6, 0x0080($sp) -/* 00624 80A0F884 3C0180A1 */ lui $at, %hi(D_80A119D0) ## $at = 80A10000 -/* 00628 80A0F888 C42819D0 */ lwc1 $f8, %lo(D_80A119D0)($at) -/* 0062C 80A0F88C E7A00084 */ swc1 $f0, 0x0084($sp) -/* 00630 80A0F890 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00634 80A0F894 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 00638 80A0F898 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0063C 80A0F89C 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 00640 80A0F8A0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00644 80A0F8A4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000024 -/* 00648 80A0F8A8 460A0402 */ mul.s $f16, $f0, $f10 -/* 0064C 80A0F8AC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFEC -/* 00650 80A0F8B0 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFE0 -/* 00654 80A0F8B4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00658 80A0F8B8 4600848D */ trunc.w.s $f18, $f16 -/* 0065C 80A0F8BC 440B9000 */ mfc1 $t3, $f18 -/* 00660 80A0F8C0 00000000 */ nop -/* 00664 80A0F8C4 000B6400 */ sll $t4, $t3, 16 -/* 00668 80A0F8C8 000C6C03 */ sra $t5, $t4, 16 -/* 0066C 80A0F8CC 25AE00F0 */ addiu $t6, $t5, 0x00F0 ## $t6 = 000000F0 -/* 00670 80A0F8D0 0C00A73C */ jal func_80029CF0 -/* 00674 80A0F8D4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00678 80A0F8D8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0067C 80A0F8DC 00108400 */ sll $s0, $s0, 16 -/* 00680 80A0F8E0 00108403 */ sra $s0, $s0, 16 -/* 00684 80A0F8E4 2A010023 */ slti $at, $s0, 0x0023 -/* 00688 80A0F8E8 1420FFDA */ bne $at, $zero, .L80A0F854 -/* 0068C 80A0F8EC 00000000 */ nop -/* 00690 80A0F8F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00694 80A0F8F4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00698 80A0F8F8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0069C 80A0F8FC 0C00CFA2 */ jal func_80033E88 -/* 006A0 80A0F900 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 006A4 80A0F904 10000057 */ beq $zero, $zero, .L80A0FA64 -/* 006A8 80A0F908 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0F90C: -/* 006AC 80A0F90C 0C016A52 */ jal func_8005A948 -/* 006B0 80A0F910 00000000 */ nop -/* 006B4 80A0F914 86380156 */ lh $t8, 0x0156($s1) ## 00000156 -/* 006B8 80A0F918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 006BC 80A0F91C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 006C0 80A0F920 0018CBC0 */ sll $t9, $t8, 15 -/* 006C4 80A0F924 03224021 */ addu $t0, $t9, $v0 -/* 006C8 80A0F928 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 006CC 80A0F92C 44060000 */ mfc1 $a2, $f0 -/* 006D0 80A0F930 A62800B6 */ sh $t0, 0x00B6($s1) ## 000000B6 -/* 006D4 80A0F934 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 006D8 80A0F938 2624016C */ addiu $a0, $s1, 0x016C ## $a0 = 0000016C -/* 006DC 80A0F93C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 006E0 80A0F940 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 006E4 80A0F944 86220150 */ lh $v0, 0x0150($s1) ## 00000150 -/* 006E8 80A0F948 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 006EC 80A0F94C 14410040 */ bne $v0, $at, .L80A0FA50 -/* 006F0 80A0F950 00000000 */ nop -/* 006F4 80A0F954 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 006F8 80A0F958 00000000 */ nop -/* 006FC 80A0F95C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00700 80A0F960 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00704 80A0F964 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00708 80A0F968 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0070C 80A0F96C 4604003C */ c.lt.s $f0, $f4 -/* 00710 80A0F970 26931C24 */ addiu $s3, $s4, 0x1C24 ## $s3 = 00001C24 -/* 00714 80A0F974 45000003 */ bc1f .L80A0F984 -/* 00718 80A0F978 00000000 */ nop -/* 0071C 80A0F97C 10000001 */ beq $zero, $zero, .L80A0F984 -/* 00720 80A0F980 24121000 */ addiu $s2, $zero, 0x1000 ## $s2 = 00001000 -.L80A0F984: -/* 00724 80A0F984 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -.L80A0F988: -/* 00728 80A0F988 00104B40 */ sll $t1, $s0, 13 -/* 0072C 80A0F98C 01325021 */ addu $t2, $t1, $s2 -/* 00730 80A0F990 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00734 80A0F994 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 00738 80A0F998 240B4000 */ addiu $t3, $zero, 0x4000 ## $t3 = 00004000 -/* 0073C 80A0F99C 260C0064 */ addiu $t4, $s0, 0x0064 ## $t4 = 00000064 -/* 00740 80A0F9A0 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00744 80A0F9A4 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 00748 80A0F9A8 AFAC0028 */ sw $t4, 0x0028($sp) -/* 0074C 80A0F9AC AFAB0024 */ sw $t3, 0x0024($sp) -/* 00750 80A0F9B0 AFAA0020 */ sw $t2, 0x0020($sp) -/* 00754 80A0F9B4 AFA0001C */ sw $zero, 0x001C($sp) -/* 00758 80A0F9B8 02602025 */ or $a0, $s3, $zero ## $a0 = 00001C24 -/* 0075C 80A0F9BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00760 80A0F9C0 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 -/* 00764 80A0F9C4 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 00768 80A0F9C8 0C00C916 */ jal Actor_SpawnAttached - -/* 0076C 80A0F9CC E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00770 80A0F9D0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00774 80A0F9D4 00108400 */ sll $s0, $s0, 16 -/* 00778 80A0F9D8 00108403 */ sra $s0, $s0, 16 -/* 0077C 80A0F9DC 2A010008 */ slti $at, $s0, 0x0008 -/* 00780 80A0F9E0 5420FFE9 */ bnel $at, $zero, .L80A0F988 -/* 00784 80A0F9E4 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 00788 80A0F9E8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0078C 80A0F9EC C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -.L80A0F9F0: -/* 00790 80A0F9F0 00106B40 */ sll $t5, $s0, 13 -/* 00794 80A0F9F4 01B27021 */ addu $t6, $t5, $s2 -/* 00798 80A0F9F8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0079C 80A0F9FC C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 007A0 80A0FA00 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 -/* 007A4 80A0FA04 02602025 */ or $a0, $s3, $zero ## $a0 = 00001C24 -/* 007A8 80A0FA08 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 007AC 80A0FA0C C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 007B0 80A0FA10 AFAF0028 */ sw $t7, 0x0028($sp) -/* 007B4 80A0FA14 AFA00024 */ sw $zero, 0x0024($sp) -/* 007B8 80A0FA18 AFAE0020 */ sw $t6, 0x0020($sp) -/* 007BC 80A0FA1C AFA0001C */ sw $zero, 0x001C($sp) -/* 007C0 80A0FA20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 007C4 80A0FA24 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 -/* 007C8 80A0FA28 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 007CC 80A0FA2C 0C00C916 */ jal Actor_SpawnAttached - -/* 007D0 80A0FA30 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 007D4 80A0FA34 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 007D8 80A0FA38 00108400 */ sll $s0, $s0, 16 -/* 007DC 80A0FA3C 00108403 */ sra $s0, $s0, 16 -/* 007E0 80A0FA40 2A010008 */ slti $at, $s0, 0x0008 -/* 007E4 80A0FA44 5420FFEA */ bnel $at, $zero, .L80A0F9F0 -/* 007E8 80A0FA48 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 007EC 80A0FA4C 86220150 */ lh $v0, 0x0150($s1) ## 00000150 -.L80A0FA50: -/* 007F0 80A0FA50 54400004 */ bnel $v0, $zero, .L80A0FA64 -/* 007F4 80A0FA54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007F8 80A0FA58 0C00B55C */ jal Actor_Kill - -/* 007FC 80A0FA5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0FA60: -/* 00800 80A0FA60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0FA64: -/* 00804 80A0FA64 0C00B58B */ jal Actor_SetScale - -/* 00808 80A0FA68 8E25016C */ lw $a1, 0x016C($s1) ## 0000016C -/* 0080C 80A0FA6C 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00810 80A0FA70 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 00814 80A0FA74 8FB00040 */ lw $s0, 0x0040($sp) -/* 00818 80A0FA78 8FB10044 */ lw $s1, 0x0044($sp) -/* 0081C 80A0FA7C 8FB20048 */ lw $s2, 0x0048($sp) -/* 00820 80A0FA80 8FB3004C */ lw $s3, 0x004C($sp) -/* 00824 80A0FA84 8FB40050 */ lw $s4, 0x0050($sp) -/* 00828 80A0FA88 03E00008 */ jr $ra -/* 0082C 80A0FA8C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s deleted file mode 100644 index 0996d40288..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s +++ /dev/null @@ -1,137 +0,0 @@ -.rdata -glabel D_80A11868 - .asciz "FF MOVE 1\n" - .balign 4 - -glabel D_80A11874 - .asciz "FF MOVE 2\n" - .balign 4 - -.text -glabel func_80A0FA90 -/* 00830 80A0FA90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00834 80A0FA94 AFB00018 */ sw $s0, 0x0018($sp) -/* 00838 80A0FA98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0083C 80A0FA9C AFBF001C */ sw $ra, 0x001C($sp) -/* 00840 80A0FAA0 3C0480A1 */ lui $a0, %hi(D_80A11868) ## $a0 = 80A10000 -/* 00844 80A0FAA4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00848 80A0FAA8 0C00084C */ jal osSyncPrintf - -/* 0084C 80A0FAAC 24841868 */ addiu $a0, $a0, %lo(D_80A11868) ## $a0 = 80A11868 -/* 00850 80A0FAB0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00854 80A0FAB4 00000000 */ nop -/* 00858 80A0FAB8 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 0085C 80A0FABC 44812000 */ mtc1 $at, $f4 ## $f4 = 4000.00 -/* 00860 80A0FAC0 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00864 80A0FAC4 86020158 */ lh $v0, 0x0158($s0) ## 00000158 -/* 00868 80A0FAC8 46040182 */ mul.s $f6, $f0, $f4 -/* 0086C 80A0FACC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00870 80A0FAD0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00874 80A0FAD4 4600320D */ trunc.w.s $f8, $f6 -/* 00878 80A0FAD8 44084000 */ mfc1 $t0, $f8 -/* 0087C 80A0FADC 00000000 */ nop -/* 00880 80A0FAE0 01C84821 */ addu $t1, $t6, $t0 -/* 00884 80A0FAE4 252A4000 */ addiu $t2, $t1, 0x4000 ## $t2 = 00004000 -/* 00888 80A0FAE8 10400007 */ beq $v0, $zero, .L80A0FB08 -/* 0088C 80A0FAEC A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 00890 80A0FAF0 10410010 */ beq $v0, $at, .L80A0FB34 -/* 00894 80A0FAF4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00898 80A0FAF8 10410036 */ beq $v0, $at, .L80A0FBD4 -/* 0089C 80A0FAFC 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 008A0 80A0FB00 1000003E */ beq $zero, $zero, .L80A0FBFC -/* 008A4 80A0FB04 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -.L80A0FB08: -/* 008A8 80A0FB08 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008AC 80A0FB0C A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 -/* 008B0 80A0FB10 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 008B4 80A0FB14 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 -/* 008B8 80A0FB18 00000000 */ nop -/* 008BC 80A0FB1C 460A0402 */ mul.s $f16, $f0, $f10 -/* 008C0 80A0FB20 4600848D */ trunc.w.s $f18, $f16 -/* 008C4 80A0FB24 44189000 */ mfc1 $t8, $f18 -/* 008C8 80A0FB28 00000000 */ nop -/* 008CC 80A0FB2C 27190007 */ addiu $t9, $t8, 0x0007 ## $t9 = 00000007 -/* 008D0 80A0FB30 A6190150 */ sh $t9, 0x0150($s0) ## 00000150 -.L80A0FB34: -/* 008D4 80A0FB34 3C053FD9 */ lui $a1, 0x3FD9 ## $a1 = 3FD90000 -/* 008D8 80A0FB38 3C073EAE */ lui $a3, 0x3EAE ## $a3 = 3EAE0000 -/* 008DC 80A0FB3C 34E7147B */ ori $a3, $a3, 0x147B ## $a3 = 3EAE147B -/* 008E0 80A0FB40 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3FD9999A -/* 008E4 80A0FB44 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 008E8 80A0FB48 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 008EC 80A0FB4C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008F0 80A0FB50 860E0150 */ lh $t6, 0x0150($s0) ## 00000150 -/* 008F4 80A0FB54 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 008F8 80A0FB58 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 008FC 80A0FB5C 15C0001B */ bne $t6, $zero, .L80A0FBCC -/* 00900 80A0FB60 00000000 */ nop -/* 00904 80A0FB64 A6080158 */ sh $t0, 0x0158($s0) ## 00000158 -/* 00908 80A0FB68 A6090150 */ sh $t1, 0x0150($s0) ## 00000150 -/* 0090C 80A0FB6C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00910 80A0FB70 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00914 80A0FB74 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 00918 80A0FB78 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 -/* 0091C 80A0FB7C C608016C */ lwc1 $f8, 0x016C($s0) ## 0000016C -/* 00920 80A0FB80 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00924 80A0FB84 46040182 */ mul.s $f6, $f0, $f4 -/* 00928 80A0FB88 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0092C 80A0FB8C 46083282 */ mul.s $f10, $f6, $f8 -/* 00930 80A0FB90 460A8480 */ add.s $f18, $f16, $f10 -/* 00934 80A0FB94 0C01DE0D */ jal Math_Coss - ## coss? -/* 00938 80A0FB98 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 0093C 80A0FB9C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00940 80A0FBA0 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 00944 80A0FBA4 C608016C */ lwc1 $f8, 0x016C($s0) ## 0000016C -/* 00948 80A0FBA8 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 0094C 80A0FBAC 46040182 */ mul.s $f6, $f0, $f4 -/* 00950 80A0FBB0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 00954 80A0FBB4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00958 80A0FBB8 01415821 */ addu $t3, $t2, $at -/* 0095C 80A0FBBC A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 00960 80A0FBC0 46083402 */ mul.s $f16, $f6, $f8 -/* 00964 80A0FBC4 46105480 */ add.s $f18, $f10, $f16 -/* 00968 80A0FBC8 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -.L80A0FBCC: -/* 0096C 80A0FBCC 1000000B */ beq $zero, $zero, .L80A0FBFC -/* 00970 80A0FBD0 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -.L80A0FBD4: -/* 00974 80A0FBD4 3C063EAE */ lui $a2, 0x3EAE ## $a2 = 3EAE0000 -/* 00978 80A0FBD8 34C6147B */ ori $a2, $a2, 0x147B ## $a2 = 3EAE147B -/* 0097C 80A0FBDC 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00980 80A0FBE0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00984 80A0FBE4 860C0150 */ lh $t4, 0x0150($s0) ## 00000150 -/* 00988 80A0FBE8 55800004 */ bnel $t4, $zero, .L80A0FBFC -/* 0098C 80A0FBEC C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -/* 00990 80A0FBF0 0C00B55C */ jal Actor_Kill - -/* 00994 80A0FBF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00998 80A0FBF8 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -.L80A0FBFC: -/* 0099C 80A0FBFC 44050000 */ mfc1 $a1, $f0 -/* 009A0 80A0FC00 0C00B58B */ jal Actor_SetScale - -/* 009A4 80A0FC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009A8 80A0FC08 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 009AC 80A0FC0C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 009B0 80A0FC10 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 009B4 80A0FC14 3C0480A1 */ lui $a0, %hi(D_80A11874) ## $a0 = 80A10000 -/* 009B8 80A0FC18 4604003C */ c.lt.s $f0, $f4 -/* 009BC 80A0FC1C 00000000 */ nop -/* 009C0 80A0FC20 45000002 */ bc1f .L80A0FC2C -/* 009C4 80A0FC24 00000000 */ nop -/* 009C8 80A0FC28 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -.L80A0FC2C: -/* 009CC 80A0FC2C 0C00084C */ jal osSyncPrintf - -/* 009D0 80A0FC30 24841874 */ addiu $a0, $a0, %lo(D_80A11874) ## $a0 = 80A11874 -/* 009D4 80A0FC34 8FBF001C */ lw $ra, 0x001C($sp) -/* 009D8 80A0FC38 8FB00018 */ lw $s0, 0x0018($sp) -/* 009DC 80A0FC3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 009E0 80A0FC40 03E00008 */ jr $ra -/* 009E4 80A0FC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s deleted file mode 100644 index eee2e43e0e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80A0FC48 -/* 009E8 80A0FC48 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 009EC 80A0FC4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 009F0 80A0FC50 AFB10020 */ sw $s1, 0x0020($sp) -/* 009F4 80A0FC54 AFB0001C */ sw $s0, 0x001C($sp) -/* 009F8 80A0FC58 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 009FC 80A0FC5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A00 80A0FC60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A04 80A0FC64 AFAE003C */ sw $t6, 0x003C($sp) -/* 00A08 80A0FC68 908201C0 */ lbu $v0, 0x01C0($a0) ## 000001C0 -/* 00A0C 80A0FC6C 240538A8 */ addiu $a1, $zero, 0x38A8 ## $a1 = 000038A8 -/* 00A10 80A0FC70 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 00A14 80A0FC74 11E00003 */ beq $t7, $zero, .L80A0FC84 -/* 00A18 80A0FC78 3058FFFD */ andi $t8, $v0, 0xFFFD ## $t8 = 00000000 -/* 00A1C 80A0FC7C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A20 80A0FC80 A09801C0 */ sb $t8, 0x01C0($a0) ## 000001C0 -.L80A0FC84: -/* 00A24 80A0FC84 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A28 80A0FC88 00000000 */ nop -/* 00A2C 80A0FC8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00A30 80A0FC90 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00A34 80A0FC94 00000000 */ nop -/* 00A38 80A0FC98 4604003C */ c.lt.s $f0, $f4 -/* 00A3C 80A0FC9C 00000000 */ nop -/* 00A40 80A0FCA0 45000012 */ bc1f .L80A0FCEC -/* 00A44 80A0FCA4 00000000 */ nop -/* 00A48 80A0FCA8 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 -/* 00A4C 80A0FCAC 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 -/* 00A50 80A0FCB0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00A54 80A0FCB4 ACC80000 */ sw $t0, 0x0000($a2) ## FFFFFFF0 -/* 00A58 80A0FCB8 8E190028 */ lw $t9, 0x0028($s0) ## 00000028 -/* 00A5C 80A0FCBC 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 00A60 80A0FCC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A64 80A0FCC4 ACD90004 */ sw $t9, 0x0004($a2) ## FFFFFFF4 -/* 00A68 80A0FCC8 8E08002C */ lw $t0, 0x002C($s0) ## 0000002C -/* 00A6C 80A0FCCC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A70 80A0FCD0 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 00A74 80A0FCD4 ACC80008 */ sw $t0, 0x0008($a2) ## FFFFFFF8 -/* 00A78 80A0FCD8 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00A7C 80A0FCDC AFA00010 */ sw $zero, 0x0010($sp) -/* 00A80 80A0FCE0 46083281 */ sub.s $f10, $f6, $f8 -/* 00A84 80A0FCE4 0C00A757 */ jal func_80029D5C -/* 00A88 80A0FCE8 E7AA0034 */ swc1 $f10, 0x0034($sp) -.L80A0FCEC: -/* 00A8C 80A0FCEC 0C00B638 */ jal Actor_MoveForward - -/* 00A90 80A0FCF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A94 80A0FCF4 260601B0 */ addiu $a2, $s0, 0x01B0 ## $a2 = 000001B0 -/* 00A98 80A0FCF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B0 -/* 00A9C 80A0FCFC AFA6002C */ sw $a2, 0x002C($sp) -/* 00AA0 80A0FD00 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00AA4 80A0FD04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA8 80A0FD08 8FA9003C */ lw $t1, 0x003C($sp) -/* 00AAC 80A0FD0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00AB0 80A0FD10 8FA6002C */ lw $a2, 0x002C($sp) -/* 00AB4 80A0FD14 812A0A78 */ lb $t2, 0x0A78($t1) ## 00000A78 -/* 00AB8 80A0FD18 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00ABC 80A0FD1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AC0 80A0FD20 55400004 */ bnel $t2, $zero, .L80A0FD34 -/* 00AC4 80A0FD24 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00AC8 80A0FD28 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00ACC 80A0FD2C 02212821 */ addu $a1, $s1, $at -/* 00AD0 80A0FD30 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L80A0FD34: -/* 00AD4 80A0FD34 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 00AD8 80A0FD38 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00ADC 80A0FD3C 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 00AE0 80A0FD40 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00AE4 80A0FD44 44060000 */ mfc1 $a2, $f0 -/* 00AE8 80A0FD48 44070000 */ mfc1 $a3, $f0 -/* 00AEC 80A0FD4C AFAB0014 */ sw $t3, 0x0014($sp) -/* 00AF0 80A0FD50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AF4 80A0FD54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AF8 80A0FD58 0C00B92D */ jal func_8002E4B4 -/* 00AFC 80A0FD5C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00B00 80A0FD60 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 00B04 80A0FD64 318D0008 */ andi $t5, $t4, 0x0008 ## $t5 = 00000000 -/* 00B08 80A0FD68 51A00004 */ beql $t5, $zero, .L80A0FD7C -/* 00B0C 80A0FD6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B10 80A0FD70 0C00B55C */ jal Actor_Kill - -/* 00B14 80A0FD74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B18 80A0FD78 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A0FD7C: -/* 00B1C 80A0FD7C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00B20 80A0FD80 8FB10020 */ lw $s1, 0x0020($sp) -/* 00B24 80A0FD84 03E00008 */ jr $ra -/* 00B28 80A0FD88 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s deleted file mode 100644 index 260d03b758..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s +++ /dev/null @@ -1,180 +0,0 @@ -glabel func_80A0FD8C -/* 00B2C 80A0FD8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B30 80A0FD90 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B34 80A0FD94 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B38 80A0FD98 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B3C 80A0FD9C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00B40 80A0FDA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B44 80A0FDA4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00B48 80A0FDA8 00250821 */ addu $at, $at, $a1 -/* 00B4C 80A0FDAC AFAE002C */ sw $t6, 0x002C($sp) -/* 00B50 80A0FDB0 A0280B05 */ sb $t0, 0x0B05($at) ## 00010B05 -/* 00B54 80A0FDB4 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00B58 80A0FDB8 84820152 */ lh $v0, 0x0152($a0) ## 00000152 -/* 00B5C 80A0FDBC 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 -/* 00B60 80A0FDC0 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 -/* 00B64 80A0FDC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B68 80A0FDC8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B6C 80A0FDCC 14410009 */ bne $v0, $at, .L80A0FDF4 -/* 00B70 80A0FDD0 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 00B74 80A0FDD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B78 80A0FDD8 00250821 */ addu $at, $at, $a1 -/* 00B7C 80A0FDDC A0280AE3 */ sb $t0, 0x0AE3($at) ## 00010AE3 -/* 00B80 80A0FDE0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B84 80A0FDE4 00250821 */ addu $at, $at, $a1 -/* 00B88 80A0FDE8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00B8C 80A0FDEC A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA -/* 00B90 80A0FDF0 84820152 */ lh $v0, 0x0152($a0) ## 00000152 -.L80A0FDF4: -/* 00B94 80A0FDF4 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 00B98 80A0FDF8 14410008 */ bne $v0, $at, .L80A0FE1C -/* 00B9C 80A0FDFC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 00BA0 80A0FE00 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BA4 80A0FE04 00310821 */ addu $at, $at, $s1 -/* 00BA8 80A0FE08 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 -/* 00BAC 80A0FE0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BB0 80A0FE10 00310821 */ addu $at, $at, $s1 -/* 00BB4 80A0FE14 A4290AFA */ sh $t1, 0x0AFA($at) ## 00010AFA -/* 00BB8 80A0FE18 86020152 */ lh $v0, 0x0152($s0) ## 00000152 -.L80A0FE1C: -/* 00BBC 80A0FE1C 28410030 */ slti $at, $v0, 0x0030 -/* 00BC0 80A0FE20 1420000F */ bne $at, $zero, .L80A0FE60 -/* 00BC4 80A0FE24 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00BC8 80A0FE28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BCC 80A0FE2C 02211021 */ addu $v0, $s1, $at -/* 00BD0 80A0FE30 A0430B08 */ sb $v1, 0x0B08($v0) ## 00000B08 -/* 00BD4 80A0FE34 A0430B07 */ sb $v1, 0x0B07($v0) ## 00000B07 -/* 00BD8 80A0FE38 A0430B06 */ sb $v1, 0x0B06($v0) ## 00000B06 -/* 00BDC 80A0FE3C 860B0150 */ lh $t3, 0x0150($s0) ## 00000150 -/* 00BE0 80A0FE40 240D0046 */ addiu $t5, $zero, 0x0046 ## $t5 = 00000046 -/* 00BE4 80A0FE44 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00BE8 80A0FE48 11800003 */ beq $t4, $zero, .L80A0FE58 -/* 00BEC 80A0FE4C 00000000 */ nop -/* 00BF0 80A0FE50 10000006 */ beq $zero, $zero, .L80A0FE6C -/* 00BF4 80A0FE54 A04D0B09 */ sb $t5, 0x0B09($v0) ## 00000B09 -.L80A0FE58: -/* 00BF8 80A0FE58 10000004 */ beq $zero, $zero, .L80A0FE6C -/* 00BFC 80A0FE5C A0400B09 */ sb $zero, 0x0B09($v0) ## 00000B09 -.L80A0FE60: -/* 00C00 80A0FE60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C04 80A0FE64 00310821 */ addu $at, $at, $s1 -/* 00C08 80A0FE68 A0200B09 */ sb $zero, 0x0B09($at) ## 00010B09 -.L80A0FE6C: -/* 00C0C 80A0FE6C 860E0150 */ lh $t6, 0x0150($s0) ## 00000150 -/* 00C10 80A0FE70 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 00C14 80A0FE74 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00C18 80A0FE78 29C10015 */ slti $at, $t6, 0x0015 -/* 00C1C 80A0FE7C 1020000B */ beq $at, $zero, .L80A0FEAC -/* 00C20 80A0FE80 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00C24 80A0FE84 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 00C28 80A0FE88 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00C2C 80A0FE8C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00C30 80A0FE90 3C064234 */ lui $a2, 0x4234 ## $a2 = 42340000 -/* 00C34 80A0FE94 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 00C38 80A0FE98 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00C3C 80A0FE9C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00C40 80A0FEA0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00C44 80A0FEA4 10000004 */ beq $zero, $zero, .L80A0FEB8 -/* 00C48 80A0FEA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A0FEAC: -/* 00C4C 80A0FEAC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00C50 80A0FEB0 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 00C54 80A0FEB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A0FEB8: -/* 00C58 80A0FEB8 0C00B58B */ jal Actor_SetScale - -/* 00C5C 80A0FEBC 8E05016C */ lw $a1, 0x016C($s0) ## 0000016C -/* 00C60 80A0FEC0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00C64 80A0FEC4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 00C68 80A0FEC8 C606018C */ lwc1 $f6, 0x018C($s0) ## 0000018C -/* 00C6C 80A0FECC 260601B0 */ addiu $a2, $s0, 0x01B0 ## $a2 = 000001B0 -/* 00C70 80A0FED0 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B0 -/* 00C74 80A0FED4 4606203C */ c.lt.s $f4, $f6 -/* 00C78 80A0FED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C7C 80A0FEDC 4502000E */ bc1fl .L80A0FF18 -/* 00C80 80A0FEE0 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -/* 00C84 80A0FEE4 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00C88 80A0FEE8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00C8C 80A0FEEC 8FAF002C */ lw $t7, 0x002C($sp) -/* 00C90 80A0FEF0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C94 80A0FEF4 8FA60024 */ lw $a2, 0x0024($sp) -/* 00C98 80A0FEF8 81F80A78 */ lb $t8, 0x0A78($t7) ## 00000A78 -/* 00C9C 80A0FEFC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00CA0 80A0FF00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CA4 80A0FF04 57000004 */ bnel $t8, $zero, .L80A0FF18 -/* 00CA8 80A0FF08 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -/* 00CAC 80A0FF0C 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00CB0 80A0FF10 02212821 */ addu $a1, $s1, $at -/* 00CB4 80A0FF14 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -.L80A0FF18: -/* 00CB8 80A0FF18 57200007 */ bnel $t9, $zero, .L80A0FF38 -/* 00CBC 80A0FF1C 860201FE */ lh $v0, 0x01FE($s0) ## 000001FE -/* 00CC0 80A0FF20 0C00B55C */ jal Actor_Kill - -/* 00CC4 80A0FF24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CC8 80A0FF28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00CCC 80A0FF2C 00310821 */ addu $at, $at, $s1 -/* 00CD0 80A0FF30 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 -/* 00CD4 80A0FF34 860201FE */ lh $v0, 0x01FE($s0) ## 000001FE -.L80A0FF38: -/* 00CD8 80A0FF38 26040200 */ addiu $a0, $s0, 0x0200 ## $a0 = 00000200 -/* 00CDC 80A0FF3C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00CE0 80A0FF40 1040000C */ beq $v0, $zero, .L80A0FF74 -/* 00CE4 80A0FF44 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 00CE8 80A0FF48 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00CEC 80A0FF4C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00CF0 80A0FF50 A60901FE */ sh $t1, 0x01FE($s0) ## 000001FE -/* 00CF4 80A0FF54 A20A01FC */ sb $t2, 0x01FC($s0) ## 000001FC -/* 00CF8 80A0FF58 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00CFC 80A0FF5C 26040200 */ addiu $a0, $s0, 0x0200 ## $a0 = 00000200 -/* 00D00 80A0FF60 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 00D04 80A0FF64 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00D08 80A0FF68 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00D0C 80A0FF6C 1000000B */ beq $zero, $zero, .L80A0FF9C -/* 00D10 80A0FF70 920B01FC */ lbu $t3, 0x01FC($s0) ## 000001FC -.L80A0FF74: -/* 00D14 80A0FF74 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00D18 80A0FF78 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00D1C 80A0FF7C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00D20 80A0FF80 C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 -/* 00D24 80A0FF84 460A4032 */ c.eq.s $f8, $f10 -/* 00D28 80A0FF88 00000000 */ nop -/* 00D2C 80A0FF8C 45020003 */ bc1fl .L80A0FF9C -/* 00D30 80A0FF90 920B01FC */ lbu $t3, 0x01FC($s0) ## 000001FC -/* 00D34 80A0FF94 A20001FC */ sb $zero, 0x01FC($s0) ## 000001FC -/* 00D38 80A0FF98 920B01FC */ lbu $t3, 0x01FC($s0) ## 000001FC -.L80A0FF9C: -/* 00D3C 80A0FF9C 3C018016 */ lui $at, %hi(D_8015FCF0) -/* 00D40 80A0FFA0 3C0C8016 */ lui $t4, %hi(D_8015FCF8) -/* 00D44 80A0FFA4 A02BFCF0 */ sb $t3, %lo(D_8015FCF0)($at) -/* 00D48 80A0FFA8 8E0E0024 */ lw $t6, 0x0024($s0) ## 00000024 -/* 00D4C 80A0FFAC 258CFCF8 */ addiu $t4, %lo(D_8015FCF8) -/* 00D50 80A0FFB0 3C018016 */ lui $at, %hi(D_8015FD06) -/* 00D54 80A0FFB4 AD8E0000 */ sw $t6, 0x0000($t4) ## 8015FCF8 -/* 00D58 80A0FFB8 8E0D0028 */ lw $t5, 0x0028($s0) ## 00000028 -/* 00D5C 80A0FFBC AD8D0004 */ sw $t5, 0x0004($t4) ## 8015FCFC -/* 00D60 80A0FFC0 8E0E002C */ lw $t6, 0x002C($s0) ## 0000002C -/* 00D64 80A0FFC4 AD8E0008 */ sw $t6, 0x0008($t4) ## 8015FD00 -/* 00D68 80A0FFC8 C6100200 */ lwc1 $f16, 0x0200($s0) ## 00000200 -/* 00D6C 80A0FFCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D70 80A0FFD0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00D74 80A0FFD4 4600848D */ trunc.w.s $f18, $f16 -/* 00D78 80A0FFD8 8FB10018 */ lw $s1, 0x0018($sp) -/* 00D7C 80A0FFDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D80 80A0FFE0 44189000 */ mfc1 $t8, $f18 -/* 00D84 80A0FFE4 00000000 */ nop -/* 00D88 80A0FFE8 A438FD06 */ sh $t8, %lo(D_8015FD06)($at) -/* 00D8C 80A0FFEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00D90 80A0FFF0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00D94 80A0FFF4 3C018016 */ lui $at, %hi(D_8015FD08) -/* 00D98 80A0FFF8 E424FD08 */ swc1 $f4, %lo(D_8015FD08)($at) -/* 00D9C 80A0FFFC 3C018016 */ lui $at, %hi(D_8015FD0C) -/* 00DA0 80A10000 03E00008 */ jr $ra -/* 00DA4 80A10004 A420FD0C */ sh $zero, %lo(D_8015FD0C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s deleted file mode 100644 index 16235991cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s +++ /dev/null @@ -1,171 +0,0 @@ -.rdata -glabel D_80A11880 - .asciz "yari hikari 1\n" - .balign 4 - -glabel D_80A11890 - .asciz "yari hikari 2\n" - .balign 4 - -glabel D_80A118A0 - .asciz "FLASH !!\n" - .balign 4 - -.late_rodata -glabel D_80A119D4 - .word 0x469C4000 -glabel D_80A119D8 - .word 0xBDA3D70A - -.text -glabel func_80A10008 -/* 00DA8 80A10008 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00DAC 80A1000C AFB10038 */ sw $s1, 0x0038($sp) -/* 00DB0 80A10010 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00DB4 80A10014 AFBF004C */ sw $ra, 0x004C($sp) -/* 00DB8 80A10018 AFB50048 */ sw $s5, 0x0048($sp) -/* 00DBC 80A1001C 3C0480A1 */ lui $a0, %hi(D_80A11880) ## $a0 = 80A10000 -/* 00DC0 80A10020 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 00DC4 80A10024 AFB40044 */ sw $s4, 0x0044($sp) -/* 00DC8 80A10028 AFB30040 */ sw $s3, 0x0040($sp) -/* 00DCC 80A1002C AFB2003C */ sw $s2, 0x003C($sp) -/* 00DD0 80A10030 AFB00034 */ sw $s0, 0x0034($sp) -/* 00DD4 80A10034 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00DD8 80A10038 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00DDC 80A1003C F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00DE0 80A10040 0C00084C */ jal osSyncPrintf - -/* 00DE4 80A10044 24841880 */ addiu $a0, $a0, %lo(D_80A11880) ## $a0 = 80A11880 -/* 00DE8 80A10048 862E0156 */ lh $t6, 0x0156($s1) ## 00000156 -/* 00DEC 80A1004C 8E300118 */ lw $s0, 0x0118($s1) ## 00000118 -/* 00DF0 80A10050 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00DF4 80A10054 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00DF8 80A10058 11E00005 */ beq $t7, $zero, .L80A10070 -/* 00DFC 80A1005C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E00 80A10060 0C00B58B */ jal Actor_SetScale - -/* 00E04 80A10064 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E08 80A10068 10000004 */ beq $zero, $zero, .L80A1007C -/* 00E0C 80A1006C 8E190200 */ lw $t9, 0x0200($s0) ## 00000200 -.L80A10070: -/* 00E10 80A10070 0C00B58B */ jal Actor_SetScale - -/* 00E14 80A10074 3C0540A8 */ lui $a1, 0x40A8 ## $a1 = 40A80000 -/* 00E18 80A10078 8E190200 */ lw $t9, 0x0200($s0) ## 00000200 -.L80A1007C: -/* 00E1C 80A1007C AE390024 */ sw $t9, 0x0024($s1) ## 00000024 -/* 00E20 80A10080 8E180204 */ lw $t8, 0x0204($s0) ## 00000204 -/* 00E24 80A10084 AE380028 */ sw $t8, 0x0028($s1) ## 00000028 -/* 00E28 80A10088 8E190208 */ lw $t9, 0x0208($s0) ## 00000208 -/* 00E2C 80A1008C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00E30 80A10090 AE39002C */ sw $t9, 0x002C($s1) ## 0000002C -/* 00E34 80A10094 3C0180A1 */ lui $at, %hi(D_80A119D4) ## $at = 80A10000 -/* 00E38 80A10098 C42419D4 */ lwc1 $f4, %lo(D_80A119D4)($at) -/* 00E3C 80A1009C 862800B8 */ lh $t0, 0x00B8($s1) ## 000000B8 -/* 00E40 80A100A0 3C0480A1 */ lui $a0, %hi(D_80A11890) ## $a0 = 80A10000 -/* 00E44 80A100A4 46040182 */ mul.s $f6, $f0, $f4 -/* 00E48 80A100A8 24841890 */ addiu $a0, $a0, %lo(D_80A11890) ## $a0 = 80A11890 -/* 00E4C 80A100AC 4600320D */ trunc.w.s $f8, $f6 -/* 00E50 80A100B0 440C4000 */ mfc1 $t4, $f8 -/* 00E54 80A100B4 00000000 */ nop -/* 00E58 80A100B8 010C6821 */ addu $t5, $t0, $t4 -/* 00E5C 80A100BC 25AE4000 */ addiu $t6, $t5, 0x4000 ## $t6 = 00004000 -/* 00E60 80A100C0 0C00084C */ jal osSyncPrintf - -/* 00E64 80A100C4 A62E00B8 */ sh $t6, 0x00B8($s1) ## 000000B8 -/* 00E68 80A100C8 862F0158 */ lh $t7, 0x0158($s1) ## 00000158 -/* 00E6C 80A100CC 3C1880A1 */ lui $t8, %hi(D_80A117C8) ## $t8 = 80A10000 -/* 00E70 80A100D0 271817C8 */ addiu $t8, $t8, %lo(D_80A117C8) ## $t8 = 80A117C8 -/* 00E74 80A100D4 55E00042 */ bnel $t7, $zero, .L80A101E0 -/* 00E78 80A100D8 86390150 */ lh $t9, 0x0150($s1) ## 00000150 -/* 00E7C 80A100DC 8F090000 */ lw $t1, 0x0000($t8) ## 80A117C8 -/* 00E80 80A100E0 27B20060 */ addiu $s2, $sp, 0x0060 ## $s2 = FFFFFFE0 -/* 00E84 80A100E4 3C0A80A1 */ lui $t2, %hi(D_80A117D4) ## $t2 = 80A10000 -/* 00E88 80A100E8 AE490000 */ sw $t1, 0x0000($s2) ## FFFFFFE0 -/* 00E8C 80A100EC 8F190004 */ lw $t9, 0x0004($t8) ## 80A117CC -/* 00E90 80A100F0 254A17D4 */ addiu $t2, $t2, %lo(D_80A117D4) ## $t2 = 80A117D4 -/* 00E94 80A100F4 27B30054 */ addiu $s3, $sp, 0x0054 ## $s3 = FFFFFFD4 -/* 00E98 80A100F8 AE590004 */ sw $t9, 0x0004($s2) ## FFFFFFE4 -/* 00E9C 80A100FC 8F090008 */ lw $t1, 0x0008($t8) ## 80A117D0 -/* 00EA0 80A10100 3C0480A1 */ lui $a0, %hi(D_80A118A0) ## $a0 = 80A10000 -/* 00EA4 80A10104 248418A0 */ addiu $a0, $a0, %lo(D_80A118A0) ## $a0 = 80A118A0 -/* 00EA8 80A10108 AE490008 */ sw $t1, 0x0008($s2) ## FFFFFFE8 -/* 00EAC 80A1010C 8D480000 */ lw $t0, 0x0000($t2) ## 80A117D4 -/* 00EB0 80A10110 AE680000 */ sw $t0, 0x0000($s3) ## FFFFFFD4 -/* 00EB4 80A10114 8D4B0004 */ lw $t3, 0x0004($t2) ## 80A117D8 -/* 00EB8 80A10118 AE6B0004 */ sw $t3, 0x0004($s3) ## FFFFFFD8 -/* 00EBC 80A1011C 8D480008 */ lw $t0, 0x0008($t2) ## 80A117DC -/* 00EC0 80A10120 0C00084C */ jal osSyncPrintf - -/* 00EC4 80A10124 AE680008 */ sw $t0, 0x0008($s3) ## FFFFFFDC -/* 00EC8 80A10128 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00ECC 80A1012C 4481C000 */ mtc1 $at, $f24 ## $f24 = 80.00 -/* 00ED0 80A10130 3C0180A1 */ lui $at, %hi(D_80A119D8) ## $at = 80A10000 -/* 00ED4 80A10134 C43619D8 */ lwc1 $f22, %lo(D_80A119D8)($at) -/* 00ED8 80A10138 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00EDC 80A1013C 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 00EE0 80A10140 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00EE4 80A10144 27B4006C */ addiu $s4, $sp, 0x006C ## $s4 = FFFFFFEC -.L80A10148: -/* 00EE8 80A10148 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00EEC 80A1014C 4600A306 */ mov.s $f12, $f20 -/* 00EF0 80A10150 C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 -/* 00EF4 80A10154 4600A306 */ mov.s $f12, $f20 -/* 00EF8 80A10158 460A0400 */ add.s $f16, $f0, $f10 -/* 00EFC 80A1015C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00F00 80A10160 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 00F04 80A10164 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 00F08 80A10168 4600A306 */ mov.s $f12, $f20 -/* 00F0C 80A1016C 46120100 */ add.s $f4, $f0, $f18 -/* 00F10 80A10170 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00F14 80A10174 E7A40070 */ swc1 $f4, 0x0070($sp) -/* 00F18 80A10178 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 00F1C 80A1017C E7B60058 */ swc1 $f22, 0x0058($sp) -/* 00F20 80A10180 46060200 */ add.s $f8, $f0, $f6 -/* 00F24 80A10184 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00F28 80A10188 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 00F2C 80A1018C 46180282 */ mul.s $f10, $f0, $f24 -/* 00F30 80A10190 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00F34 80A10194 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFEC -/* 00F38 80A10198 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE0 -/* 00F3C 80A1019C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFD4 -/* 00F40 80A101A0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F44 80A101A4 4600540D */ trunc.w.s $f16, $f10 -/* 00F48 80A101A8 440D8000 */ mfc1 $t5, $f16 -/* 00F4C 80A101AC 00000000 */ nop -/* 00F50 80A101B0 000D7400 */ sll $t6, $t5, 16 -/* 00F54 80A101B4 000E7C03 */ sra $t7, $t6, 16 -/* 00F58 80A101B8 25F80096 */ addiu $t8, $t7, 0x0096 ## $t8 = 00000096 -/* 00F5C 80A101BC 0C00A73C */ jal func_80029CF0 -/* 00F60 80A101C0 AFB80010 */ sw $t8, 0x0010($sp) -/* 00F64 80A101C4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00F68 80A101C8 00108400 */ sll $s0, $s0, 16 -/* 00F6C 80A101CC 00108403 */ sra $s0, $s0, 16 -/* 00F70 80A101D0 2A010002 */ slti $at, $s0, 0x0002 -/* 00F74 80A101D4 1420FFDC */ bne $at, $zero, .L80A10148 -/* 00F78 80A101D8 00000000 */ nop -/* 00F7C 80A101DC 86390150 */ lh $t9, 0x0150($s1) ## 00000150 -.L80A101E0: -/* 00F80 80A101E0 57200004 */ bnel $t9, $zero, .L80A101F4 -/* 00F84 80A101E4 8FBF004C */ lw $ra, 0x004C($sp) -/* 00F88 80A101E8 0C00B55C */ jal Actor_Kill - -/* 00F8C 80A101EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F90 80A101F0 8FBF004C */ lw $ra, 0x004C($sp) -.L80A101F4: -/* 00F94 80A101F4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00F98 80A101F8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00F9C 80A101FC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 00FA0 80A10200 8FB00034 */ lw $s0, 0x0034($sp) -/* 00FA4 80A10204 8FB10038 */ lw $s1, 0x0038($sp) -/* 00FA8 80A10208 8FB2003C */ lw $s2, 0x003C($sp) -/* 00FAC 80A1020C 8FB30040 */ lw $s3, 0x0040($sp) -/* 00FB0 80A10210 8FB40044 */ lw $s4, 0x0044($sp) -/* 00FB4 80A10214 8FB50048 */ lw $s5, 0x0048($sp) -/* 00FB8 80A10218 03E00008 */ jr $ra -/* 00FBC 80A1021C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index bade13c4a8..6e32d224d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -192,7 +192,7 @@ glabel func_80A10220 /* 011D4 80A10434 000FC400 */ sll $t8, $t7, 16 /* 011D8 80A10438 0018CC03 */ sra $t9, $t8, 16 /* 011DC 80A1043C 27290096 */ addiu $t1, $t9, 0x0096 ## $t1 = 00000096 -/* 011E0 80A10440 0C00A73C */ jal func_80029CF0 +/* 011E0 80A10440 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 011E4 80A10444 AFA90010 */ sw $t1, 0x0010($sp) /* 011E8 80A10448 87A200E0 */ lh $v0, 0x00E0($sp) /* 011EC 80A1044C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -309,7 +309,7 @@ glabel func_80A10220 /* 0137C 80A105DC 00086400 */ sll $t4, $t0, 16 /* 01380 80A105E0 000C5C03 */ sra $t3, $t4, 16 /* 01384 80A105E4 256E0032 */ addiu $t6, $t3, 0x0032 ## $t6 = 00000032 -/* 01388 80A105E8 0C00A73C */ jal func_80029CF0 +/* 01388 80A105E8 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 0138C 80A105EC AFAE0010 */ sw $t6, 0x0010($sp) /* 01390 80A105F0 87A200B6 */ lh $v0, 0x00B6($sp) /* 01394 80A105F4 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -702,7 +702,7 @@ glabel func_80A10220 /* 01928 80A10B88 00086400 */ sll $t4, $t0, 16 /* 0192C 80A10B8C 000C5C03 */ sra $t3, $t4, 16 /* 01930 80A10B90 256E0050 */ addiu $t6, $t3, 0x0050 ## $t6 = 00000050 -/* 01934 80A10B94 0C00A73C */ jal func_80029CF0 +/* 01934 80A10B94 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 01938 80A10B98 AFAE0010 */ sw $t6, 0x0010($sp) /* 0193C 80A10B9C 87A20096 */ lh $v0, 0x0096($sp) /* 01940 80A10BA0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -832,7 +832,7 @@ glabel func_80A10220 /* 01B04 80A10D64 000C5C00 */ sll $t3, $t4, 16 /* 01B08 80A10D68 000B7403 */ sra $t6, $t3, 16 /* 01B0C 80A10D6C 25CF0064 */ addiu $t7, $t6, 0x0064 ## $t7 = 00000064 -/* 01B10 80A10D70 0C00A73C */ jal func_80029CF0 +/* 01B10 80A10D70 0C00A73C */ jal EffectSsFhgFlash_Spawn /* 01B14 80A10D74 AFAF0010 */ sw $t7, 0x0010($sp) /* 01B18 80A10D78 87A20078 */ lh $v0, 0x0078($sp) /* 01B1C 80A10D7C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s deleted file mode 100644 index 93f4fca3bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s +++ /dev/null @@ -1,145 +0,0 @@ -.rdata -glabel D_80A11910 - .asciz "EFC 1\n" - .balign 4 - -glabel D_80A11918 - .asciz "EFC 2\n" - .balign 4 - -.text -glabel func_80A10F18 -/* 01CB8 80A10F18 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CBC 80A10F1C AFBF001C */ sw $ra, 0x001C($sp) -/* 01CC0 80A10F20 AFB00018 */ sw $s0, 0x0018($sp) -/* 01CC4 80A10F24 AFA5002C */ sw $a1, 0x002C($sp) -/* 01CC8 80A10F28 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 -/* 01CCC 80A10F2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 01CD0 80A10F30 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 01CD4 80A10F34 AFAE0024 */ sw $t6, 0x0024($sp) -/* 01CD8 80A10F38 C4800184 */ lwc1 $f0, 0x0184($a0) ## 00000184 -/* 01CDC 80A10F3C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01CE0 80A10F40 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01CE4 80A10F44 46003202 */ mul.s $f8, $f6, $f0 -/* 01CE8 80A10F48 C4840174 */ lwc1 $f4, 0x0174($a0) ## 00000174 -/* 01CEC 80A10F4C C4900178 */ lwc1 $f16, 0x0178($a0) ## 00000178 -/* 01CF0 80A10F50 46009182 */ mul.s $f6, $f18, $f0 -/* 01CF4 80A10F54 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01CF8 80A10F58 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 01CFC 80A10F5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D00 80A10F60 46082280 */ add.s $f10, $f4, $f8 -/* 01D04 80A10F64 C488017C */ lwc1 $f8, 0x017C($a0) ## 0000017C -/* 01D08 80A10F68 46068101 */ sub.s $f4, $f16, $f6 -/* 01D0C 80A10F6C E48A0174 */ swc1 $f10, 0x0174($a0) ## 00000174 -/* 01D10 80A10F70 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 01D14 80A10F74 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01D18 80A10F78 E4840178 */ swc1 $f4, 0x0178($a0) ## 00000178 -/* 01D1C 80A10F7C 46005482 */ mul.s $f18, $f10, $f0 -/* 01D20 80A10F80 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 01D24 80A10F84 C4860180 */ lwc1 $f6, 0x0180($a0) ## 00000180 -/* 01D28 80A10F88 24010029 */ addiu $at, $zero, 0x0029 ## $at = 00000029 -/* 01D2C 80A10F8C 46002282 */ mul.s $f10, $f4, $f0 -/* 01D30 80A10F90 46124400 */ add.s $f16, $f8, $f18 -/* 01D34 80A10F94 460A3201 */ sub.s $f8, $f6, $f10 -/* 01D38 80A10F98 E490017C */ swc1 $f16, 0x017C($a0) ## 0000017C -/* 01D3C 80A10F9C 15E10013 */ bne $t7, $at, .L80A10FEC -/* 01D40 80A10FA0 E4880180 */ swc1 $f8, 0x0180($a0) ## 00000180 -/* 01D44 80A10FA4 84820150 */ lh $v0, 0x0150($a0) ## 00000150 -/* 01D48 80A10FA8 28410047 */ slti $at, $v0, 0x0047 -/* 01D4C 80A10FAC 54200008 */ bnel $at, $zero, .L80A10FD0 -/* 01D50 80A10FB0 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 01D54 80A10FB4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D58 80A10FB8 24052040 */ addiu $a1, $zero, 0x2040 ## $a1 = 00002040 -/* 01D5C 80A10FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D60 80A10FC0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D64 80A10FC4 24052054 */ addiu $a1, $zero, 0x2054 ## $a1 = 00002054 -/* 01D68 80A10FC8 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -/* 01D6C 80A10FCC 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -.L80A10FD0: -/* 01D70 80A10FD0 14410006 */ bne $v0, $at, .L80A10FEC -/* 01D74 80A10FD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D78 80A10FD8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D7C 80A10FDC 2405283F */ addiu $a1, $zero, 0x283F ## $a1 = 0000283F -/* 01D80 80A10FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D84 80A10FE4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D88 80A10FE8 24052853 */ addiu $a1, $zero, 0x2853 ## $a1 = 00002853 -.L80A10FEC: -/* 01D8C 80A10FEC 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -/* 01D90 80A10FF0 26040184 */ addiu $a0, $s0, 0x0184 ## $a0 = 00000184 -/* 01D94 80A10FF4 3C073D23 */ lui $a3, 0x3D23 ## $a3 = 3D230000 -/* 01D98 80A10FF8 28410033 */ slti $at, $v0, 0x0033 -/* 01D9C 80A10FFC 54200017 */ bnel $at, $zero, .L80A1105C -/* 01DA0 80A11000 2841001A */ slti $at, $v0, 0x001A -/* 01DA4 80A11004 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 01DA8 80A11008 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DAC 80A1100C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01DB0 80A11010 2B010028 */ slti $at, $t8, 0x0028 -/* 01DB4 80A11014 14200004 */ bne $at, $zero, .L80A11028 -/* 01DB8 80A11018 46001006 */ mov.s $f0, $f2 -/* 01DBC 80A1101C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01DC0 80A11020 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 01DC4 80A11024 00000000 */ nop -.L80A11028: -/* 01DC8 80A11028 44050000 */ mfc1 $a1, $f0 -/* 01DCC 80A1102C 44061000 */ mfc1 $a2, $f2 -/* 01DD0 80A11030 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01DD4 80A11034 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3D23D70A -/* 01DD8 80A11038 3C074123 */ lui $a3, 0x4123 ## $a3 = 41230000 -/* 01DDC 80A1103C 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 41233333 -/* 01DE0 80A11040 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01DE4 80A11044 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 01DE8 80A11048 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01DEC 80A1104C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01DF0 80A11050 1000000D */ beq $zero, $zero, .L80A11088 -/* 01DF4 80A11054 00000000 */ nop -/* 01DF8 80A11058 2841001A */ slti $at, $v0, 0x001A -.L80A1105C: -/* 01DFC 80A1105C 1020000A */ beq $at, $zero, .L80A11088 -/* 01E00 80A11060 26040184 */ addiu $a0, $s0, 0x0184 ## $a0 = 00000184 -/* 01E04 80A11064 3C063D23 */ lui $a2, 0x3D23 ## $a2 = 3D230000 -/* 01E08 80A11068 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3D23D70A -/* 01E0C 80A1106C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01E10 80A11070 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01E14 80A11074 3C064123 */ lui $a2, 0x4123 ## $a2 = 41230000 -/* 01E18 80A11078 34C63333 */ ori $a2, $a2, 0x3333 ## $a2 = 41233333 -/* 01E1C 80A1107C 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01E20 80A11080 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01E24 80A11084 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -.L80A11088: -/* 01E28 80A11088 3C0480A1 */ lui $a0, %hi(D_80A11910) ## $a0 = 80A10000 -/* 01E2C 80A1108C 0C00084C */ jal osSyncPrintf - -/* 01E30 80A11090 24841910 */ addiu $a0, $a0, %lo(D_80A11910) ## $a0 = 80A11910 -/* 01E34 80A11094 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -/* 01E38 80A11098 13200009 */ beq $t9, $zero, .L80A110C0 -/* 01E3C 80A1109C 00000000 */ nop -/* 01E40 80A110A0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 01E44 80A110A4 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 01E48 80A110A8 8FA90024 */ lw $t1, 0x0024($sp) -/* 01E4C 80A110AC 15010006 */ bne $t0, $at, .L80A110C8 -/* 01E50 80A110B0 00000000 */ nop -/* 01E54 80A110B4 912A014F */ lbu $t2, 0x014F($t1) ## 0000014F -/* 01E58 80A110B8 11400003 */ beq $t2, $zero, .L80A110C8 -/* 01E5C 80A110BC 00000000 */ nop -.L80A110C0: -/* 01E60 80A110C0 0C00B55C */ jal Actor_Kill - -/* 01E64 80A110C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A110C8: -/* 01E68 80A110C8 3C0480A1 */ lui $a0, %hi(D_80A11918) ## $a0 = 80A10000 -/* 01E6C 80A110CC 0C00084C */ jal osSyncPrintf - -/* 01E70 80A110D0 24841918 */ addiu $a0, $a0, %lo(D_80A11918) ## $a0 = 80A11918 -/* 01E74 80A110D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E78 80A110D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01E7C 80A110DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01E80 80A110E0 03E00008 */ jr $ra -/* 01E84 80A110E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s deleted file mode 100644 index 244960a753..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnHeishi1_Destroy -/* 00350 80A51620 AFA40000 */ sw $a0, 0x0000($sp) -/* 00354 80A51624 03E00008 */ jr $ra -/* 00358 80A51628 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s deleted file mode 100644 index 60d99673d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel EnHeishi1_Draw -/* 013AC 80A5267C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 013B0 80A52680 3C0F80A5 */ lui $t7, %hi(D_80A52918) ## $t7 = 80A50000 -/* 013B4 80A52684 AFBF004C */ sw $ra, 0x004C($sp) -/* 013B8 80A52688 AFB00048 */ sw $s0, 0x0048($sp) -/* 013BC 80A5268C AFA5006C */ sw $a1, 0x006C($sp) -/* 013C0 80A52690 25EF2918 */ addiu $t7, $t7, %lo(D_80A52918) ## $t7 = 80A52918 -/* 013C4 80A52694 8DF90000 */ lw $t9, 0x0000($t7) ## 80A52918 -/* 013C8 80A52698 27AE0054 */ addiu $t6, $sp, 0x0054 ## $t6 = FFFFFFEC -/* 013CC 80A5269C 8DF80004 */ lw $t8, 0x0004($t7) ## 80A5291C -/* 013D0 80A526A0 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 013D4 80A526A4 8DF90008 */ lw $t9, 0x0008($t7) ## 80A52920 -/* 013D8 80A526A8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 013DC 80A526AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E0 80A526B0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 013E4 80A526B4 8FA8006C */ lw $t0, 0x006C($sp) -/* 013E8 80A526B8 0C024F46 */ jal func_80093D18 -/* 013EC 80A526BC 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 013F0 80A526C0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 013F4 80A526C4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 013F8 80A526C8 3C0780A5 */ lui $a3, %hi(func_80A5263C) ## $a3 = 80A50000 -/* 013FC 80A526CC 24E7263C */ addiu $a3, $a3, %lo(func_80A5263C) ## $a3 = 80A5263C -/* 01400 80A526D0 AFB00014 */ sw $s0, 0x0014($sp) -/* 01404 80A526D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01408 80A526D8 0C028572 */ jal SkelAnime_Draw - -/* 0140C 80A526DC 8FA4006C */ lw $a0, 0x006C($sp) -/* 01410 80A526E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01414 80A526E4 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFEC -/* 01418 80A526E8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0141C 80A526EC 0C00CF0C */ jal func_80033C30 -/* 01420 80A526F0 8FA7006C */ lw $a3, 0x006C($sp) -/* 01424 80A526F4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01428 80A526F8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0142C 80A526FC 8609026C */ lh $t1, 0x026C($s0) ## 0000026C -/* 01430 80A52700 844A12D6 */ lh $t2, 0x12D6($v0) ## 801612D6 -/* 01434 80A52704 552A0020 */ bnel $t1, $t2, .L80A52788 -/* 01438 80A52708 8FBF004C */ lw $ra, 0x004C($sp) -/* 0143C 80A5270C 844B12D4 */ lh $t3, 0x12D4($v0) ## 801612D4 -/* 01440 80A52710 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01444 80A52714 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01448 80A52718 1160001A */ beq $t3, $zero, .L80A52784 -/* 0144C 80A5271C 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01450 80A52720 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 -/* 01454 80A52724 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01458 80A52728 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 0145C 80A5272C 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 01460 80A52730 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01464 80A52734 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 -/* 01468 80A52738 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0146C 80A5273C 8FB9006C */ lw $t9, 0x006C($sp) -/* 01470 80A52740 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01474 80A52744 AFB80034 */ sw $t8, 0x0034($sp) -/* 01478 80A52748 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0147C 80A5274C AFAF0030 */ sw $t7, 0x0030($sp) -/* 01480 80A52750 AFA0002C */ sw $zero, 0x002C($sp) -/* 01484 80A52754 AFA00028 */ sw $zero, 0x0028($sp) -/* 01488 80A52758 AFAE0024 */ sw $t6, 0x0024($sp) -/* 0148C 80A5275C AFAD0014 */ sw $t5, 0x0014($sp) -/* 01490 80A52760 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01494 80A52764 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 01498 80A52768 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 0149C 80A5276C 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 014A0 80A52770 8F280000 */ lw $t0, 0x0000($t9) ## 00000000 -/* 014A4 80A52774 24074268 */ addiu $a3, $zero, 0x4268 ## $a3 = 00004268 -/* 014A8 80A52778 46062380 */ add.s $f14, $f4, $f6 -/* 014AC 80A5277C 0C018FA7 */ jal DebugDisplay_AddObject - -/* 014B0 80A52780 AFA80038 */ sw $t0, 0x0038($sp) -.L80A52784: -/* 014B4 80A52784 8FBF004C */ lw $ra, 0x004C($sp) -.L80A52788: -/* 014B8 80A52788 8FB00048 */ lw $s0, 0x0048($sp) -/* 014BC 80A5278C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 014C0 80A52790 03E00008 */ jr $ra -/* 014C4 80A52794 00000000 */ nop -/* 014C8 80A52798 00000000 */ nop -/* 014CC 80A5279C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s deleted file mode 100644 index a1385d29ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s +++ /dev/null @@ -1,295 +0,0 @@ -.rdata -glabel D_80A52930 - .asciz " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A5295C - .asciz " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A52988 - .asciz " anime_frame_speed ☆☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A529B4 - .asciz " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" - .balign 4 - -glabel D_80A529E0 - .asciz " point間の移動スピード目標値 ☆ %f\n" - .balign 4 - -glabel D_80A52A0C - .asciz " point間の移動スピード最大 ☆☆ %f\n" - .balign 4 - -glabel D_80A52A38 - .asciz " (体)反転アングルスピード目標値 %f\n" - .balign 4 - -glabel D_80A52A64 - .asciz " (体)反転アングルスピード最大☆ %f\n" - .balign 4 - -glabel D_80A52A90 - .asciz " (頭)反転アングルスピード加算値 %f\n" - .balign 4 - -glabel D_80A52ABC - .asciz " (頭)反転アングルスピード最大☆ %f\n" - .balign 4 - -glabel D_80A52AE8 - .asciz " 今時間 %d\n" - .balign 4 - -glabel D_80A52AFC - .asciz " チェック時間 %d\n" - .balign 4 - -glabel D_80A52B18 - .asciz "\n\n" - .balign 4 - -.text -glabel EnHeishi1_Init -/* 00000 80A512D0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00004 80A512D4 AFB20040 */ sw $s2, 0x0040($sp) -/* 00008 80A512D8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0000C 80A512DC AFBF0044 */ sw $ra, 0x0044($sp) -/* 00010 80A512E0 AFB1003C */ sw $s1, 0x003C($sp) -/* 00014 80A512E4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00018 80A512E8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0001C 80A512EC AFB00038 */ sw $s0, 0x0038($sp) -/* 00020 80A512F0 0C00B58B */ jal Actor_SetScale - -/* 00024 80A512F4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00028 80A512F8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0002C 80A512FC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00030 80A51300 262E0190 */ addiu $t6, $s1, 0x0190 ## $t6 = 00000190 -/* 00034 80A51304 262F01F6 */ addiu $t7, $s1, 0x01F6 ## $t7 = 000001F6 -/* 00038 80A51308 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0003C 80A5130C AFB80018 */ sw $t8, 0x0018($sp) -/* 00040 80A51310 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00044 80A51314 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00048 80A51318 24E75C30 */ addiu $a3, $a3, 0x5C30 ## $a3 = 06005C30 -/* 0004C 80A5131C 24C6BAC8 */ addiu $a2, $a2, 0xBAC8 ## $a2 = 0600BAC8 -/* 00050 80A51320 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00054 80A51324 0C02915F */ jal SkelAnime_Init - -/* 00058 80A51328 2625014C */ addiu $a1, $s1, 0x014C ## $a1 = 0000014C -/* 0005C 80A5132C 8624001C */ lh $a0, 0x001C($s1) ## 0000001C -/* 00060 80A51330 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00064 80A51334 02201825 */ or $v1, $s1, $zero ## $v1 = 00000000 -/* 00068 80A51338 0004CA03 */ sra $t9, $a0, 8 -/* 0006C 80A5133C 308900FF */ andi $t1, $a0, 0x00FF ## $t1 = 00000000 -/* 00070 80A51340 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00074 80A51344 3C0480A5 */ lui $a0, %hi(D_80A527C4) ## $a0 = 80A50000 -/* 00078 80A51348 A628026A */ sh $t0, 0x026A($s1) ## 0000026A -/* 0007C 80A5134C A629026C */ sh $t1, 0x026C($s1) ## 0000026C -/* 00080 80A51350 248427C4 */ addiu $a0, $a0, %lo(D_80A527C4) ## $a0 = 80A527C4 -.L80A51354: -/* 00084 80A51354 862A026A */ lh $t2, 0x026A($s1) ## 0000026A -/* 00088 80A51358 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000004 -/* 0008C 80A5135C 000A5940 */ sll $t3, $t2, 5 -/* 00090 80A51360 008B6021 */ addu $t4, $a0, $t3 -/* 00094 80A51364 01826821 */ addu $t5, $t4, $v0 -/* 00098 80A51368 C5A40000 */ lwc1 $f4, 0x0000($t5) ## 00000000 -/* 0009C 80A5136C 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000004 -/* 000A0 80A51370 28410020 */ slti $at, $v0, 0x0020 -/* 000A4 80A51374 1420FFF7 */ bne $at, $zero, .L80A51354 -/* 000A8 80A51378 E4640280 */ swc1 $f4, 0x0280($v1) ## 00000284 -/* 000AC 80A5137C 3C0480A5 */ lui $a0, %hi(D_80A52930) ## $a0 = 80A50000 -/* 000B0 80A51380 24842930 */ addiu $a0, $a0, %lo(D_80A52930) ## $a0 = 80A52930 -/* 000B4 80A51384 0C00084C */ jal osSyncPrintf - -/* 000B8 80A51388 8625026A */ lh $a1, 0x026A($s1) ## 0000026A -/* 000BC 80A5138C 3C0480A5 */ lui $a0, %hi(D_80A5295C) ## $a0 = 80A50000 -/* 000C0 80A51390 2484295C */ addiu $a0, $a0, %lo(D_80A5295C) ## $a0 = 80A5295C -/* 000C4 80A51394 0C00084C */ jal osSyncPrintf - -/* 000C8 80A51398 8625026C */ lh $a1, 0x026C($s1) ## 0000026C -/* 000CC 80A5139C C6260284 */ lwc1 $f6, 0x0284($s1) ## 00000284 -/* 000D0 80A513A0 3C0480A5 */ lui $a0, %hi(D_80A52988) ## $a0 = 80A50000 -/* 000D4 80A513A4 24842988 */ addiu $a0, $a0, %lo(D_80A52988) ## $a0 = 80A52988 -/* 000D8 80A513A8 46003221 */ cvt.d.s $f8, $f6 -/* 000DC 80A513AC 44074000 */ mfc1 $a3, $f8 -/* 000E0 80A513B0 44064800 */ mfc1 $a2, $f9 -/* 000E4 80A513B4 0C00084C */ jal osSyncPrintf - -/* 000E8 80A513B8 00000000 */ nop -/* 000EC 80A513BC C62A0288 */ lwc1 $f10, 0x0288($s1) ## 00000288 -/* 000F0 80A513C0 3C0480A5 */ lui $a0, %hi(D_80A529B4) ## $a0 = 80A50000 -/* 000F4 80A513C4 248429B4 */ addiu $a0, $a0, %lo(D_80A529B4) ## $a0 = 80A529B4 -/* 000F8 80A513C8 46005421 */ cvt.d.s $f16, $f10 -/* 000FC 80A513CC 44078000 */ mfc1 $a3, $f16 -/* 00100 80A513D0 44068800 */ mfc1 $a2, $f17 -/* 00104 80A513D4 0C00084C */ jal osSyncPrintf - -/* 00108 80A513D8 00000000 */ nop -/* 0010C 80A513DC C632028C */ lwc1 $f18, 0x028C($s1) ## 0000028C -/* 00110 80A513E0 3C0480A5 */ lui $a0, %hi(D_80A529E0) ## $a0 = 80A50000 -/* 00114 80A513E4 248429E0 */ addiu $a0, $a0, %lo(D_80A529E0) ## $a0 = 80A529E0 -/* 00118 80A513E8 46009121 */ cvt.d.s $f4, $f18 -/* 0011C 80A513EC 44072000 */ mfc1 $a3, $f4 -/* 00120 80A513F0 44062800 */ mfc1 $a2, $f5 -/* 00124 80A513F4 0C00084C */ jal osSyncPrintf - -/* 00128 80A513F8 00000000 */ nop -/* 0012C 80A513FC C6260290 */ lwc1 $f6, 0x0290($s1) ## 00000290 -/* 00130 80A51400 3C0480A5 */ lui $a0, %hi(D_80A52A0C) ## $a0 = 80A50000 -/* 00134 80A51404 24842A0C */ addiu $a0, $a0, %lo(D_80A52A0C) ## $a0 = 80A52A0C -/* 00138 80A51408 46003221 */ cvt.d.s $f8, $f6 -/* 0013C 80A5140C 44074000 */ mfc1 $a3, $f8 -/* 00140 80A51410 44064800 */ mfc1 $a2, $f9 -/* 00144 80A51414 0C00084C */ jal osSyncPrintf - -/* 00148 80A51418 00000000 */ nop -/* 0014C 80A5141C C62A0294 */ lwc1 $f10, 0x0294($s1) ## 00000294 -/* 00150 80A51420 3C0480A5 */ lui $a0, %hi(D_80A52A38) ## $a0 = 80A50000 -/* 00154 80A51424 24842A38 */ addiu $a0, $a0, %lo(D_80A52A38) ## $a0 = 80A52A38 -/* 00158 80A51428 46005421 */ cvt.d.s $f16, $f10 -/* 0015C 80A5142C 44078000 */ mfc1 $a3, $f16 -/* 00160 80A51430 44068800 */ mfc1 $a2, $f17 -/* 00164 80A51434 0C00084C */ jal osSyncPrintf - -/* 00168 80A51438 00000000 */ nop -/* 0016C 80A5143C C6320298 */ lwc1 $f18, 0x0298($s1) ## 00000298 -/* 00170 80A51440 3C0480A5 */ lui $a0, %hi(D_80A52A64) ## $a0 = 80A50000 -/* 00174 80A51444 24842A64 */ addiu $a0, $a0, %lo(D_80A52A64) ## $a0 = 80A52A64 -/* 00178 80A51448 46009121 */ cvt.d.s $f4, $f18 -/* 0017C 80A5144C 44072000 */ mfc1 $a3, $f4 -/* 00180 80A51450 44062800 */ mfc1 $a2, $f5 -/* 00184 80A51454 0C00084C */ jal osSyncPrintf - -/* 00188 80A51458 00000000 */ nop -/* 0018C 80A5145C C626029C */ lwc1 $f6, 0x029C($s1) ## 0000029C -/* 00190 80A51460 3C0480A5 */ lui $a0, %hi(D_80A52A90) ## $a0 = 80A50000 -/* 00194 80A51464 24842A90 */ addiu $a0, $a0, %lo(D_80A52A90) ## $a0 = 80A52A90 -/* 00198 80A51468 46003221 */ cvt.d.s $f8, $f6 -/* 0019C 80A5146C 44074000 */ mfc1 $a3, $f8 -/* 001A0 80A51470 44064800 */ mfc1 $a2, $f9 -/* 001A4 80A51474 0C00084C */ jal osSyncPrintf - -/* 001A8 80A51478 00000000 */ nop -/* 001AC 80A5147C C62A02A0 */ lwc1 $f10, 0x02A0($s1) ## 000002A0 -/* 001B0 80A51480 3C0480A5 */ lui $a0, %hi(D_80A52ABC) ## $a0 = 80A50000 -/* 001B4 80A51484 24842ABC */ addiu $a0, $a0, %lo(D_80A52ABC) ## $a0 = 80A52ABC -/* 001B8 80A51488 46005421 */ cvt.d.s $f16, $f10 -/* 001BC 80A5148C 44078000 */ mfc1 $a3, $f16 -/* 001C0 80A51490 44068800 */ mfc1 $a2, $f17 -/* 001C4 80A51494 0C00084C */ jal osSyncPrintf - -/* 001C8 80A51498 00000000 */ nop -/* 001CC 80A5149C 3C028016 */ lui $v0, %hi(gSaveContext+0xc) -/* 001D0 80A514A0 3C0480A5 */ lui $a0, %hi(D_80A52AE8) ## $a0 = 80A50000 -/* 001D4 80A514A4 24842AE8 */ addiu $a0, $a0, %lo(D_80A52AE8) ## $a0 = 80A52AE8 -/* 001D8 80A514A8 0C00084C */ jal osSyncPrintf - -/* 001DC 80A514AC 9445E66C */ lhu $a1, %lo(gSaveContext+0xc)($v0) -/* 001E0 80A514B0 3C0480A5 */ lui $a0, %hi(D_80A52AFC) ## $a0 = 80A50000 -/* 001E4 80A514B4 24842AFC */ addiu $a0, $a0, %lo(D_80A52AFC) ## $a0 = 80A52AFC -/* 001E8 80A514B8 0C00084C */ jal osSyncPrintf - -/* 001EC 80A514BC 3405BAAA */ ori $a1, $zero, 0xBAAA ## $a1 = 0000BAAA -/* 001F0 80A514C0 3C0480A5 */ lui $a0, %hi(D_80A52B18) ## $a0 = 80A50000 -/* 001F4 80A514C4 0C00084C */ jal osSyncPrintf - -/* 001F8 80A514C8 24842B18 */ addiu $a0, $a0, %lo(D_80A52B18) ## $a0 = 80A52B18 -/* 001FC 80A514CC 862E026C */ lh $t6, 0x026C($s1) ## 0000026C -/* 00200 80A514D0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00204 80A514D4 3C1080A5 */ lui $s0, %hi(D_80A52850) ## $s0 = 80A50000 -/* 00208 80A514D8 15C1001F */ bne $t6, $at, .L80A51558 -/* 0020C 80A514DC 26102850 */ addiu $s0, $s0, %lo(D_80A52850) ## $s0 = 80A52850 -/* 00210 80A514E0 26441C24 */ addiu $a0, $s2, 0x1C24 ## $a0 = 00001C24 -/* 00214 80A514E4 AFA4004C */ sw $a0, 0x004C($sp) -/* 00218 80A514E8 8E190000 */ lw $t9, 0x0000($s0) ## 80A52850 -.L80A514EC: -/* 0021C 80A514EC 8FA4004C */ lw $a0, 0x004C($sp) -/* 00220 80A514F0 27AF005C */ addiu $t7, $sp, 0x005C ## $t7 = FFFFFFEC -/* 00224 80A514F4 ADF90000 */ sw $t9, 0x0000($t7) ## FFFFFFEC -/* 00228 80A514F8 8E180004 */ lw $t8, 0x0004($s0) ## 80A52854 -/* 0022C 80A514FC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 00230 80A51500 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00234 80A51504 ADF80004 */ sw $t8, 0x0004($t7) ## FFFFFFF0 -/* 00238 80A51508 8E190008 */ lw $t9, 0x0008($s0) ## 80A52858 -/* 0023C 80A5150C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00240 80A51510 24070131 */ addiu $a3, $zero, 0x0131 ## $a3 = 00000131 -/* 00244 80A51514 ADF90008 */ sw $t9, 0x0008($t7) ## FFFFFFF4 -/* 00248 80A51518 C7A60064 */ lwc1 $f6, 0x0064($sp) -/* 0024C 80A5151C C7A40060 */ lwc1 $f4, 0x0060($sp) -/* 00250 80A51520 C7B2005C */ lwc1 $f18, 0x005C($sp) -/* 00254 80A51524 AFA80028 */ sw $t0, 0x0028($sp) -/* 00258 80A51528 AFA00024 */ sw $zero, 0x0024($sp) -/* 0025C 80A5152C AFA00020 */ sw $zero, 0x0020($sp) -/* 00260 80A51530 AFA0001C */ sw $zero, 0x001C($sp) -/* 00264 80A51534 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00268 80A51538 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 0026C 80A5153C 0C00C916 */ jal Actor_SpawnAttached - -/* 00270 80A51540 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00274 80A51544 3C0980A5 */ lui $t1, %hi(D_80A528B0) ## $t1 = 80A50000 -/* 00278 80A51548 252928B0 */ addiu $t1, $t1, %lo(D_80A528B0) ## $t1 = 80A528B0 -/* 0027C 80A5154C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 80A5285C -/* 00280 80A51550 5609FFE6 */ bnel $s0, $t1, .L80A514EC -/* 00284 80A51554 8E190000 */ lw $t9, 0x0000($s0) ## 80A5285C -.L80A51558: -/* 00288 80A51558 862A026A */ lh $t2, 0x026A($s1) ## 0000026A -/* 0028C 80A5155C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00290 80A51560 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00294 80A51564 11410017 */ beq $t2, $at, .L80A515C4 -/* 00298 80A51568 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0029C 80A5156C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 002A0 80A51570 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 002A4 80A51574 944B000C */ lhu $t3, 0x000C($v0) ## 8015E66C -/* 002A8 80A51578 3401B888 */ ori $at, $zero, 0xB888 ## $at = 0000B888 -/* 002AC 80A5157C 0161082A */ slt $at, $t3, $at -/* 002B0 80A51580 54200005 */ bnel $at, $zero, .L80A51598 -/* 002B4 80A51584 944D0EE4 */ lhu $t5, 0x0EE4($v0) ## 8015F544 -/* 002B8 80A51588 8C4C0010 */ lw $t4, 0x0010($v0) ## 8015E670 -/* 002BC 80A5158C 15800009 */ bne $t4, $zero, .L80A515B4 -/* 002C0 80A51590 00000000 */ nop -/* 002C4 80A51594 944D0EE4 */ lhu $t5, 0x0EE4($v0) ## 8015F544 -.L80A51598: -/* 002C8 80A51598 3C0F80A5 */ lui $t7, %hi(func_80A5162C) ## $t7 = 80A50000 -/* 002CC 80A5159C 25EF162C */ addiu $t7, $t7, %lo(func_80A5162C) ## $t7 = 80A5162C -/* 002D0 80A515A0 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 002D4 80A515A4 15C00003 */ bne $t6, $zero, .L80A515B4 -/* 002D8 80A515A8 00000000 */ nop -/* 002DC 80A515AC 10000016 */ beq $zero, $zero, .L80A51608 -/* 002E0 80A515B0 AE2F025C */ sw $t7, 0x025C($s1) ## 0000025C -.L80A515B4: -/* 002E4 80A515B4 0C00B55C */ jal Actor_Kill - -/* 002E8 80A515B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002EC 80A515BC 10000013 */ beq $zero, $zero, .L80A5160C -/* 002F0 80A515C0 8FBF0044 */ lw $ra, 0x0044($sp) -.L80A515C4: -/* 002F4 80A515C4 9458000C */ lhu $t8, 0x000C($v0) ## 0000000C -/* 002F8 80A515C8 3401B889 */ ori $at, $zero, 0xB889 ## $at = 0000B889 -/* 002FC 80A515CC 3C0A80A5 */ lui $t2, %hi(func_80A521FC) ## $t2 = 80A50000 -/* 00300 80A515D0 0301082A */ slt $at, $t8, $at -/* 00304 80A515D4 10200008 */ beq $at, $zero, .L80A515F8 -/* 00308 80A515D8 254A21FC */ addiu $t2, $t2, %lo(func_80A521FC) ## $t2 = 80A521FC -/* 0030C 80A515DC 8C590010 */ lw $t9, 0x0010($v0) ## 00000010 -/* 00310 80A515E0 17200005 */ bne $t9, $zero, .L80A515F8 -/* 00314 80A515E4 00000000 */ nop -/* 00318 80A515E8 94480EE4 */ lhu $t0, 0x0EE4($v0) ## 00000EE4 -/* 0031C 80A515EC 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00320 80A515F0 11200003 */ beq $t1, $zero, .L80A51600 -/* 00324 80A515F4 00000000 */ nop -.L80A515F8: -/* 00328 80A515F8 10000003 */ beq $zero, $zero, .L80A51608 -/* 0032C 80A515FC AE2A025C */ sw $t2, 0x025C($s1) ## 0000025C -.L80A51600: -/* 00330 80A51600 0C00B55C */ jal Actor_Kill - -/* 00334 80A51604 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A51608: -/* 00338 80A51608 8FBF0044 */ lw $ra, 0x0044($sp) -.L80A5160C: -/* 0033C 80A5160C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00340 80A51610 8FB1003C */ lw $s1, 0x003C($sp) -/* 00344 80A51614 8FB20040 */ lw $s2, 0x0040($sp) -/* 00348 80A51618 03E00008 */ jr $ra -/* 0034C 80A5161C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s deleted file mode 100644 index e5d80ebe72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s +++ /dev/null @@ -1,227 +0,0 @@ -.rdata -glabel D_80A52C00 - .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" - .balign 4 - -.late_rodata -glabel D_80A52C38 - .word 0x44098000 -glabel D_80A52C3C - .float 3.14159274101 - -glabel D_80A52C40 - .word 0xC079999A, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel EnHeishi1_Update -/* 0104C 80A5231C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 01050 80A52320 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01054 80A52324 AFB00020 */ sw $s0, 0x0020($sp) -/* 01058 80A52328 848E0260 */ lh $t6, 0x0260($a0) ## 00000260 -/* 0105C 80A5232C 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 01060 80A52330 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01064 80A52334 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01068 80A52338 A48F0260 */ sh $t7, 0x0260($a0) ## 00000260 -/* 0106C 80A5233C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01070 80A52340 0002C040 */ sll $t8, $v0, 1 -.L80A52344: -/* 01074 80A52344 02181821 */ addu $v1, $s0, $t8 -/* 01078 80A52348 846402A4 */ lh $a0, 0x02A4($v1) ## 000002A4 -/* 0107C 80A5234C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 01080 80A52350 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000001 -/* 01084 80A52354 10800003 */ beq $a0, $zero, .L80A52364 -/* 01088 80A52358 28410003 */ slti $at, $v0, 0x0003 -/* 0108C 80A5235C 2499FFFF */ addiu $t9, $a0, 0xFFFF ## $t9 = FFFFFFFF -/* 01090 80A52360 A47902A4 */ sh $t9, 0x02A4($v1) ## 000002A4 -.L80A52364: -/* 01094 80A52364 5420FFF7 */ bnel $at, $zero, .L80A52344 -/* 01098 80A52368 0002C040 */ sll $t8, $v0, 1 -/* 0109C 80A5236C 86020270 */ lh $v0, 0x0270($s0) ## 00000270 -/* 010A0 80A52370 10400002 */ beq $v0, $zero, .L80A5237C -/* 010A4 80A52374 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = 00000000 -/* 010A8 80A52378 A6080270 */ sh $t0, 0x0270($s0) ## 00000270 -.L80A5237C: -/* 010AC 80A5237C 84A907A0 */ lh $t1, 0x07A0($a1) ## 000007A0 -/* 010B0 80A52380 94EC0110 */ lhu $t4, 0x0110($a3) ## 00000110 -/* 010B4 80A52384 00095080 */ sll $t2, $t1, 2 -/* 010B8 80A52388 00AA5821 */ addu $t3, $a1, $t2 -/* 010BC 80A5238C 158000A6 */ bne $t4, $zero, .L80A52628 -/* 010C0 80A52390 8D660790 */ lw $a2, 0x0790($t3) ## 00000790 -/* 010C4 80A52394 AFA5007C */ sw $a1, 0x007C($sp) -/* 010C8 80A52398 AFA60060 */ sw $a2, 0x0060($sp) -/* 010CC 80A5239C AFA70068 */ sw $a3, 0x0068($sp) -/* 010D0 80A523A0 8E19025C */ lw $t9, 0x025C($s0) ## 0000025C -/* 010D4 80A523A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010D8 80A523A8 0320F809 */ jalr $ra, $t9 -/* 010DC 80A523AC 00000000 */ nop -/* 010E0 80A523B0 3C0180A5 */ lui $at, %hi(D_80A52C38) ## $at = 80A50000 -/* 010E4 80A523B4 C4242C38 */ lwc1 $f4, %lo(D_80A52C38)($at) -/* 010E8 80A523B8 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 010EC 80A523BC 44813000 */ mtc1 $at, $f6 ## $f6 = 350.00 -/* 010F0 80A523C0 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 010F4 80A523C4 44814000 */ mtc1 $at, $f8 ## $f8 = 700.00 -/* 010F8 80A523C8 860D026A */ lh $t5, 0x026A($s0) ## 0000026A -/* 010FC 80A523CC 8FA60060 */ lw $a2, 0x0060($sp) -/* 01100 80A523D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01104 80A523D4 E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 -/* 01108 80A523D8 E60600F8 */ swc1 $f6, 0x00F8($s0) ## 000000F8 -/* 0110C 80A523DC 11A10092 */ beq $t5, $at, .L80A52628 -/* 01110 80A523E0 E60800FC */ swc1 $f8, 0x00FC($s0) ## 000000FC -/* 01114 80A523E4 8602026C */ lh $v0, 0x026C($s0) ## 0000026C -/* 01118 80A523E8 3C0F80A5 */ lui $t7, %hi(D_80A528B0) ## $t7 = 80A50000 -/* 0111C 80A523EC 25EF28B0 */ addiu $t7, $t7, %lo(D_80A528B0) ## $t7 = 80A528B0 -/* 01120 80A523F0 00021040 */ sll $v0, $v0, 1 -/* 01124 80A523F4 00021400 */ sll $v0, $v0, 16 -/* 01128 80A523F8 00021403 */ sra $v0, $v0, 16 -/* 0112C 80A523FC 00027080 */ sll $t6, $v0, 2 -/* 01130 80A52400 01CF2021 */ addu $a0, $t6, $t7 -/* 01134 80A52404 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 01138 80A52408 84C30148 */ lh $v1, 0x0148($a2) ## 00000148 -/* 0113C 80A5240C 3C0980A5 */ lui $t1, %hi(D_80A527A0) ## $t1 = 80A50000 -/* 01140 80A52410 10780004 */ beq $v1, $t8, .L80A52424 -/* 01144 80A52414 00000000 */ nop -/* 01148 80A52418 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -/* 0114C 80A5241C 54680083 */ bnel $v1, $t0, .L80A5262C -/* 01150 80A52420 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A52424: -/* 01154 80A52424 8D2927A0 */ lw $t1, %lo(D_80A527A0)($t1) -/* 01158 80A52428 55200080 */ bnel $t1, $zero, .L80A5262C -/* 0115C 80A5242C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01160 80A52430 8E02025C */ lw $v0, 0x025C($s0) ## 0000025C -/* 01164 80A52434 3C0A80A5 */ lui $t2, %hi(func_80A516E4) ## $t2 = 80A50000 -/* 01168 80A52438 254A16E4 */ addiu $t2, $t2, %lo(func_80A516E4) ## $t2 = 80A516E4 -/* 0116C 80A5243C 11420003 */ beq $t2, $v0, .L80A5244C -/* 01170 80A52440 3C0B80A5 */ lui $t3, %hi(func_80A51D18) ## $t3 = 80A50000 -/* 01174 80A52444 256B1D18 */ addiu $t3, $t3, %lo(func_80A51D18) ## $t3 = 80A51D18 -/* 01178 80A52448 15620077 */ bne $t3, $v0, .L80A52628 -.L80A5244C: -/* 0117C 80A5244C 3C1980A5 */ lui $t9, %hi(D_80A52900) ## $t9 = 80A50000 -/* 01180 80A52450 27392900 */ addiu $t9, $t9, %lo(D_80A52900) ## $t9 = 80A52900 -/* 01184 80A52454 8F2E0000 */ lw $t6, 0x0000($t9) ## 80A52900 -/* 01188 80A52458 27AC0048 */ addiu $t4, $sp, 0x0048 ## $t4 = FFFFFFD0 -/* 0118C 80A5245C 8F2D0004 */ lw $t5, 0x0004($t9) ## 80A52904 -/* 01190 80A52460 AD8E0000 */ sw $t6, 0x0000($t4) ## FFFFFFD0 -/* 01194 80A52464 8F2E0008 */ lw $t6, 0x0008($t9) ## 80A52908 -/* 01198 80A52468 3C1880A5 */ lui $t8, %hi(D_80A5290C) ## $t8 = 80A50000 -/* 0119C 80A5246C 2718290C */ addiu $t8, $t8, %lo(D_80A5290C) ## $t8 = 80A5290C -/* 011A0 80A52470 AD8D0004 */ sw $t5, 0x0004($t4) ## FFFFFFD4 -/* 011A4 80A52474 AD8E0008 */ sw $t6, 0x0008($t4) ## FFFFFFD8 -/* 011A8 80A52478 8F090000 */ lw $t1, 0x0000($t8) ## 80A5290C -/* 011AC 80A5247C 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFC4 -/* 011B0 80A52480 8F080004 */ lw $t0, 0x0004($t8) ## 80A52910 -/* 011B4 80A52484 ADE90000 */ sw $t1, 0x0000($t7) ## FFFFFFC4 -/* 011B8 80A52488 8F090008 */ lw $t1, 0x0008($t8) ## 80A52914 -/* 011BC 80A5248C ADE80004 */ sw $t0, 0x0004($t7) ## FFFFFFC8 -/* 011C0 80A52490 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 011C4 80A52494 ADE90008 */ sw $t1, 0x0008($t7) ## FFFFFFCC -/* 011C8 80A52498 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 011CC 80A5249C 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 -/* 011D0 80A524A0 E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 011D4 80A524A4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 011D8 80A524A8 46128100 */ add.s $f4, $f16, $f18 -/* 011DC 80A524AC E7A40034 */ swc1 $f4, 0x0034($sp) -/* 011E0 80A524B0 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 011E4 80A524B4 0C034213 */ jal Matrix_Push -/* 011E8 80A524B8 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 011EC 80A524BC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 011F0 80A524C0 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C -/* 011F4 80A524C4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 011F8 80A524C8 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 011FC 80A524CC 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 01200 80A524D0 3C0180A5 */ lui $at, %hi(D_80A52C3C) ## $at = 80A50000 -/* 01204 80A524D4 468042A0 */ cvt.s.w $f10, $f8 -/* 01208 80A524D8 C4282C3C */ lwc1 $f8, %lo(D_80A52C3C)($at) -/* 0120C 80A524DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01210 80A524E0 46105480 */ add.s $f18, $f10, $f16 -/* 01214 80A524E4 46049183 */ div.s $f6, $f18, $f4 -/* 01218 80A524E8 46083302 */ mul.s $f12, $f6, $f8 -/* 0121C 80A524EC 0C034348 */ jal Matrix_RotateY -/* 01220 80A524F0 00000000 */ nop -/* 01224 80A524F4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01228 80A524F8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 0122C 80A524FC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFC4 -/* 01230 80A52500 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFDC -/* 01234 80A52504 0C0346BD */ jal Matrix_MultVec3f -/* 01238 80A52508 E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 0123C 80A5250C 0C034221 */ jal Matrix_Pull -/* 01240 80A52510 00000000 */ nop -/* 01244 80A52514 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01248 80A52518 260C0266 */ addiu $t4, $s0, 0x0266 ## $t4 = 00000266 -/* 0124C 80A5251C AFAC0014 */ sw $t4, 0x0014($sp) -/* 01250 80A52520 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01254 80A52524 8FA4007C */ lw $a0, 0x007C($sp) -/* 01258 80A52528 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFB8 -/* 0125C 80A5252C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFDC -/* 01260 80A52530 0C00A789 */ jal func_80029E24 -/* 01264 80A52534 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD0 -/* 01268 80A52538 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0126C 80A5253C 44811000 */ mtc1 $at, $f2 ## $f2 = 60.00 -/* 01270 80A52540 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 01274 80A52544 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01278 80A52548 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 0127C 80A5254C 4602003C */ c.lt.s $f0, $f2 -/* 01280 80A52550 00000000 */ nop -/* 01284 80A52554 45020004 */ bc1fl .L80A52568 -/* 01288 80A52558 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -/* 0128C 80A5255C 1000000F */ beq $zero, $zero, .L80A5259C -/* 01290 80A52560 A6190266 */ sh $t9, 0x0266($s0) ## 00000266 -/* 01294 80A52564 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -.L80A52568: -/* 01298 80A52568 8FAD0068 */ lw $t5, 0x0068($sp) -/* 0129C 80A5256C 4610003C */ c.lt.s $f0, $f16 -/* 012A0 80A52570 00000000 */ nop -/* 012A4 80A52574 45000009 */ bc1f .L80A5259C -/* 012A8 80A52578 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 012AC 80A5257C 44819000 */ mtc1 $at, $f18 ## $f18 = -4.00 -/* 012B0 80A52580 C5A40060 */ lwc1 $f4, 0x0060($t5) ## 00000060 -/* 012B4 80A52584 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 012B8 80A52588 4604903C */ c.lt.s $f18, $f4 -/* 012BC 80A5258C 00000000 */ nop -/* 012C0 80A52590 45020003 */ bc1fl .L80A525A0 -/* 012C4 80A52594 860F0266 */ lh $t7, 0x0266($s0) ## 00000266 -/* 012C8 80A52598 A60E0266 */ sh $t6, 0x0266($s0) ## 00000266 -.L80A5259C: -/* 012CC 80A5259C 860F0266 */ lh $t7, 0x0266($s0) ## 00000266 -.L80A525A0: -/* 012D0 80A525A0 8FA20068 */ lw $v0, 0x0068($sp) -/* 012D4 80A525A4 3C0180A5 */ lui $at, %hi(D_80A52C40) ## $at = 80A50000 -/* 012D8 80A525A8 51E00020 */ beql $t7, $zero, .L80A5262C -/* 012DC 80A525AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012E0 80A525B0 C4262C40 */ lwc1 $f6, %lo(D_80A52C40)($at) -/* 012E4 80A525B4 C4480060 */ lwc1 $f8, 0x0060($v0) ## 00000060 -/* 012E8 80A525B8 4608303C */ c.lt.s $f6, $f8 -/* 012EC 80A525BC 00000000 */ nop -/* 012F0 80A525C0 4503001A */ bc1tl .L80A5262C -/* 012F4 80A525C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012F8 80A525C8 A6000266 */ sh $zero, 0x0266($s0) ## 00000266 -/* 012FC 80A525CC C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 01300 80A525D0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01304 80A525D4 46105001 */ sub.s $f0, $f10, $f16 -/* 01308 80A525D8 46000005 */ abs.s $f0, $f0 -/* 0130C 80A525DC 4602003C */ c.lt.s $f0, $f2 -/* 01310 80A525E0 00000000 */ nop -/* 01314 80A525E4 45020011 */ bc1fl .L80A5262C -/* 01318 80A525E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0131C 80A525EC 0C01E221 */ jal func_80078884 -/* 01320 80A525F0 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C -/* 01324 80A525F4 3C0480A5 */ lui $a0, %hi(D_80A52C00) ## $a0 = 80A50000 -/* 01328 80A525F8 0C00084C */ jal osSyncPrintf - -/* 0132C 80A525FC 24842C00 */ addiu $a0, $a0, %lo(D_80A52C00) ## $a0 = 80A52C00 -/* 01330 80A52600 8FA4007C */ lw $a0, 0x007C($sp) -/* 01334 80A52604 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01338 80A52608 0C00B7D5 */ jal func_8002DF54 -/* 0133C 80A5260C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01340 80A52610 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01344 80A52614 3C0180A5 */ lui $at, %hi(D_80A527A0) ## $at = 80A50000 -/* 01348 80A52618 3C0880A5 */ lui $t0, %hi(func_80A51A98) ## $t0 = 80A50000 -/* 0134C 80A5261C AC3827A0 */ sw $t8, %lo(D_80A527A0)($at) -/* 01350 80A52620 25081A98 */ addiu $t0, $t0, %lo(func_80A51A98) ## $t0 = 80A51A98 -/* 01354 80A52624 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -.L80A52628: -/* 01358 80A52628 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5262C: -/* 0135C 80A5262C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01360 80A52630 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01364 80A52634 03E00008 */ jr $ra -/* 01368 80A52638 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s deleted file mode 100644 index 57e4dd4725..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s +++ /dev/null @@ -1,55 +0,0 @@ -.late_rodata -glabel D_80A52C28 - .float 1.99000000954 - -.text -glabel func_80A5162C -/* 0035C 80A5162C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00360 80A51630 AFB00028 */ sw $s0, 0x0028($sp) -/* 00364 80A51634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00368 80A51638 AFBF002C */ sw $ra, 0x002C($sp) -/* 0036C 80A5163C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00370 80A51640 AFA50034 */ sw $a1, 0x0034($sp) -/* 00374 80A51644 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00378 80A51648 24845880 */ addiu $a0, $a0, 0x5880 ## $a0 = 06005880 -/* 0037C 80A5164C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00380 80A51650 8E060284 */ lw $a2, 0x0284($s0) ## 00000284 -/* 00384 80A51654 AFA00014 */ sw $zero, 0x0014($sp) -/* 00388 80A51658 468021A0 */ cvt.s.w $f6, $f4 -/* 0038C 80A5165C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00390 80A51660 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 -/* 00394 80A51664 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00398 80A51668 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0039C 80A5166C 4600320D */ trunc.w.s $f8, $f6 -/* 003A0 80A51670 440F4000 */ mfc1 $t7, $f8 -/* 003A4 80A51674 00000000 */ nop -/* 003A8 80A51678 000FC400 */ sll $t8, $t7, 16 -/* 003AC 80A5167C 0018CC03 */ sra $t9, $t8, 16 -/* 003B0 80A51680 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 003B4 80A51684 00000000 */ nop -/* 003B8 80A51688 46805420 */ cvt.s.w $f16, $f10 -/* 003BC 80A5168C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 003C0 80A51690 C6120288 */ lwc1 $f18, 0x0288($s0) ## 00000288 -/* 003C4 80A51694 0C029468 */ jal SkelAnime_ChangeAnim - -/* 003C8 80A51698 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 003CC 80A5169C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003D0 80A516A0 3C0180A5 */ lui $at, %hi(D_80A52C28) ## $at = 80A50000 -/* 003D4 80A516A4 E6000278 */ swc1 $f0, 0x0278($s0) ## 00000278 -/* 003D8 80A516A8 E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 -/* 003DC 80A516AC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 003E0 80A516B0 C42C2C28 */ lwc1 $f12, %lo(D_80A52C28)($at) -/* 003E4 80A516B4 4600010D */ trunc.w.s $f4, $f0 -/* 003E8 80A516B8 3C0A80A5 */ lui $t2, %hi(func_80A516E4) ## $t2 = 80A50000 -/* 003EC 80A516BC 254A16E4 */ addiu $t2, $t2, %lo(func_80A516E4) ## $t2 = 80A516E4 -/* 003F0 80A516C0 AE0A025C */ sw $t2, 0x025C($s0) ## 0000025C -/* 003F4 80A516C4 44092000 */ mfc1 $t1, $f4 -/* 003F8 80A516C8 00000000 */ nop -/* 003FC 80A516CC A6090262 */ sh $t1, 0x0262($s0) ## 00000262 -/* 00400 80A516D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00404 80A516D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00408 80A516D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0040C 80A516DC 03E00008 */ jr $ra -/* 00410 80A516E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s deleted file mode 100644 index e96dd473ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s +++ /dev/null @@ -1,296 +0,0 @@ -.rdata -glabel D_80A52B1C - .asciz " 種類 %d\n" - .balign 4 - -glabel D_80A52B30 - .asciz " ぱす %d\n" - .balign 4 - -glabel D_80A52B44 - .asciz " 反転 %d\n" - .balign 4 - -glabel D_80A52B58 - .asciz " 時間 %d\n" - .balign 4 - -glabel D_80A52B6C - .asciz " 点座 %d\n" - .balign 4 - -glabel D_80A52B80 - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80A52C2C - .word 0x4622F983 -glabel D_80A52C30 - .float 1.99000000954 - -.text -glabel func_80A516E4 -/* 00414 80A516E4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00418 80A516E8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0041C 80A516EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00420 80A516F0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00424 80A516F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00428 80A516F8 AFA5004C */ sw $a1, 0x004C($sp) -/* 0042C 80A516FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00430 80A51700 AFA4002C */ sw $a0, 0x002C($sp) -/* 00434 80A51704 8FA4002C */ lw $a0, 0x002C($sp) -/* 00438 80A51708 0C0295B2 */ jal func_800A56C8 -/* 0043C 80A5170C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00440 80A51710 14400004 */ bne $v0, $zero, .L80A51724 -/* 00444 80A51714 8FA4002C */ lw $a0, 0x002C($sp) -/* 00448 80A51718 0C0295B2 */ jal func_800A56C8 -/* 0044C 80A5171C 3C054188 */ lui $a1, 0x4188 ## $a1 = 41880000 -/* 00450 80A51720 10400003 */ beq $v0, $zero, .L80A51730 -.L80A51724: -/* 00454 80A51724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00458 80A51728 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0045C 80A5172C 240528F0 */ addiu $a1, $zero, 0x28F0 ## $a1 = 000028F0 -.L80A51730: -/* 00460 80A51730 3C0E80A5 */ lui $t6, %hi(D_80A527A0) ## $t6 = 80A50000 -/* 00464 80A51734 8DCE27A0 */ lw $t6, %lo(D_80A527A0)($t6) -/* 00468 80A51738 8FAF004C */ lw $t7, 0x004C($sp) -/* 0046C 80A5173C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00470 80A51740 15C000D0 */ bne $t6, $zero, .L80A51A84 -/* 00474 80A51744 030FC021 */ addu $t8, $t8, $t7 -/* 00478 80A51748 8619026C */ lh $t9, 0x026C($s0) ## 0000026C -/* 0047C 80A5174C 8F181E08 */ lw $t8, 0x1E08($t8) ## 00011E08 -/* 00480 80A51750 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00484 80A51754 001948C0 */ sll $t1, $t9, 3 -/* 00488 80A51758 03094021 */ addu $t0, $t8, $t1 -/* 0048C 80A5175C 8D030004 */ lw $v1, 0x0004($t0) ## 00000004 -/* 00490 80A51760 860F02AA */ lh $t7, 0x02AA($s0) ## 000002AA -/* 00494 80A51764 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00498 80A51768 00035100 */ sll $t2, $v1, 4 -/* 0049C 80A5176C 000A5F02 */ srl $t3, $t2, 28 -/* 004A0 80A51770 000B6080 */ sll $t4, $t3, 2 -/* 004A4 80A51774 01AC6821 */ addu $t5, $t5, $t4 -/* 004A8 80A51778 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 004AC 80A5177C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 004B0 80A51780 00617024 */ and $t6, $v1, $at -/* 004B4 80A51784 000FC880 */ sll $t9, $t7, 2 -/* 004B8 80A51788 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 004BC 80A5178C 032FC823 */ subu $t9, $t9, $t7 -/* 004C0 80A51790 01AE1021 */ addu $v0, $t5, $t6 -/* 004C4 80A51794 00411021 */ addu $v0, $v0, $at -/* 004C8 80A51798 0019C840 */ sll $t9, $t9, 1 -/* 004CC 80A5179C 00591021 */ addu $v0, $v0, $t9 -/* 004D0 80A517A0 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 004D4 80A517A4 8E070274 */ lw $a3, 0x0274($s0) ## 00000274 -/* 004D8 80A517A8 AFA80044 */ sw $t0, 0x0044($sp) -/* 004DC 80A517AC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 004E0 80A517B0 AFA20040 */ sw $v0, 0x0040($sp) -/* 004E4 80A517B4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 004E8 80A517B8 46802120 */ cvt.s.w $f4, $f4 -/* 004EC 80A517BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004F0 80A517C0 44052000 */ mfc1 $a1, $f4 -/* 004F4 80A517C4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 004F8 80A517C8 00000000 */ nop -/* 004FC 80A517CC 8FA20040 */ lw $v0, 0x0040($sp) -/* 00500 80A517D0 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00504 80A517D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00508 80A517D8 84490004 */ lh $t1, 0x0004($v0) ## 00000004 -/* 0050C 80A517DC 8E070274 */ lw $a3, 0x0274($s0) ## 00000274 -/* 00510 80A517E0 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 00514 80A517E4 00000000 */ nop -/* 00518 80A517E8 468031A0 */ cvt.s.w $f6, $f6 -/* 0051C 80A517EC 44053000 */ mfc1 $a1, $f6 -/* 00520 80A517F0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00524 80A517F4 00000000 */ nop -/* 00528 80A517F8 26040274 */ addiu $a0, $s0, 0x0274 ## $a0 = 00000274 -/* 0052C 80A517FC 8E05028C */ lw $a1, 0x028C($s0) ## 0000028C -/* 00530 80A51800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00534 80A51804 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00538 80A51808 8E070290 */ lw $a3, 0x0290($s0) ## 00000290 -/* 0053C 80A5180C 8FA20040 */ lw $v0, 0x0040($sp) -/* 00540 80A51810 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00544 80A51814 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00548 80A51818 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 0054C 80A5181C 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 00550 80A51820 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 00554 80A51824 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 00558 80A51828 468042A0 */ cvt.s.w $f10, $f8 -/* 0055C 80A5182C 46809120 */ cvt.s.w $f4, $f18 -/* 00560 80A51830 46105301 */ sub.s $f12, $f10, $f16 -/* 00564 80A51834 46062381 */ sub.s $f14, $f4, $f6 -/* 00568 80A51838 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 0056C 80A5183C 0C03F494 */ jal Math_atan2f -/* 00570 80A51840 E7AE0038 */ swc1 $f14, 0x0038($sp) -/* 00574 80A51844 3C0180A5 */ lui $at, %hi(D_80A52C2C) ## $at = 80A50000 -/* 00578 80A51848 C4282C2C */ lwc1 $f8, %lo(D_80A52C2C)($at) -/* 0057C 80A5184C C6120278 */ lwc1 $f18, 0x0278($s0) ## 00000278 -/* 00580 80A51850 AFA00010 */ sw $zero, 0x0010($sp) -/* 00584 80A51854 46080282 */ mul.s $f10, $f0, $f8 -/* 00588 80A51858 4600910D */ trunc.w.s $f4, $f18 -/* 0058C 80A5185C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00590 80A51860 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00594 80A51864 44072000 */ mfc1 $a3, $f4 -/* 00598 80A51868 4600540D */ trunc.w.s $f16, $f10 -/* 0059C 80A5186C 00073C00 */ sll $a3, $a3, 16 -/* 005A0 80A51870 00073C03 */ sra $a3, $a3, 16 -/* 005A4 80A51874 44058000 */ mfc1 $a1, $f16 -/* 005A8 80A51878 00000000 */ nop -/* 005AC 80A5187C 00052C00 */ sll $a1, $a1, 16 -/* 005B0 80A51880 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 005B4 80A51884 00052C03 */ sra $a1, $a1, 16 -/* 005B8 80A51888 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 005BC 80A5188C 8E050294 */ lw $a1, 0x0294($s0) ## 00000294 -/* 005C0 80A51890 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 005C4 80A51894 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 005C8 80A51898 8E070298 */ lw $a3, 0x0298($s0) ## 00000298 -/* 005CC 80A5189C 860E02A4 */ lh $t6, 0x02A4($s0) ## 000002A4 -/* 005D0 80A518A0 55C00020 */ bnel $t6, $zero, .L80A51924 -/* 005D4 80A518A4 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C -/* 005D8 80A518A8 860F0262 */ lh $t7, 0x0262($s0) ## 00000262 -/* 005DC 80A518AC 3C014600 */ lui $at, 0x4600 ## $at = 46000000 -/* 005E0 80A518B0 44813000 */ mtc1 $at, $f6 ## $f6 = 8192.00 -/* 005E4 80A518B4 25F90001 */ addiu $t9, $t7, 0x0001 ## $t9 = 00000001 -/* 005E8 80A518B8 A6190262 */ sh $t9, 0x0262($s0) ## 00000262 -/* 005EC 80A518BC 86180262 */ lh $t8, 0x0262($s0) ## 00000262 -/* 005F0 80A518C0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 005F4 80A518C4 E6060280 */ swc1 $f6, 0x0280($s0) ## 00000280 -/* 005F8 80A518C8 33090001 */ andi $t1, $t8, 0x0001 ## $t1 = 00000000 -/* 005FC 80A518CC 51200007 */ beql $t1, $zero, .L80A518EC -/* 00600 80A518D0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00604 80A518D4 C6080280 */ lwc1 $f8, 0x0280($s0) ## 00000280 -/* 00608 80A518D8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 0060C 80A518DC 00000000 */ nop -/* 00610 80A518E0 460A4402 */ mul.s $f16, $f8, $f10 -/* 00614 80A518E4 E6100280 */ swc1 $f16, 0x0280($s0) ## 00000280 -/* 00618 80A518E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80A518EC: -/* 0061C 80A518EC 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 00620 80A518F0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00624 80A518F4 00000000 */ nop -/* 00628 80A518F8 860A026A */ lh $t2, 0x026A($s0) ## 0000026A -/* 0062C 80A518FC 4600048D */ trunc.w.s $f18, $f0 -/* 00630 80A51900 3C0C80A5 */ lui $t4, %hi(D_80A52844) ## $t4 = 80A50000 -/* 00634 80A51904 000A5840 */ sll $t3, $t2, 1 -/* 00638 80A51908 018B6021 */ addu $t4, $t4, $t3 -/* 0063C 80A5190C 858C2844 */ lh $t4, %lo(D_80A52844)($t4) -/* 00640 80A51910 44199000 */ mfc1 $t9, $f18 -/* 00644 80A51914 00000000 */ nop -/* 00648 80A51918 0199C021 */ addu $t8, $t4, $t9 -/* 0064C 80A5191C A61802A4 */ sh $t8, 0x02A4($s0) ## 000002A4 -/* 00650 80A51920 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C -.L80A51924: -/* 00654 80A51924 8E050280 */ lw $a1, 0x0280($s0) ## 00000280 -/* 00658 80A51928 8E06029C */ lw $a2, 0x029C($s0) ## 0000029C -/* 0065C 80A5192C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00660 80A51930 8E0702A0 */ lw $a3, 0x02A0($s0) ## 000002A0 -/* 00664 80A51934 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00668 80A51938 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0066C 80A5193C 8605026C */ lh $a1, 0x026C($s0) ## 0000026C -/* 00670 80A51940 844912D6 */ lh $t1, 0x12D6($v0) ## 801612D6 -/* 00674 80A51944 54A90020 */ bnel $a1, $t1, .L80A519C8 -/* 00678 80A51948 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0067C 80A5194C 844A12D4 */ lh $t2, 0x12D4($v0) ## 801612D4 -/* 00680 80A51950 3C0480A5 */ lui $a0, %hi(D_80A52B1C) ## $a0 = 80A50000 -/* 00684 80A51954 5140001C */ beql $t2, $zero, .L80A519C8 -/* 00688 80A51958 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0068C 80A5195C 0C00084C */ jal osSyncPrintf - -/* 00690 80A51960 24842B1C */ addiu $a0, $a0, %lo(D_80A52B1C) ## $a0 = 80A52B1C -/* 00694 80A51964 3C0480A5 */ lui $a0, %hi(D_80A52B30) ## $a0 = 80A50000 -/* 00698 80A51968 24842B30 */ addiu $a0, $a0, %lo(D_80A52B30) ## $a0 = 80A52B30 -/* 0069C 80A5196C 0C00084C */ jal osSyncPrintf - -/* 006A0 80A51970 860502AA */ lh $a1, 0x02AA($s0) ## 000002AA -/* 006A4 80A51974 C6040278 */ lwc1 $f4, 0x0278($s0) ## 00000278 -/* 006A8 80A51978 3C0480A5 */ lui $a0, %hi(D_80A52B44) ## $a0 = 80A50000 -/* 006AC 80A5197C 24842B44 */ addiu $a0, $a0, %lo(D_80A52B44) ## $a0 = 80A52B44 -/* 006B0 80A51980 460021A1 */ cvt.d.s $f6, $f4 -/* 006B4 80A51984 44073000 */ mfc1 $a3, $f6 -/* 006B8 80A51988 44063800 */ mfc1 $a2, $f7 -/* 006BC 80A5198C 0C00084C */ jal osSyncPrintf - -/* 006C0 80A51990 00000000 */ nop -/* 006C4 80A51994 3C0480A5 */ lui $a0, %hi(D_80A52B58) ## $a0 = 80A50000 -/* 006C8 80A51998 24842B58 */ addiu $a0, $a0, %lo(D_80A52B58) ## $a0 = 80A52B58 -/* 006CC 80A5199C 0C00084C */ jal osSyncPrintf - -/* 006D0 80A519A0 86050270 */ lh $a1, 0x0270($s0) ## 00000270 -/* 006D4 80A519A4 8FAB0044 */ lw $t3, 0x0044($sp) -/* 006D8 80A519A8 3C0480A5 */ lui $a0, %hi(D_80A52B6C) ## $a0 = 80A50000 -/* 006DC 80A519AC 24842B6C */ addiu $a0, $a0, %lo(D_80A52B6C) ## $a0 = 80A52B6C -/* 006E0 80A519B0 0C00084C */ jal osSyncPrintf - -/* 006E4 80A519B4 91650000 */ lbu $a1, 0x0000($t3) ## 00000000 -/* 006E8 80A519B8 3C0480A5 */ lui $a0, %hi(D_80A52B80) ## $a0 = 80A50000 -/* 006EC 80A519BC 0C00084C */ jal osSyncPrintf - -/* 006F0 80A519C0 24842B80 */ addiu $a0, $a0, %lo(D_80A52B80) ## $a0 = 80A52B80 -/* 006F4 80A519C4 C7A0003C */ lwc1 $f0, 0x003C($sp) -.L80A519C8: -/* 006F8 80A519C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 006FC 80A519CC 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 00700 80A519D0 46000005 */ abs.s $f0, $f0 -/* 00704 80A519D4 4602003C */ c.lt.s $f0, $f2 -/* 00708 80A519D8 C7A00038 */ lwc1 $f0, 0x0038($sp) -/* 0070C 80A519DC 4502002A */ bc1fl .L80A51A88 -/* 00710 80A519E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00714 80A519E4 46000005 */ abs.s $f0, $f0 -/* 00718 80A519E8 4602003C */ c.lt.s $f0, $f2 -/* 0071C 80A519EC 00000000 */ nop -/* 00720 80A519F0 45020025 */ bc1fl .L80A51A88 -/* 00724 80A519F4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00728 80A519F8 860D0270 */ lh $t5, 0x0270($s0) ## 00000270 -/* 0072C 80A519FC 55A00022 */ bnel $t5, $zero, .L80A51A88 -/* 00730 80A51A00 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00734 80A51A04 860E026A */ lh $t6, 0x026A($s0) ## 0000026A -/* 00738 80A51A08 29C10002 */ slti $at, $t6, 0x0002 -/* 0073C 80A51A0C 1420001A */ bne $at, $zero, .L80A51A78 -/* 00740 80A51A10 00000000 */ nop -/* 00744 80A51A14 860F02AA */ lh $t7, 0x02AA($s0) ## 000002AA -/* 00748 80A51A18 29E10004 */ slti $at, $t7, 0x0004 -/* 0074C 80A51A1C 14200016 */ bne $at, $zero, .L80A51A78 -/* 00750 80A51A20 3C0180A5 */ lui $at, %hi(D_80A52C30) ## $at = 80A50000 -/* 00754 80A51A24 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00758 80A51A28 C42C2C30 */ lwc1 $f12, %lo(D_80A52C30)($at) -/* 0075C 80A51A2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00760 80A51A30 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00764 80A51A34 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00768 80A51A38 4600403C */ c.lt.s $f8, $f0 -/* 0076C 80A51A3C 00000000 */ nop -/* 00770 80A51A40 4500000D */ bc1f .L80A51A78 -/* 00774 80A51A44 00000000 */ nop -/* 00778 80A51A48 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA -/* 0077C 80A51A4C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00780 80A51A50 54410004 */ bnel $v0, $at, .L80A51A64 -/* 00784 80A51A54 28410004 */ slti $at, $v0, 0x0004 -/* 00788 80A51A58 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 0078C 80A51A5C 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA -/* 00790 80A51A60 28410004 */ slti $at, $v0, 0x0004 -.L80A51A64: -/* 00794 80A51A64 14200002 */ bne $at, $zero, .L80A51A70 -/* 00798 80A51A68 244CFFFD */ addiu $t4, $v0, 0xFFFD ## $t4 = FFFFFFFD -/* 0079C 80A51A6C A60C02AA */ sh $t4, 0x02AA($s0) ## 000002AA -.L80A51A70: -/* 007A0 80A51A70 10000004 */ beq $zero, $zero, .L80A51A84 -/* 007A4 80A51A74 A6190270 */ sh $t9, 0x0270($s0) ## 00000270 -.L80A51A78: -/* 007A8 80A51A78 3C1880A5 */ lui $t8, %hi(func_80A51C4C) ## $t8 = 80A50000 -/* 007AC 80A51A7C 27181C4C */ addiu $t8, $t8, %lo(func_80A51C4C) ## $t8 = 80A51C4C -/* 007B0 80A51A80 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -.L80A51A84: -/* 007B4 80A51A84 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A51A88: -/* 007B8 80A51A88 8FB00020 */ lw $s0, 0x0020($sp) -/* 007BC 80A51A8C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 007C0 80A51A90 03E00008 */ jr $ra -/* 007C4 80A51A94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s deleted file mode 100644 index 2c33a08e7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A51A98 -/* 007C8 80A51A98 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007CC 80A51A9C AFB00028 */ sw $s0, 0x0028($sp) -/* 007D0 80A51AA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007D4 80A51AA4 AFBF002C */ sw $ra, 0x002C($sp) -/* 007D8 80A51AA8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 007DC 80A51AAC AFA50034 */ sw $a1, 0x0034($sp) -/* 007E0 80A51AB0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 007E4 80A51AB4 24845880 */ addiu $a0, $a0, 0x5880 ## $a0 = 06005880 -/* 007E8 80A51AB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 007EC 80A51ABC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 007F0 80A51AC0 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 007F4 80A51AC4 468021A0 */ cvt.s.w $f6, $f4 -/* 007F8 80A51AC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007FC 80A51ACC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 -/* 00800 80A51AD0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00804 80A51AD4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00808 80A51AD8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0080C 80A51ADC 4600320D */ trunc.w.s $f8, $f6 -/* 00810 80A51AE0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00814 80A51AE4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00818 80A51AE8 440F4000 */ mfc1 $t7, $f8 -/* 0081C 80A51AEC 00000000 */ nop -/* 00820 80A51AF0 000FC400 */ sll $t8, $t7, 16 -/* 00824 80A51AF4 0018CC03 */ sra $t9, $t8, 16 -/* 00828 80A51AF8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0082C 80A51AFC 00000000 */ nop -/* 00830 80A51B00 46805420 */ cvt.s.w $f16, $f10 -/* 00834 80A51B04 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00838 80A51B08 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0083C 80A51B0C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00840 80A51B10 2405702D */ addiu $a1, $zero, 0x702D ## $a1 = 0000702D -/* 00844 80A51B14 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00848 80A51B18 E6000278 */ swc1 $f0, 0x0278($s0) ## 00000278 -/* 0084C 80A51B1C E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 -/* 00850 80A51B20 0C042DA0 */ jal func_8010B680 -/* 00854 80A51B24 8FA40034 */ lw $a0, 0x0034($sp) -/* 00858 80A51B28 8FA40034 */ lw $a0, 0x0034($sp) -/* 0085C 80A51B2C 0C021BC0 */ jal Interface_SetDoAction -/* 00860 80A51B30 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 -/* 00864 80A51B34 3C0880A5 */ lui $t0, %hi(func_80A51B54) ## $t0 = 80A50000 -/* 00868 80A51B38 25081B54 */ addiu $t0, $t0, %lo(func_80A51B54) ## $t0 = 80A51B54 -/* 0086C 80A51B3C AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00870 80A51B40 8FBF002C */ lw $ra, 0x002C($sp) -/* 00874 80A51B44 8FB00028 */ lw $s0, 0x0028($sp) -/* 00878 80A51B48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0087C 80A51B4C 03E00008 */ jr $ra -/* 00880 80A51B50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s deleted file mode 100644 index aec5f504b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80A51B54 -/* 00884 80A51B54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00888 80A51B58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0088C 80A51B5C AFB00020 */ sw $s0, 0x0020($sp) -/* 00890 80A51B60 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00894 80A51B64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 80A51B68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0089C 80A51B6C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008A0 80A51B70 AFAE002C */ sw $t6, 0x002C($sp) -/* 008A4 80A51B74 8FAF002C */ lw $t7, 0x002C($sp) -/* 008A8 80A51B78 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 008AC 80A51B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008B0 80A51B80 8E070274 */ lw $a3, 0x0274($s0) ## 00000274 -/* 008B4 80A51B84 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 008B8 80A51B88 8DE50024 */ lw $a1, 0x0024($t7) ## 00000024 -/* 008BC 80A51B8C 8FB8002C */ lw $t8, 0x002C($sp) -/* 008C0 80A51B90 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 008C4 80A51B94 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008C8 80A51B98 8E070274 */ lw $a3, 0x0274($s0) ## 00000274 -/* 008CC 80A51B9C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 008D0 80A51BA0 8F05002C */ lw $a1, 0x002C($t8) ## 0000002C -/* 008D4 80A51BA4 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 008D8 80A51BA8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 008DC 80A51BAC 26040274 */ addiu $a0, $s0, 0x0274 ## $a0 = 00000274 -/* 008E0 80A51BB0 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 008E4 80A51BB4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 008E8 80A51BB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008EC 80A51BBC C6040278 */ lwc1 $f4, 0x0278($s0) ## 00000278 -/* 008F0 80A51BC0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 008F4 80A51BC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 008F8 80A51BC8 4600218D */ trunc.w.s $f6, $f4 -/* 008FC 80A51BCC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00900 80A51BD0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00904 80A51BD4 44073000 */ mfc1 $a3, $f6 -/* 00908 80A51BD8 00000000 */ nop -/* 0090C 80A51BDC 00073C00 */ sll $a3, $a3, 16 -/* 00910 80A51BE0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00914 80A51BE4 00073C03 */ sra $a3, $a3, 16 -/* 00918 80A51BE8 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 0091C 80A51BEC 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 00920 80A51BF0 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 00924 80A51BF4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00928 80A51BF8 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0092C 80A51BFC 3C074396 */ lui $a3, 0x4396 ## $a3 = 43960000 -/* 00930 80A51C00 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C -/* 00934 80A51C04 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 00938 80A51C08 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 0093C 80A51C0C 3C0644FA */ lui $a2, 0x44FA ## $a2 = 44FA0000 -/* 00940 80A51C10 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00944 80A51C14 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 -/* 00948 80A51C18 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 0094C 80A51C1C 3C0880A5 */ lui $t0, %hi(func_80A51F50) ## $t0 = 80A50000 -/* 00950 80A51C20 25081F50 */ addiu $t0, $t0, %lo(func_80A51F50) ## $t0 = 80A51F50 -/* 00954 80A51C24 460A403C */ c.lt.s $f8, $f10 -/* 00958 80A51C28 00000000 */ nop -/* 0095C 80A51C2C 45020003 */ bc1fl .L80A51C3C -/* 00960 80A51C30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00964 80A51C34 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00968 80A51C38 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A51C3C: -/* 0096C 80A51C3C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00970 80A51C40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00974 80A51C44 03E00008 */ jr $ra -/* 00978 80A51C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s deleted file mode 100644 index 7ecc645efe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80A52C34 - .float 1.99000000954 - -.text -glabel func_80A51C4C -/* 0097C 80A51C4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00980 80A51C50 AFB00028 */ sw $s0, 0x0028($sp) -/* 00984 80A51C54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00988 80A51C58 AFBF002C */ sw $ra, 0x002C($sp) -/* 0098C 80A51C5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00990 80A51C60 AFA50034 */ sw $a1, 0x0034($sp) -/* 00994 80A51C64 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00998 80A51C68 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 0099C 80A51C6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 009A0 80A51C70 8E060284 */ lw $a2, 0x0284($s0) ## 00000284 -/* 009A4 80A51C74 AFA00014 */ sw $zero, 0x0014($sp) -/* 009A8 80A51C78 468021A0 */ cvt.s.w $f6, $f4 -/* 009AC 80A51C7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 009B0 80A51C80 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 009B4 80A51C84 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009B8 80A51C88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009BC 80A51C8C 4600320D */ trunc.w.s $f8, $f6 -/* 009C0 80A51C90 440F4000 */ mfc1 $t7, $f8 -/* 009C4 80A51C94 00000000 */ nop -/* 009C8 80A51C98 000FC400 */ sll $t8, $t7, 16 -/* 009CC 80A51C9C 0018CC03 */ sra $t9, $t8, 16 -/* 009D0 80A51CA0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 009D4 80A51CA4 00000000 */ nop -/* 009D8 80A51CA8 46805420 */ cvt.s.w $f16, $f10 -/* 009DC 80A51CAC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 009E0 80A51CB0 C6120288 */ lwc1 $f18, 0x0288($s0) ## 00000288 -/* 009E4 80A51CB4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 009E8 80A51CB8 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 009EC 80A51CBC A6000264 */ sh $zero, 0x0264($s0) ## 00000264 -/* 009F0 80A51CC0 3C0180A5 */ lui $at, %hi(D_80A52C34) ## $at = 80A50000 -/* 009F4 80A51CC4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 009F8 80A51CC8 C42C2C34 */ lwc1 $f12, %lo(D_80A52C34)($at) -/* 009FC 80A51CCC 4600010D */ trunc.w.s $f4, $f0 -/* 00A00 80A51CD0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00A04 80A51CD4 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 00A08 80A51CD8 44092000 */ mfc1 $t1, $f4 -/* 00A0C 80A51CDC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00A10 80A51CE0 A6090262 */ sh $t1, 0x0262($s0) ## 00000262 -/* 00A14 80A51CE4 4600018D */ trunc.w.s $f6, $f0 -/* 00A18 80A51CE8 3C0F80A5 */ lui $t7, %hi(func_80A51D18) ## $t7 = 80A50000 -/* 00A1C 80A51CEC 25EF1D18 */ addiu $t7, $t7, %lo(func_80A51D18) ## $t7 = 80A51D18 -/* 00A20 80A51CF0 AE0F025C */ sw $t7, 0x025C($s0) ## 0000025C -/* 00A24 80A51CF4 440D3000 */ mfc1 $t5, $f6 -/* 00A28 80A51CF8 00000000 */ nop -/* 00A2C 80A51CFC 25AE0032 */ addiu $t6, $t5, 0x0032 ## $t6 = 00000032 -/* 00A30 80A51D00 A60E02A6 */ sh $t6, 0x02A6($s0) ## 000002A6 -/* 00A34 80A51D04 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A38 80A51D08 8FB00028 */ lw $s0, 0x0028($sp) -/* 00A3C 80A51D0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A40 80A51D10 03E00008 */ jr $ra -/* 00A44 80A51D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s deleted file mode 100644 index bc8175272b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s +++ /dev/null @@ -1,187 +0,0 @@ -.rdata -glabel D_80A52B84 - .asciz " 種類 %d\n" - .balign 4 - -glabel D_80A52B98 - .asciz " ぱす %d\n" - .balign 4 - -glabel D_80A52BAC - .asciz " 反転 %d\n" - .balign 4 - -glabel D_80A52BC0 - .asciz " 時間 %d\n" - .balign 4 - -glabel D_80A52BD4 - .asciz "\n\n" - .balign 4 - -.text -glabel func_80A51D18 -/* 00A48 80A51D18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A4C 80A51D1C AFB00018 */ sw $s0, 0x0018($sp) -/* 00A50 80A51D20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A54 80A51D24 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A58 80A51D28 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A5C 80A51D2C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A60 80A51D30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A64 80A51D34 3C0E80A5 */ lui $t6, %hi(D_80A527A0) ## $t6 = 80A50000 -/* 00A68 80A51D38 8DCE27A0 */ lw $t6, %lo(D_80A527A0)($t6) -/* 00A6C 80A51D3C 55C00080 */ bnel $t6, $zero, .L80A51F40 -/* 00A70 80A51D40 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A74 80A51D44 86020264 */ lh $v0, 0x0264($s0) ## 00000264 -/* 00A78 80A51D48 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00A7C 80A51D4C 50400006 */ beql $v0, $zero, .L80A51D68 -/* 00A80 80A51D50 860F0262 */ lh $t7, 0x0262($s0) ## 00000262 -/* 00A84 80A51D54 50430023 */ beql $v0, $v1, .L80A51DE4 -/* 00A88 80A51D58 861902A4 */ lh $t9, 0x02A4($s0) ## 000002A4 -/* 00A8C 80A51D5C 10000051 */ beq $zero, $zero, .L80A51EA4 -/* 00A90 80A51D60 C60002A0 */ lwc1 $f0, 0x02A0($s0) ## 000002A0 -/* 00A94 80A51D64 860F0262 */ lh $t7, 0x0262($s0) ## 00000262 -.L80A51D68: -/* 00A98 80A51D68 3C01C614 */ lui $at, 0xC614 ## $at = C6140000 -/* 00A9C 80A51D6C 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00AA0 80A51D70 A6180262 */ sh $t8, 0x0262($s0) ## 00000262 -/* 00AA4 80A51D74 86190262 */ lh $t9, 0x0262($s0) ## 00000262 -/* 00AA8 80A51D78 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00AAC 80A51D7C 51000006 */ beql $t0, $zero, .L80A51D98 -/* 00AB0 80A51D80 44813000 */ mtc1 $at, $f6 ## $f6 = -9472.00 -/* 00AB4 80A51D84 3C014614 */ lui $at, 0x4614 ## $at = 46140000 -/* 00AB8 80A51D88 44812000 */ mtc1 $at, $f4 ## $f4 = 9472.00 -/* 00ABC 80A51D8C 10000004 */ beq $zero, $zero, .L80A51DA0 -/* 00AC0 80A51D90 E6040280 */ swc1 $f4, 0x0280($s0) ## 00000280 -/* 00AC4 80A51D94 44813000 */ mtc1 $at, $f6 ## $f6 = 9472.00 -.L80A51D98: -/* 00AC8 80A51D98 00000000 */ nop -/* 00ACC 80A51D9C E6060280 */ swc1 $f6, 0x0280($s0) ## 00000280 -.L80A51DA0: -/* 00AD0 80A51DA0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00AD4 80A51DA4 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 00AD8 80A51DA8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00ADC 80A51DAC 00000000 */ nop -/* 00AE0 80A51DB0 8609026A */ lh $t1, 0x026A($s0) ## 0000026A -/* 00AE4 80A51DB4 4600020D */ trunc.w.s $f8, $f0 -/* 00AE8 80A51DB8 3C0B80A5 */ lui $t3, %hi(D_80A52844) ## $t3 = 80A50000 -/* 00AEC 80A51DBC 00095040 */ sll $t2, $t1, 1 -/* 00AF0 80A51DC0 016A5821 */ addu $t3, $t3, $t2 -/* 00AF4 80A51DC4 856B2844 */ lh $t3, %lo(D_80A52844)($t3) -/* 00AF8 80A51DC8 440F4000 */ mfc1 $t7, $f8 -/* 00AFC 80A51DCC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00B00 80A51DD0 A6030264 */ sh $v1, 0x0264($s0) ## 00000264 -/* 00B04 80A51DD4 016FC021 */ addu $t8, $t3, $t7 -/* 00B08 80A51DD8 10000031 */ beq $zero, $zero, .L80A51EA0 -/* 00B0C 80A51DDC A61802A4 */ sh $t8, 0x02A4($s0) ## 000002A4 -/* 00B10 80A51DE0 861902A4 */ lh $t9, 0x02A4($s0) ## 000002A4 -.L80A51DE4: -/* 00B14 80A51DE4 5720002F */ bnel $t9, $zero, .L80A51EA4 -/* 00B18 80A51DE8 C60002A0 */ lwc1 $f0, 0x02A0($s0) ## 000002A0 -/* 00B1C 80A51DEC 860802A6 */ lh $t0, 0x02A6($s0) ## 000002A6 -/* 00B20 80A51DF0 3C1880A5 */ lui $t8, %hi(func_80A5162C) ## $t8 = 80A50000 -/* 00B24 80A51DF4 2718162C */ addiu $t8, $t8, %lo(func_80A5162C) ## $t8 = 80A5162C -/* 00B28 80A51DF8 55000029 */ bnel $t0, $zero, .L80A51EA0 -/* 00B2C 80A51DFC A6000264 */ sh $zero, 0x0264($s0) ## 00000264 -/* 00B30 80A51E00 8602026A */ lh $v0, 0x026A($s0) ## 0000026A -/* 00B34 80A51E04 50400004 */ beql $v0, $zero, .L80A51E18 -/* 00B38 80A51E08 860902AA */ lh $t1, 0x02AA($s0) ## 000002AA -/* 00B3C 80A51E0C 1462000A */ bne $v1, $v0, .L80A51E38 -/* 00B40 80A51E10 3C0480A5 */ lui $a0, %hi(D_80A52900) ## $a0 = 80A50000 -/* 00B44 80A51E14 860902AA */ lh $t1, 0x02AA($s0) ## 000002AA -.L80A51E18: -/* 00B48 80A51E18 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 00B4C 80A51E1C A60A02AA */ sh $t2, 0x02AA($s0) ## 000002AA -/* 00B50 80A51E20 860C02AA */ lh $t4, 0x02AA($s0) ## 000002AA -/* 00B54 80A51E24 29810004 */ slti $at, $t4, 0x0004 -/* 00B58 80A51E28 1420001A */ bne $at, $zero, .L80A51E94 -/* 00B5C 80A51E2C 00000000 */ nop -/* 00B60 80A51E30 10000018 */ beq $zero, $zero, .L80A51E94 -/* 00B64 80A51E34 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -.L80A51E38: -/* 00B68 80A51E38 3C0280A5 */ lui $v0, %hi(D_80A528F0) ## $v0 = 80A50000 -/* 00B6C 80A51E3C 244228F0 */ addiu $v0, $v0, %lo(D_80A528F0) ## $v0 = 80A528F0 -/* 00B70 80A51E40 860302AA */ lh $v1, 0x02AA($s0) ## 000002AA -/* 00B74 80A51E44 24842900 */ addiu $a0, $a0, %lo(D_80A52900) ## $a0 = 80A52900 -/* 00B78 80A51E48 844D0000 */ lh $t5, 0x0000($v0) ## 80A528F0 -.L80A51E4C: -/* 00B7C 80A51E4C 146D000B */ bne $v1, $t5, .L80A51E7C -/* 00B80 80A51E50 3C0E80A5 */ lui $t6, %hi(D_80A52900) ## $t6 = 80A50000 -/* 00B84 80A51E54 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 80A528F2 -/* 00B88 80A51E58 25CE2900 */ addiu $t6, $t6, %lo(D_80A52900) ## $t6 = 80A52900 -/* 00B8C 80A51E5C 004E082B */ sltu $at, $v0, $t6 -/* 00B90 80A51E60 54200004 */ bnel $at, $zero, .L80A51E74 -/* 00B94 80A51E64 844B0000 */ lh $t3, 0x0000($v0) ## 80A528F2 -/* 00B98 80A51E68 3C0280A5 */ lui $v0, %hi(D_80A528F0) ## $v0 = 80A50000 -/* 00B9C 80A51E6C 244228F0 */ addiu $v0, $v0, %lo(D_80A528F0) ## $v0 = 80A528F0 -/* 00BA0 80A51E70 844B0000 */ lh $t3, 0x0000($v0) ## 80A528F0 -.L80A51E74: -/* 00BA4 80A51E74 10000005 */ beq $zero, $zero, .L80A51E8C -/* 00BA8 80A51E78 A60B02AA */ sh $t3, 0x02AA($s0) ## 000002AA -.L80A51E7C: -/* 00BAC 80A51E7C 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 80A528F2 -/* 00BB0 80A51E80 0044082B */ sltu $at, $v0, $a0 -/* 00BB4 80A51E84 5420FFF1 */ bnel $at, $zero, .L80A51E4C -/* 00BB8 80A51E88 844D0000 */ lh $t5, 0x0000($v0) ## 80A528F2 -.L80A51E8C: -/* 00BBC 80A51E8C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00BC0 80A51E90 A60F0270 */ sh $t7, 0x0270($s0) ## 00000270 -.L80A51E94: -/* 00BC4 80A51E94 10000002 */ beq $zero, $zero, .L80A51EA0 -/* 00BC8 80A51E98 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -/* 00BCC 80A51E9C A6000264 */ sh $zero, 0x0264($s0) ## 00000264 -.L80A51EA0: -/* 00BD0 80A51EA0 C60002A0 */ lwc1 $f0, 0x02A0($s0) ## 000002A0 -.L80A51EA4: -/* 00BD4 80A51EA4 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C -/* 00BD8 80A51EA8 8E050280 */ lw $a1, 0x0280($s0) ## 00000280 -/* 00BDC 80A51EAC 46000280 */ add.s $f10, $f0, $f0 -/* 00BE0 80A51EB0 8E06029C */ lw $a2, 0x029C($s0) ## 0000029C -/* 00BE4 80A51EB4 44075000 */ mfc1 $a3, $f10 -/* 00BE8 80A51EB8 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00BEC 80A51EBC 00000000 */ nop -/* 00BF0 80A51EC0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00BF4 80A51EC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00BF8 80A51EC8 8605026C */ lh $a1, 0x026C($s0) ## 0000026C -/* 00BFC 80A51ECC 845912D6 */ lh $t9, 0x12D6($v0) ## 801612D6 -/* 00C00 80A51ED0 54B9001B */ bnel $a1, $t9, .L80A51F40 -/* 00C04 80A51ED4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C08 80A51ED8 844812D4 */ lh $t0, 0x12D4($v0) ## 801612D4 -/* 00C0C 80A51EDC 3C0480A5 */ lui $a0, %hi(D_80A52B84) ## $a0 = 80A50000 -/* 00C10 80A51EE0 51000017 */ beql $t0, $zero, .L80A51F40 -/* 00C14 80A51EE4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C18 80A51EE8 0C00084C */ jal osSyncPrintf - -/* 00C1C 80A51EEC 24842B84 */ addiu $a0, $a0, %lo(D_80A52B84) ## $a0 = 80A52B84 -/* 00C20 80A51EF0 3C0480A5 */ lui $a0, %hi(D_80A52B98) ## $a0 = 80A50000 -/* 00C24 80A51EF4 24842B98 */ addiu $a0, $a0, %lo(D_80A52B98) ## $a0 = 80A52B98 -/* 00C28 80A51EF8 0C00084C */ jal osSyncPrintf - -/* 00C2C 80A51EFC 860502AA */ lh $a1, 0x02AA($s0) ## 000002AA -/* 00C30 80A51F00 C6100278 */ lwc1 $f16, 0x0278($s0) ## 00000278 -/* 00C34 80A51F04 3C0480A5 */ lui $a0, %hi(D_80A52BAC) ## $a0 = 80A50000 -/* 00C38 80A51F08 24842BAC */ addiu $a0, $a0, %lo(D_80A52BAC) ## $a0 = 80A52BAC -/* 00C3C 80A51F0C 460084A1 */ cvt.d.s $f18, $f16 -/* 00C40 80A51F10 44079000 */ mfc1 $a3, $f18 -/* 00C44 80A51F14 44069800 */ mfc1 $a2, $f19 -/* 00C48 80A51F18 0C00084C */ jal osSyncPrintf - -/* 00C4C 80A51F1C 00000000 */ nop -/* 00C50 80A51F20 3C0480A5 */ lui $a0, %hi(D_80A52BC0) ## $a0 = 80A50000 -/* 00C54 80A51F24 24842BC0 */ addiu $a0, $a0, %lo(D_80A52BC0) ## $a0 = 80A52BC0 -/* 00C58 80A51F28 0C00084C */ jal osSyncPrintf - -/* 00C5C 80A51F2C 86050270 */ lh $a1, 0x0270($s0) ## 00000270 -/* 00C60 80A51F30 3C0480A5 */ lui $a0, %hi(D_80A52BD4) ## $a0 = 80A50000 -/* 00C64 80A51F34 0C00084C */ jal osSyncPrintf - -/* 00C68 80A51F38 24842BD4 */ addiu $a0, $a0, %lo(D_80A52BD4) ## $a0 = 80A52BD4 -/* 00C6C 80A51F3C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A51F40: -/* 00C70 80A51F40 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C74 80A51F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C78 80A51F48 03E00008 */ jr $ra -/* 00C7C 80A51F4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s deleted file mode 100644 index f945ce797e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80A51F50 -/* 00C80 80A51F50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C84 80A51F54 AFA40028 */ sw $a0, 0x0028($sp) -/* 00C88 80A51F58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C8C 80A51F5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00C90 80A51F60 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C94 80A51F64 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00C98 80A51F68 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00C9C 80A51F6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00CA0 80A51F70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00CA4 80A51F74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00CA8 80A51F78 468021A0 */ cvt.s.w $f6, $f4 -/* 00CAC 80A51F7C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00CB0 80A51F80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00CB4 80A51F84 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 00CB8 80A51F88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00CBC 80A51F8C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00CC0 80A51F90 4600320D */ trunc.w.s $f8, $f6 -/* 00CC4 80A51F94 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CC8 80A51F98 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00CCC 80A51F9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CD0 80A51FA0 440F4000 */ mfc1 $t7, $f8 -/* 00CD4 80A51FA4 00000000 */ nop -/* 00CD8 80A51FA8 000FC400 */ sll $t8, $t7, 16 -/* 00CDC 80A51FAC 0018CC03 */ sra $t9, $t8, 16 -/* 00CE0 80A51FB0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00CE4 80A51FB4 00000000 */ nop -/* 00CE8 80A51FB8 46805420 */ cvt.s.w $f16, $f10 -/* 00CEC 80A51FBC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00CF0 80A51FC0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00CF4 80A51FC4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00CF8 80A51FC8 3C0980A5 */ lui $t1, %hi(func_80A51FEC) ## $t1 = 80A50000 -/* 00CFC 80A51FCC 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 00D00 80A51FD0 25291FEC */ addiu $t1, $t1, %lo(func_80A51FEC) ## $t1 = 80A51FEC -/* 00D04 80A51FD4 A44802A8 */ sh $t0, 0x02A8($v0) ## 000002A8 -/* 00D08 80A51FD8 AC49025C */ sw $t1, 0x025C($v0) ## 0000025C -/* 00D0C 80A51FDC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00D10 80A51FE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D14 80A51FE4 03E00008 */ jr $ra -/* 00D18 80A51FE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s deleted file mode 100644 index 2bcd87f50c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A51FEC -/* 00D1C 80A51FEC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D20 80A51FF0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D24 80A51FF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D28 80A51FF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D2C 80A51FFC AFA5002C */ sw $a1, 0x002C($sp) -/* 00D30 80A52000 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D34 80A52004 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D38 80A52008 860E026A */ lh $t6, 0x026A($s0) ## 0000026A -/* 00D3C 80A5200C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00D40 80A52010 51C10017 */ beql $t6, $at, .L80A52070 -/* 00D44 80A52014 861802A8 */ lh $t8, 0x02A8($s0) ## 000002A8 -/* 00D48 80A52018 C6040278 */ lwc1 $f4, 0x0278($s0) ## 00000278 -/* 00D4C 80A5201C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00D50 80A52020 AFA00010 */ sw $zero, 0x0010($sp) -/* 00D54 80A52024 4600218D */ trunc.w.s $f6, $f4 -/* 00D58 80A52028 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00D5C 80A5202C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00D60 80A52030 44073000 */ mfc1 $a3, $f6 -/* 00D64 80A52034 00000000 */ nop -/* 00D68 80A52038 00073C00 */ sll $a3, $a3, 16 -/* 00D6C 80A5203C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00D70 80A52040 00073C03 */ sra $a3, $a3, 16 -/* 00D74 80A52044 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 00D78 80A52048 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 00D7C 80A5204C 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 00D80 80A52050 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00D84 80A52054 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00D88 80A52058 3C074396 */ lui $a3, 0x4396 ## $a3 = 43960000 -/* 00D8C 80A5205C 2604027C */ addiu $a0, $s0, 0x027C ## $a0 = 0000027C -/* 00D90 80A52060 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 00D94 80A52064 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00D98 80A52068 3C0644FA */ lui $a2, 0x44FA ## $a2 = 44FA0000 -/* 00D9C 80A5206C 861802A8 */ lh $t8, 0x02A8($s0) ## 000002A8 -.L80A52070: -/* 00DA0 80A52070 3C1980A5 */ lui $t9, %hi(func_80A52098) ## $t9 = 80A50000 -/* 00DA4 80A52074 27392098 */ addiu $t9, $t9, %lo(func_80A52098) ## $t9 = 80A52098 -/* 00DA8 80A52078 57000003 */ bnel $t8, $zero, .L80A52088 -/* 00DAC 80A5207C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DB0 80A52080 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -/* 00DB4 80A52084 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A52088: -/* 00DB8 80A52088 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DBC 80A5208C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DC0 80A52090 03E00008 */ jr $ra -/* 00DC4 80A52094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s deleted file mode 100644 index 7caa148292..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A52098 -/* 00DC8 80A52098 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DCC 80A5209C AFA40028 */ sw $a0, 0x0028($sp) -/* 00DD0 80A520A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00DD4 80A520A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00DD8 80A520A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00DDC 80A520AC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00DE0 80A520B0 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00DE4 80A520B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00DE8 80A520B8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00DEC 80A520BC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00DF0 80A520C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00DF4 80A520C4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00DF8 80A520C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DFC 80A520CC 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 00E00 80A520D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E04 80A520D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E08 80A520D8 4600320D */ trunc.w.s $f8, $f6 -/* 00E0C 80A520DC AFA00014 */ sw $zero, 0x0014($sp) -/* 00E10 80A520E0 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00E14 80A520E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E18 80A520E8 440F4000 */ mfc1 $t7, $f8 -/* 00E1C 80A520EC 00000000 */ nop -/* 00E20 80A520F0 000FC400 */ sll $t8, $t7, 16 -/* 00E24 80A520F4 0018CC03 */ sra $t9, $t8, 16 -/* 00E28 80A520F8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00E2C 80A520FC 00000000 */ nop -/* 00E30 80A52100 46805420 */ cvt.s.w $f16, $f10 -/* 00E34 80A52104 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00E38 80A52108 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00E3C 80A5210C 8FA90028 */ lw $t1, 0x0028($sp) -/* 00E40 80A52110 3C0880A5 */ lui $t0, %hi(func_80A5212C) ## $t0 = 80A50000 -/* 00E44 80A52114 2508212C */ addiu $t0, $t0, %lo(func_80A5212C) ## $t0 = 80A5212C -/* 00E48 80A52118 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00E4C 80A5211C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E50 80A52120 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E54 80A52124 03E00008 */ jr $ra -/* 00E58 80A52128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s deleted file mode 100644 index da3a45b4ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80A5212C -/* 00E5C 80A5212C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E60 80A52130 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E64 80A52134 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E68 80A52138 AFA40020 */ sw $a0, 0x0020($sp) -/* 00E6C 80A5213C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00E70 80A52140 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E74 80A52144 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E78 80A52148 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00E7C 80A5214C 85CF0268 */ lh $t7, 0x0268($t6) ## 00000268 -/* 00E80 80A52150 55E00026 */ bnel $t7, $zero, .L80A521EC -/* 00E84 80A52154 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E88 80A52158 0C042F6F */ jal func_8010BDBC -/* 00E8C 80A5215C 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00E90 80A52160 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00E94 80A52164 54410021 */ bnel $v0, $at, .L80A521EC -/* 00E98 80A52168 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E9C 80A5216C 0C041AF2 */ jal func_80106BC8 -/* 00EA0 80A52170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EA4 80A52174 5040001D */ beql $v0, $zero, .L80A521EC -/* 00EA8 80A52178 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EAC 80A5217C 0C041B33 */ jal func_80106CCC -/* 00EB0 80A52180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EB4 80A52184 8FA40020 */ lw $a0, 0x0020($sp) -/* 00EB8 80A52188 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00EBC 80A5218C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00EC0 80A52190 84980268 */ lh $t8, 0x0268($a0) ## 00000268 -/* 00EC4 80A52194 2403002E */ addiu $v1, $zero, 0x002E ## $v1 = 0000002E -/* 00EC8 80A52198 240904FA */ addiu $t1, $zero, 0x04FA ## $t1 = 000004FA -/* 00ECC 80A5219C 17000012 */ bne $t8, $zero, .L80A521E8 -/* 00ED0 80A521A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00ED4 80A521A4 94590EDC */ lhu $t9, 0x0EDC($v0) ## 8015F53C -/* 00ED8 80A521A8 00300821 */ addu $at, $at, $s0 -/* 00EDC 80A521AC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00EE0 80A521B0 37284000 */ ori $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 00EE4 80A521B4 A4480EDC */ sh $t0, 0x0EDC($v0) ## 8015F53C -/* 00EE8 80A521B8 A4291E1A */ sh $t1, 0x1E1A($at) ## 00011E1A -/* 00EEC 80A521BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EF0 80A521C0 00300821 */ addu $at, $at, $s0 -/* 00EF4 80A521C4 A02A1E15 */ sb $t2, 0x1E15($at) ## 00011E15 -/* 00EF8 80A521C8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00EFC 80A521CC A48B0268 */ sh $t3, 0x0268($a0) ## 00000268 -/* 00F00 80A521D0 3C0180A5 */ lui $at, %hi(D_80A527A0) ## $at = 80A50000 -/* 00F04 80A521D4 AC2027A0 */ sw $zero, %lo(D_80A527A0)($at) -/* 00F08 80A521D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F0C 80A521DC 00300821 */ addu $at, $at, $s0 -/* 00F10 80A521E0 A0231E5E */ sb $v1, 0x1E5E($at) ## 00011E5E -/* 00F14 80A521E4 A043141D */ sb $v1, 0x141D($v0) ## 8015FA7D -.L80A521E8: -/* 00F18 80A521E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A521EC: -/* 00F1C 80A521EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F20 80A521F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F24 80A521F4 03E00008 */ jr $ra -/* 00F28 80A521F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s deleted file mode 100644 index 4a6950ed63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A521FC -/* 00F2C 80A521FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F30 80A52200 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F34 80A52204 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F38 80A52208 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F3C 80A5220C AFA5002C */ sw $a1, 0x002C($sp) -/* 00F40 80A52210 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00F44 80A52214 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00F48 80A52218 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F4C 80A5221C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F50 80A52220 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00F54 80A52224 468021A0 */ cvt.s.w $f6, $f4 -/* 00F58 80A52228 8FA40028 */ lw $a0, 0x0028($sp) -/* 00F5C 80A5222C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F60 80A52230 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 00F64 80A52234 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F68 80A52238 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F6C 80A5223C 4600320D */ trunc.w.s $f8, $f6 -/* 00F70 80A52240 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F74 80A52244 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00F78 80A52248 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F7C 80A5224C 440F4000 */ mfc1 $t7, $f8 -/* 00F80 80A52250 00000000 */ nop -/* 00F84 80A52254 000FC400 */ sll $t8, $t7, 16 -/* 00F88 80A52258 0018CC03 */ sra $t9, $t8, 16 -/* 00F8C 80A5225C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00F90 80A52260 00000000 */ nop -/* 00F94 80A52264 46805420 */ cvt.s.w $f16, $f10 -/* 00F98 80A52268 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00F9C 80A5226C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00FA0 80A52270 8FA90028 */ lw $t1, 0x0028($sp) -/* 00FA4 80A52274 3C0880A5 */ lui $t0, %hi(func_80A52290) ## $t0 = 80A50000 -/* 00FA8 80A52278 25082290 */ addiu $t0, $t0, %lo(func_80A52290) ## $t0 = 80A52290 -/* 00FAC 80A5227C AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00FB0 80A52280 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FB4 80A52284 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FB8 80A52288 03E00008 */ jr $ra -/* 00FBC 80A5228C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s deleted file mode 100644 index 0cf718db7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s +++ /dev/null @@ -1,45 +0,0 @@ -.rdata -glabel D_80A52BD8 - .asciz "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" - .balign 4 - -.text -glabel func_80A52290 -/* 00FC0 80A52290 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FC4 80A52294 AFB00018 */ sw $s0, 0x0018($sp) -/* 00FC8 80A52298 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FCC 80A5229C AFBF001C */ sw $ra, 0x001C($sp) -/* 00FD0 80A522A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FD4 80A522A4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00FD8 80A522A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FDC 80A522AC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00FE0 80A522B0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00FE4 80A522B4 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00FE8 80A522B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FEC 80A522BC 2405702D */ addiu $a1, $zero, 0x702D ## $a1 = 0000702D -/* 00FF0 80A522C0 4606203C */ c.lt.s $f4, $f6 -/* 00FF4 80A522C4 00000000 */ nop -/* 00FF8 80A522C8 45020010 */ bc1fl .L80A5230C -/* 00FFC 80A522CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01000 80A522D0 0C042DA0 */ jal func_8010B680 -/* 01004 80A522D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01008 80A522D8 0C01E221 */ jal func_80078884 -/* 0100C 80A522DC 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C -/* 01010 80A522E0 3C0480A5 */ lui $a0, %hi(D_80A52BD8) ## $a0 = 80A50000 -/* 01014 80A522E4 0C00084C */ jal osSyncPrintf - -/* 01018 80A522E8 24842BD8 */ addiu $a0, $a0, %lo(D_80A52BD8) ## $a0 = 80A52BD8 -/* 0101C 80A522EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 01020 80A522F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01024 80A522F4 0C00B7D5 */ jal func_8002DF54 -/* 01028 80A522F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0102C 80A522FC 3C0E80A5 */ lui $t6, %hi(func_80A52098) ## $t6 = 80A50000 -/* 01030 80A52300 25CE2098 */ addiu $t6, $t6, %lo(func_80A52098) ## $t6 = 80A52098 -/* 01034 80A52304 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C -/* 01038 80A52308 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5230C: -/* 0103C 80A5230C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01040 80A52310 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01044 80A52314 03E00008 */ jr $ra -/* 01048 80A52318 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s deleted file mode 100644 index d8b8d9884a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A5263C -/* 0136C 80A5263C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01370 80A52640 AFA40000 */ sw $a0, 0x0000($sp) -/* 01374 80A52644 AFA60008 */ sw $a2, 0x0008($sp) -/* 01378 80A52648 14A1000A */ bne $a1, $at, .L80A52674 -/* 0137C 80A5264C AFA7000C */ sw $a3, 0x000C($sp) -/* 01380 80A52650 8FAF0014 */ lw $t7, 0x0014($sp) -/* 01384 80A52654 8FA20010 */ lw $v0, 0x0010($sp) -/* 01388 80A52658 C5E4027C */ lwc1 $f4, 0x027C($t7) ## 0000027C -/* 0138C 80A5265C 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 01390 80A52660 4600218D */ trunc.w.s $f6, $f4 -/* 01394 80A52664 44093000 */ mfc1 $t1, $f6 -/* 01398 80A52668 00000000 */ nop -/* 0139C 80A5266C 01C95021 */ addu $t2, $t6, $t1 -/* 013A0 80A52670 A44A0000 */ sh $t2, 0x0000($v0) ## 00000000 -.L80A52674: -/* 013A4 80A52674 03E00008 */ jr $ra -/* 013A8 80A52678 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s deleted file mode 100644 index fee1d43b12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s +++ /dev/null @@ -1,118 +0,0 @@ -.rdata -glabel D_80A55224 - .asciz " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" - .balign 4 - -.late_rodata -glabel D_80A552F8 - .float 7000.0 - -.text -glabel func_80A5455C -/* 016BC 80A5455C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 016C0 80A54560 AFB10030 */ sw $s1, 0x0030($sp) -/* 016C4 80A54564 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 016C8 80A54568 AFBF0034 */ sw $ra, 0x0034($sp) -/* 016CC 80A5456C AFB0002C */ sw $s0, 0x002C($sp) -/* 016D0 80A54570 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 016D4 80A54574 0C042F6F */ jal func_8010BDBC -/* 016D8 80A54578 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 016DC 80A5457C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 016E0 80A54580 54410052 */ bnel $v0, $at, .L80A546CC -/* 016E4 80A54584 8FBF0034 */ lw $ra, 0x0034($sp) -/* 016E8 80A54588 0C041AF2 */ jal func_80106BC8 -/* 016EC 80A5458C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F0 80A54590 1040004D */ beq $v0, $zero, .L80A546C8 -/* 016F4 80A54594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F8 80A54598 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 016FC 80A5459C 0C00B7D5 */ jal func_8002DF54 -/* 01700 80A545A0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01704 80A545A4 0C041B33 */ jal func_80106CCC -/* 01708 80A545A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0170C 80A545AC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01710 80A545B0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01714 80A545B4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01718 80A545B8 00000000 */ nop -/* 0171C 80A545BC C6240274 */ lwc1 $f4, 0x0274($s1) ## 00000274 -/* 01720 80A545C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01724 80A545C4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01728 80A545C8 46040180 */ add.s $f6, $f0, $f4 -/* 0172C 80A545CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01730 80A545D0 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 01734 80A545D4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01738 80A545D8 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 0173C 80A545DC C6280278 */ lwc1 $f8, 0x0278($s1) ## 00000278 -/* 01740 80A545E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01744 80A545E4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01748 80A545E8 460A4401 */ sub.s $f16, $f8, $f10 -/* 0174C 80A545EC 46100480 */ add.s $f18, $f0, $f16 -/* 01750 80A545F0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01754 80A545F4 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 01758 80A545F8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0175C 80A545FC 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 01760 80A54600 C624027C */ lwc1 $f4, 0x027C($s1) ## 0000027C -/* 01764 80A54604 3C0180A5 */ lui $at, %hi(D_80A552F8) ## $at = 80A50000 -/* 01768 80A54608 C42C52F8 */ lwc1 $f12, %lo(D_80A552F8)($at) -/* 0176C 80A5460C 46062201 */ sub.s $f8, $f4, $f6 -/* 01770 80A54610 46080280 */ add.s $f10, $f0, $f8 -/* 01774 80A54614 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01778 80A54618 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 0177C 80A5461C 862E008A */ lh $t6, 0x008A($s1) ## 0000008A -/* 01780 80A54620 C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 01784 80A54624 C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 01788 80A54628 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 0178C 80A5462C AFA00024 */ sw $zero, 0x0024($sp) -/* 01790 80A54630 AFA00020 */ sw $zero, 0x0020($sp) -/* 01794 80A54634 468084A0 */ cvt.s.w $f18, $f16 -/* 01798 80A54638 AFA00018 */ sw $zero, 0x0018($sp) -/* 0179C 80A5463C 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 017A0 80A54640 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 017A4 80A54644 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 017A8 80A54648 8FA70038 */ lw $a3, 0x0038($sp) -/* 017AC 80A5464C 46120080 */ add.s $f2, $f0, $f18 -/* 017B0 80A54650 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 017B4 80A54654 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 017B8 80A54658 4600120D */ trunc.w.s $f8, $f2 -/* 017BC 80A5465C 44184000 */ mfc1 $t8, $f8 -/* 017C0 80A54660 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 017C4 80A54664 AFB8001C */ sw $t8, 0x001C($sp) -/* 017C8 80A54668 10400011 */ beq $v0, $zero, .L80A546B0 -/* 017CC 80A5466C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 017D0 80A54670 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017D4 80A54674 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 017D8 80A54678 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 017DC 80A5467C 00000000 */ nop -/* 017E0 80A54680 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 017E4 80A54684 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 017E8 80A54688 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017EC 80A5468C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 017F0 80A54690 460A0400 */ add.s $f16, $f0, $f10 -/* 017F4 80A54694 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 017F8 80A54698 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 017FC 80A5469C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01800 80A546A0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01804 80A546A4 00000000 */ nop -/* 01808 80A546A8 46120100 */ add.s $f4, $f0, $f18 -/* 0180C 80A546AC E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -.L80A546B0: -/* 01810 80A546B0 3C0480A5 */ lui $a0, %hi(D_80A55224) ## $a0 = 80A50000 -/* 01814 80A546B4 0C00084C */ jal osSyncPrintf - -/* 01818 80A546B8 24845224 */ addiu $a0, $a0, %lo(D_80A55224) ## $a0 = 80A55224 -/* 0181C 80A546BC 3C1980A5 */ lui $t9, %hi(func_80A546DC) ## $t9 = 80A50000 -/* 01820 80A546C0 273946DC */ addiu $t9, $t9, %lo(func_80A546DC) ## $t9 = 80A546DC -/* 01824 80A546C4 AE39025C */ sw $t9, 0x025C($s1) ## 0000025C -.L80A546C8: -/* 01828 80A546C8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A546CC: -/* 0182C 80A546CC 8FB0002C */ lw $s0, 0x002C($sp) -/* 01830 80A546D0 8FB10030 */ lw $s1, 0x0030($sp) -/* 01834 80A546D4 03E00008 */ jr $ra -/* 01838 80A546D8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s index 14c7e4ee63..d552452569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79C78.s @@ -118,7 +118,7 @@ glabel func_80A79C78 /* 00E88 80A79E38 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00E8C 80A79E3C 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 00E90 80A79E40 01616024 */ and $t4, $t3, $at -/* 00E94 80A79E44 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 00E94 80A79E44 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 00E98 80A79E48 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 00E9C 80A79E4C 0C020978 */ jal Interface_ChangeAlpha /* 00EA0 80A79E50 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s index d72ad343a7..e5e4f3d469 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7AA40.s @@ -88,7 +88,7 @@ glabel func_80A7AA40 /* 01BE8 80A7AB98 A60E0308 */ sh $t6, 0x0308($s0) ## 00000308 /* 01BEC 80A7AB9C A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC /* 01BF0 80A7ABA0 A6201D74 */ sh $zero, 0x1D74($s1) ## 00001D74 -/* 01BF4 80A7ABA4 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 01BF4 80A7ABA4 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 01BF8 80A7ABA8 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 01BFC 80A7ABAC 0C020978 */ jal Interface_ChangeAlpha /* 01C00 80A7ABB0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s deleted file mode 100644 index 46e011919a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnMd_Destroy -/* 015FC 80AAB84C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01600 80AAB850 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01604 80AAB854 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01608 80AAB858 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0160C 80AAB85C 0C0170EB */ jal Collider_DestroyCylinder - -/* 01610 80AAB860 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 01614 80AAB864 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01618 80AAB868 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0161C 80AAB86C 03E00008 */ jr $ra -/* 01620 80AAB870 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s deleted file mode 100644 index 97707249fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s +++ /dev/null @@ -1,114 +0,0 @@ -.rdata -glabel D_80AAC4B0 - .asciz "../z_en_md.c" - .balign 4 - -glabel D_80AAC4C0 - .asciz "../z_en_md.c" - .balign 4 - -.text -glabel EnMd_Draw -/* 01F10 80AAC160 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01F14 80AAC164 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01F18 80AAC168 AFB00020 */ sw $s0, 0x0020($sp) -/* 01F1C 80AAC16C AFA50054 */ sw $a1, 0x0054($sp) -/* 01F20 80AAC170 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01F24 80AAC174 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F28 80AAC178 3C0680AB */ lui $a2, %hi(D_80AAC4B0) ## $a2 = 80AB0000 -/* 01F2C 80AAC17C 24C6C4B0 */ addiu $a2, $a2, %lo(D_80AAC4B0) ## $a2 = 80AAC4B0 -/* 01F30 80AAC180 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01F34 80AAC184 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 -/* 01F38 80AAC188 0C031AB1 */ jal Graph_OpenDisps -/* 01F3C 80AAC18C AFA50048 */ sw $a1, 0x0048($sp) -/* 01F40 80AAC190 86020210 */ lh $v0, 0x0210($s0) ## 00000210 -/* 01F44 80AAC194 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01F48 80AAC198 8FA80048 */ lw $t0, 0x0048($sp) -/* 01F4C 80AAC19C 14410024 */ bne $v0, $at, .L80AAC230 -/* 01F50 80AAC1A0 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01F54 80AAC1A4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01F58 80AAC1A8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01F5C 80AAC1AC 3C0480AB */ lui $a0, %hi(D_80AAC4A4) ## $a0 = 80AB0000 -/* 01F60 80AAC1B0 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01F64 80AAC1B4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01F68 80AAC1B8 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01F6C 80AAC1BC 8619020E */ lh $t9, 0x020E($s0) ## 0000020E -/* 01F70 80AAC1C0 3C0E8016 */ lui $t6, %hi(gSegments) -/* 01F74 80AAC1C4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01F78 80AAC1C8 00194880 */ sll $t1, $t9, 2 -/* 01F7C 80AAC1CC 00892021 */ addu $a0, $a0, $t1 -/* 01F80 80AAC1D0 8C84C4A4 */ lw $a0, %lo(D_80AAC4A4)($a0) -/* 01F84 80AAC1D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01F88 80AAC1D8 3C0680AB */ lui $a2, %hi(func_80AABEF0) ## $a2 = 80AB0000 -/* 01F8C 80AAC1DC 00045900 */ sll $t3, $a0, 4 -/* 01F90 80AAC1E0 000B6702 */ srl $t4, $t3, 28 -/* 01F94 80AAC1E4 000C6880 */ sll $t5, $t4, 2 -/* 01F98 80AAC1E8 01CD7021 */ addu $t6, $t6, $t5 -/* 01F9C 80AAC1EC 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 01FA0 80AAC1F0 00815024 */ and $t2, $a0, $at -/* 01FA4 80AAC1F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01FA8 80AAC1F8 014E7821 */ addu $t7, $t2, $t6 -/* 01FAC 80AAC1FC 01E1C021 */ addu $t8, $t7, $at -/* 01FB0 80AAC200 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 01FB4 80AAC204 AFB00010 */ sw $s0, 0x0010($sp) -/* 01FB8 80AAC208 86190210 */ lh $t9, 0x0210($s0) ## 00000210 -/* 01FBC 80AAC20C 3C0780AB */ lui $a3, %hi(func_80AAC104) ## $a3 = 80AB0000 -/* 01FC0 80AAC210 24E7C104 */ addiu $a3, $a3, %lo(func_80AAC104) ## $a3 = 80AAC104 -/* 01FC4 80AAC214 8FA40054 */ lw $a0, 0x0054($sp) -/* 01FC8 80AAC218 24C6BEF0 */ addiu $a2, $a2, %lo(func_80AABEF0) ## $a2 = 80AABEF0 -/* 01FCC 80AAC21C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01FD0 80AAC220 0C00D2E8 */ jal func_80034BA0 -/* 01FD4 80AAC224 AFB90014 */ sw $t9, 0x0014($sp) -/* 01FD8 80AAC228 10000025 */ beq $zero, $zero, .L80AAC2C0 -/* 01FDC 80AAC22C 8FAD0054 */ lw $t5, 0x0054($sp) -.L80AAC230: -/* 01FE0 80AAC230 10400022 */ beq $v0, $zero, .L80AAC2BC -/* 01FE4 80AAC234 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01FE8 80AAC238 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 01FEC 80AAC23C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01FF0 80AAC240 3C0480AB */ lui $a0, %hi(D_80AAC4A4) ## $a0 = 80AB0000 -/* 01FF4 80AAC244 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 01FF8 80AAC248 AD0902D0 */ sw $t1, 0x02D0($t0) ## 000002D0 -/* 01FFC 80AAC24C AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 02000 80AAC250 860C020E */ lh $t4, 0x020E($s0) ## 0000020E -/* 02004 80AAC254 3C198016 */ lui $t9, %hi(gSegments) -/* 02008 80AAC258 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0200C 80AAC25C 000C6880 */ sll $t5, $t4, 2 -/* 02010 80AAC260 008D2021 */ addu $a0, $a0, $t5 -/* 02014 80AAC264 8C84C4A4 */ lw $a0, %lo(D_80AAC4A4)($a0) -/* 02018 80AAC268 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0201C 80AAC26C 3C0680AB */ lui $a2, %hi(func_80AABEF0) ## $a2 = 80AB0000 -/* 02020 80AAC270 00047100 */ sll $t6, $a0, 4 -/* 02024 80AAC274 000E7F02 */ srl $t7, $t6, 28 -/* 02028 80AAC278 000FC080 */ sll $t8, $t7, 2 -/* 0202C 80AAC27C 0338C821 */ addu $t9, $t9, $t8 -/* 02030 80AAC280 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 02034 80AAC284 00815024 */ and $t2, $a0, $at -/* 02038 80AAC288 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0203C 80AAC28C 01594821 */ addu $t1, $t2, $t9 -/* 02040 80AAC290 01215821 */ addu $t3, $t1, $at -/* 02044 80AAC294 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 02048 80AAC298 AFB00010 */ sw $s0, 0x0010($sp) -/* 0204C 80AAC29C 860C0210 */ lh $t4, 0x0210($s0) ## 00000210 -/* 02050 80AAC2A0 3C0780AB */ lui $a3, %hi(func_80AAC104) ## $a3 = 80AB0000 -/* 02054 80AAC2A4 24E7C104 */ addiu $a3, $a3, %lo(func_80AAC104) ## $a3 = 80AAC104 -/* 02058 80AAC2A8 8FA40054 */ lw $a0, 0x0054($sp) -/* 0205C 80AAC2AC 24C6BEF0 */ addiu $a2, $a2, %lo(func_80AABEF0) ## $a2 = 80AABEF0 -/* 02060 80AAC2B0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02064 80AAC2B4 0C00D331 */ jal func_80034CC4 -/* 02068 80AAC2B8 AFAC0014 */ sw $t4, 0x0014($sp) -.L80AAC2BC: -/* 0206C 80AAC2BC 8FAD0054 */ lw $t5, 0x0054($sp) -.L80AAC2C0: -/* 02070 80AAC2C0 3C0680AB */ lui $a2, %hi(D_80AAC4C0) ## $a2 = 80AB0000 -/* 02074 80AAC2C4 24C6C4C0 */ addiu $a2, $a2, %lo(D_80AAC4C0) ## $a2 = 80AAC4C0 -/* 02078 80AAC2C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 0207C 80AAC2CC 24070525 */ addiu $a3, $zero, 0x0525 ## $a3 = 00000525 -/* 02080 80AAC2D0 0C031AD5 */ jal Graph_CloseDisps -/* 02084 80AAC2D4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 02088 80AAC2D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0208C 80AAC2DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 02090 80AAC2E0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02094 80AAC2E4 03E00008 */ jr $ra -/* 02098 80AAC2E8 00000000 */ nop -/* 0209C 80AAC2EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s deleted file mode 100644 index a42b017635..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ /dev/null @@ -1,143 +0,0 @@ -glabel EnMd_Init -/* 01400 80AAB650 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01404 80AAB654 AFB10038 */ sw $s1, 0x0038($sp) -/* 01408 80AAB658 AFB00034 */ sw $s0, 0x0034($sp) -/* 0140C 80AAB65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01410 80AAB660 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) -/* 01418 80AAB668 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 0141C 80AAB66C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01420 80AAB670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01424 80AAB674 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01428 80AAB678 0C00AC78 */ jal ActorShape_Init - -/* 0142C 80AAB67C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 01430 80AAB680 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01434 80AAB684 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01438 80AAB688 260E0258 */ addiu $t6, $s0, 0x0258 ## $t6 = 00000258 -/* 0143C 80AAB68C 260F02BE */ addiu $t7, $s0, 0x02BE ## $t7 = 000002BE -/* 01440 80AAB690 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 01444 80AAB694 AFB80018 */ sw $t8, 0x0018($sp) -/* 01448 80AAB698 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0144C 80AAB69C AFAE0010 */ sw $t6, 0x0010($sp) -/* 01450 80AAB6A0 24C67FB8 */ addiu $a2, $a2, 0x7FB8 ## $a2 = 06007FB8 -/* 01454 80AAB6A4 AFA50044 */ sw $a1, 0x0044($sp) -/* 01458 80AAB6A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0145C 80AAB6AC 0C0291BE */ jal SkelAnime_InitSV -/* 01460 80AAB6B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01464 80AAB6B4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) -/* 0146C 80AAB6BC 0C0170D9 */ jal Collider_InitCylinder - -/* 01470 80AAB6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01474 80AAB6C4 3C0780AB */ lui $a3, %hi(D_80AAC310) ## $a3 = 80AB0000 -/* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0147C 80AAB6CC 24E7C310 */ addiu $a3, $a3, %lo(D_80AAC310) ## $a3 = 80AAC310 -/* 01480 80AAB6D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01484 80AAB6D4 0C01712B */ jal Collider_SetCylinder - -/* 01488 80AAB6D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0148C 80AAB6DC 3C0680AB */ lui $a2, %hi(D_80AAC33C) ## $a2 = 80AB0000 -/* 01490 80AAB6E0 24C6C33C */ addiu $a2, $a2, %lo(D_80AAC33C) ## $a2 = 80AAC33C -/* 01494 80AAB6E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01498 80AAB6E8 0C0187BF */ jal func_80061EFC -/* 0149C 80AAB6EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 014A0 80AAB6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80AAB6F4 0C2AAC0F */ jal func_80AAB03C -/* 014A8 80AAB6F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014AC 80AAB6FC 14400005 */ bne $v0, $zero, .L80AAB714 -/* 014B0 80AAB700 8FA40044 */ lw $a0, 0x0044($sp) -/* 014B4 80AAB704 0C00B55C */ jal Actor_Kill - -/* 014B8 80AAB708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014BC 80AAB70C 1000004B */ beq $zero, $zero, .L80AAB83C -/* 014C0 80AAB710 8FBF003C */ lw $ra, 0x003C($sp) -.L80AAB714: -/* 014C4 80AAB714 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 014C8 80AAB718 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 014CC 80AAB71C 0C00D3B0 */ jal func_80034EC0 -/* 014D0 80AAB720 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 014D4 80AAB724 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 014D8 80AAB728 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 014DC 80AAB72C 0C00B58B */ jal Actor_SetScale - -/* 014E0 80AAB730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E4 80AAB734 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 014E8 80AAB738 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 -/* 014EC 80AAB73C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 014F0 80AAB740 A219001F */ sb $t9, 0x001F($s0) ## 0000001F -/* 014F4 80AAB744 A6080210 */ sh $t0, 0x0210($s0) ## 00000210 -/* 014F8 80AAB748 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 014FC 80AAB74C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01500 80AAB750 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 01504 80AAB754 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01508 80AAB758 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0150C 80AAB75C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01510 80AAB760 AFA90028 */ sw $t1, 0x0028($sp) -/* 01514 80AAB764 AFA00024 */ sw $zero, 0x0024($sp) -/* 01518 80AAB768 AFA00020 */ sw $zero, 0x0020($sp) -/* 0151C 80AAB76C AFA0001C */ sw $zero, 0x001C($sp) -/* 01520 80AAB770 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01524 80AAB774 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01528 80AAB778 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 0152C 80AAB77C 0C00C916 */ jal Actor_SpawnAttached - -/* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01534 80AAB784 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -/* 01538 80AAB788 24040055 */ addiu $a0, $zero, 0x0055 ## $a0 = 00000055 -/* 0153C 80AAB78C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 -/* 01544 80AAB794 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01548 80AAB798 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 8015F534 -/* 0154C 80AAB79C 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 -/* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 -.L80AAB7A4: -/* 01554 80AAB7A4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 -/* 0155C 80AAB7AC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01560 80AAB7B0 944C0ED4 */ lhu $t4, 0x0ED4($v0) ## 8015F534 -/* 01564 80AAB7B4 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) -/* 01568 80AAB7B8 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 -/* 01570 80AAB7C0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01574 80AAB7C4 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) -/* 01578 80AAB7C8 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 -/* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 -.L80AAB7D4: -/* 01584 80AAB7D4 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -.L80AAB7D8: -/* 01588 80AAB7D8 54610010 */ bnel $v1, $at, .L80AAB81C -/* 0158C 80AAB7DC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01590 80AAB7E0 94590ED4 */ lhu $t9, 0x0ED4($v0) ## 8015F534 -/* 01594 80AAB7E4 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 01598 80AAB7E8 5500000C */ bnel $t0, $zero, .L80AAB81C -/* 0159C 80AAB7EC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -.L80AAB7F0: -/* 015A0 80AAB7F0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 015A4 80AAB7F4 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 015A8 80AAB7F8 3C0B80AB */ lui $t3, %hi(func_80AAB948) ## $t3 = 80AB0000 -/* 015AC 80AAB7FC AE0A0008 */ sw $t2, 0x0008($s0) ## 00000008 -/* 015B0 80AAB800 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 015B4 80AAB804 256BB948 */ addiu $t3, $t3, %lo(func_80AAB948) ## $t3 = 80AAB948 -/* 015B8 80AAB808 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 015BC 80AAB80C AE09000C */ sw $t1, 0x000C($s0) ## 0000000C -/* 015C0 80AAB810 10000009 */ beq $zero, $zero, .L80AAB838 -/* 015C4 80AAB814 AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 -/* 015C8 80AAB818 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -.L80AAB81C: -/* 015CC 80AAB81C 10610003 */ beq $v1, $at, .L80AAB82C -/* 015D0 80AAB820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D4 80AAB824 0C2AAD37 */ jal func_80AAB4DC -/* 015D8 80AAB828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80AAB82C: -/* 015DC 80AAB82C 3C0C80AB */ lui $t4, %hi(func_80AAB874) ## $t4 = 80AB0000 -/* 015E0 80AAB830 258CB874 */ addiu $t4, $t4, %lo(func_80AAB874) ## $t4 = 80AAB874 -/* 015E4 80AAB834 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -.L80AAB838: -/* 015E8 80AAB838 8FBF003C */ lw $ra, 0x003C($sp) -.L80AAB83C: -/* 015EC 80AAB83C 8FB00034 */ lw $s0, 0x0034($sp) -/* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) -/* 015F4 80AAB844 03E00008 */ jr $ra -/* 015F8 80AAB848 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s deleted file mode 100644 index 2af2e4340c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel EnMd_Update -/* 01BE4 80AABE34 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01BE8 80AABE38 AFB0001C */ sw $s0, 0x001C($sp) -/* 01BEC 80AABE3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BF0 80AABE40 AFB10020 */ sw $s1, 0x0020($sp) -/* 01BF4 80AABE44 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01BF8 80AABE48 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01BFC 80AABE4C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01C00 80AABE50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 01C04 80AABE54 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01C08 80AABE58 AFA6002C */ sw $a2, 0x002C($sp) -/* 01C0C 80AABE5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01C10 80AABE60 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01C14 80AABE64 8FA6002C */ lw $a2, 0x002C($sp) -/* 01C18 80AABE68 02212821 */ addu $a1, $s1, $at -/* 01C1C 80AABE6C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01C20 80AABE70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01C24 80AABE74 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C28 80AABE78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01C2C 80AABE7C 0C2AAC38 */ jal func_80AAB0E0 -/* 01C30 80AABE80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C34 80AABE84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C38 80AABE88 0C2AAD69 */ jal func_80AAB5A4 -/* 01C3C 80AABE8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01C40 80AABE90 0C00B638 */ jal Actor_MoveForward - -/* 01C44 80AABE94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C48 80AABE98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C4C 80AABE9C 0C2AAC56 */ jal func_80AAB158 -/* 01C50 80AABEA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01C54 80AABEA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C58 80AABEA8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 01C5C 80AABEAC AFAE0014 */ sw $t6, 0x0014($sp) -/* 01C60 80AABEB0 44060000 */ mfc1 $a2, $f0 -/* 01C64 80AABEB4 44070000 */ mfc1 $a3, $f0 -/* 01C68 80AABEB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01C6C 80AABEBC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01C70 80AABEC0 0C00B92D */ jal func_8002E4B4 -/* 01C74 80AABEC4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C78 80AABEC8 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 01C7C 80AABECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C80 80AABED0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01C84 80AABED4 0320F809 */ jalr $ra, $t9 -/* 01C88 80AABED8 00000000 */ nop -/* 01C8C 80AABEDC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C90 80AABEE0 8FB0001C */ lw $s0, 0x001C($sp) -/* 01C94 80AABEE4 8FB10020 */ lw $s1, 0x0020($sp) -/* 01C98 80AABEE8 03E00008 */ jr $ra -/* 01C9C 80AABEEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s deleted file mode 100644 index ad8b34192f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AAA250 -/* 00000 80AAA250 C482015C */ lwc1 $f2, 0x015C($a0) ## 0000015C -/* 00004 80AAA254 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00008 80AAA258 C4800158 */ lwc1 $f0, 0x0158($a0) ## 00000158 -/* 0000C 80AAA25C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00010 80AAA260 E4820158 */ swc1 $f2, 0x0158($a0) ## 00000158 -/* 00014 80AAA264 E4820164 */ swc1 $f2, 0x0164($a0) ## 00000164 -/* 00018 80AAA268 E480015C */ swc1 $f0, 0x015C($a0) ## 0000015C -/* 0001C 80AAA26C 03E00008 */ jr $ra -/* 00020 80AAA270 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s deleted file mode 100644 index 08e13b8367..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA274 -/* 00024 80AAA274 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00028 80AAA278 AFBF001C */ sw $ra, 0x001C($sp) -/* 0002C 80AAA27C AFB00018 */ sw $s0, 0x0018($sp) -/* 00030 80AAA280 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00034 80AAA284 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00038 80AAA288 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0003C 80AAA28C 10400006 */ beq $v0, $zero, .L80AAA2A8 -/* 00040 80AAA290 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00044 80AAA294 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00048 80AAA298 5041000A */ beql $v0, $at, .L80AAA2C4 -/* 0004C 80AAA29C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00050 80AAA2A0 10000015 */ beq $zero, $zero, .L80AAA2F8 -/* 00054 80AAA2A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA2A8: -/* 00058 80AAA2A8 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0005C 80AAA2AC 0C00D3B0 */ jal func_80034EC0 -/* 00060 80AAA2B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00064 80AAA2B4 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00068 80AAA2B8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0006C 80AAA2BC A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00070 80AAA2C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA2C4: -/* 00074 80AAA2C4 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00078 80AAA2C8 0C0295B2 */ jal func_800A56C8 -/* 0007C 80AAA2CC AFA40020 */ sw $a0, 0x0020($sp) -/* 00080 80AAA2D0 10400008 */ beq $v0, $zero, .L80AAA2F4 -/* 00084 80AAA2D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 00088 80AAA2D8 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 0008C 80AAA2DC 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00090 80AAA2E0 0C00D3B0 */ jal func_80034EC0 -/* 00094 80AAA2E4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00098 80AAA2E8 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 0009C 80AAA2EC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 000A0 80AAA2F0 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA2F4: -/* 000A4 80AAA2F4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA2F8: -/* 000A8 80AAA2F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 000AC 80AAA2FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 000B0 80AAA300 03E00008 */ jr $ra -/* 000B4 80AAA304 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s deleted file mode 100644 index 320a7b17a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA308 -/* 000B8 80AAA308 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 000BC 80AAA30C AFBF001C */ sw $ra, 0x001C($sp) -/* 000C0 80AAA310 AFB00018 */ sw $s0, 0x0018($sp) -/* 000C4 80AAA314 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 000C8 80AAA318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000CC 80AAA31C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 000D0 80AAA320 10400006 */ beq $v0, $zero, .L80AAA33C -/* 000D4 80AAA324 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 000D8 80AAA328 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000DC 80AAA32C 5041000A */ beql $v0, $at, .L80AAA358 -/* 000E0 80AAA330 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 000E4 80AAA334 10000015 */ beq $zero, $zero, .L80AAA38C -/* 000E8 80AAA338 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA33C: -/* 000EC 80AAA33C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 000F0 80AAA340 0C00D3B0 */ jal func_80034EC0 -/* 000F4 80AAA344 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 000F8 80AAA348 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 000FC 80AAA34C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00100 80AAA350 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00104 80AAA354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA358: -/* 00108 80AAA358 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0010C 80AAA35C 0C0295B2 */ jal func_800A56C8 -/* 00110 80AAA360 AFA40020 */ sw $a0, 0x0020($sp) -/* 00114 80AAA364 10400008 */ beq $v0, $zero, .L80AAA388 -/* 00118 80AAA368 8FA40020 */ lw $a0, 0x0020($sp) -/* 0011C 80AAA36C 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00120 80AAA370 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00124 80AAA374 0C00D3B0 */ jal func_80034EC0 -/* 00128 80AAA378 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0012C 80AAA37C 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00130 80AAA380 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00134 80AAA384 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA388: -/* 00138 80AAA388 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA38C: -/* 0013C 80AAA38C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00140 80AAA390 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00144 80AAA394 03E00008 */ jr $ra -/* 00148 80AAA398 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s deleted file mode 100644 index 317cc0a9a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80AAA39C -/* 0014C 80AAA39C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00150 80AAA3A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00154 80AAA3A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00158 80AAA3A8 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 0015C 80AAA3AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00160 80AAA3B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00164 80AAA3B4 10400008 */ beq $v0, $zero, .L80AAA3D8 -/* 00168 80AAA3B8 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 0016C 80AAA3BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00170 80AAA3C0 1041000D */ beq $v0, $at, .L80AAA3F8 -/* 00174 80AAA3C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00178 80AAA3C8 50410019 */ beql $v0, $at, .L80AAA430 -/* 0017C 80AAA3CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00180 80AAA3D0 10000024 */ beq $zero, $zero, .L80AAA464 -/* 00184 80AAA3D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA3D8: -/* 00188 80AAA3D8 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0018C 80AAA3DC 0C00D3B0 */ jal func_80034EC0 -/* 00190 80AAA3E0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00194 80AAA3E4 0C2AA894 */ jal func_80AAA250 -/* 00198 80AAA3E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0019C 80AAA3EC 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 001A0 80AAA3F0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 001A4 80AAA3F4 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -.L80AAA3F8: -/* 001A8 80AAA3F8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 001AC 80AAA3FC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 001B0 80AAA400 0C0295B2 */ jal func_800A56C8 -/* 001B4 80AAA404 AFA40020 */ sw $a0, 0x0020($sp) -/* 001B8 80AAA408 10400015 */ beq $v0, $zero, .L80AAA460 -/* 001BC 80AAA40C 8FA40020 */ lw $a0, 0x0020($sp) -/* 001C0 80AAA410 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 001C4 80AAA414 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 001C8 80AAA418 0C00D3B0 */ jal func_80034EC0 -/* 001CC 80AAA41C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 001D0 80AAA420 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 001D4 80AAA424 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 001D8 80AAA428 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -/* 001DC 80AAA42C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA430: -/* 001E0 80AAA430 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 001E4 80AAA434 0C0295B2 */ jal func_800A56C8 -/* 001E8 80AAA438 AFA40020 */ sw $a0, 0x0020($sp) -/* 001EC 80AAA43C 10400008 */ beq $v0, $zero, .L80AAA460 -/* 001F0 80AAA440 8FA40020 */ lw $a0, 0x0020($sp) -/* 001F4 80AAA444 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 001F8 80AAA448 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 001FC 80AAA44C 0C00D3B0 */ jal func_80034EC0 -/* 00200 80AAA450 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00204 80AAA454 9208020A */ lbu $t0, 0x020A($s0) ## 0000020A -/* 00208 80AAA458 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 0020C 80AAA45C A209020A */ sb $t1, 0x020A($s0) ## 0000020A -.L80AAA460: -/* 00210 80AAA460 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA464: -/* 00214 80AAA464 8FB00018 */ lw $s0, 0x0018($sp) -/* 00218 80AAA468 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0021C 80AAA46C 03E00008 */ jr $ra -/* 00220 80AAA470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s deleted file mode 100644 index 0a1ab75af4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA474 -/* 00224 80AAA474 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00228 80AAA478 AFBF001C */ sw $ra, 0x001C($sp) -/* 0022C 80AAA47C AFB00018 */ sw $s0, 0x0018($sp) -/* 00230 80AAA480 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00234 80AAA484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00238 80AAA488 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0023C 80AAA48C 10400006 */ beq $v0, $zero, .L80AAA4A8 -/* 00240 80AAA490 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00244 80AAA494 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00248 80AAA498 5041000A */ beql $v0, $at, .L80AAA4C4 -/* 0024C 80AAA49C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00250 80AAA4A0 10000015 */ beq $zero, $zero, .L80AAA4F8 -/* 00254 80AAA4A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA4A8: -/* 00258 80AAA4A8 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0025C 80AAA4AC 0C00D3B0 */ jal func_80034EC0 -/* 00260 80AAA4B0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00264 80AAA4B4 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00268 80AAA4B8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0026C 80AAA4BC A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00270 80AAA4C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA4C4: -/* 00274 80AAA4C4 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00278 80AAA4C8 0C0295B2 */ jal func_800A56C8 -/* 0027C 80AAA4CC AFA40020 */ sw $a0, 0x0020($sp) -/* 00280 80AAA4D0 10400008 */ beq $v0, $zero, .L80AAA4F4 -/* 00284 80AAA4D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 00288 80AAA4D8 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 0028C 80AAA4DC 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00290 80AAA4E0 0C00D3B0 */ jal func_80034EC0 -/* 00294 80AAA4E4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00298 80AAA4E8 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 0029C 80AAA4EC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 002A0 80AAA4F0 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA4F4: -/* 002A4 80AAA4F4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA4F8: -/* 002A8 80AAA4F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 002AC 80AAA4FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002B0 80AAA500 03E00008 */ jr $ra -/* 002B4 80AAA504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s deleted file mode 100644 index 074a9531e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AAA508 -/* 002B8 80AAA508 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 002BC 80AAA50C AFBF001C */ sw $ra, 0x001C($sp) -/* 002C0 80AAA510 AFB00018 */ sw $s0, 0x0018($sp) -/* 002C4 80AAA514 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 002C8 80AAA518 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002CC 80AAA51C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 002D0 80AAA520 10400006 */ beq $v0, $zero, .L80AAA53C -/* 002D4 80AAA524 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 002D8 80AAA528 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002DC 80AAA52C 5041000C */ beql $v0, $at, .L80AAA560 -/* 002E0 80AAA530 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 002E4 80AAA534 10000017 */ beq $zero, $zero, .L80AAA594 -/* 002E8 80AAA538 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA53C: -/* 002EC 80AAA53C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 002F0 80AAA540 0C00D3B0 */ jal func_80034EC0 -/* 002F4 80AAA544 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 002F8 80AAA548 0C2AA894 */ jal func_80AAA250 -/* 002FC 80AAA54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00300 80AAA550 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00304 80AAA554 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00308 80AAA558 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 0030C 80AAA55C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA560: -/* 00310 80AAA560 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00314 80AAA564 0C0295B2 */ jal func_800A56C8 -/* 00318 80AAA568 AFA40020 */ sw $a0, 0x0020($sp) -/* 0031C 80AAA56C 10400008 */ beq $v0, $zero, .L80AAA590 -/* 00320 80AAA570 8FA40020 */ lw $a0, 0x0020($sp) -/* 00324 80AAA574 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00328 80AAA578 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0032C 80AAA57C 0C00D3B0 */ jal func_80034EC0 -/* 00330 80AAA580 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00334 80AAA584 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00338 80AAA588 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0033C 80AAA58C A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA590: -/* 00340 80AAA590 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA594: -/* 00344 80AAA594 8FB00018 */ lw $s0, 0x0018($sp) -/* 00348 80AAA598 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0034C 80AAA59C 03E00008 */ jr $ra -/* 00350 80AAA5A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s deleted file mode 100644 index ce5c342658..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA5A4 -/* 00354 80AAA5A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00358 80AAA5A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0035C 80AAA5AC AFB00018 */ sw $s0, 0x0018($sp) -/* 00360 80AAA5B0 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00364 80AAA5B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00368 80AAA5B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0036C 80AAA5BC 10400006 */ beq $v0, $zero, .L80AAA5D8 -/* 00370 80AAA5C0 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00374 80AAA5C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00378 80AAA5C8 5041000A */ beql $v0, $at, .L80AAA5F4 -/* 0037C 80AAA5CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00380 80AAA5D0 10000015 */ beq $zero, $zero, .L80AAA628 -/* 00384 80AAA5D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA5D8: -/* 00388 80AAA5D8 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0038C 80AAA5DC 0C00D3B0 */ jal func_80034EC0 -/* 00390 80AAA5E0 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00394 80AAA5E4 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00398 80AAA5E8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0039C 80AAA5EC A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 003A0 80AAA5F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA5F4: -/* 003A4 80AAA5F4 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 003A8 80AAA5F8 0C0295B2 */ jal func_800A56C8 -/* 003AC 80AAA5FC AFA40020 */ sw $a0, 0x0020($sp) -/* 003B0 80AAA600 10400008 */ beq $v0, $zero, .L80AAA624 -/* 003B4 80AAA604 8FA40020 */ lw $a0, 0x0020($sp) -/* 003B8 80AAA608 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 003BC 80AAA60C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 003C0 80AAA610 0C00D3B0 */ jal func_80034EC0 -/* 003C4 80AAA614 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 003C8 80AAA618 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 003CC 80AAA61C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 003D0 80AAA620 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA624: -/* 003D4 80AAA624 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA628: -/* 003D8 80AAA628 8FB00018 */ lw $s0, 0x0018($sp) -/* 003DC 80AAA62C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003E0 80AAA630 03E00008 */ jr $ra -/* 003E4 80AAA634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s deleted file mode 100644 index 9cffa79cc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AAA638 -/* 003E8 80AAA638 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003EC 80AAA63C AFBF001C */ sw $ra, 0x001C($sp) -/* 003F0 80AAA640 AFB00018 */ sw $s0, 0x0018($sp) -/* 003F4 80AAA644 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 003F8 80AAA648 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003FC 80AAA64C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00400 80AAA650 10400006 */ beq $v0, $zero, .L80AAA66C -/* 00404 80AAA654 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00408 80AAA658 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0040C 80AAA65C 5041000C */ beql $v0, $at, .L80AAA690 -/* 00410 80AAA660 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00414 80AAA664 10000017 */ beq $zero, $zero, .L80AAA6C4 -/* 00418 80AAA668 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA66C: -/* 0041C 80AAA66C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00420 80AAA670 0C00D3B0 */ jal func_80034EC0 -/* 00424 80AAA674 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00428 80AAA678 0C2AA894 */ jal func_80AAA250 -/* 0042C 80AAA67C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00430 80AAA680 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 00434 80AAA684 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00438 80AAA688 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 0043C 80AAA68C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA690: -/* 00440 80AAA690 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00444 80AAA694 0C0295B2 */ jal func_800A56C8 -/* 00448 80AAA698 AFA40020 */ sw $a0, 0x0020($sp) -/* 0044C 80AAA69C 10400008 */ beq $v0, $zero, .L80AAA6C0 -/* 00450 80AAA6A0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00454 80AAA6A4 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00458 80AAA6A8 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 0045C 80AAA6AC 0C00D3B0 */ jal func_80034EC0 -/* 00460 80AAA6B0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00464 80AAA6B4 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00468 80AAA6B8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0046C 80AAA6BC A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA6C0: -/* 00470 80AAA6C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA6C4: -/* 00474 80AAA6C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00478 80AAA6C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0047C 80AAA6CC 03E00008 */ jr $ra -/* 00480 80AAA6D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s deleted file mode 100644 index 813555cb62..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA6D4 -/* 00484 80AAA6D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00488 80AAA6D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0048C 80AAA6DC AFB00018 */ sw $s0, 0x0018($sp) -/* 00490 80AAA6E0 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00494 80AAA6E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00498 80AAA6E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0049C 80AAA6EC 10400006 */ beq $v0, $zero, .L80AAA708 -/* 004A0 80AAA6F0 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 004A4 80AAA6F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 004A8 80AAA6F8 5041000A */ beql $v0, $at, .L80AAA724 -/* 004AC 80AAA6FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 004B0 80AAA700 10000015 */ beq $zero, $zero, .L80AAA758 -/* 004B4 80AAA704 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA708: -/* 004B8 80AAA708 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 004BC 80AAA70C 0C00D3B0 */ jal func_80034EC0 -/* 004C0 80AAA710 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -/* 004C4 80AAA714 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 004C8 80AAA718 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 004CC 80AAA71C A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 004D0 80AAA720 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA724: -/* 004D4 80AAA724 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 004D8 80AAA728 0C0295B2 */ jal func_800A56C8 -/* 004DC 80AAA72C AFA40020 */ sw $a0, 0x0020($sp) -/* 004E0 80AAA730 10400008 */ beq $v0, $zero, .L80AAA754 -/* 004E4 80AAA734 8FA40020 */ lw $a0, 0x0020($sp) -/* 004E8 80AAA738 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 004EC 80AAA73C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 004F0 80AAA740 0C00D3B0 */ jal func_80034EC0 -/* 004F4 80AAA744 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 004F8 80AAA748 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 004FC 80AAA74C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00500 80AAA750 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA754: -/* 00504 80AAA754 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA758: -/* 00508 80AAA758 8FB00018 */ lw $s0, 0x0018($sp) -/* 0050C 80AAA75C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00510 80AAA760 03E00008 */ jr $ra -/* 00514 80AAA764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s deleted file mode 100644 index ede5ea246d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA768 -/* 00518 80AAA768 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0051C 80AAA76C AFBF001C */ sw $ra, 0x001C($sp) -/* 00520 80AAA770 AFB00018 */ sw $s0, 0x0018($sp) -/* 00524 80AAA774 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00528 80AAA778 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0052C 80AAA77C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00530 80AAA780 10400006 */ beq $v0, $zero, .L80AAA79C -/* 00534 80AAA784 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00538 80AAA788 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0053C 80AAA78C 5041000A */ beql $v0, $at, .L80AAA7B8 -/* 00540 80AAA790 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00544 80AAA794 10000015 */ beq $zero, $zero, .L80AAA7EC -/* 00548 80AAA798 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA79C: -/* 0054C 80AAA79C 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00550 80AAA7A0 0C00D3B0 */ jal func_80034EC0 -/* 00554 80AAA7A4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00558 80AAA7A8 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 0055C 80AAA7AC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00560 80AAA7B0 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00564 80AAA7B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA7B8: -/* 00568 80AAA7B8 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0056C 80AAA7BC 0C0295B2 */ jal func_800A56C8 -/* 00570 80AAA7C0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00574 80AAA7C4 10400008 */ beq $v0, $zero, .L80AAA7E8 -/* 00578 80AAA7C8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0057C 80AAA7CC 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00580 80AAA7D0 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00584 80AAA7D4 0C00D3B0 */ jal func_80034EC0 -/* 00588 80AAA7D8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0058C 80AAA7DC 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00590 80AAA7E0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00594 80AAA7E4 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA7E8: -/* 00598 80AAA7E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA7EC: -/* 0059C 80AAA7EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 005A0 80AAA7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005A4 80AAA7F4 03E00008 */ jr $ra -/* 005A8 80AAA7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s deleted file mode 100644 index a7ac952e01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AAA7FC -/* 005AC 80AAA7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005B0 80AAA800 AFBF001C */ sw $ra, 0x001C($sp) -/* 005B4 80AAA804 AFB00018 */ sw $s0, 0x0018($sp) -/* 005B8 80AAA808 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 005BC 80AAA80C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005C0 80AAA810 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005C4 80AAA814 10400006 */ beq $v0, $zero, .L80AAA830 -/* 005C8 80AAA818 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 005CC 80AAA81C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 005D0 80AAA820 5041000A */ beql $v0, $at, .L80AAA84C -/* 005D4 80AAA824 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005D8 80AAA828 10000015 */ beq $zero, $zero, .L80AAA880 -/* 005DC 80AAA82C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA830: -/* 005E0 80AAA830 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 005E4 80AAA834 0C00D3B0 */ jal func_80034EC0 -/* 005E8 80AAA838 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 005EC 80AAA83C 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 005F0 80AAA840 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 005F4 80AAA844 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 005F8 80AAA848 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA84C: -/* 005FC 80AAA84C 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00600 80AAA850 0C0295B2 */ jal func_800A56C8 -/* 00604 80AAA854 AFA40020 */ sw $a0, 0x0020($sp) -/* 00608 80AAA858 10400008 */ beq $v0, $zero, .L80AAA87C -/* 0060C 80AAA85C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00610 80AAA860 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00614 80AAA864 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00618 80AAA868 0C00D3B0 */ jal func_80034EC0 -/* 0061C 80AAA86C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00620 80AAA870 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 00624 80AAA874 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00628 80AAA878 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA87C: -/* 0062C 80AAA87C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA880: -/* 00630 80AAA880 8FB00018 */ lw $s0, 0x0018($sp) -/* 00634 80AAA884 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00638 80AAA888 03E00008 */ jr $ra -/* 0063C 80AAA88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s deleted file mode 100644 index de51f23e7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AAA890 -/* 00640 80AAA890 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00644 80AAA894 AFBF001C */ sw $ra, 0x001C($sp) -/* 00648 80AAA898 AFB00018 */ sw $s0, 0x0018($sp) -/* 0064C 80AAA89C 9082020A */ lbu $v0, 0x020A($a0) ## 0000020A -/* 00650 80AAA8A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00654 80AAA8A4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00658 80AAA8A8 10400006 */ beq $v0, $zero, .L80AAA8C4 -/* 0065C 80AAA8AC 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 00660 80AAA8B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00664 80AAA8B4 5041000C */ beql $v0, $at, .L80AAA8E8 -/* 00668 80AAA8B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0066C 80AAA8BC 10000017 */ beq $zero, $zero, .L80AAA91C -/* 00670 80AAA8C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA8C4: -/* 00674 80AAA8C4 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 00678 80AAA8C8 0C00D3B0 */ jal func_80034EC0 -/* 0067C 80AAA8CC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00680 80AAA8D0 0C2AA894 */ jal func_80AAA250 -/* 00684 80AAA8D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00688 80AAA8D8 920E020A */ lbu $t6, 0x020A($s0) ## 0000020A -/* 0068C 80AAA8DC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00690 80AAA8E0 A20F020A */ sb $t7, 0x020A($s0) ## 0000020A -/* 00694 80AAA8E4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AAA8E8: -/* 00698 80AAA8E8 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0069C 80AAA8EC 0C0295B2 */ jal func_800A56C8 -/* 006A0 80AAA8F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 006A4 80AAA8F4 10400008 */ beq $v0, $zero, .L80AAA918 -/* 006A8 80AAA8F8 8FA40020 */ lw $a0, 0x0020($sp) -/* 006AC 80AAA8FC 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 006B0 80AAA900 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 006B4 80AAA904 0C00D3B0 */ jal func_80034EC0 -/* 006B8 80AAA908 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 006BC 80AAA90C 9218020A */ lbu $t8, 0x020A($s0) ## 0000020A -/* 006C0 80AAA910 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 006C4 80AAA914 A219020A */ sb $t9, 0x020A($s0) ## 0000020A -.L80AAA918: -/* 006C8 80AAA918 8FBF001C */ lw $ra, 0x001C($sp) -.L80AAA91C: -/* 006CC 80AAA91C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006D0 80AAA920 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006D4 80AAA924 03E00008 */ jr $ra -/* 006D8 80AAA928 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s deleted file mode 100644 index 4a08ab38c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AAA92C -/* 006DC 80AAA92C AFA50004 */ sw $a1, 0x0004($sp) -/* 006E0 80AAA930 A085020B */ sb $a1, 0x020B($a0) ## 0000020B -/* 006E4 80AAA934 03E00008 */ jr $ra -/* 006E8 80AAA938 A080020A */ sb $zero, 0x020A($a0) ## 0000020A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s deleted file mode 100644 index ddb0adb340..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s +++ /dev/null @@ -1,87 +0,0 @@ -.late_rodata -glabel jtbl_80AAC4D0 -.word L80AAA96C -.word L80AAA97C -.word L80AAA98C -.word L80AAA99C -.word L80AAA9AC -.word L80AAA9BC -.word L80AAA9CC -.word L80AAA9DC -.word L80AAA9EC -.word L80AAA9FC -.word L80AAAA0C - -.text -glabel func_80AAA93C -/* 006EC 80AAA93C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F0 80AAA940 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006F4 80AAA944 908E020B */ lbu $t6, 0x020B($a0) ## 0000020B -/* 006F8 80AAA948 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 006FC 80AAA94C 2DE1000B */ sltiu $at, $t7, 0x000B -/* 00700 80AAA950 10200030 */ beq $at, $zero, .L80AAAA14 -/* 00704 80AAA954 000F7880 */ sll $t7, $t7, 2 -/* 00708 80AAA958 3C0180AB */ lui $at, %hi(jtbl_80AAC4D0) ## $at = 80AB0000 -/* 0070C 80AAA95C 002F0821 */ addu $at, $at, $t7 -/* 00710 80AAA960 8C2FC4D0 */ lw $t7, %lo(jtbl_80AAC4D0)($at) -/* 00714 80AAA964 01E00008 */ jr $t7 -/* 00718 80AAA968 00000000 */ nop -glabel L80AAA96C -/* 0071C 80AAA96C 0C2AA89D */ jal func_80AAA274 -/* 00720 80AAA970 00000000 */ nop -/* 00724 80AAA974 10000028 */ beq $zero, $zero, .L80AAAA18 -/* 00728 80AAA978 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA97C -/* 0072C 80AAA97C 0C2AA8C2 */ jal func_80AAA308 -/* 00730 80AAA980 00000000 */ nop -/* 00734 80AAA984 10000024 */ beq $zero, $zero, .L80AAAA18 -/* 00738 80AAA988 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA98C -/* 0073C 80AAA98C 0C2AA8E7 */ jal func_80AAA39C -/* 00740 80AAA990 00000000 */ nop -/* 00744 80AAA994 10000020 */ beq $zero, $zero, .L80AAAA18 -/* 00748 80AAA998 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA99C -/* 0074C 80AAA99C 0C2AA91D */ jal func_80AAA474 -/* 00750 80AAA9A0 00000000 */ nop -/* 00754 80AAA9A4 1000001C */ beq $zero, $zero, .L80AAAA18 -/* 00758 80AAA9A8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9AC -/* 0075C 80AAA9AC 0C2AA942 */ jal func_80AAA508 -/* 00760 80AAA9B0 00000000 */ nop -/* 00764 80AAA9B4 10000018 */ beq $zero, $zero, .L80AAAA18 -/* 00768 80AAA9B8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9BC -/* 0076C 80AAA9BC 0C2AA969 */ jal func_80AAA5A4 -/* 00770 80AAA9C0 00000000 */ nop -/* 00774 80AAA9C4 10000014 */ beq $zero, $zero, .L80AAAA18 -/* 00778 80AAA9C8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9CC -/* 0077C 80AAA9CC 0C2AA98E */ jal func_80AAA638 -/* 00780 80AAA9D0 00000000 */ nop -/* 00784 80AAA9D4 10000010 */ beq $zero, $zero, .L80AAAA18 -/* 00788 80AAA9D8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9DC -/* 0078C 80AAA9DC 0C2AA9B5 */ jal func_80AAA6D4 -/* 00790 80AAA9E0 00000000 */ nop -/* 00794 80AAA9E4 1000000C */ beq $zero, $zero, .L80AAAA18 -/* 00798 80AAA9E8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9EC -/* 0079C 80AAA9EC 0C2AA9DA */ jal func_80AAA768 -/* 007A0 80AAA9F0 00000000 */ nop -/* 007A4 80AAA9F4 10000008 */ beq $zero, $zero, .L80AAAA18 -/* 007A8 80AAA9F8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAA9FC -/* 007AC 80AAA9FC 0C2AA9FF */ jal func_80AAA7FC -/* 007B0 80AAAA00 00000000 */ nop -/* 007B4 80AAAA04 10000004 */ beq $zero, $zero, .L80AAAA18 -/* 007B8 80AAAA08 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80AAAA0C -/* 007BC 80AAAA0C 0C2AAA24 */ jal func_80AAA890 -/* 007C0 80AAAA10 00000000 */ nop -.L80AAAA14: -/* 007C4 80AAAA14 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAAA18: -/* 007C8 80AAAA18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007CC 80AAAA1C 03E00008 */ jr $ra -/* 007D0 80AAAA20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s deleted file mode 100644 index 0ddfb36cbc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s +++ /dev/null @@ -1,191 +0,0 @@ -.late_rodata -glabel jtbl_80AAC4FC -.word L80AAAA68 -.word L80AAABCC -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAB18 -.word L80AAABCC -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAAC5C -.word L80AAABCC -.word L80AAABFC - -.text -glabel func_80AAAA24 -/* 007D4 80AAAA24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007D8 80AAAA28 AFBF001C */ sw $ra, 0x001C($sp) -/* 007DC 80AAAA2C AFB00018 */ sw $s0, 0x0018($sp) -/* 007E0 80AAAA30 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 007E4 80AAAA34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007E8 80AAAA38 51C0007D */ beql $t6, $zero, .L80AAAC30 -/* 007EC 80AAAA3C 8E0A0154 */ lw $t2, 0x0154($s0) ## 00000154 -/* 007F0 80AAAA40 948F010E */ lhu $t7, 0x010E($a0) ## 0000010E -/* 007F4 80AAAA44 25F8EFD1 */ addiu $t8, $t7, 0xEFD1 ## $t8 = FFFFEFD1 -/* 007F8 80AAAA48 2F010018 */ sltiu $at, $t8, 0x0018 -/* 007FC 80AAAA4C 10200083 */ beq $at, $zero, .L80AAAC5C -/* 00800 80AAAA50 0018C080 */ sll $t8, $t8, 2 -/* 00804 80AAAA54 3C0180AB */ lui $at, %hi(jtbl_80AAC4FC) ## $at = 80AB0000 -/* 00808 80AAAA58 00380821 */ addu $at, $at, $t8 -/* 0080C 80AAAA5C 8C38C4FC */ lw $t8, %lo(jtbl_80AAC4FC)($at) -/* 00810 80AAAA60 03000008 */ jr $t8 -/* 00814 80AAAA64 00000000 */ nop -glabel L80AAAA68 -/* 00818 80AAAA68 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 0081C 80AAAA6C 5440000A */ bnel $v0, $zero, .L80AAAA98 -/* 00820 80AAAA70 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00824 80AAAA74 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B -/* 00828 80AAAA78 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0082C 80AAAA7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00830 80AAAA80 53210005 */ beql $t9, $at, .L80AAAA98 -/* 00834 80AAAA84 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00838 80AAAA88 0C2AAA4B */ jal func_80AAA92C -/* 0083C 80AAAA8C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00840 80AAAA90 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00844 80AAAA94 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80AAAA98: -/* 00848 80AAAA98 54620009 */ bnel $v1, $v0, .L80AAAAC0 -/* 0084C 80AAAA9C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00850 80AAAAA0 9208020B */ lbu $t0, 0x020B($s0) ## 0000020B -/* 00854 80AAAAA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00858 80AAAAA8 50680005 */ beql $v1, $t0, .L80AAAAC0 -/* 0085C 80AAAAAC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00860 80AAAAB0 0C2AAA4B */ jal func_80AAA92C -/* 00864 80AAAAB4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00868 80AAAAB8 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 0086C 80AAAABC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80AAAAC0: -/* 00870 80AAAAC0 5441000A */ bnel $v0, $at, .L80AAAAEC -/* 00874 80AAAAC4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00878 80AAAAC8 9209020B */ lbu $t1, 0x020B($s0) ## 0000020B -/* 0087C 80AAAACC 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00880 80AAAAD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00884 80AAAAD4 51210005 */ beql $t1, $at, .L80AAAAEC -/* 00888 80AAAAD8 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0088C 80AAAADC 0C2AAA4B */ jal func_80AAA92C -/* 00890 80AAAAE0 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00894 80AAAAE4 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00898 80AAAAE8 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -.L80AAAAEC: -/* 0089C 80AAAAEC 1441005B */ bne $v0, $at, .L80AAAC5C -/* 008A0 80AAAAF0 00000000 */ nop -/* 008A4 80AAAAF4 920A020B */ lbu $t2, 0x020B($s0) ## 0000020B -/* 008A8 80AAAAF8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 008AC 80AAAAFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008B0 80AAAB00 11410056 */ beq $t2, $at, .L80AAAC5C -/* 008B4 80AAAB04 00000000 */ nop -/* 008B8 80AAAB08 0C2AAA4B */ jal func_80AAA92C -/* 008BC 80AAAB0C 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 008C0 80AAAB10 10000052 */ beq $zero, $zero, .L80AAAC5C -/* 008C4 80AAAB14 00000000 */ nop -glabel L80AAAB18 -/* 008C8 80AAAB18 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 008CC 80AAAB1C 5440000A */ bnel $v0, $zero, .L80AAAB48 -/* 008D0 80AAAB20 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008D4 80AAAB24 920B020B */ lbu $t3, 0x020B($s0) ## 0000020B -/* 008D8 80AAAB28 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008DC 80AAAB2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E0 80AAAB30 51610005 */ beql $t3, $at, .L80AAAB48 -/* 008E4 80AAAB34 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008E8 80AAAB38 0C2AAA4B */ jal func_80AAA92C -/* 008EC 80AAAB3C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 008F0 80AAAB40 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 008F4 80AAAB44 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80AAAB48: -/* 008F8 80AAAB48 5441000A */ bnel $v0, $at, .L80AAAB74 -/* 008FC 80AAAB4C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00900 80AAAB50 920C020B */ lbu $t4, 0x020B($s0) ## 0000020B -/* 00904 80AAAB54 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00908 80AAAB58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80AAAB5C 506C0005 */ beql $v1, $t4, .L80AAAB74 -/* 00910 80AAAB60 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00914 80AAAB64 0C2AAA4B */ jal func_80AAA92C -/* 00918 80AAAB68 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0091C 80AAAB6C 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00920 80AAAB70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80AAAB74: -/* 00924 80AAAB74 5441000A */ bnel $v0, $at, .L80AAABA0 -/* 00928 80AAAB78 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0092C 80AAAB7C 920D020B */ lbu $t5, 0x020B($s0) ## 0000020B -/* 00930 80AAAB80 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00934 80AAAB84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00938 80AAAB88 51A10005 */ beql $t5, $at, .L80AAABA0 -/* 0093C 80AAAB8C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00940 80AAAB90 0C2AAA4B */ jal func_80AAA92C -/* 00944 80AAAB94 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 00948 80AAAB98 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 0094C 80AAAB9C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L80AAABA0: -/* 00950 80AAABA0 1441002E */ bne $v0, $at, .L80AAAC5C -/* 00954 80AAABA4 00000000 */ nop -/* 00958 80AAABA8 920E020B */ lbu $t6, 0x020B($s0) ## 0000020B -/* 0095C 80AAABAC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00960 80AAABB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00964 80AAABB4 11C10029 */ beq $t6, $at, .L80AAAC5C -/* 00968 80AAABB8 00000000 */ nop -/* 0096C 80AAABBC 0C2AAA4B */ jal func_80AAA92C -/* 00970 80AAABC0 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00974 80AAABC4 10000025 */ beq $zero, $zero, .L80AAAC5C -/* 00978 80AAABC8 00000000 */ nop -glabel L80AAABCC -/* 0097C 80AAABCC 920F0208 */ lbu $t7, 0x0208($s0) ## 00000208 -/* 00980 80AAABD0 15E00022 */ bne $t7, $zero, .L80AAAC5C -/* 00984 80AAABD4 00000000 */ nop -/* 00988 80AAABD8 9218020B */ lbu $t8, 0x020B($s0) ## 0000020B -/* 0098C 80AAABDC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00990 80AAABE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00994 80AAABE4 1301001D */ beq $t8, $at, .L80AAAC5C -/* 00998 80AAABE8 00000000 */ nop -/* 0099C 80AAABEC 0C2AAA4B */ jal func_80AAA92C -/* 009A0 80AAABF0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 009A4 80AAABF4 10000019 */ beq $zero, $zero, .L80AAAC5C -/* 009A8 80AAABF8 00000000 */ nop -glabel L80AAABFC -/* 009AC 80AAABFC 92190208 */ lbu $t9, 0x0208($s0) ## 00000208 -/* 009B0 80AAAC00 17200016 */ bne $t9, $zero, .L80AAAC5C -/* 009B4 80AAAC04 00000000 */ nop -/* 009B8 80AAAC08 9208020B */ lbu $t0, 0x020B($s0) ## 0000020B -/* 009BC 80AAAC0C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 009C0 80AAAC10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009C4 80AAAC14 11010011 */ beq $t0, $at, .L80AAAC5C -/* 009C8 80AAAC18 00000000 */ nop -/* 009CC 80AAAC1C 0C2AAA4B */ jal func_80AAA92C -/* 009D0 80AAAC20 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 009D4 80AAAC24 1000000D */ beq $zero, $zero, .L80AAAC5C -/* 009D8 80AAAC28 00000000 */ nop -/* 009DC 80AAAC2C 8E0A0154 */ lw $t2, 0x0154($s0) ## 00000154 -.L80AAAC30: -/* 009E0 80AAAC30 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 009E4 80AAAC34 252902C8 */ addiu $t1, $t1, 0x02C8 ## $t1 = 060002C8 -/* 009E8 80AAAC38 112A0008 */ beq $t1, $t2, .L80AAAC5C -/* 009EC 80AAAC3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009F0 80AAAC40 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 -/* 009F4 80AAAC44 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 009F8 80AAAC48 0C00D3B0 */ jal func_80034EC0 -/* 009FC 80AAAC4C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00A00 80AAAC50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A04 80AAAC54 0C2AAA4B */ jal func_80AAA92C -/* 00A08 80AAAC58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -glabel L80AAAC5C -.L80AAAC5C: -/* 00A0C 80AAAC5C 0C2AAA4F */ jal func_80AAA93C -/* 00A10 80AAAC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A14 80AAAC64 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A18 80AAAC68 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A1C 80AAAC6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A20 80AAAC70 03E00008 */ jr $ra -/* 00A24 80AAAC74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s deleted file mode 100644 index 3994a68d78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AAAC78 -/* 00A28 80AAAC78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A2C 80AAAC7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A30 80AAAC80 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A34 80AAAC84 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A38 80AAAC88 0C042F6F */ jal func_8010BDBC -/* 00A3C 80AAAC8C 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00A40 80AAAC90 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A44 80AAAC94 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00A48 80AAAC98 00022400 */ sll $a0, $v0, 16 -/* 00A4C 80AAAC9C 90C30209 */ lbu $v1, 0x0209($a2) ## 00000209 -/* 00A50 80AAACA0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00A54 80AAACA4 00042403 */ sra $a0, $a0, 16 -/* 00A58 80AAACA8 10610007 */ beq $v1, $at, .L80AAACC8 -/* 00A5C 80AAACAC 00057400 */ sll $t6, $a1, 16 -/* 00A60 80AAACB0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A64 80AAACB4 10610004 */ beq $v1, $at, .L80AAACC8 -/* 00A68 80AAACB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00A6C 80AAACBC 10610002 */ beq $v1, $at, .L80AAACC8 -/* 00A70 80AAACC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A74 80AAACC4 14610006 */ bne $v1, $at, .L80AAACE0 -.L80AAACC8: -/* 00A78 80AAACC8 000E7C03 */ sra $t7, $t6, 16 -/* 00A7C 80AAACCC 51E30005 */ beql $t7, $v1, .L80AAACE4 -/* 00A80 80AAACD0 A0C40209 */ sb $a0, 0x0209($a2) ## 00000209 -/* 00A84 80AAACD4 90D80208 */ lbu $t8, 0x0208($a2) ## 00000208 -/* 00A88 80AAACD8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00A8C 80AAACDC A0D90208 */ sb $t9, 0x0208($a2) ## 00000208 -.L80AAACE0: -/* 00A90 80AAACE0 A0C40209 */ sb $a0, 0x0209($a2) ## 00000209 -.L80AAACE4: -/* 00A94 80AAACE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A98 80AAACE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A9C 80AAACEC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 00AA0 80AAACF0 03E00008 */ jr $ra -/* 00AA4 80AAACF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s deleted file mode 100644 index 22d7bef7d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80AAACF8 -/* 00AA8 80AAACF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AAC 80AAACFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AB0 80AAAD00 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AB4 80AAAD04 0C01B0D8 */ jal Text_GetFaceReaction -/* 00AB8 80AAAD08 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011 -/* 00ABC 80AAAD0C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AC0 80AAAD10 10400003 */ beq $v0, $zero, .L80AAAD20 -/* 00AC4 80AAAD14 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 00AC8 80AAAD18 1000002D */ beq $zero, $zero, .L80AAADD0 -/* 00ACC 80AAAD1C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AAAD20: -/* 00AD0 80AAAD20 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00AD4 80AAAD24 A0800208 */ sb $zero, 0x0208($a0) ## 00000208 -/* 00AD8 80AAAD28 A0800209 */ sb $zero, 0x0209($a0) ## 00000209 -/* 00ADC 80AAAD2C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00AE0 80AAAD30 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) -/* 00AE4 80AAAD34 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) -/* 00AE8 80AAAD38 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 -/* 00AEC 80AAAD3C 01CFC024 */ and $t8, $t6, $t7 -/* 00AF0 80AAAD40 53000004 */ beql $t8, $zero, .L80AAAD54 -/* 00AF4 80AAAD44 94790ED4 */ lhu $t9, 0x0ED4($v1) ## 8015F534 -/* 00AF8 80AAAD48 10000021 */ beq $zero, $zero, .L80AAADD0 -/* 00AFC 80AAAD4C 24021045 */ addiu $v0, $zero, 0x1045 ## $v0 = 00001045 -/* 00B00 80AAAD50 94790ED4 */ lhu $t9, 0x0ED4($v1) ## 8015F534 -.L80AAAD54: -/* 00B04 80AAAD54 3C058012 */ lui $a1, %hi(gEquipMasks) -/* 00B08 80AAAD58 24A571A0 */ addiu $a1, %lo(gEquipMasks) -/* 00B0C 80AAAD5C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 -/* 00B10 80AAAD60 11000003 */ beq $t0, $zero, .L80AAAD70 -/* 00B14 80AAAD64 3C068012 */ lui $a2, %hi(gEquipShifts) -/* 00B18 80AAAD68 10000019 */ beq $zero, $zero, .L80AAADD0 -/* 00B1C 80AAAD6C 24021034 */ addiu $v0, $zero, 0x1034 ## $v0 = 00001034 -.L80AAAD70: -/* 00B20 80AAAD70 94620070 */ lhu $v0, 0x0070($v1) ## 8015E6D0 -/* 00B24 80AAAD74 94A90002 */ lhu $t1, 0x0002($a1) ## 801271A2 -/* 00B28 80AAAD78 24C671F0 */ addiu $a2, %lo(gEquipShifts) -/* 00B2C 80AAAD7C 90CB0001 */ lbu $t3, 0x0001($a2) ## 801271F1 -/* 00B30 80AAAD80 00495024 */ and $t2, $v0, $t1 -/* 00B34 80AAAD84 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00B38 80AAAD88 016A6007 */ srav $t4, $t2, $t3 -/* 00B3C 80AAAD8C 548C000A */ bnel $a0, $t4, .L80AAADB8 -/* 00B40 80AAAD90 94790EF8 */ lhu $t9, 0x0EF8($v1) ## 8015F558 -/* 00B44 80AAAD94 94AD0000 */ lhu $t5, 0x0000($a1) ## 801271A0 -/* 00B48 80AAAD98 90CF0000 */ lbu $t7, 0x0000($a2) ## 801271F0 -/* 00B4C 80AAAD9C 004D7024 */ and $t6, $v0, $t5 -/* 00B50 80AAADA0 01EEC007 */ srav $t8, $t6, $t7 -/* 00B54 80AAADA4 54980004 */ bnel $a0, $t8, .L80AAADB8 -/* 00B58 80AAADA8 94790EF8 */ lhu $t9, 0x0EF8($v1) ## 8015F558 -/* 00B5C 80AAADAC 10000008 */ beq $zero, $zero, .L80AAADD0 -/* 00B60 80AAADB0 24021033 */ addiu $v0, $zero, 0x1033 ## $v0 = 00001033 -/* 00B64 80AAADB4 94790EF8 */ lhu $t9, 0x0EF8($v1) ## 8015F558 -.L80AAADB8: -/* 00B68 80AAADB8 2402102F */ addiu $v0, $zero, 0x102F ## $v0 = 0000102F -/* 00B6C 80AAADBC 33281000 */ andi $t0, $t9, 0x1000 ## $t0 = 00000000 -/* 00B70 80AAADC0 11000003 */ beq $t0, $zero, .L80AAADD0 -/* 00B74 80AAADC4 00000000 */ nop -/* 00B78 80AAADC8 10000001 */ beq $zero, $zero, .L80AAADD0 -/* 00B7C 80AAADCC 24021030 */ addiu $v0, $zero, 0x1030 ## $v0 = 00001030 -.L80AAADD0: -/* 00B80 80AAADD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B84 80AAADD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B88 80AAADD8 03E00008 */ jr $ra -/* 00B8C 80AAADDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s deleted file mode 100644 index 6c1835b5c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AAADE0 -/* 00B90 80AAADE0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00B94 80AAADE4 A0A00208 */ sb $zero, 0x0208($a1) ## 00000208 -/* 00B98 80AAADE8 A0A00209 */ sb $zero, 0x0209($a1) ## 00000209 -/* 00B9C 80AAADEC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) -/* 00BA0 80AAADF0 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) -/* 00BA4 80AAADF4 24021046 */ addiu $v0, $zero, 0x1046 ## $v0 = 00001046 -/* 00BA8 80AAADF8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00BAC 80AAADFC 11E00003 */ beq $t7, $zero, .L80AAAE0C -/* 00BB0 80AAAE00 00000000 */ nop -/* 00BB4 80AAAE04 03E00008 */ jr $ra -/* 00BB8 80AAAE08 24021028 */ addiu $v0, $zero, 0x1028 ## $v0 = 00001028 -.L80AAAE0C: -/* 00BBC 80AAAE0C 03E00008 */ jr $ra -/* 00BC0 80AAAE10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s deleted file mode 100644 index 0a808ecafa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80AAAE14 -/* 00BC4 80AAAE14 AFA40000 */ sw $a0, 0x0000($sp) -/* 00BC8 80AAAE18 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00BCC 80AAAE1C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00BD0 80AAAE20 A0A00208 */ sb $zero, 0x0208($a1) ## 00000208 -/* 00BD4 80AAAE24 A0A00209 */ sb $zero, 0x0209($a1) ## 00000209 -/* 00BD8 80AAAE28 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 00BDC 80AAAE2C 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 00BE0 80AAAE30 51E0000A */ beql $t7, $zero, .L80AAAE5C -/* 00BE4 80AAAE34 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 8015F534 -/* 00BE8 80AAAE38 94580EFA */ lhu $t8, 0x0EFA($v0) ## 8015F55A -/* 00BEC 80AAAE3C 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 -/* 00BF0 80AAAE40 13200003 */ beq $t9, $zero, .L80AAAE50 -/* 00BF4 80AAAE44 00000000 */ nop -/* 00BF8 80AAAE48 03E00008 */ jr $ra -/* 00BFC 80AAAE4C 24021071 */ addiu $v0, $zero, 0x1071 ## $v0 = 00001071 -.L80AAAE50: -/* 00C00 80AAAE50 03E00008 */ jr $ra -/* 00C04 80AAAE54 24021070 */ addiu $v0, $zero, 0x1070 ## $v0 = 00001070 -.L80AAAE58: -/* 00C08 80AAAE58 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 00001F44 -.L80AAAE5C: -/* 00C0C 80AAAE5C 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 -/* 00C10 80AAAE60 51200004 */ beql $t1, $zero, .L80AAAE74 -/* 00C14 80AAAE64 944A0EFA */ lhu $t2, 0x0EFA($v0) ## 00001F6A -/* 00C18 80AAAE68 03E00008 */ jr $ra -/* 00C1C 80AAAE6C 24021068 */ addiu $v0, $zero, 0x1068 ## $v0 = 00001068 -.L80AAAE70: -/* 00C20 80AAAE70 944A0EFA */ lhu $t2, 0x0EFA($v0) ## 00001F62 -.L80AAAE74: -/* 00C24 80AAAE74 24021060 */ addiu $v0, $zero, 0x1060 ## $v0 = 00001060 -/* 00C28 80AAAE78 314B0020 */ andi $t3, $t2, 0x0020 ## $t3 = 00000000 -/* 00C2C 80AAAE7C 11600003 */ beq $t3, $zero, .L80AAAE8C -/* 00C30 80AAAE80 00000000 */ nop -/* 00C34 80AAAE84 03E00008 */ jr $ra -/* 00C38 80AAAE88 24021061 */ addiu $v0, $zero, 0x1061 ## $v0 = 00001061 -.L80AAAE8C: -/* 00C3C 80AAAE8C 03E00008 */ jr $ra -/* 00C40 80AAAE90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s deleted file mode 100644 index 61b3aa1194..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AAAE94 -/* 00C44 80AAAE94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C48 80AAAE98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C4C 80AAAE9C 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 00C50 80AAAEA0 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 00C54 80AAAEA4 1041000B */ beq $v0, $at, .L80AAAED4 -/* 00C58 80AAAEA8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00C5C 80AAAEAC 10410005 */ beq $v0, $at, .L80AAAEC4 -/* 00C60 80AAAEB0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 00C64 80AAAEB4 1041000B */ beq $v0, $at, .L80AAAEE4 -/* 00C68 80AAAEB8 00000000 */ nop -/* 00C6C 80AAAEBC 1000000D */ beq $zero, $zero, .L80AAAEF4 -/* 00C70 80AAAEC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAAEC4: -/* 00C74 80AAAEC4 0C2AAB3E */ jal func_80AAACF8 -/* 00C78 80AAAEC8 00000000 */ nop -/* 00C7C 80AAAECC 1000000A */ beq $zero, $zero, .L80AAAEF8 -/* 00C80 80AAAED0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAAED4: -/* 00C84 80AAAED4 0C2AAB78 */ jal func_80AAADE0 -/* 00C88 80AAAED8 00000000 */ nop -/* 00C8C 80AAAEDC 10000006 */ beq $zero, $zero, .L80AAAEF8 -/* 00C90 80AAAEE0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAAEE4: -/* 00C94 80AAAEE4 0C2AAB85 */ jal func_80AAAE14 -/* 00C98 80AAAEE8 00000000 */ nop -/* 00C9C 80AAAEEC 10000002 */ beq $zero, $zero, .L80AAAEF8 -/* 00CA0 80AAAEF0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAAEF4: -/* 00CA4 80AAAEF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAAEF8: -/* 00CA8 80AAAEF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CAC 80AAAEFC 03E00008 */ jr $ra -/* 00CB0 80AAAF00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s deleted file mode 100644 index 6a48c2fa29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s +++ /dev/null @@ -1,103 +0,0 @@ -.late_rodata -glabel jtbl_80AAC55C -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF48 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAB010 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF40 -.word L80AAAF40 - -.text -glabel func_80AAAF04 -/* 00CB4 80AAAF04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CB8 80AAAF08 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CBC 80AAAF0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CC0 80AAAF10 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CC4 80AAAF14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00CC8 80AAAF18 0C2AAB1E */ jal func_80AAAC78 -/* 00CCC 80AAAF1C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00CD0 80AAAF20 2C41000A */ sltiu $at, $v0, 0x000A -/* 00CD4 80AAAF24 10200040 */ beq $at, $zero, .L80AAB028 -/* 00CD8 80AAAF28 00027080 */ sll $t6, $v0, 2 -/* 00CDC 80AAAF2C 3C0180AB */ lui $at, %hi(jtbl_80AAC55C) ## $at = 80AB0000 -/* 00CE0 80AAAF30 002E0821 */ addu $at, $at, $t6 -/* 00CE4 80AAAF34 8C2EC55C */ lw $t6, %lo(jtbl_80AAC55C)($at) -/* 00CE8 80AAAF38 01C00008 */ jr $t6 -/* 00CEC 80AAAF3C 00000000 */ nop -glabel L80AAAF40 -/* 00CF0 80AAAF40 1000003A */ beq $zero, $zero, .L80AAB02C -/* 00CF4 80AAAF44 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AAAF48 -/* 00CF8 80AAAF48 8FAF001C */ lw $t7, 0x001C($sp) -/* 00CFC 80AAAF4C 24011028 */ addiu $at, $zero, 0x1028 ## $at = 00001028 -/* 00D00 80AAAF50 95E2010E */ lhu $v0, 0x010E($t7) ## 0000010E -/* 00D04 80AAAF54 1041000D */ beq $v0, $at, .L80AAAF8C -/* 00D08 80AAAF58 2401102F */ addiu $at, $zero, 0x102F ## $at = 0000102F -/* 00D0C 80AAAF5C 10410012 */ beq $v0, $at, .L80AAAFA8 -/* 00D10 80AAAF60 24011033 */ addiu $at, $zero, 0x1033 ## $at = 00001033 -/* 00D14 80AAAF64 10410028 */ beq $v0, $at, .L80AAB008 -/* 00D18 80AAAF68 24011060 */ addiu $at, $zero, 0x1060 ## $at = 00001060 -/* 00D1C 80AAAF6C 10410018 */ beq $v0, $at, .L80AAAFD0 -/* 00D20 80AAAF70 24011067 */ addiu $at, $zero, 0x1067 ## $at = 00001067 -/* 00D24 80AAAF74 10410024 */ beq $v0, $at, .L80AAB008 -/* 00D28 80AAAF78 24011070 */ addiu $at, $zero, 0x1070 ## $at = 00001070 -/* 00D2C 80AAAF7C 1041001B */ beq $v0, $at, .L80AAAFEC -/* 00D30 80AAAF80 00000000 */ nop -/* 00D34 80AAAF84 10000029 */ beq $zero, $zero, .L80AAB02C -/* 00D38 80AAAF88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAAF8C: -/* 00D3C 80AAAF8C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D40 80AAAF90 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D44 80AAAF94 94580ED4 */ lhu $t8, 0x0ED4($v0) ## 8015F534 -/* 00D48 80AAAF98 37198000 */ ori $t9, $t8, 0x8000 ## $t9 = 00008000 -/* 00D4C 80AAAF9C A4590ED4 */ sh $t9, 0x0ED4($v0) ## 8015F534 -/* 00D50 80AAAFA0 10000022 */ beq $zero, $zero, .L80AAB02C -/* 00D54 80AAAFA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAAFA8: -/* 00D58 80AAAFA8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D5C 80AAAFAC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D60 80AAAFB0 94480ED4 */ lhu $t0, 0x0ED4($v0) ## 8015F534 -/* 00D64 80AAAFB4 944A0EF8 */ lhu $t2, 0x0EF8($v0) ## 8015F558 -/* 00D68 80AAAFB8 35090004 */ ori $t1, $t0, 0x0004 ## $t1 = 00000004 -/* 00D6C 80AAAFBC 354B1000 */ ori $t3, $t2, 0x1000 ## $t3 = 00001000 -/* 00D70 80AAAFC0 A4490ED4 */ sh $t1, 0x0ED4($v0) ## 8015F534 -/* 00D74 80AAAFC4 A44B0EF8 */ sh $t3, 0x0EF8($v0) ## 8015F558 -/* 00D78 80AAAFC8 10000018 */ beq $zero, $zero, .L80AAB02C -/* 00D7C 80AAAFCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAAFD0: -/* 00D80 80AAAFD0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D84 80AAAFD4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D88 80AAAFD8 944C0EFA */ lhu $t4, 0x0EFA($v0) ## 8015F55A -/* 00D8C 80AAAFDC 358D0020 */ ori $t5, $t4, 0x0020 ## $t5 = 00000020 -/* 00D90 80AAAFE0 A44D0EFA */ sh $t5, 0x0EFA($v0) ## 8015F55A -/* 00D94 80AAAFE4 10000011 */ beq $zero, $zero, .L80AAB02C -/* 00D98 80AAAFE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAAFEC: -/* 00D9C 80AAAFEC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00DA0 80AAAFF0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00DA4 80AAAFF4 944E0EFA */ lhu $t6, 0x0EFA($v0) ## 8015F55A -/* 00DA8 80AAAFF8 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 00DAC 80AAAFFC A44F0EFA */ sh $t7, 0x0EFA($v0) ## 8015F55A -/* 00DB0 80AAB000 1000000A */ beq $zero, $zero, .L80AAB02C -/* 00DB4 80AAB004 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAB008: -/* 00DB8 80AAB008 10000008 */ beq $zero, $zero, .L80AAB02C -/* 00DBC 80AAB00C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -glabel L80AAB010 -/* 00DC0 80AAB010 0C041AF2 */ jal func_80106BC8 -/* 00DC4 80AAB014 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DC8 80AAB018 50400004 */ beql $v0, $zero, .L80AAB02C -/* 00DCC 80AAB01C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00DD0 80AAB020 10000002 */ beq $zero, $zero, .L80AAB02C -/* 00DD4 80AAB024 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80AAB028: -/* 00DD8 80AAB028 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AAB02C: -/* 00DDC 80AAB02C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DE0 80AAB030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DE4 80AAB034 03E00008 */ jr $ra -/* 00DE8 80AAB038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s deleted file mode 100644 index 60f4819f73..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80AAB03C -/* 00DEC 80AAB03C AFA40000 */ sw $a0, 0x0000($sp) -/* 00DF0 80AAB040 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00DF4 80AAB044 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00DF8 80AAB048 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00DFC 80AAB04C 1441000B */ bne $v0, $at, .L80AAB07C -/* 00E00 80AAB050 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00E04 80AAB054 946E0ED6 */ lhu $t6, 0x0ED6($v1) ## 8015F536 -/* 00E08 80AAB058 31CF1000 */ andi $t7, $t6, 0x1000 ## $t7 = 00000000 -/* 00E0C 80AAB05C 15E00007 */ bne $t7, $zero, .L80AAB07C -/* 00E10 80AAB060 00000000 */ nop -/* 00E14 80AAB064 94780EDC */ lhu $t8, 0x0EDC($v1) ## 8015F53C -/* 00E18 80AAB068 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00E1C 80AAB06C 17200003 */ bne $t9, $zero, .L80AAB07C -/* 00E20 80AAB070 00000000 */ nop -/* 00E24 80AAB074 03E00008 */ jr $ra -/* 00E28 80AAB078 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AAB07C: -/* 00E2C 80AAB07C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00E30 80AAB080 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 00E34 80AAB084 1441000E */ bne $v0, $at, .L80AAB0C0 -/* 00E38 80AAB088 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00E3C 80AAB08C 94680ED6 */ lhu $t0, 0x0ED6($v1) ## 8015F536 -/* 00E40 80AAB090 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 -/* 00E44 80AAB094 55200006 */ bnel $t1, $zero, .L80AAB0B0 -/* 00E48 80AAB098 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015E664 -/* 00E4C 80AAB09C 946A0EDC */ lhu $t2, 0x0EDC($v1) ## 8015F53C -/* 00E50 80AAB0A0 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 00E54 80AAB0A4 51600007 */ beql $t3, $zero, .L80AAB0C4 -/* 00E58 80AAB0A8 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 00E5C 80AAB0AC 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015E664 -.L80AAB0B0: -/* 00E60 80AAB0B0 51800004 */ beql $t4, $zero, .L80AAB0C4 -/* 00E64 80AAB0B4 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 00E68 80AAB0B8 03E00008 */ jr $ra -/* 00E6C 80AAB0BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AAB0C0: -/* 00E70 80AAB0C0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -.L80AAB0C4: -/* 00E74 80AAB0C4 54410004 */ bnel $v0, $at, .L80AAB0D8 -/* 00E78 80AAB0C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E7C 80AAB0CC 03E00008 */ jr $ra -/* 00E80 80AAB0D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AAB0D4: -/* 00E84 80AAB0D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAB0D8: -/* 00E88 80AAB0D8 03E00008 */ jr $ra -/* 00E8C 80AAB0DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s deleted file mode 100644 index ee8cc380f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AAB0E0 -/* 00E90 80AAB0E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E94 80AAB0E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E98 80AAB0E8 8482020C */ lh $v0, 0x020C($a0) ## 0000020C -/* 00E9C 80AAB0EC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00EA0 80AAB0F0 14400003 */ bne $v0, $zero, .L80AAB100 -/* 00EA4 80AAB0F4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00EA8 80AAB0F8 10000003 */ beq $zero, $zero, .L80AAB108 -/* 00EAC 80AAB0FC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80AAB100: -/* 00EB0 80AAB100 A4CE020C */ sh $t6, 0x020C($a2) ## 0000020C -/* 00EB4 80AAB104 84C3020C */ lh $v1, 0x020C($a2) ## 0000020C -.L80AAB108: -/* 00EB8 80AAB108 54600010 */ bnel $v1, $zero, .L80AAB14C -/* 00EBC 80AAB10C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EC0 80AAB110 84CF020E */ lh $t7, 0x020E($a2) ## 0000020E -/* 00EC4 80AAB114 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00EC8 80AAB118 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00ECC 80AAB11C 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00ED0 80AAB120 A4D8020E */ sh $t8, 0x020E($a2) ## 0000020E -/* 00ED4 80AAB124 84D9020E */ lh $t9, 0x020E($a2) ## 0000020E -/* 00ED8 80AAB128 2B210003 */ slti $at, $t9, 0x0003 -/* 00EDC 80AAB12C 54200007 */ bnel $at, $zero, .L80AAB14C -/* 00EE0 80AAB130 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EE4 80AAB134 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00EE8 80AAB138 AFA60018 */ sw $a2, 0x0018($sp) -/* 00EEC 80AAB13C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00EF0 80AAB140 A4C2020C */ sh $v0, 0x020C($a2) ## 0000020C -/* 00EF4 80AAB144 A4C0020E */ sh $zero, 0x020E($a2) ## 0000020E -/* 00EF8 80AAB148 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AAB14C: -/* 00EFC 80AAB14C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F00 80AAB150 03E00008 */ jr $ra -/* 00F04 80AAB154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s deleted file mode 100644 index 5db440e8e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80AAB158 -/* 00F08 80AAB158 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00F0C 80AAB15C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F10 80AAB160 AFB00020 */ sw $s0, 0x0020($sp) -/* 00F14 80AAB164 AFA5003C */ sw $a1, 0x003C($sp) -/* 00F18 80AAB168 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00F1C 80AAB16C 44813000 */ mtc1 $at, $f6 ## $f6 = 170.00 -/* 00F20 80AAB170 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00F24 80AAB174 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F28 80AAB178 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 00F2C 80AAB17C 4606203C */ c.lt.s $f4, $f6 -/* 00F30 80AAB180 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F34 80AAB184 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00F38 80AAB188 45000022 */ bc1f .L80AAB214 -/* 00F3C 80AAB18C 00000000 */ nop -/* 00F40 80AAB190 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00F44 80AAB194 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00F48 80AAB198 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00F4C 80AAB19C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00F50 80AAB1A0 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00F54 80AAB1A4 468042A0 */ cvt.s.w $f10, $f8 -/* 00F58 80AAB1A8 468084A0 */ cvt.s.w $f18, $f16 -/* 00F5C 80AAB1AC 46125101 */ sub.s $f4, $f10, $f18 -/* 00F60 80AAB1B0 4600218D */ trunc.w.s $f6, $f4 -/* 00F64 80AAB1B4 44023000 */ mfc1 $v0, $f6 -/* 00F68 80AAB1B8 00000000 */ nop -/* 00F6C 80AAB1BC 00021400 */ sll $v0, $v0, 16 -/* 00F70 80AAB1C0 00021403 */ sra $v0, $v0, 16 -/* 00F74 80AAB1C4 04400004 */ bltz $v0, .L80AAB1D8 -/* 00F78 80AAB1C8 00021823 */ subu $v1, $zero, $v0 -/* 00F7C 80AAB1CC 00021C00 */ sll $v1, $v0, 16 -/* 00F80 80AAB1D0 10000003 */ beq $zero, $zero, .L80AAB1E0 -/* 00F84 80AAB1D4 00031C03 */ sra $v1, $v1, 16 -.L80AAB1D8: -/* 00F88 80AAB1D8 00031C00 */ sll $v1, $v1, 16 -/* 00F8C 80AAB1DC 00031C03 */ sra $v1, $v1, 16 -.L80AAB1E0: -/* 00F90 80AAB1E0 A7A30032 */ sh $v1, 0x0032($sp) -/* 00F94 80AAB1E4 0C00D1FA */ jal func_800347E8 -/* 00F98 80AAB1E8 AFA60034 */ sw $a2, 0x0034($sp) -/* 00F9C 80AAB1EC 87A30032 */ lh $v1, 0x0032($sp) -/* 00FA0 80AAB1F0 8FA60034 */ lw $a2, 0x0034($sp) -/* 00FA4 80AAB1F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FA8 80AAB1F8 0043082A */ slt $at, $v0, $v1 -/* 00FAC 80AAB1FC 14200003 */ bne $at, $zero, .L80AAB20C -/* 00FB0 80AAB200 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00FB4 80AAB204 10000003 */ beq $zero, $zero, .L80AAB214 -/* 00FB8 80AAB208 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -.L80AAB20C: -/* 00FBC 80AAB20C 10000001 */ beq $zero, $zero, .L80AAB214 -/* 00FC0 80AAB210 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80AAB214: -/* 00FC4 80AAB214 860801E0 */ lh $t0, 0x01E0($s0) ## 000001E0 -/* 00FC8 80AAB218 3C0A80AB */ lui $t2, %hi(func_80AAB8F8) ## $t2 = 80AB0000 -/* 00FCC 80AAB21C 254AB8F8 */ addiu $t2, $t2, %lo(func_80AAB8F8) ## $t2 = 80AAB8F8 -/* 00FD0 80AAB220 11000002 */ beq $t0, $zero, .L80AAB22C -/* 00FD4 80AAB224 8FAB003C */ lw $t3, 0x003C($sp) -/* 00FD8 80AAB228 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -.L80AAB22C: -/* 00FDC 80AAB22C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 00FE0 80AAB230 3C0980AB */ lui $t1, %hi(func_80AABD0C) ## $t1 = 80AB0000 -/* 00FE4 80AAB234 2529BD0C */ addiu $t1, $t1, %lo(func_80AABD0C) ## $t1 = 80AABD0C -/* 00FE8 80AAB238 15220003 */ bne $t1, $v0, .L80AAB248 -/* 00FEC 80AAB23C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF0 80AAB240 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FF4 80AAB244 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80AAB248: -/* 00FF8 80AAB248 15420003 */ bne $t2, $v0, .L80AAB258 -/* 00FFC 80AAB24C 260501E0 */ addiu $a1, $s0, 0x01E0 ## $a1 = 000001E0 -/* 01000 80AAB250 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01004 80AAB254 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80AAB258: -/* 01008 80AAB258 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 0100C 80AAB25C 3C0D8012 */ lui $t5, %hi(D_8011D394) -/* 01010 80AAB260 8FAE003C */ lw $t6, 0x003C($sp) -/* 01014 80AAB264 55800005 */ bnel $t4, $zero, .L80AAB27C -/* 01018 80AAB268 8DD800E0 */ lw $t8, 0x00E0($t6) ## 000000E0 -/* 0101C 80AAB26C 8DADD394 */ lw $t5, %lo(D_8011D394)($t5) -/* 01020 80AAB270 51A0000D */ beql $t5, $zero, .L80AAB2A8 -/* 01024 80AAB274 8CC80024 */ lw $t0, 0x0024($a2) ## 00000024 -/* 01028 80AAB278 8DD800E0 */ lw $t8, 0x00E0($t6) ## 000000E0 -.L80AAB27C: -/* 0102C 80AAB27C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01030 80AAB280 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 01034 80AAB284 AE1801F8 */ sw $t8, 0x01F8($s0) ## 000001F8 -/* 01038 80AAB288 8DCF00E4 */ lw $t7, 0x00E4($t6) ## 000000E4 -/* 0103C 80AAB28C 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 01040 80AAB290 AE0F01FC */ sw $t7, 0x01FC($s0) ## 000001FC -/* 01044 80AAB294 8DD800E8 */ lw $t8, 0x00E8($t6) ## 000000E8 -/* 01048 80AAB298 E60801F4 */ swc1 $f8, 0x01F4($s0) ## 000001F4 -/* 0104C 80AAB29C 10000012 */ beq $zero, $zero, .L80AAB2E8 -/* 01050 80AAB2A0 AE180200 */ sw $t8, 0x0200($s0) ## 00000200 -/* 01054 80AAB2A4 8CC80024 */ lw $t0, 0x0024($a2) ## 00000024 -.L80AAB2A8: -/* 01058 80AAB2A8 3C098016 */ lui $t1, %hi(gSaveContext+4) -/* 0105C 80AAB2AC 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 -/* 01060 80AAB2B0 AE0801F8 */ sw $t0, 0x01F8($s0) ## 000001F8 -/* 01064 80AAB2B4 8CD90028 */ lw $t9, 0x0028($a2) ## 00000028 -/* 01068 80AAB2B8 AE1901FC */ sw $t9, 0x01FC($s0) ## 000001FC -/* 0106C 80AAB2BC 8CC8002C */ lw $t0, 0x002C($a2) ## 0000002C -/* 01070 80AAB2C0 AE080200 */ sw $t0, 0x0200($s0) ## 00000200 -/* 01074 80AAB2C4 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) -/* 01078 80AAB2C8 59200005 */ blezl $t1, .L80AAB2E0 -/* 0107C 80AAB2CC 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 -/* 01080 80AAB2D0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01084 80AAB2D4 10000004 */ beq $zero, $zero, .L80AAB2E8 -/* 01088 80AAB2D8 E61001F4 */ swc1 $f16, 0x01F4($s0) ## 000001F4 -/* 0108C 80AAB2DC 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 -.L80AAB2E0: -/* 01090 80AAB2E0 00000000 */ nop -/* 01094 80AAB2E4 E60A01F4 */ swc1 $f10, 0x01F4($s0) ## 000001F4 -.L80AAB2E8: -/* 01098 80AAB2E8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0109C 80AAB2EC A7A3002E */ sh $v1, 0x002E($sp) -/* 010A0 80AAB2F0 0C00D285 */ jal func_80034A14 -/* 010A4 80AAB2F4 AFA50028 */ sw $a1, 0x0028($sp) -/* 010A8 80AAB2F8 8E0B0190 */ lw $t3, 0x0190($s0) ## 00000190 -/* 010AC 80AAB2FC 3C0A80AB */ lui $t2, %hi(func_80AABC10) ## $t2 = 80AB0000 -/* 010B0 80AAB300 254ABC10 */ addiu $t2, $t2, %lo(func_80AABC10) ## $t2 = 80AABC10 -/* 010B4 80AAB304 114B0015 */ beq $t2, $t3, .L80AAB35C -/* 010B8 80AAB308 87A3002E */ lh $v1, 0x002E($sp) -/* 010BC 80AAB30C 50600014 */ beql $v1, $zero, .L80AAB360 -/* 010C0 80AAB310 8FBF0024 */ lw $ra, 0x0024($sp) -/* 010C4 80AAB314 860C01D4 */ lh $t4, 0x01D4($s0) ## 000001D4 -/* 010C8 80AAB318 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 010CC 80AAB31C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 010D0 80AAB320 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 010D4 80AAB324 3C0D80AB */ lui $t5, %hi(func_80AAAE94) ## $t5 = 80AB0000 -/* 010D8 80AAB328 3C0E80AB */ lui $t6, %hi(func_80AAAF04) ## $t6 = 80AB0000 -/* 010DC 80AAB32C 46809120 */ cvt.s.w $f4, $f18 -/* 010E0 80AAB330 25CEAF04 */ addiu $t6, $t6, %lo(func_80AAAF04) ## $t6 = 80AAAF04 -/* 010E4 80AAB334 25ADAE94 */ addiu $t5, $t5, %lo(func_80AAAE94) ## $t5 = 80AAAE94 -/* 010E8 80AAB338 AFAD0010 */ sw $t5, 0x0010($sp) -/* 010EC 80AAB33C AFAE0014 */ sw $t6, 0x0014($sp) -/* 010F0 80AAB340 8FA4003C */ lw $a0, 0x003C($sp) -/* 010F4 80AAB344 46062200 */ add.s $f8, $f4, $f6 -/* 010F8 80AAB348 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010FC 80AAB34C 8FA60028 */ lw $a2, 0x0028($sp) -/* 01100 80AAB350 44074000 */ mfc1 $a3, $f8 -/* 01104 80AAB354 0C00D0F3 */ jal func_800343CC -/* 01108 80AAB358 00000000 */ nop -.L80AAB35C: -/* 0110C 80AAB35C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AAB360: -/* 01110 80AAB360 8FB00020 */ lw $s0, 0x0020($sp) -/* 01114 80AAB364 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01118 80AAB368 03E00008 */ jr $ra -/* 0111C 80AAB36C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s deleted file mode 100644 index 1240995f75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s +++ /dev/null @@ -1,101 +0,0 @@ -.late_rodata -glabel D_80AAC584 - .word 0x4622F983 - -.text -glabel func_80AAB370 -/* 01120 80AAB370 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01124 80AAB374 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01128 80AAB378 AFB00020 */ sw $s0, 0x0020($sp) -/* 0112C 80AAB37C 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 01130 80AAB380 3401FF00 */ ori $at, $zero, 0xFF00 ## $at = 0000FF00 -/* 01134 80AAB384 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01138 80AAB388 30C6FF00 */ andi $a2, $a2, 0xFF00 ## $a2 = 00000000 -/* 0113C 80AAB38C 14C10003 */ bne $a2, $at, .L80AAB39C -/* 01140 80AAB390 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 01144 80AAB394 1000004C */ beq $zero, $zero, .L80AAB4C8 -/* 01148 80AAB398 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAB39C: -/* 0114C 80AAB39C 01C57021 */ addu $t6, $t6, $a1 -/* 01150 80AAB3A0 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 01154 80AAB3A4 00067A03 */ sra $t7, $a2, 8 -/* 01158 80AAB3A8 000FC0C0 */ sll $t8, $t7, 3 -/* 0115C 80AAB3AC 01D82021 */ addu $a0, $t6, $t8 -/* 01160 80AAB3B0 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 -/* 01164 80AAB3B4 3C0A8016 */ lui $t2, %hi(gSegments) -/* 01168 80AAB3B8 860C0212 */ lh $t4, 0x0212($s0) ## 00000212 -/* 0116C 80AAB3BC 0003C900 */ sll $t9, $v1, 4 -/* 01170 80AAB3C0 00194702 */ srl $t0, $t9, 28 -/* 01174 80AAB3C4 00084880 */ sll $t1, $t0, 2 -/* 01178 80AAB3C8 01495021 */ addu $t2, $t2, $t1 -/* 0117C 80AAB3CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01180 80AAB3D0 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 01184 80AAB3D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01188 80AAB3D8 00615824 */ and $t3, $v1, $at -/* 0118C 80AAB3DC 000C6880 */ sll $t5, $t4, 2 -/* 01190 80AAB3E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01194 80AAB3E4 01AC6823 */ subu $t5, $t5, $t4 -/* 01198 80AAB3E8 014B1021 */ addu $v0, $t2, $t3 -/* 0119C 80AAB3EC 00411021 */ addu $v0, $v0, $at -/* 011A0 80AAB3F0 000D6840 */ sll $t5, $t5, 1 -/* 011A4 80AAB3F4 004D1021 */ addu $v0, $v0, $t5 -/* 011A8 80AAB3F8 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 011AC 80AAB3FC 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 -/* 011B0 80AAB400 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 011B4 80AAB404 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 011B8 80AAB408 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 011BC 80AAB40C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 011C0 80AAB410 468021A0 */ cvt.s.w $f6, $f4 -/* 011C4 80AAB414 AFA40034 */ sw $a0, 0x0034($sp) -/* 011C8 80AAB418 46805420 */ cvt.s.w $f16, $f10 -/* 011CC 80AAB41C 46083301 */ sub.s $f12, $f6, $f8 -/* 011D0 80AAB420 46128381 */ sub.s $f14, $f16, $f18 -/* 011D4 80AAB424 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 011D8 80AAB428 0C03F494 */ jal Math_atan2f -/* 011DC 80AAB42C E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 011E0 80AAB430 3C0180AB */ lui $at, %hi(D_80AAC584) ## $at = 80AB0000 -/* 011E4 80AAB434 C424C584 */ lwc1 $f4, %lo(D_80AAC584)($at) -/* 011E8 80AAB438 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 011EC 80AAB43C AFB90010 */ sw $t9, 0x0010($sp) -/* 011F0 80AAB440 46040182 */ mul.s $f6, $f0, $f4 -/* 011F4 80AAB444 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 011F8 80AAB448 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 011FC 80AAB44C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 01200 80AAB450 4600320D */ trunc.w.s $f8, $f6 -/* 01204 80AAB454 44054000 */ mfc1 $a1, $f8 -/* 01208 80AAB458 00000000 */ nop -/* 0120C 80AAB45C 00052C00 */ sll $a1, $a1, 16 -/* 01210 80AAB460 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01214 80AAB464 00052C03 */ sra $a1, $a1, 16 -/* 01218 80AAB468 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 0121C 80AAB46C C7AE0028 */ lwc1 $f14, 0x0028($sp) -/* 01220 80AAB470 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01224 80AAB474 460C6282 */ mul.s $f10, $f12, $f12 -/* 01228 80AAB478 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 0122C 80AAB47C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01230 80AAB480 460E7402 */ mul.s $f16, $f14, $f14 -/* 01234 80AAB484 46105480 */ add.s $f18, $f10, $f16 -/* 01238 80AAB488 4604903C */ c.lt.s $f18, $f4 -/* 0123C 80AAB48C 00000000 */ nop -/* 01240 80AAB490 4500000D */ bc1f .L80AAB4C8 -/* 01244 80AAB494 00000000 */ nop -/* 01248 80AAB498 86080212 */ lh $t0, 0x0212($s0) ## 00000212 -/* 0124C 80AAB49C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01250 80AAB4A0 A6090212 */ sh $t1, 0x0212($s0) ## 00000212 -/* 01254 80AAB4A4 8FAB0034 */ lw $t3, 0x0034($sp) -/* 01258 80AAB4A8 860A0212 */ lh $t2, 0x0212($s0) ## 00000212 -/* 0125C 80AAB4AC 916C0000 */ lbu $t4, 0x0000($t3) ## 00000000 -/* 01260 80AAB4B0 014C082A */ slt $at, $t2, $t4 -/* 01264 80AAB4B4 14200002 */ bne $at, $zero, .L80AAB4C0 -/* 01268 80AAB4B8 00000000 */ nop -/* 0126C 80AAB4BC A6000212 */ sh $zero, 0x0212($s0) ## 00000212 -.L80AAB4C0: -/* 01270 80AAB4C0 10000001 */ beq $zero, $zero, .L80AAB4C8 -/* 01274 80AAB4C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AAB4C8: -/* 01278 80AAB4C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0127C 80AAB4CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01280 80AAB4D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01284 80AAB4D4 03E00008 */ jr $ra -/* 01288 80AAB4D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s deleted file mode 100644 index 6437ba15aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AAB4DC -/* 0128C 80AAB4DC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01290 80AAB4E0 3401FF00 */ ori $at, $zero, 0xFF00 ## $at = 0000FF00 -/* 01294 80AAB4E4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01298 80AAB4E8 3063FF00 */ andi $v1, $v1, 0xFF00 ## $v1 = 00000000 -/* 0129C 80AAB4EC 14610003 */ bne $v1, $at, .L80AAB4FC -/* 012A0 80AAB4F0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 012A4 80AAB4F4 03E00008 */ jr $ra -/* 012A8 80AAB4F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AAB4FC: -/* 012AC 80AAB4FC 01C67021 */ addu $t6, $t6, $a2 -/* 012B0 80AAB500 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 012B4 80AAB504 00037A03 */ sra $t7, $v1, 8 -/* 012B8 80AAB508 000FC0C0 */ sll $t8, $t7, 3 -/* 012BC 80AAB50C 01D82821 */ addu $a1, $t6, $t8 -/* 012C0 80AAB510 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 012C4 80AAB514 3C0B8016 */ lui $t3, %hi(gSegments) -/* 012C8 80AAB518 90AD0000 */ lbu $t5, 0x0000($a1) ## 00000000 -/* 012CC 80AAB51C 0008C900 */ sll $t9, $t0, 4 -/* 012D0 80AAB520 00194F02 */ srl $t1, $t9, 28 -/* 012D4 80AAB524 00095080 */ sll $t2, $t1, 2 -/* 012D8 80AAB528 016A5821 */ addu $t3, $t3, $t2 -/* 012DC 80AAB52C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 012E0 80AAB530 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 012E4 80AAB534 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 012E8 80AAB538 01016024 */ and $t4, $t0, $at -/* 012EC 80AAB53C 000D7880 */ sll $t7, $t5, 2 -/* 012F0 80AAB540 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012F4 80AAB544 01ED7823 */ subu $t7, $t7, $t5 -/* 012F8 80AAB548 016C3821 */ addu $a3, $t3, $t4 -/* 012FC 80AAB54C 00E13821 */ addu $a3, $a3, $at -/* 01300 80AAB550 000F7840 */ sll $t7, $t7, 1 -/* 01304 80AAB554 00EF3821 */ addu $a3, $a3, $t7 -/* 01308 80AAB558 84EEFFFA */ lh $t6, -0x0006($a3) ## FFFFFFFA -/* 0130C 80AAB55C 24E7FFFA */ addiu $a3, $a3, 0xFFFA ## $a3 = FFFFFFFA -/* 01310 80AAB560 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01314 80AAB564 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 01318 80AAB568 00000000 */ nop -/* 0131C 80AAB56C 468021A0 */ cvt.s.w $f6, $f4 -/* 01320 80AAB570 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 01324 80AAB574 84F80002 */ lh $t8, 0x0002($a3) ## FFFFFFFC -/* 01328 80AAB578 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 0132C 80AAB57C 00000000 */ nop -/* 01330 80AAB580 468042A0 */ cvt.s.w $f10, $f8 -/* 01334 80AAB584 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 01338 80AAB588 84F90004 */ lh $t9, 0x0004($a3) ## FFFFFFFE -/* 0133C 80AAB58C 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01340 80AAB590 00000000 */ nop -/* 01344 80AAB594 468084A0 */ cvt.s.w $f18, $f16 -/* 01348 80AAB598 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 0134C 80AAB59C 03E00008 */ jr $ra -/* 01350 80AAB5A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s deleted file mode 100644 index 3db22443d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80AAB5A4 -/* 01354 80AAB5A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01358 80AAB5A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0135C 80AAB5AC 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 01360 80AAB5B0 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01364 80AAB5B4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01368 80AAB5B8 1041001E */ beq $v0, $at, .L80AAB634 -/* 0136C 80AAB5BC 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 01370 80AAB5C0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01374 80AAB5C4 3C0E8012 */ lui $t6, %hi(gBitFlags+0x48) -/* 01378 80AAB5C8 8DCE7168 */ lw $t6, %lo(gBitFlags+0x48)($t6) -/* 0137C 80AAB5CC 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 -/* 01380 80AAB5D0 01CFC024 */ and $t8, $t6, $t7 -/* 01384 80AAB5D4 5300000C */ beql $t8, $zero, .L80AAB608 -/* 01388 80AAB5D8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 0138C 80AAB5DC 94790ED6 */ lhu $t9, 0x0ED6($v1) ## 8015F536 -/* 01390 80AAB5E0 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01394 80AAB5E4 33281000 */ andi $t0, $t9, 0x1000 ## $t0 = 00000000 -/* 01398 80AAB5E8 55000007 */ bnel $t0, $zero, .L80AAB608 -/* 0139C 80AAB5EC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 013A0 80AAB5F0 14410004 */ bne $v0, $at, .L80AAB604 -/* 013A4 80AAB5F4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 013A8 80AAB5F8 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 013AC 80AAB5FC 10000005 */ beq $zero, $zero, .L80AAB614 -/* 013B0 80AAB600 84860210 */ lh $a2, 0x0210($a0) ## 00000210 -.L80AAB604: -/* 013B4 80AAB604 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -.L80AAB608: -/* 013B8 80AAB608 44810000 */ mtc1 $at, $f0 ## $f0 = 400.00 -/* 013BC 80AAB60C 00000000 */ nop -/* 013C0 80AAB610 84860210 */ lh $a2, 0x0210($a0) ## 00000210 -.L80AAB614: -/* 013C4 80AAB614 44070000 */ mfc1 $a3, $f0 -/* 013C8 80AAB618 0C00D375 */ jal func_80034DD4 -/* 013CC 80AAB61C AFA40018 */ sw $a0, 0x0018($sp) -/* 013D0 80AAB620 8FA40018 */ lw $a0, 0x0018($sp) -/* 013D4 80AAB624 A4820210 */ sh $v0, 0x0210($a0) ## 00000210 -/* 013D8 80AAB628 84890210 */ lh $t1, 0x0210($a0) ## 00000210 -/* 013DC 80AAB62C 10000004 */ beq $zero, $zero, .L80AAB640 -/* 013E0 80AAB630 A08900C8 */ sb $t1, 0x00C8($a0) ## 000000C8 -.L80AAB634: -/* 013E4 80AAB634 A48A0210 */ sh $t2, 0x0210($a0) ## 00000210 -/* 013E8 80AAB638 848B0210 */ lh $t3, 0x0210($a0) ## 00000210 -/* 013EC 80AAB63C A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L80AAB640: -/* 013F0 80AAB640 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013F4 80AAB644 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013F8 80AAB648 03E00008 */ jr $ra -/* 013FC 80AAB64C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s deleted file mode 100644 index f29db25941..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AAB874 -/* 01624 80AAB874 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01628 80AAB878 AFBF001C */ sw $ra, 0x001C($sp) -/* 0162C 80AAB87C AFB00018 */ sw $s0, 0x0018($sp) -/* 01630 80AAB880 AFA50024 */ sw $a1, 0x0024($sp) -/* 01634 80AAB884 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 01638 80AAB888 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 0163C 80AAB88C 25CE02C8 */ addiu $t6, $t6, 0x02C8 ## $t6 = 060002C8 -/* 01640 80AAB890 15CF0008 */ bne $t6, $t7, .L80AAB8B4 -/* 01644 80AAB894 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01648 80AAB898 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0164C 80AAB89C 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 01650 80AAB8A0 26060236 */ addiu $a2, $s0, 0x0236 ## $a2 = 00000236 -/* 01654 80AAB8A4 0C00D3D5 */ jal func_80034F54 -/* 01658 80AAB8A8 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -/* 0165C 80AAB8AC 1000000B */ beq $zero, $zero, .L80AAB8DC -/* 01660 80AAB8B0 00000000 */ nop -.L80AAB8B4: -/* 01664 80AAB8B4 861801E0 */ lh $t8, 0x01E0($s0) ## 000001E0 -/* 01668 80AAB8B8 17000008 */ bne $t8, $zero, .L80AAB8DC -/* 0166C 80AAB8BC 00000000 */ nop -/* 01670 80AAB8C0 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B -/* 01674 80AAB8C4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01678 80AAB8C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0167C 80AAB8CC 13210003 */ beq $t9, $at, .L80AAB8DC -/* 01680 80AAB8D0 00000000 */ nop -/* 01684 80AAB8D4 0C2AAA4B */ jal func_80AAA92C -/* 01688 80AAB8D8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -.L80AAB8DC: -/* 0168C 80AAB8DC 0C2AAA89 */ jal func_80AAAA24 -/* 01690 80AAB8E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01694 80AAB8E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01698 80AAB8E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0169C 80AAB8EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 016A0 80AAB8F0 03E00008 */ jr $ra -/* 016A4 80AAB8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s deleted file mode 100644 index 7989d432f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AAB8F8 -/* 016A8 80AAB8F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016AC 80AAB8FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 016B0 80AAB900 AFA40018 */ sw $a0, 0x0018($sp) -/* 016B4 80AAB904 AFA5001C */ sw $a1, 0x001C($sp) -/* 016B8 80AAB908 8C980154 */ lw $t8, 0x0154($a0) ## 00000154 -/* 016BC 80AAB90C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 016C0 80AAB910 25CE02C8 */ addiu $t6, $t6, 0x02C8 ## $t6 = 060002C8 -/* 016C4 80AAB914 15D80006 */ bne $t6, $t8, .L80AAB930 -/* 016C8 80AAB918 00807825 */ or $t7, $a0, $zero ## $t7 = 00000000 -/* 016CC 80AAB91C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 016D0 80AAB920 25E50214 */ addiu $a1, $t7, 0x0214 ## $a1 = 00000214 -/* 016D4 80AAB924 25E60236 */ addiu $a2, $t7, 0x0236 ## $a2 = 00000236 -/* 016D8 80AAB928 0C00D3D5 */ jal func_80034F54 -/* 016DC 80AAB92C 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -.L80AAB930: -/* 016E0 80AAB930 0C2AAA4F */ jal func_80AAA93C -/* 016E4 80AAB934 8FA40018 */ lw $a0, 0x0018($sp) -/* 016E8 80AAB938 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016EC 80AAB93C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016F0 80AAB940 03E00008 */ jr $ra -/* 016F4 80AAB944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s deleted file mode 100644 index 634574821c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s +++ /dev/null @@ -1,200 +0,0 @@ -.late_rodata -glabel D_80AAC588 - .float 0.001 - -.text -glabel func_80AAB948 -/* 016F8 80AAB948 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 016FC 80AAB94C AFBF001C */ sw $ra, 0x001C($sp) -/* 01700 80AAB950 AFB00018 */ sw $s0, 0x0018($sp) -/* 01704 80AAB954 AFA50034 */ sw $a1, 0x0034($sp) -/* 01708 80AAB958 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0170C 80AAB95C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01710 80AAB960 AFA2002C */ sw $v0, 0x002C($sp) -/* 01714 80AAB964 0C2AAA89 */ jal func_80AAAA24 -/* 01718 80AAB968 AFA20024 */ sw $v0, 0x0024($sp) -/* 0171C 80AAB96C 860201E0 */ lh $v0, 0x01E0($s0) ## 000001E0 -/* 01720 80AAB970 54400042 */ bnel $v0, $zero, .L80AABA7C -/* 01724 80AAB974 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01728 80AAB978 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 0172C 80AAB97C 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 01730 80AAB980 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01734 80AAB984 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 01738 80AAB988 8FA50024 */ lw $a1, 0x0024($sp) -/* 0173C 80AAB98C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 01740 80AAB990 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 01744 80AAB994 A7A20022 */ sh $v0, 0x0022($sp) -/* 01748 80AAB998 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 0174C 80AAB99C 00022400 */ sll $a0, $v0, 16 -/* 01750 80AAB9A0 00042403 */ sra $a0, $a0, 16 -/* 01754 80AAB9A4 0C01DE1C */ jal Math_Sins - ## sins? -/* 01758 80AAB9A8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 0175C 80AAB9AC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01760 80AAB9B0 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 01764 80AAB9B4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01768 80AAB9B8 C6120010 */ lwc1 $f18, 0x0010($s0) ## 00000010 -/* 0176C 80AAB9BC 46004282 */ mul.s $f10, $f8, $f0 -/* 01770 80AAB9C0 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 01774 80AAB9C4 460A3400 */ add.s $f16, $f6, $f10 -/* 01778 80AAB9C8 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 0177C 80AAB9CC 0C01DE0D */ jal Math_Coss - ## coss? -/* 01780 80AAB9D0 87A40022 */ lh $a0, 0x0022($sp) -/* 01784 80AAB9D4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01788 80AAB9D8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 0178C 80AAB9DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01790 80AAB9E0 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 01794 80AAB9E4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01798 80AAB9E8 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 0179C 80AAB9EC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 017A0 80AAB9F0 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 017A4 80AAB9F4 46004182 */ mul.s $f6, $f8, $f0 -/* 017A8 80AAB9F8 3C0180AB */ lui $at, %hi(D_80AAC588) ## $at = 80AB0000 -/* 017AC 80AAB9FC 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 017B0 80AABA00 00000000 */ nop -/* 017B4 80AABA04 468084A0 */ cvt.s.w $f18, $f16 -/* 017B8 80AABA08 46062280 */ add.s $f10, $f4, $f6 -/* 017BC 80AABA0C E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 017C0 80AABA10 87B80022 */ lh $t8, 0x0022($sp) -/* 017C4 80AABA14 C426C588 */ lwc1 $f6, %lo(D_80AAC588)($at) -/* 017C8 80AABA18 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 017CC 80AABA1C 00000000 */ nop -/* 017D0 80AABA20 46804120 */ cvt.s.w $f4, $f8 -/* 017D4 80AABA24 46049001 */ sub.s $f0, $f18, $f4 -/* 017D8 80AABA28 46000005 */ abs.s $f0, $f0 -/* 017DC 80AABA2C 46060282 */ mul.s $f10, $f0, $f6 -/* 017E0 80AABA30 00000000 */ nop -/* 017E4 80AABA34 460C5082 */ mul.s $f2, $f10, $f12 -/* 017E8 80AABA38 460E103C */ c.lt.s $f2, $f14 -/* 017EC 80AABA3C 00000000 */ nop -/* 017F0 80AABA40 45000004 */ bc1f .L80AABA54 -/* 017F4 80AABA44 00000000 */ nop -/* 017F8 80AABA48 E60E0168 */ swc1 $f14, 0x0168($s0) ## 00000168 -/* 017FC 80AABA4C 1000000A */ beq $zero, $zero, .L80AABA78 -/* 01800 80AABA50 860201E0 */ lh $v0, 0x01E0($s0) ## 000001E0 -.L80AABA54: -/* 01804 80AABA54 4602603C */ c.lt.s $f12, $f2 -/* 01808 80AABA58 00000000 */ nop -/* 0180C 80AABA5C 45020004 */ bc1fl .L80AABA70 -/* 01810 80AABA60 46001006 */ mov.s $f0, $f2 -/* 01814 80AABA64 10000002 */ beq $zero, $zero, .L80AABA70 -/* 01818 80AABA68 46006006 */ mov.s $f0, $f12 -/* 0181C 80AABA6C 46001006 */ mov.s $f0, $f2 -.L80AABA70: -/* 01820 80AABA70 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 01824 80AABA74 860201E0 */ lh $v0, 0x01E0($s0) ## 000001E0 -.L80AABA78: -/* 01828 80AABA78 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80AABA7C: -/* 0182C 80AABA7C 14410032 */ bne $v0, $at, .L80AABB48 -/* 01830 80AABA80 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01834 80AABA84 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01838 80AABA88 3C198012 */ lui $t9, %hi(gBitFlags+0x48) -/* 0183C 80AABA8C 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) -/* 01840 80AABA90 8C6800A4 */ lw $t0, 0x00A4($v1) ## 8015E704 -/* 01844 80AABA94 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01848 80AABA98 03284824 */ and $t1, $t9, $t0 -/* 0184C 80AABA9C 5120000E */ beql $t1, $zero, .L80AABAD8 -/* 01850 80AABAA0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01854 80AABAA4 946A0ED6 */ lhu $t2, 0x0ED6($v1) ## 8015F536 -/* 01858 80AABAA8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0185C 80AABAAC 314B1000 */ andi $t3, $t2, 0x1000 ## $t3 = 00000000 -/* 01860 80AABAB0 55600009 */ bnel $t3, $zero, .L80AABAD8 -/* 01864 80AABAB4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01868 80AABAB8 848C00A4 */ lh $t4, 0x00A4($a0) ## 000000A4 -/* 0186C 80AABABC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01870 80AABAC0 240D0037 */ addiu $t5, $zero, 0x0037 ## $t5 = 00000037 -/* 01874 80AABAC4 15810003 */ bne $t4, $at, .L80AABAD4 -/* 01878 80AABAC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0187C 80AABACC 00240821 */ addu $at, $at, $a0 -/* 01880 80AABAD0 A02D03DC */ sb $t5, 0x03DC($at) ## 000103DC -.L80AABAD4: -/* 01884 80AABAD4 8FA40034 */ lw $a0, 0x0034($sp) -.L80AABAD8: -/* 01888 80AABAD8 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 0188C 80AABADC 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 01890 80AABAE0 54410006 */ bnel $v0, $at, .L80AABAFC -/* 01894 80AABAE4 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01898 80AABAE8 946E0ED4 */ lhu $t6, 0x0ED4($v1) ## 8015F534 -/* 0189C 80AABAEC 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 018A0 80AABAF0 A46F0ED4 */ sh $t7, 0x0ED4($v1) ## 8015F534 -/* 018A4 80AABAF4 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 018A8 80AABAF8 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -.L80AABAFC: -/* 018AC 80AABAFC 14410004 */ bne $v0, $at, .L80AABB10 -/* 018B0 80AABB00 00000000 */ nop -/* 018B4 80AABB04 94780ED4 */ lhu $t8, 0x0ED4($v1) ## 8015F534 -/* 018B8 80AABB08 37190400 */ ori $t9, $t8, 0x0400 ## $t9 = 00000400 -/* 018BC 80AABB0C A4790ED4 */ sh $t9, 0x0ED4($v1) ## 8015F534 -.L80AABB10: -/* 018C0 80AABB10 0C2AAA4B */ jal func_80AAA92C -/* 018C4 80AABB14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C8 80AABB18 0C2AAA4F */ jal func_80AAA93C -/* 018CC 80AABB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018D0 80AABB20 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 018D4 80AABB24 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 018D8 80AABB28 3C0980AB */ lui $t1, %hi(func_80AABD0C) ## $t1 = 80AB0000 -/* 018DC 80AABB2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 018E0 80AABB30 2529BD0C */ addiu $t1, $t1, %lo(func_80AABD0C) ## $t1 = 80AABD0C -/* 018E4 80AABB34 A6080212 */ sh $t0, 0x0212($s0) ## 00000212 -/* 018E8 80AABB38 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 018EC 80AABB3C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 018F0 80AABB40 1000002E */ beq $zero, $zero, .L80AABBFC -/* 018F4 80AABB44 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -.L80AABB48: -/* 018F8 80AABB48 8E0B0154 */ lw $t3, 0x0154($s0) ## 00000154 -/* 018FC 80AABB4C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01900 80AABB50 254A02C8 */ addiu $t2, $t2, 0x02C8 ## $t2 = 060002C8 -/* 01904 80AABB54 154B0006 */ bne $t2, $t3, .L80AABB70 -/* 01908 80AABB58 8FA40034 */ lw $a0, 0x0034($sp) -/* 0190C 80AABB5C 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 01910 80AABB60 26060236 */ addiu $a2, $s0, 0x0236 ## $a2 = 00000236 -/* 01914 80AABB64 0C00D3D5 */ jal func_80034F54 -/* 01918 80AABB68 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -/* 0191C 80AABB6C 860201E0 */ lh $v0, 0x01E0($s0) ## 000001E0 -.L80AABB70: -/* 01920 80AABB70 14400022 */ bne $v0, $zero, .L80AABBFC -/* 01924 80AABB74 8FAC0034 */ lw $t4, 0x0034($sp) -/* 01928 80AABB78 858D00A4 */ lh $t5, 0x00A4($t4) ## 000000A4 -/* 0192C 80AABB7C 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B -/* 01930 80AABB80 8FA3002C */ lw $v1, 0x002C($sp) -/* 01934 80AABB84 55A1001E */ bnel $t5, $at, .L80AABC00 -/* 01938 80AABB88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0193C 80AABB8C 8C620680 */ lw $v0, 0x0680($v1) ## 00000680 -/* 01940 80AABB90 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 01944 80AABB94 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 -/* 01948 80AABB98 000271C0 */ sll $t6, $v0, 7 -/* 0194C 80AABB9C 05C10009 */ bgez $t6, .L80AABBC4 -/* 01950 80AABBA0 00417825 */ or $t7, $v0, $at ## $t7 = 02000000 -/* 01954 80AABBA4 AC6F0680 */ sw $t7, 0x0680($v1) ## 00000680 -/* 01958 80AABBA8 AC7006A8 */ sw $s0, 0x06A8($v1) ## 000006A8 -/* 0195C 80AABBAC 0C042F56 */ jal func_8010BD58 -/* 01960 80AABBB0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01964 80AABBB4 3C1880AB */ lui $t8, %hi(func_80AABC10) ## $t8 = 80AB0000 -/* 01968 80AABBB8 2718BC10 */ addiu $t8, $t8, %lo(func_80AABC10) ## $t8 = 80AABC10 -/* 0196C 80AABBBC 1000000F */ beq $zero, $zero, .L80AABBFC -/* 01970 80AABBC0 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80AABBC4: -/* 01974 80AABBC4 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 -/* 01978 80AABBC8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0197C 80AABBCC 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 01980 80AABBD0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01984 80AABBD4 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 01988 80AABBD8 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 0198C 80AABBDC 468021A0 */ cvt.s.w $f6, $f4 -/* 01990 80AABBE0 00414025 */ or $t0, $v0, $at ## $t0 = 00800000 -/* 01994 80AABBE4 46069280 */ add.s $f10, $f18, $f6 -/* 01998 80AABBE8 460A403C */ c.lt.s $f8, $f10 -/* 0199C 80AABBEC 00000000 */ nop -/* 019A0 80AABBF0 45020003 */ bc1fl .L80AABC00 -/* 019A4 80AABBF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 019A8 80AABBF8 AC680680 */ sw $t0, 0x0680($v1) ## 00000680 -.L80AABBFC: -/* 019AC 80AABBFC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AABC00: -/* 019B0 80AABC00 8FB00018 */ lw $s0, 0x0018($sp) -/* 019B4 80AABC04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 019B8 80AABC08 03E00008 */ jr $ra -/* 019BC 80AABC0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s deleted file mode 100644 index 14633307dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80AABC10 -/* 019C0 80AABC10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019C4 80AABC14 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 019C8 80AABC18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019CC 80AABC1C AFB10020 */ sw $s1, 0x0020($sp) -/* 019D0 80AABC20 AFB0001C */ sw $s0, 0x001C($sp) -/* 019D4 80AABC24 00651821 */ addu $v1, $v1, $a1 -/* 019D8 80AABC28 946304C6 */ lhu $v1, 0x04C6($v1) ## 000104C6 -/* 019DC 80AABC2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 019E0 80AABC30 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 019E4 80AABC34 28610004 */ slti $at, $v1, 0x0004 -/* 019E8 80AABC38 14200009 */ bne $at, $zero, .L80AABC60 -/* 019EC 80AABC3C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 019F0 80AABC40 3C0E80AB */ lui $t6, %hi(func_80AAB948) ## $t6 = 80AB0000 -/* 019F4 80AABC44 25CEB948 */ addiu $t6, $t6, %lo(func_80AAB948) ## $t6 = 80AAB948 -/* 019F8 80AABC48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 019FC 80AABC4C AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -/* 01A00 80AABC50 00250821 */ addu $at, $at, $a1 -/* 01A04 80AABC54 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 01A08 80AABC58 10000027 */ beq $zero, $zero, .L80AABCF8 -/* 01A0C 80AABC5C A42F04C6 */ sh $t7, 0x04C6($at) ## 000104C6 -.L80AABC60: -/* 01A10 80AABC60 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01A14 80AABC64 14610020 */ bne $v1, $at, .L80AABCE8 -/* 01A18 80AABC68 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01A1C 80AABC6C 3C188013 */ lui $t8, %hi(D_801333E8) -/* 01A20 80AABC70 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01A24 80AABC74 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 01A28 80AABC78 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01A2C 80AABC7C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01A30 80AABC80 AFB80014 */ sw $t8, 0x0014($sp) -/* 01A34 80AABC84 AFA70010 */ sw $a3, 0x0010($sp) -/* 01A38 80AABC88 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 01A3C 80AABC8C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01A40 80AABC90 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01A44 80AABC94 862801D4 */ lh $t0, 0x01D4($s1) ## 000001D4 -/* 01A48 80AABC98 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01A4C 80AABC9C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01A50 80AABCA0 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 01A54 80AABCA4 24191067 */ addiu $t9, $zero, 0x1067 ## $t9 = 00001067 -/* 01A58 80AABCA8 A639010E */ sh $t9, 0x010E($s1) ## 0000010E -/* 01A5C 80AABCAC 468021A0 */ cvt.s.w $f6, $f4 -/* 01A60 80AABCB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A64 80AABCB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A68 80AABCB8 46083280 */ add.s $f10, $f6, $f8 -/* 01A6C 80AABCBC 44065000 */ mfc1 $a2, $f10 -/* 01A70 80AABCC0 0C00BCB3 */ jal func_8002F2CC -/* 01A74 80AABCC4 00000000 */ nop -/* 01A78 80AABCC8 3C0980AB */ lui $t1, %hi(func_80AAB948) ## $t1 = 80AB0000 -/* 01A7C 80AABCCC 2529B948 */ addiu $t1, $t1, %lo(func_80AAB948) ## $t1 = 80AAB948 -/* 01A80 80AABCD0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01A84 80AABCD4 AE290190 */ sw $t1, 0x0190($s1) ## 00000190 -/* 01A88 80AABCD8 00300821 */ addu $at, $at, $s0 -/* 01A8C 80AABCDC 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 01A90 80AABCE0 10000005 */ beq $zero, $zero, .L80AABCF8 -/* 01A94 80AABCE4 A42A04C6 */ sh $t2, 0x04C6($at) ## 000104C6 -.L80AABCE8: -/* 01A98 80AABCE8 8C4B0680 */ lw $t3, 0x0680($v0) ## 00000680 -/* 01A9C 80AABCEC 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 01AA0 80AABCF0 01616025 */ or $t4, $t3, $at ## $t4 = 00800000 -/* 01AA4 80AABCF4 AC4C0680 */ sw $t4, 0x0680($v0) ## 00000680 -.L80AABCF8: -/* 01AA8 80AABCF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01AAC 80AABCFC 8FB0001C */ lw $s0, 0x001C($sp) -/* 01AB0 80AABD00 8FB10020 */ lw $s1, 0x0020($sp) -/* 01AB4 80AABD04 03E00008 */ jr $ra -/* 01AB8 80AABD08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s deleted file mode 100644 index fbdb858960..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80AABD0C -/* 01ABC 80AABD0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AC0 80AABD10 AFB00018 */ sw $s0, 0x0018($sp) -/* 01AC4 80AABD14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AC8 80AABD18 AFBF001C */ sw $ra, 0x001C($sp) -/* 01ACC 80AABD1C AFA50024 */ sw $a1, 0x0024($sp) -/* 01AD0 80AABD20 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01AD4 80AABD24 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 01AD8 80AABD28 26060236 */ addiu $a2, $s0, 0x0236 ## $a2 = 00000236 -/* 01ADC 80AABD2C 0C00D3D5 */ jal func_80034F54 -/* 01AE0 80AABD30 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -/* 01AE4 80AABD34 0C2AAA4F */ jal func_80AAA93C -/* 01AE8 80AABD38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AEC 80AABD3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AF0 80AABD40 0C2AACDC */ jal func_80AAB370 -/* 01AF4 80AABD44 8FA50024 */ lw $a1, 0x0024($sp) -/* 01AF8 80AABD48 50400007 */ beql $v0, $zero, .L80AABD68 -/* 01AFC 80AABD4C 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 -/* 01B00 80AABD50 860E0212 */ lh $t6, 0x0212($s0) ## 00000212 -/* 01B04 80AABD54 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01B08 80AABD58 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01B0C 80AABD5C 11C00008 */ beq $t6, $zero, .L80AABD80 -/* 01B10 80AABD60 3C198012 */ lui $t9, %hi(gBitFlags+0x48) -/* 01B14 80AABD64 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 -.L80AABD68: -/* 01B18 80AABD68 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 -/* 01B1C 80AABD6C AA1800B4 */ swl $t8, 0x00B4($s0) ## 000000B4 -/* 01B20 80AABD70 BA1800B7 */ swr $t8, 0x00B7($s0) ## 000000B7 -/* 01B24 80AABD74 96180034 */ lhu $t8, 0x0034($s0) ## 00000034 -/* 01B28 80AABD78 10000029 */ beq $zero, $zero, .L80AABE20 -/* 01B2C 80AABD7C A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 -.L80AABD80: -/* 01B30 80AABD80 8F397168 */ lw $t9, %lo(gBitFlags+0x48)($t9) -/* 01B34 80AABD84 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 -/* 01B38 80AABD88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B3C 80AABD8C 03284824 */ and $t1, $t9, $t0 -/* 01B40 80AABD90 11200015 */ beq $t1, $zero, .L80AABDE8 -/* 01B44 80AABD94 00000000 */ nop -/* 01B48 80AABD98 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 -/* 01B4C 80AABD9C 8FAC0024 */ lw $t4, 0x0024($sp) -/* 01B50 80AABDA0 314B1000 */ andi $t3, $t2, 0x1000 ## $t3 = 00000000 -/* 01B54 80AABDA4 15600010 */ bne $t3, $zero, .L80AABDE8 -/* 01B58 80AABDA8 00000000 */ nop -/* 01B5C 80AABDAC 858D00A4 */ lh $t5, 0x00A4($t4) ## 000000A4 -/* 01B60 80AABDB0 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01B64 80AABDB4 15A1000C */ bne $t5, $at, .L80AABDE8 -/* 01B68 80AABDB8 00000000 */ nop -/* 01B6C 80AABDBC 0C041B33 */ jal func_80106CCC -/* 01B70 80AABDC0 01802025 */ or $a0, $t4, $zero ## $a0 = 00000000 -/* 01B74 80AABDC4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01B78 80AABDC8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01B7C 80AABDCC 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 8015F536 -/* 01B80 80AABDD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B84 80AABDD4 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 01B88 80AABDD8 0C00B55C */ jal Actor_Kill - -/* 01B8C 80AABDDC A44F0ED6 */ sh $t7, 0x0ED6($v0) ## 8015F536 -/* 01B90 80AABDE0 10000010 */ beq $zero, $zero, .L80AABE24 -/* 01B94 80AABDE4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AABDE8: -/* 01B98 80AABDE8 0C2AAA4B */ jal func_80AAA92C -/* 01B9C 80AABDEC 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01BA0 80AABDF0 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 01BA4 80AABDF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01BA8 80AABDF8 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 01BAC 80AABDFC AE190008 */ sw $t9, 0x0008($s0) ## 00000008 -/* 01BB0 80AABE00 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 01BB4 80AABE04 3C0880AB */ lui $t0, %hi(func_80AAB8F8) ## $t0 = 80AB0000 -/* 01BB8 80AABE08 2508B8F8 */ addiu $t0, $t0, %lo(func_80AAB8F8) ## $t0 = 80AAB8F8 -/* 01BBC 80AABE0C AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 01BC0 80AABE10 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 01BC4 80AABE14 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01BC8 80AABE18 AE18000C */ sw $t8, 0x000C($s0) ## 0000000C -/* 01BCC 80AABE1C AE190010 */ sw $t9, 0x0010($s0) ## 00000010 -.L80AABE20: -/* 01BD0 80AABE20 8FBF001C */ lw $ra, 0x001C($sp) -.L80AABE24: -/* 01BD4 80AABE24 8FB00018 */ lw $s0, 0x0018($sp) -/* 01BD8 80AABE28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BDC 80AABE2C 03E00008 */ jr $ra -/* 01BE0 80AABE30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s deleted file mode 100644 index a6cf61fab7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s +++ /dev/null @@ -1,154 +0,0 @@ -.late_rodata -glabel D_80AAC58C - .float 3.14159274101 - -glabel D_80AAC590 - .float 3.14159274101 - -glabel D_80AAC594 - .float 3.14159274101 - -glabel D_80AAC598 - .float 3.14159274101 - -.text -glabel func_80AABEF0 -/* 01CA0 80AABEF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01CA4 80AABEF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01CA8 80AABEF8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01CAC 80AABEFC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01CB0 80AABF00 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CB4 80AABF04 AFA40038 */ sw $a0, 0x0038($sp) -/* 01CB8 80AABF08 AFA60040 */ sw $a2, 0x0040($sp) -/* 01CBC 80AABF0C 14A1002D */ bne $a1, $at, .L80AABFC4 -/* 01CC0 80AABF10 AFA70044 */ sw $a3, 0x0044($sp) -/* 01CC4 80AABF14 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01CC8 80AABF18 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 01CCC 80AABF1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1200.00 -/* 01CD0 80AABF20 44067000 */ mfc1 $a2, $f14 -/* 01CD4 80AABF24 0C034261 */ jal Matrix_Translate -/* 01CD8 80AABF28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01CDC 80AABF2C 8FAF004C */ lw $t7, 0x004C($sp) -/* 01CE0 80AABF30 27AE002C */ addiu $t6, $sp, 0x002C ## $t6 = FFFFFFF4 -/* 01CE4 80AABF34 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01CE8 80AABF38 89F901E8 */ lwl $t9, 0x01E8($t7) ## 000001E8 -/* 01CEC 80AABF3C 99F901EB */ lwr $t9, 0x01EB($t7) ## 000001EB -/* 01CF0 80AABF40 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 01CF4 80AABF44 3C0180AB */ lui $at, %hi(D_80AAC58C) ## $at = 80AB0000 -/* 01CF8 80AABF48 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 01CFC 80AABF4C 95F901EC */ lhu $t9, 0x01EC($t7) ## 000001EC -/* 01D00 80AABF50 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01D04 80AABF54 A5D90004 */ sh $t9, 0x0004($t6) ## FFFFFFF8 -/* 01D08 80AABF58 87A8002E */ lh $t0, 0x002E($sp) -/* 01D0C 80AABF5C C430C58C */ lwc1 $f16, %lo(D_80AAC58C)($at) -/* 01D10 80AABF60 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 01D14 80AABF64 00000000 */ nop -/* 01D18 80AABF68 468021A0 */ cvt.s.w $f6, $f4 -/* 01D1C 80AABF6C 46083283 */ div.s $f10, $f6, $f8 -/* 01D20 80AABF70 46105302 */ mul.s $f12, $f10, $f16 -/* 01D24 80AABF74 0C0342DC */ jal Matrix_RotateX -/* 01D28 80AABF78 00000000 */ nop -/* 01D2C 80AABF7C 87A9002C */ lh $t1, 0x002C($sp) -/* 01D30 80AABF80 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01D34 80AABF84 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 01D38 80AABF88 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01D3C 80AABF8C 3C0180AB */ lui $at, %hi(D_80AAC590) ## $at = 80AB0000 -/* 01D40 80AABF90 C42AC590 */ lwc1 $f10, %lo(D_80AAC590)($at) -/* 01D44 80AABF94 46809120 */ cvt.s.w $f4, $f18 -/* 01D48 80AABF98 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01D4C 80AABF9C 46062203 */ div.s $f8, $f4, $f6 -/* 01D50 80AABFA0 460A4302 */ mul.s $f12, $f8, $f10 -/* 01D54 80AABFA4 0C0343B5 */ jal Matrix_RotateZ -/* 01D58 80AABFA8 00000000 */ nop -/* 01D5C 80AABFAC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01D60 80AABFB0 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 -/* 01D64 80AABFB4 44816000 */ mtc1 $at, $f12 ## $f12 = -1200.00 -/* 01D68 80AABFB8 44067000 */ mfc1 $a2, $f14 -/* 01D6C 80AABFBC 0C034261 */ jal Matrix_Translate -/* 01D70 80AABFC0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AABFC4: -/* 01D74 80AABFC4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01D78 80AABFC8 16010020 */ bne $s0, $at, .L80AAC04C -/* 01D7C 80AABFCC 8FAB004C */ lw $t3, 0x004C($sp) -/* 01D80 80AABFD0 896D01EE */ lwl $t5, 0x01EE($t3) ## 000001EE -/* 01D84 80AABFD4 996D01F1 */ lwr $t5, 0x01F1($t3) ## 000001F1 -/* 01D88 80AABFD8 27AA002C */ addiu $t2, $sp, 0x002C ## $t2 = FFFFFFF4 -/* 01D8C 80AABFDC 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01D90 80AABFE0 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFF4 -/* 01D94 80AABFE4 956D01F2 */ lhu $t5, 0x01F2($t3) ## 000001F2 -/* 01D98 80AABFE8 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 01D9C 80AABFEC 3C0180AB */ lui $at, %hi(D_80AAC594) ## $at = 80AB0000 -/* 01DA0 80AABFF0 A54D0004 */ sh $t5, 0x0004($t2) ## FFFFFFF8 -/* 01DA4 80AABFF4 87AE002C */ lh $t6, 0x002C($sp) -/* 01DA8 80AABFF8 C428C594 */ lwc1 $f8, %lo(D_80AAC594)($at) -/* 01DAC 80AABFFC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01DB0 80AAC000 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 01DB4 80AAC004 00000000 */ nop -/* 01DB8 80AAC008 468084A0 */ cvt.s.w $f18, $f16 -/* 01DBC 80AAC00C 46049183 */ div.s $f6, $f18, $f4 -/* 01DC0 80AAC010 46083302 */ mul.s $f12, $f6, $f8 -/* 01DC4 80AAC014 0C0342DC */ jal Matrix_RotateX -/* 01DC8 80AAC018 00000000 */ nop -/* 01DCC 80AAC01C 87AF002E */ lh $t7, 0x002E($sp) -/* 01DD0 80AAC020 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01DD4 80AAC024 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 01DD8 80AAC028 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01DDC 80AAC02C 3C0180AB */ lui $at, %hi(D_80AAC598) ## $at = 80AB0000 -/* 01DE0 80AAC030 C426C598 */ lwc1 $f6, %lo(D_80AAC598)($at) -/* 01DE4 80AAC034 46805420 */ cvt.s.w $f16, $f10 -/* 01DE8 80AAC038 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01DEC 80AAC03C 46128103 */ div.s $f4, $f16, $f18 -/* 01DF0 80AAC040 46062302 */ mul.s $f12, $f4, $f6 -/* 01DF4 80AAC044 0C034348 */ jal Matrix_RotateY -/* 01DF8 80AAC048 00000000 */ nop -.L80AAC04C: -/* 01DFC 80AAC04C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01E00 80AAC050 12010005 */ beq $s0, $at, .L80AAC068 -/* 01E04 80AAC054 8FB8004C */ lw $t8, 0x004C($sp) -/* 01E08 80AAC058 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01E0C 80AAC05C 12010002 */ beq $s0, $at, .L80AAC068 -/* 01E10 80AAC060 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01E14 80AAC064 16010022 */ bne $s0, $at, .L80AAC0F0 -.L80AAC068: -/* 01E18 80AAC068 0010C840 */ sll $t9, $s0, 1 -/* 01E1C 80AAC06C 03191821 */ addu $v1, $t8, $t9 -/* 01E20 80AAC070 84640214 */ lh $a0, 0x0214($v1) ## 00000214 -/* 01E24 80AAC074 0C01DE1C */ jal Math_Sins - ## sins? -/* 01E28 80AAC078 AFA30024 */ sw $v1, 0x0024($sp) -/* 01E2C 80AAC07C 8FA20048 */ lw $v0, 0x0048($sp) -/* 01E30 80AAC080 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01E34 80AAC084 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 01E38 80AAC088 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 01E3C 80AAC08C 8FA30024 */ lw $v1, 0x0024($sp) -/* 01E40 80AAC090 46100482 */ mul.s $f18, $f0, $f16 -/* 01E44 80AAC094 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 01E48 80AAC098 00000000 */ nop -/* 01E4C 80AAC09C 468042A0 */ cvt.s.w $f10, $f8 -/* 01E50 80AAC0A0 46125100 */ add.s $f4, $f10, $f18 -/* 01E54 80AAC0A4 4600218D */ trunc.w.s $f6, $f4 -/* 01E58 80AAC0A8 440A3000 */ mfc1 $t2, $f6 -/* 01E5C 80AAC0AC 00000000 */ nop -/* 01E60 80AAC0B0 A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 01E64 80AAC0B4 0C01DE0D */ jal Math_Coss - ## coss? -/* 01E68 80AAC0B8 84640236 */ lh $a0, 0x0236($v1) ## 00000236 -/* 01E6C 80AAC0BC 8FA20048 */ lw $v0, 0x0048($sp) -/* 01E70 80AAC0C0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01E74 80AAC0C4 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 01E78 80AAC0C8 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 01E7C 80AAC0CC 460A0482 */ mul.s $f18, $f0, $f10 -/* 01E80 80AAC0D0 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 01E84 80AAC0D4 00000000 */ nop -/* 01E88 80AAC0D8 46804420 */ cvt.s.w $f16, $f8 -/* 01E8C 80AAC0DC 46128100 */ add.s $f4, $f16, $f18 -/* 01E90 80AAC0E0 4600218D */ trunc.w.s $f6, $f4 -/* 01E94 80AAC0E4 440D3000 */ mfc1 $t5, $f6 -/* 01E98 80AAC0E8 00000000 */ nop -/* 01E9C 80AAC0EC A44D0004 */ sh $t5, 0x0004($v0) ## 00000004 -.L80AAC0F0: -/* 01EA0 80AAC0F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EA4 80AAC0F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EA8 80AAC0F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01EAC 80AAC0FC 03E00008 */ jr $ra -/* 01EB0 80AAC100 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s deleted file mode 100644 index 28c9fef2f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AAC104 -/* 01EB4 80AAC104 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01EB8 80AAC108 3C0E80AB */ lui $t6, %hi(D_80AAC498) ## $t6 = 80AB0000 -/* 01EBC 80AAC10C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EC0 80AAC110 AFA40028 */ sw $a0, 0x0028($sp) -/* 01EC4 80AAC114 AFA60030 */ sw $a2, 0x0030($sp) -/* 01EC8 80AAC118 AFA70034 */ sw $a3, 0x0034($sp) -/* 01ECC 80AAC11C 25CEC498 */ addiu $t6, $t6, %lo(D_80AAC498) ## $t6 = 80AAC498 -/* 01ED0 80AAC120 8DD80000 */ lw $t8, 0x0000($t6) ## 80AAC498 -/* 01ED4 80AAC124 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 01ED8 80AAC128 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01EDC 80AAC12C AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 01EE0 80AAC130 8DCF0004 */ lw $t7, 0x0004($t6) ## 80AAC49C -/* 01EE4 80AAC134 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 01EE8 80AAC138 8DD80008 */ lw $t8, 0x0008($t6) ## 80AAC4A0 -/* 01EEC 80AAC13C 14A10004 */ bne $a1, $at, .L80AAC150 -/* 01EF0 80AAC140 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 01EF4 80AAC144 8FA50038 */ lw $a1, 0x0038($sp) -/* 01EF8 80AAC148 0C0346BD */ jal Matrix_MultVec3f -/* 01EFC 80AAC14C 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80AAC150: -/* 01F00 80AAC150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F04 80AAC154 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F08 80AAC158 03E00008 */ jr $ra -/* 01F0C 80AAC15C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s deleted file mode 100644 index 43c1fb4994..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnSi_Destroy -/* 00090 80AFB720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80AFB724 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80AFB728 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80AFB72C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80AFB730 0C0170EB */ jal Collider_DestroyCylinder - -/* 000A4 80AFB734 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 000A8 80AFB738 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80AFB73C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80AFB740 03E00008 */ jr $ra -/* 000B4 80AFB744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s deleted file mode 100644 index 413ea52ed5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel EnSi_Draw -/* 003C4 80AFBA54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C8 80AFBA58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003CC 80AFBA5C AFA5001C */ sw $a1, 0x001C($sp) -/* 003D0 80AFBA60 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C -/* 003D4 80AFBA64 3C0E80B0 */ lui $t6, %hi(func_80AFB950) ## $t6 = 80B00000 -/* 003D8 80AFBA68 25CEB950 */ addiu $t6, $t6, %lo(func_80AFB950) ## $t6 = 80AFB950 -/* 003DC 80AFBA6C 11CF000A */ beq $t6, $t7, .L80AFBA98 -/* 003E0 80AFBA70 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003E4 80AFBA74 0C00BB60 */ jal func_8002ED80 -/* 003E8 80AFBA78 AFA40018 */ sw $a0, 0x0018($sp) -/* 003EC 80AFBA7C 8FA40018 */ lw $a0, 0x0018($sp) -/* 003F0 80AFBA80 8FA5001C */ lw $a1, 0x001C($sp) -/* 003F4 80AFBA84 0C00BAF3 */ jal func_8002EBCC -/* 003F8 80AFBA88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003FC 80AFBA8C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00400 80AFBA90 0C01A528 */ jal func_800694A0 -/* 00404 80AFBA94 24050074 */ addiu $a1, $zero, 0x0074 ## $a1 = 00000074 -.L80AFBA98: -/* 00408 80AFBA98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0040C 80AFBA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00410 80AFBAA0 03E00008 */ jr $ra -/* 00414 80AFBAA4 00000000 */ nop -/* 00418 80AFBAA8 00000000 */ nop -/* 0041C 80AFBAAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s deleted file mode 100644 index 97e76b9f68..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel EnSi_Init -/* 00000 80AFB690 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 80AFB694 AFB00018 */ sw $s0, 0x0018($sp) -/* 00008 80AFB698 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80AFB69C AFA5002C */ sw $a1, 0x002C($sp) -/* 00010 80AFB6A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00014 80AFB6A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00018 80AFB6A8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0001C 80AFB6AC 0C0170D9 */ jal Collider_InitCylinder - -/* 00020 80AFB6B0 AFA50020 */ sw $a1, 0x0020($sp) -/* 00024 80AFB6B4 3C0780B0 */ lui $a3, %hi(D_80AFBAB0) ## $a3 = 80B00000 -/* 00028 80AFB6B8 8FA50020 */ lw $a1, 0x0020($sp) -/* 0002C 80AFB6BC 24E7BAB0 */ addiu $a3, $a3, %lo(D_80AFBAB0) ## $a3 = 80AFBAB0 -/* 00030 80AFB6C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00034 80AFB6C4 0C01712B */ jal Collider_SetCylinder - -/* 00038 80AFB6C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0003C 80AFB6CC 3C0680B0 */ lui $a2, %hi(D_80AFBADC) ## $a2 = 80B00000 -/* 00040 80AFB6D0 24C6BADC */ addiu $a2, $a2, %lo(D_80AFBADC) ## $a2 = 80AFBADC -/* 00044 80AFB6D4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00048 80AFB6D8 0C0187BF */ jal func_80061EFC -/* 0004C 80AFB6DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00050 80AFB6E0 3C053CCC */ lui $a1, 0x3CCC ## $a1 = 3CCC0000 -/* 00054 80AFB6E4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3CCCCCCD -/* 00058 80AFB6E8 0C00B58B */ jal Actor_SetScale - -/* 0005C 80AFB6EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00060 80AFB6F0 3C014228 */ lui $at, 0x4228 ## $at = 42280000 -/* 00064 80AFB6F4 44812000 */ mtc1 $at, $f4 ## $f4 = 42.00 -/* 00068 80AFB6F8 3C0E80B0 */ lui $t6, %hi(func_80AFB768) ## $t6 = 80B00000 -/* 0006C 80AFB6FC 25CEB768 */ addiu $t6, $t6, %lo(func_80AFB768) ## $t6 = 80AFB768 -/* 00070 80AFB700 A200019C */ sb $zero, 0x019C($s0) ## 0000019C -/* 00074 80AFB704 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 00078 80AFB708 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 0007C 80AFB70C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00080 80AFB710 8FB00018 */ lw $s0, 0x0018($sp) -/* 00084 80AFB714 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00088 80AFB718 03E00008 */ jr $ra -/* 0008C 80AFB71C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s deleted file mode 100644 index 7c8676c57f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel EnSi_Update -/* 00354 80AFB9E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00358 80AFB9E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0035C 80AFB9EC AFB00020 */ sw $s0, 0x0020($sp) -/* 00360 80AFB9F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00364 80AFB9F4 0C00B638 */ jal Actor_MoveForward - -/* 00368 80AFB9F8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0036C 80AFB9FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00370 80AFBA00 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00374 80AFBA04 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00378 80AFBA08 44060000 */ mfc1 $a2, $f0 -/* 0037C 80AFBA0C 44070000 */ mfc1 $a3, $f0 -/* 00380 80AFBA10 8FA4002C */ lw $a0, 0x002C($sp) -/* 00384 80AFBA14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00388 80AFBA18 0C00B92D */ jal func_8002E4B4 -/* 0038C 80AFBA1C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00390 80AFBA20 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00394 80AFBA24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 80AFBA28 8FA5002C */ lw $a1, 0x002C($sp) -/* 0039C 80AFBA2C 0320F809 */ jalr $ra, $t9 -/* 003A0 80AFBA30 00000000 */ nop -/* 003A4 80AFBA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003A8 80AFBA38 0C00B56E */ jal Actor_SetHeight - -/* 003AC 80AFBA3C 3C054180 */ lui $a1, 0x4180 ## $a1 = 41800000 -/* 003B0 80AFBA40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003B4 80AFBA44 8FB00020 */ lw $s0, 0x0020($sp) -/* 003B8 80AFBA48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003BC 80AFBA4C 03E00008 */ jr $ra -/* 003C0 80AFBA50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s deleted file mode 100644 index c50fbf2bb8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AFB748 -/* 000B8 80AFB748 AFA50004 */ sw $a1, 0x0004($sp) -/* 000BC 80AFB74C 90820161 */ lbu $v0, 0x0161($a0) ## 00000161 -/* 000C0 80AFB750 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 000C4 80AFB754 11C00002 */ beq $t6, $zero, .L80AFB760 -/* 000C8 80AFB758 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 000CC 80AFB75C A08F0161 */ sb $t7, 0x0161($a0) ## 00000161 -.L80AFB760: -/* 000D0 80AFB760 03E00008 */ jr $ra -/* 000D4 80AFB764 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s deleted file mode 100644 index 246d5724fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80AFB768 -/* 000D8 80AFB768 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000DC 80AFB76C AFBF0024 */ sw $ra, 0x0024($sp) -/* 000E0 80AFB770 AFB10020 */ sw $s1, 0x0020($sp) -/* 000E4 80AFB774 AFB0001C */ sw $s0, 0x001C($sp) -/* 000E8 80AFB778 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 000EC 80AFB77C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000F0 80AFB780 24012000 */ addiu $at, $zero, 0x2000 ## $at = 00002000 -/* 000F4 80AFB784 AFAE002C */ sw $t6, 0x002C($sp) -/* 000F8 80AFB788 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 000FC 80AFB78C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00100 80AFB790 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 00104 80AFB794 31F82000 */ andi $t8, $t7, 0x2000 ## $t8 = 00000000 -/* 00108 80AFB798 17010005 */ bne $t8, $at, .L80AFB7B0 -/* 0010C 80AFB79C 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 00110 80AFB7A0 3C1980B0 */ lui $t9, %hi(func_80AFB89C) ## $t9 = 80B00000 -/* 00114 80AFB7A4 2739B89C */ addiu $t9, $t9, %lo(func_80AFB89C) ## $t9 = 80AFB89C -/* 00118 80AFB7A8 10000037 */ beq $zero, $zero, .L80AFB888 -/* 0011C 80AFB7AC AC99014C */ sw $t9, 0x014C($a0) ## 0000014C -.L80AFB7B0: -/* 00120 80AFB7B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00124 80AFB7B4 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 00128 80AFB7B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 0012C 80AFB7BC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00130 80AFB7C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00134 80AFB7C4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00138 80AFB7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 80AFB7CC 0C00B58B */ jal Actor_SetScale - -/* 00140 80AFB7D0 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 00144 80AFB7D4 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00148 80AFB7D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0014C 80AFB7DC 25090400 */ addiu $t1, $t0, 0x0400 ## $t1 = 00000400 -/* 00150 80AFB7E0 0C023A62 */ jal func_8008E988 -/* 00154 80AFB7E4 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 00158 80AFB7E8 14400027 */ bne $v0, $zero, .L80AFB888 -/* 0015C 80AFB7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00160 80AFB7F0 0C2BEDD2 */ jal func_80AFB748 -/* 00164 80AFB7F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00168 80AFB7F8 92030163 */ lbu $v1, 0x0163($s0) ## 00000163 -/* 0016C 80AFB7FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00170 80AFB800 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00174 80AFB804 306A0001 */ andi $t2, $v1, 0x0001 ## $t2 = 00000000 -/* 00178 80AFB808 11400012 */ beq $t2, $zero, .L80AFB854 -/* 0017C 80AFB80C 306BFFFE */ andi $t3, $v1, 0xFFFE ## $t3 = 00000000 -/* 00180 80AFB810 A20B0163 */ sb $t3, 0x0163($s0) ## 00000163 -/* 00184 80AFB814 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00188 80AFB818 0C021344 */ jal Item_Give -/* 0018C 80AFB81C 24050071 */ addiu $a1, $zero, 0x0071 ## $a1 = 00000071 -/* 00190 80AFB820 8FAD002C */ lw $t5, 0x002C($sp) -/* 00194 80AFB824 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00198 80AFB828 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0019C 80AFB82C 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 001A0 80AFB830 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001A4 80AFB834 0C042DA0 */ jal func_8010B680 -/* 001A8 80AFB838 A5AC0110 */ sh $t4, 0x0110($t5) ## 00000110 -/* 001AC 80AFB83C 0C03D719 */ jal func_800F5C64 -/* 001B0 80AFB840 24040039 */ addiu $a0, $zero, 0x0039 ## $a0 = 00000039 -/* 001B4 80AFB844 3C0E80B0 */ lui $t6, %hi(func_80AFB950) ## $t6 = 80B00000 -/* 001B8 80AFB848 25CEB950 */ addiu $t6, $t6, %lo(func_80AFB950) ## $t6 = 80AFB950 -/* 001BC 80AFB84C 1000000E */ beq $zero, $zero, .L80AFB888 -/* 001C0 80AFB850 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -.L80AFB854: -/* 001C4 80AFB854 0C0189B7 */ jal Collider_CylinderUpdate - -/* 001C8 80AFB858 AFA50028 */ sw $a1, 0x0028($sp) -/* 001CC 80AFB85C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001D0 80AFB860 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 001D4 80AFB864 02218021 */ addu $s0, $s1, $at -/* 001D8 80AFB868 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001DC 80AFB86C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001E0 80AFB870 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 001E4 80AFB874 8FA60028 */ lw $a2, 0x0028($sp) -/* 001E8 80AFB878 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001EC 80AFB87C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001F0 80AFB880 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 001F4 80AFB884 8FA60028 */ lw $a2, 0x0028($sp) -.L80AFB888: -/* 001F8 80AFB888 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001FC 80AFB88C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00200 80AFB890 8FB10020 */ lw $s1, 0x0020($sp) -/* 00204 80AFB894 03E00008 */ jr $ra -/* 00208 80AFB898 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s deleted file mode 100644 index 367cf4fa93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80AFB89C -/* 0020C 80AFB89C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00210 80AFB8A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00214 80AFB8A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00218 80AFB8A8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0021C 80AFB8AC 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00220 80AFB8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00224 80AFB8B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00228 80AFB8B8 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 0022C 80AFB8BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 00230 80AFB8C0 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 00234 80AFB8C4 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 00238 80AFB8C8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0023C 80AFB8CC AFAF002C */ sw $t7, 0x002C($sp) -/* 00240 80AFB8D0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00244 80AFB8D4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00248 80AFB8D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0024C 80AFB8DC 0C00B58B */ jal Actor_SetScale - -/* 00250 80AFB8E0 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 00254 80AFB8E4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00258 80AFB8E8 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 0025C 80AFB8EC 24012000 */ addiu $at, $zero, 0x2000 ## $at = 00002000 -/* 00260 80AFB8F0 27190400 */ addiu $t9, $t8, 0x0400 ## $t9 = 00000400 -/* 00264 80AFB8F4 31092000 */ andi $t1, $t0, 0x2000 ## $t1 = 00000000 -/* 00268 80AFB8F8 11210010 */ beq $t1, $at, .L80AFB93C -/* 0026C 80AFB8FC A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 00270 80AFB900 8FA40034 */ lw $a0, 0x0034($sp) -/* 00274 80AFB904 0C021344 */ jal Item_Give -/* 00278 80AFB908 24050071 */ addiu $a1, $zero, 0x0071 ## $a1 = 00000071 -/* 0027C 80AFB90C 8FAB002C */ lw $t3, 0x002C($sp) -/* 00280 80AFB910 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 00284 80AFB914 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 00288 80AFB918 A56A0110 */ sh $t2, 0x0110($t3) ## 00000110 -/* 0028C 80AFB91C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00290 80AFB920 0C042DA0 */ jal func_8010B680 -/* 00294 80AFB924 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00298 80AFB928 0C03D719 */ jal func_800F5C64 -/* 0029C 80AFB92C 24040039 */ addiu $a0, $zero, 0x0039 ## $a0 = 00000039 -/* 002A0 80AFB930 3C0C80B0 */ lui $t4, %hi(func_80AFB950) ## $t4 = 80B00000 -/* 002A4 80AFB934 258CB950 */ addiu $t4, $t4, %lo(func_80AFB950) ## $t4 = 80AFB950 -/* 002A8 80AFB938 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -.L80AFB93C: -/* 002AC 80AFB93C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002B0 80AFB940 8FB00020 */ lw $s0, 0x0020($sp) -/* 002B4 80AFB944 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002B8 80AFB948 03E00008 */ jr $ra -/* 002BC 80AFB94C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s deleted file mode 100644 index 5e9014a83a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AFB950 -/* 002C0 80AFB950 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002C4 80AFB954 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C8 80AFB958 AFA40020 */ sw $a0, 0x0020($sp) -/* 002CC 80AFB95C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 002D0 80AFB960 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 002D4 80AFB964 0C042F6F */ jal func_8010BDBC -/* 002D8 80AFB968 AFAE001C */ sw $t6, 0x001C($sp) -/* 002DC 80AFB96C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 002E0 80AFB970 10410005 */ beq $v0, $at, .L80AFB988 -/* 002E4 80AFB974 8FA40020 */ lw $a0, 0x0020($sp) -/* 002E8 80AFB978 8FB8001C */ lw $t8, 0x001C($sp) -/* 002EC 80AFB97C 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 002F0 80AFB980 10000014 */ beq $zero, $zero, .L80AFB9D4 -/* 002F4 80AFB984 A70F0110 */ sh $t7, 0x0110($t8) ## 00000110 -.L80AFB988: -/* 002F8 80AFB988 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 002FC 80AFB98C 3C098016 */ lui $t1, %hi(gSaveContext) -/* 00300 80AFB990 3C0D8012 */ lui $t5, %hi(D_8012724C) -/* 00304 80AFB994 30431F00 */ andi $v1, $v0, 0x1F00 ## $v1 = 00000000 -/* 00308 80AFB998 00031A03 */ sra $v1, $v1, 8 -/* 0030C 80AFB99C 306B0003 */ andi $t3, $v1, 0x0003 ## $t3 = 00000000 -/* 00310 80AFB9A0 000B6080 */ sll $t4, $t3, 2 -/* 00314 80AFB9A4 0003C883 */ sra $t9, $v1, 2 -/* 00318 80AFB9A8 00194080 */ sll $t0, $t9, 2 -/* 0031C 80AFB9AC 01AC6821 */ addu $t5, $t5, $t4 -/* 00320 80AFB9B0 2529E660 */ addiu $t1, %lo(gSaveContext) -/* 00324 80AFB9B4 8DAD724C */ lw $t5, %lo(D_8012724C)($t5) -/* 00328 80AFB9B8 01092821 */ addu $a1, $t0, $t1 -/* 0032C 80AFB9BC 8CAF0E9C */ lw $t7, 0x0E9C($a1) ## 00000E9C -/* 00330 80AFB9C0 304A00FF */ andi $t2, $v0, 0x00FF ## $t2 = 00000000 -/* 00334 80AFB9C4 01AA7004 */ sllv $t6, $t2, $t5 -/* 00338 80AFB9C8 01EEC025 */ or $t8, $t7, $t6 ## $t8 = 0000000A -/* 0033C 80AFB9CC 0C00B55C */ jal Actor_Kill - -/* 00340 80AFB9D0 ACB80E9C */ sw $t8, 0x0E9C($a1) ## 00000E9C -.L80AFB9D4: -/* 00344 80AFB9D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00348 80AFB9D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0034C 80AFB9DC 03E00008 */ jr $ra -/* 00350 80AFB9E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s deleted file mode 100644 index 9f0ce582a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel EnZl2_Destroy -/* 00000 80B4E990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B4E998 0C0295BC */ jal SkelAnime_Free -/* 0000C 80B4E99C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 80B4E9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80B4E9A8 03E00008 */ jr $ra -/* 0001C 80B4E9AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s deleted file mode 100644 index 8e10ad5f9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_80B52B78 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel EnZl2_Draw -/* 03E1C 80B527AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03E20 80B527B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E24 80B527B4 8C8201A0 */ lw $v0, 0x01A0($a0) ## 000001A0 -/* 03E28 80B527B8 04400008 */ bltz $v0, .L80B527DC -/* 03E2C 80B527BC 28410003 */ slti $at, $v0, 0x0003 -/* 03E30 80B527C0 10200006 */ beq $at, $zero, .L80B527DC -/* 03E34 80B527C4 00027080 */ sll $t6, $v0, 2 -/* 03E38 80B527C8 3C0380B5 */ lui $v1, %hi(D_80B528D4) ## $v1 = 80B50000 -/* 03E3C 80B527CC 006E1821 */ addu $v1, $v1, $t6 -/* 03E40 80B527D0 8C6328D4 */ lw $v1, %lo(D_80B528D4)($v1) -/* 03E44 80B527D4 14600006 */ bne $v1, $zero, .L80B527F0 -/* 03E48 80B527D8 00000000 */ nop -.L80B527DC: -/* 03E4C 80B527DC 3C0480B5 */ lui $a0, %hi(D_80B52B78) ## $a0 = 80B50000 -/* 03E50 80B527E0 0C00084C */ jal osSyncPrintf - -/* 03E54 80B527E4 24842B78 */ addiu $a0, $a0, %lo(D_80B52B78) ## $a0 = 80B52B78 -/* 03E58 80B527E8 10000004 */ beq $zero, $zero, .L80B527FC -/* 03E5C 80B527EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B527F0: -/* 03E60 80B527F0 0060F809 */ jalr $ra, $v1 -/* 03E64 80B527F4 00000000 */ nop -/* 03E68 80B527F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B527FC: -/* 03E6C 80B527FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E70 80B52800 03E00008 */ jr $ra -/* 03E74 80B52804 00000000 */ nop -/* 03E78 80B52808 00000000 */ nop -/* 03E7C 80B5280C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s deleted file mode 100644 index 6d575a922d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel EnZl2_Init -/* 03910 80B522A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) -/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) -/* 03920 80B522B0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 03924 80B522B4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 03928 80B522B8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) -/* 03930 80B522C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 03934 80B522C4 0C00AC78 */ jal ActorShape_Init - -/* 03938 80B522C8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) -/* 03940 80B522D0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 03944 80B522D4 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 -/* 03948 80B522D8 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) -/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) -/* 03960 80B522F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03964 80B522F4 0C0291BE */ jal SkelAnime_InitSV -/* 03968 80B522F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) -/* 03970 80B52300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03974 80B52304 85E2001C */ lh $v0, 0x001C($t7) ## 0000001C -/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 -/* 0397C 80B5230C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 -/* 03984 80B52314 00000000 */ nop -/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C -/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B52320: -/* 03990 80B52320 0C03DC98 */ jal func_800F7260 -/* 03994 80B52324 2404006F */ addiu $a0, $zero, 0x006F ## $a0 = 0000006F -/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C -/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B52330: -/* 039A0 80B52330 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) -/* 039A4 80B52334 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) -/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B5233C: -/* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 039B0 80B52340 03E00008 */ jr $ra -/* 039B4 80B52344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s deleted file mode 100644 index cd0c6e3489..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80B52ABC - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel EnZl2_Update -/* 038B4 80B52244 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 038B8 80B52248 AFBF0014 */ sw $ra, 0x0014($sp) -/* 038BC 80B5224C 8C82019C */ lw $v0, 0x019C($a0) ## 0000019C -/* 038C0 80B52250 04400008 */ bltz $v0, .L80B52274 -/* 038C4 80B52254 28410024 */ slti $at, $v0, 0x0024 -/* 038C8 80B52258 10200006 */ beq $at, $zero, .L80B52274 -/* 038CC 80B5225C 00027080 */ sll $t6, $v0, 2 -/* 038D0 80B52260 3C0380B5 */ lui $v1, %hi(D_80B52840) ## $v1 = 80B50000 -/* 038D4 80B52264 006E1821 */ addu $v1, $v1, $t6 -/* 038D8 80B52268 8C632840 */ lw $v1, %lo(D_80B52840)($v1) -/* 038DC 80B5226C 14600006 */ bne $v1, $zero, .L80B52288 -/* 038E0 80B52270 00000000 */ nop -.L80B52274: -/* 038E4 80B52274 3C0480B5 */ lui $a0, %hi(D_80B52ABC) ## $a0 = 80B50000 -/* 038E8 80B52278 0C00084C */ jal osSyncPrintf - -/* 038EC 80B5227C 24842ABC */ addiu $a0, $a0, %lo(D_80B52ABC) ## $a0 = 80B52ABC -/* 038F0 80B52280 10000004 */ beq $zero, $zero, .L80B52294 -/* 038F4 80B52284 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52288: -/* 038F8 80B52288 0060F809 */ jalr $ra, $v1 -/* 038FC 80B5228C 00000000 */ nop -/* 03900 80B52290 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52294: -/* 03904 80B52294 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03908 80B52298 03E00008 */ jr $ra -/* 0390C 80B5229C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s deleted file mode 100644 index d0a1173b03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B4E9B0 -/* 00020 80B4E9B0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00024 80B4E9B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 80B4E9B8 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 80B4E9BC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 80B4E9C0 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 80B4E9C4 15C00003 */ bne $t6, $zero, .L80B4E9D4 -/* 00038 80B4E9C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 80B4E9CC 10000005 */ beq $zero, $zero, .L80B4E9E4 -/* 00040 80B4E9D0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L80B4E9D4: -/* 00044 80B4E9D4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 80B4E9D8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 80B4E9DC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 80B4E9E0 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L80B4E9E4: -/* 00054 80B4E9E4 14400008 */ bne $v0, $zero, .L80B4EA08 -/* 00058 80B4E9E8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 80B4E9EC 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 80B4E9F0 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80B4E9F4 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 80B4E9F8 AFA60040 */ sw $a2, 0x0040($sp) -/* 0006C 80B4E9FC 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 80B4EA00 8FA60040 */ lw $a2, 0x0040($sp) -/* 00074 80B4EA04 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80B4EA08: -/* 00078 80B4EA08 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 80B4EA0C 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 80B4EA10 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 80B4EA14 84440000 */ lh $a0, 0x0000($v0) ## 00000190 -/* 00088 80B4EA18 28810003 */ slti $at, $a0, 0x0003 -/* 0008C 80B4EA1C 54200004 */ bnel $at, $zero, .L80B4EA30 -/* 00090 80B4EA20 A4C40194 */ sh $a0, 0x0194($a2) ## 00000194 -/* 00094 80B4EA24 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 80B4EA28 84440000 */ lh $a0, 0x0000($v0) ## 00000190 -/* 0009C 80B4EA2C A4C40194 */ sh $a0, 0x0194($a2) ## 00000194 -.L80B4EA30: -/* 000A0 80B4EA30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000A4 80B4EA34 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000A8 80B4EA38 03E00008 */ jr $ra -/* 000AC 80B4EA3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s deleted file mode 100644 index 1147590861..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B4EA40 -/* 000B0 80B4EA40 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 000B4 80B4EA44 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 000B8 80B4EA48 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 000BC 80B4EA4C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 000C0 80B4EA50 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 000C4 80B4EA54 4606203C */ c.lt.s $f4, $f6 -/* 000C8 80B4EA58 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 000CC 80B4EA5C 45020005 */ bc1fl .L80B4EA74 -/* 000D0 80B4EA60 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -/* 000D4 80B4EA64 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 000D8 80B4EA68 10000019 */ beq $zero, $zero, .L80B4EAD0 -/* 000DC 80B4EA6C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 000E0 80B4EA70 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -.L80B4EA74: -/* 000E4 80B4EA74 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 000E8 80B4EA78 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 000EC 80B4EA7C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 000F0 80B4EA80 4608003C */ c.lt.s $f0, $f8 -/* 000F4 80B4EA84 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 000F8 80B4EA88 45020004 */ bc1fl .L80B4EA9C -/* 000FC 80B4EA8C 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 00100 80B4EA90 1000000F */ beq $zero, $zero, .L80B4EAD0 -/* 00104 80B4EA94 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00108 80B4EA98 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -.L80B4EA9C: -/* 0010C 80B4EA9C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00110 80B4EAA0 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00114 80B4EAA4 460A003C */ c.lt.s $f0, $f10 -/* 00118 80B4EAA8 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 0011C 80B4EAAC 45020005 */ bc1fl .L80B4EAC4 -/* 00120 80B4EAB0 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -/* 00124 80B4EAB4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00128 80B4EAB8 10000005 */ beq $zero, $zero, .L80B4EAD0 -/* 0012C 80B4EABC A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 00130 80B4EAC0 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -.L80B4EAC4: -/* 00134 80B4EAC4 84590000 */ lh $t9, 0x0000($v0) ## 00000190 -/* 00138 80B4EAC8 03E00008 */ jr $ra -/* 0013C 80B4EACC A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -.L80B4EAD0: -/* 00140 80B4EAD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00144 80B4EAD4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00148 80B4EAD8 C4700000 */ lwc1 $f16, 0x0000($v1) ## 0000027C -/* 0014C 80B4EADC 46128100 */ add.s $f4, $f16, $f18 -/* 00150 80B4EAE0 E4640000 */ swc1 $f4, 0x0000($v1) ## 0000027C -/* 00154 80B4EAE4 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00158 80B4EAE8 A4880194 */ sh $t0, 0x0194($a0) ## 00000194 -/* 0015C 80B4EAEC 03E00008 */ jr $ra -/* 00160 80B4EAF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s deleted file mode 100644 index c6a48010b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B4EAF4 -/* 00164 80B4EAF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00168 80B4EAF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0016C 80B4EAFC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00170 80B4EB00 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00174 80B4EB04 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 00178 80B4EB08 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 0017C 80B4EB0C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00180 80B4EB10 4606203C */ c.lt.s $f4, $f6 -/* 00184 80B4EB14 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00188 80B4EB18 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 0018C 80B4EB1C 45020005 */ bc1fl .L80B4EB34 -/* 00190 80B4EB20 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -/* 00194 80B4EB24 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00198 80B4EB28 10000018 */ beq $zero, $zero, .L80B4EB8C -/* 0019C 80B4EB2C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 001A0 80B4EB30 C4600000 */ lwc1 $f0, 0x0000($v1) ## 0000027C -.L80B4EB34: -/* 001A4 80B4EB34 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 001A8 80B4EB38 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 001AC 80B4EB3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 001B0 80B4EB40 4608003C */ c.lt.s $f0, $f8 -/* 001B4 80B4EB44 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 001B8 80B4EB48 45020004 */ bc1fl .L80B4EB5C -/* 001BC 80B4EB4C 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -/* 001C0 80B4EB50 1000000E */ beq $zero, $zero, .L80B4EB8C -/* 001C4 80B4EB54 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 001C8 80B4EB58 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -.L80B4EB5C: -/* 001CC 80B4EB5C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 001D0 80B4EB60 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 001D4 80B4EB64 460A003C */ c.lt.s $f0, $f10 -/* 001D8 80B4EB68 00000000 */ nop -/* 001DC 80B4EB6C 45000003 */ bc1f .L80B4EB7C -/* 001E0 80B4EB70 00000000 */ nop -/* 001E4 80B4EB74 10000005 */ beq $zero, $zero, .L80B4EB8C -/* 001E8 80B4EB78 A4580000 */ sh $t8, 0x0000($v0) ## 00000190 -.L80B4EB7C: -/* 001EC 80B4EB7C 0C2D3A6C */ jal func_80B4E9B0 -/* 001F0 80B4EB80 00000000 */ nop -/* 001F4 80B4EB84 10000009 */ beq $zero, $zero, .L80B4EBAC -/* 001F8 80B4EB88 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4EB8C: -/* 001FC 80B4EB8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00200 80B4EB90 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00204 80B4EB94 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00208 80B4EB98 46128100 */ add.s $f4, $f16, $f18 -/* 0020C 80B4EB9C E4640000 */ swc1 $f4, 0x0000($v1) ## 00000000 -/* 00210 80B4EBA0 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 00214 80B4EBA4 A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -/* 00218 80B4EBA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4EBAC: -/* 0021C 80B4EBAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00220 80B4EBB0 03E00008 */ jr $ra -/* 00224 80B4EBB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s deleted file mode 100644 index f05c43dc30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B4EBB8 -/* 00228 80B4EBB8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0022C 80B4EBBC 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00230 80B4EBC0 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 00234 80B4EBC4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00238 80B4EBC8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0023C 80B4EBCC 4606203C */ c.lt.s $f4, $f6 -/* 00240 80B4EBD0 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 00244 80B4EBD4 45020005 */ bc1fl .L80B4EBEC -/* 00248 80B4EBD8 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -/* 0024C 80B4EBDC A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00250 80B4EBE0 10000010 */ beq $zero, $zero, .L80B4EC24 -/* 00254 80B4EBE4 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 00258 80B4EBE8 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -.L80B4EBEC: -/* 0025C 80B4EBEC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 00260 80B4EBF0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00264 80B4EBF4 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00268 80B4EBF8 460A403C */ c.lt.s $f8, $f10 -/* 0026C 80B4EBFC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00270 80B4EC00 45020005 */ bc1fl .L80B4EC18 -/* 00274 80B4EC04 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -/* 00278 80B4EC08 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 0027C 80B4EC0C 10000005 */ beq $zero, $zero, .L80B4EC24 -/* 00280 80B4EC10 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 00284 80B4EC14 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -.L80B4EC18: -/* 00288 80B4EC18 84580000 */ lh $t8, 0x0000($v0) ## 00000190 -/* 0028C 80B4EC1C 03E00008 */ jr $ra -/* 00290 80B4EC20 A4980194 */ sh $t8, 0x0194($a0) ## 00000194 -.L80B4EC24: -/* 00294 80B4EC24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00298 80B4EC28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0029C 80B4EC2C C4700000 */ lwc1 $f16, 0x0000($v1) ## 0000027C -/* 002A0 80B4EC30 46128100 */ add.s $f4, $f16, $f18 -/* 002A4 80B4EC34 E4640000 */ swc1 $f4, 0x0000($v1) ## 0000027C -/* 002A8 80B4EC38 84590000 */ lh $t9, 0x0000($v0) ## 00000190 -/* 002AC 80B4EC3C A4990194 */ sh $t9, 0x0194($a0) ## 00000194 -/* 002B0 80B4EC40 03E00008 */ jr $ra -/* 002B4 80B4EC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s deleted file mode 100644 index e2b558bd65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80B4EC48 -/* 002B8 80B4EC48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002BC 80B4EC4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 80B4EC50 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002C4 80B4EC54 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 002C8 80B4EC58 C484027C */ lwc1 $f4, 0x027C($a0) ## 0000027C -/* 002CC 80B4EC5C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 002D0 80B4EC60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 002D4 80B4EC64 4606203C */ c.lt.s $f4, $f6 -/* 002D8 80B4EC68 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 002DC 80B4EC6C 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 002E0 80B4EC70 45020005 */ bc1fl .L80B4EC88 -/* 002E4 80B4EC74 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -/* 002E8 80B4EC78 A44E0000 */ sh $t6, 0x0000($v0) ## 00000190 -/* 002EC 80B4EC7C 1000000F */ beq $zero, $zero, .L80B4ECBC -/* 002F0 80B4EC80 2483027C */ addiu $v1, $a0, 0x027C ## $v1 = 0000027C -/* 002F4 80B4EC84 C4680000 */ lwc1 $f8, 0x0000($v1) ## 0000027C -.L80B4EC88: -/* 002F8 80B4EC88 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 002FC 80B4EC8C 24820190 */ addiu $v0, $a0, 0x0190 ## $v0 = 00000190 -/* 00300 80B4EC90 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00304 80B4EC94 460A403C */ c.lt.s $f8, $f10 -/* 00308 80B4EC98 00000000 */ nop -/* 0030C 80B4EC9C 45000003 */ bc1f .L80B4ECAC -/* 00310 80B4ECA0 00000000 */ nop -/* 00314 80B4ECA4 10000005 */ beq $zero, $zero, .L80B4ECBC -/* 00318 80B4ECA8 A44F0000 */ sh $t7, 0x0000($v0) ## 00000190 -.L80B4ECAC: -/* 0031C 80B4ECAC 0C2D3A6C */ jal func_80B4E9B0 -/* 00320 80B4ECB0 00000000 */ nop -/* 00324 80B4ECB4 10000009 */ beq $zero, $zero, .L80B4ECDC -/* 00328 80B4ECB8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4ECBC: -/* 0032C 80B4ECBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00330 80B4ECC0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00334 80B4ECC4 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00338 80B4ECC8 46128100 */ add.s $f4, $f16, $f18 -/* 0033C 80B4ECCC E4640000 */ swc1 $f4, 0x0000($v1) ## 00000000 -/* 00340 80B4ECD0 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 00344 80B4ECD4 A4980194 */ sh $t8, 0x0194($a0) ## 00000194 -/* 00348 80B4ECD8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4ECDC: -/* 0034C 80B4ECDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80B4ECE0 03E00008 */ jr $ra -/* 00354 80B4ECE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s deleted file mode 100644 index 71c307e492..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80B4ECE8 -/* 00358 80B4ECE8 AFA50004 */ sw $a1, 0x0004($sp) -/* 0035C 80B4ECEC 00052C00 */ sll $a1, $a1, 16 -/* 00360 80B4ECF0 00052C03 */ sra $a1, $a1, 16 -/* 00364 80B4ECF4 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 -/* 00368 80B4ECF8 848E0190 */ lh $t6, 0x0190($a0) ## 00000190 -/* 0036C 80B4ECFC 03E00008 */ jr $ra -/* 00370 80B4ED00 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s deleted file mode 100644 index 8845818c44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B4ED04 -/* 00374 80B4ED04 AFA50004 */ sw $a1, 0x0004($sp) -/* 00378 80B4ED08 00052C00 */ sll $a1, $a1, 16 -/* 0037C 80B4ED0C 00052C03 */ sra $a1, $a1, 16 -/* 00380 80B4ED10 03E00008 */ jr $ra -/* 00384 80B4ED14 A4850194 */ sh $a1, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s deleted file mode 100644 index 267d007586..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B4ED18 -/* 00388 80B4ED18 AFA50004 */ sw $a1, 0x0004($sp) -/* 0038C 80B4ED1C 00052C00 */ sll $a1, $a1, 16 -/* 00390 80B4ED20 00052C03 */ sra $a1, $a1, 16 -/* 00394 80B4ED24 03E00008 */ jr $ra -/* 00398 80B4ED28 A4850198 */ sh $a1, 0x0198($a0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s deleted file mode 100644 index 9402ed3f92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B4ED2C -/* 0039C 80B4ED2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003A0 80B4ED30 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 003A4 80B4ED34 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 003A8 80B4ED38 AFA50024 */ sw $a1, 0x0024($sp) -/* 003AC 80B4ED3C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 003B0 80B4ED40 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B4 80B4ED44 AFA40020 */ sw $a0, 0x0020($sp) -/* 003B8 80B4ED48 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 003BC 80B4ED4C 44070000 */ mfc1 $a3, $f0 -/* 003C0 80B4ED50 AFAE0014 */ sw $t6, 0x0014($sp) -/* 003C4 80B4ED54 8FA40024 */ lw $a0, 0x0024($sp) -/* 003C8 80B4ED58 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 003CC 80B4ED5C 0C00B92D */ jal func_8002E4B4 -/* 003D0 80B4ED60 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 003D4 80B4ED64 8FBF001C */ lw $ra, 0x001C($sp) -/* 003D8 80B4ED68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003DC 80B4ED6C 03E00008 */ jr $ra -/* 003E0 80B4ED70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s deleted file mode 100644 index 8f13c75ca5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4ED74 -/* 003E4 80B4ED74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E8 80B4ED78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003EC 80B4ED7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 003F0 80B4ED80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80B4ED84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003F8 80B4ED88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003FC 80B4ED8C 03E00008 */ jr $ra -/* 00400 80B4ED90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s deleted file mode 100644 index 7840fd6cb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B4ED94 -/* 00404 80B4ED94 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00408 80B4ED98 00057880 */ sll $t7, $a1, 2 -/* 0040C 80B4ED9C 008FC021 */ addu $t8, $a0, $t7 -/* 00410 80B4EDA0 11C00003 */ beq $t6, $zero, .L80B4EDB0 -/* 00414 80B4EDA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00418 80B4EDA8 03E00008 */ jr $ra -/* 0041C 80B4EDAC 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80B4EDB0: -/* 00420 80B4EDB0 03E00008 */ jr $ra -/* 00424 80B4EDB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s deleted file mode 100644 index 3cf56f0452..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B4EDB8 -/* 00428 80B4EDB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0042C 80B4EDBC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00430 80B4EDC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00434 80B4EDC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00438 80B4EDC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0043C 80B4EDCC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00440 80B4EDD0 0C2D3B65 */ jal func_80B4ED94 -/* 00444 80B4EDD4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00448 80B4EDD8 10400013 */ beq $v0, $zero, .L80B4EE28 -/* 0044C 80B4EDDC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00450 80B4EDE0 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00454 80B4EDE4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00458 80B4EDE8 00000000 */ nop -/* 0045C 80B4EDEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00460 80B4EDF0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00464 80B4EDF4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00468 80B4EDF8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0046C 80B4EDFC 00000000 */ nop -/* 00470 80B4EE00 468042A0 */ cvt.s.w $f10, $f8 -/* 00474 80B4EE04 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00478 80B4EE08 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0047C 80B4EE0C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00480 80B4EE10 00000000 */ nop -/* 00484 80B4EE14 468084A0 */ cvt.s.w $f18, $f16 -/* 00488 80B4EE18 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0048C 80B4EE1C 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00490 80B4EE20 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00494 80B4EE24 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80B4EE28: -/* 00498 80B4EE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0049C 80B4EE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A0 80B4EE30 03E00008 */ jr $ra -/* 004A4 80B4EE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s deleted file mode 100644 index a4d0b8b664..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80B4EE38 -/* 004A8 80B4EE38 AFA50004 */ sw $a1, 0x0004($sp) -/* 004AC 80B4EE3C 8C8E024C */ lw $t6, 0x024C($a0) ## 0000024C -/* 004B0 80B4EE40 00052C00 */ sll $a1, $a1, 16 -/* 004B4 80B4EE44 00052C03 */ sra $a1, $a1, 16 -/* 004B8 80B4EE48 11C00043 */ beq $t6, $zero, .L80B4EF58 -/* 004BC 80B4EE4C 00065040 */ sll $t2, $a2, 1 -/* 004C0 80B4EE50 00067840 */ sll $t7, $a2, 1 -/* 004C4 80B4EE54 008F4021 */ addu $t0, $a0, $t7 -/* 004C8 80B4EE58 8519020C */ lh $t9, 0x020C($t0) ## 0000020C -/* 004CC 80B4EE5C 851801DC */ lh $t8, 0x01DC($t0) ## 000001DC -/* 004D0 80B4EE60 850901AC */ lh $t1, 0x01AC($t0) ## 000001AC -/* 004D4 80B4EE64 00B93823 */ subu $a3, $a1, $t9 -/* 004D8 80B4EE68 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 004DC 80B4EE6C 34018001 */ ori $at, $zero, 0x8001 ## $at = 00008001 -/* 004E0 80B4EE70 03051821 */ addu $v1, $t8, $a1 -/* 004E4 80B4EE74 46802020 */ cvt.s.w $f0, $f4 -/* 004E8 80B4EE78 00031C00 */ sll $v1, $v1, 16 -/* 004EC 80B4EE7C 00031C03 */ sra $v1, $v1, 16 -/* 004F0 80B4EE80 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 -/* 004F4 80B4EE84 46000005 */ abs.s $f0, $f0 -/* 004F8 80B4EE88 4600018D */ trunc.w.s $f6, $f0 -/* 004FC 80B4EE8C 440B3000 */ mfc1 $t3, $f6 -/* 00500 80B4EE90 00000000 */ nop -/* 00504 80B4EE94 0161082A */ slt $at, $t3, $at -/* 00508 80B4EE98 14200007 */ bne $at, $zero, .L80B4EEB8 -/* 0050C 80B4EE9C 00000000 */ nop -/* 00510 80B4EEA0 18A00004 */ blez $a1, .L80B4EEB4 -/* 00514 80B4EEA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00518 80B4EEA8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0051C 80B4EEAC 10000002 */ beq $zero, $zero, .L80B4EEB8 -/* 00520 80B4EEB0 00E13821 */ addu $a3, $a3, $at -.L80B4EEB4: -/* 00524 80B4EEB4 00E13821 */ addu $a3, $a3, $at -.L80B4EEB8: -/* 00528 80B4EEB8 10E00006 */ beq $a3, $zero, .L80B4EED4 -/* 0052C 80B4EEBC 00E26023 */ subu $t4, $a3, $v0 -/* 00530 80B4EEC0 05810003 */ bgez $t4, .L80B4EED0 -/* 00534 80B4EEC4 000C6903 */ sra $t5, $t4, 4 -/* 00538 80B4EEC8 2581000F */ addiu $at, $t4, 0x000F ## $at = 0000000F -/* 0053C 80B4EECC 00016903 */ sra $t5, $at, 4 -.L80B4EED0: -/* 00540 80B4EED0 004D1021 */ addu $v0, $v0, $t5 -.L80B4EED4: -/* 00544 80B4EED4 10400006 */ beq $v0, $zero, .L80B4EEF0 -/* 00548 80B4EED8 00653823 */ subu $a3, $v1, $a1 -/* 0054C 80B4EEDC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00550 80B4EEE0 0041001A */ div $zero, $v0, $at -/* 00554 80B4EEE4 00007012 */ mflo $t6 -/* 00558 80B4EEE8 004E1023 */ subu $v0, $v0, $t6 -/* 0055C 80B4EEEC 00000000 */ nop -.L80B4EEF0: -/* 00560 80B4EEF0 00073C00 */ sll $a3, $a3, 16 -/* 00564 80B4EEF4 00073C03 */ sra $a3, $a3, 16 -/* 00568 80B4EEF8 10E00005 */ beq $a3, $zero, .L80B4EF10 -/* 0056C 80B4EEFC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00570 80B4EF00 00E1001A */ div $zero, $a3, $at -/* 00574 80B4EF04 00007812 */ mflo $t7 -/* 00578 80B4EF08 004F1023 */ subu $v0, $v0, $t7 -/* 0057C 80B4EF0C 00000000 */ nop -.L80B4EF10: -/* 00580 80B4EF10 01220019 */ multu $t1, $v0 -/* 00584 80B4EF14 00621821 */ addu $v1, $v1, $v0 -/* 00588 80B4EF18 00653823 */ subu $a3, $v1, $a1 -/* 0058C 80B4EF1C 00073C00 */ sll $a3, $a3, 16 -/* 00590 80B4EF20 00073C03 */ sra $a3, $a3, 16 -/* 00594 80B4EF24 28E1FF9D */ slti $at, $a3, 0xFF9D -/* 00598 80B4EF28 0000C012 */ mflo $t8 -/* 0059C 80B4EF2C 5F000008 */ bgtzl $t8, .L80B4EF50 -/* 005A0 80B4EF30 0065C823 */ subu $t9, $v1, $a1 -/* 005A4 80B4EF34 14200005 */ bne $at, $zero, .L80B4EF4C -/* 005A8 80B4EF38 28E10064 */ slti $at, $a3, 0x0064 -/* 005AC 80B4EF3C 50200004 */ beql $at, $zero, .L80B4EF50 -/* 005B0 80B4EF40 0065C823 */ subu $t9, $v1, $a1 -/* 005B4 80B4EF44 00A01825 */ or $v1, $a1, $zero ## $v1 = 00000000 -/* 005B8 80B4EF48 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4EF4C: -/* 005BC 80B4EF4C 0065C823 */ subu $t9, $v1, $a1 -.L80B4EF50: -/* 005C0 80B4EF50 A50201AC */ sh $v0, 0x01AC($t0) ## 000001AC -/* 005C4 80B4EF54 A51901DC */ sh $t9, 0x01DC($t0) ## 000001DC -.L80B4EF58: -/* 005C8 80B4EF58 008A5821 */ addu $t3, $a0, $t2 -/* 005CC 80B4EF5C 03E00008 */ jr $ra -/* 005D0 80B4EF60 A565020C */ sh $a1, 0x020C($t3) ## 0000020C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s deleted file mode 100644 index 037c4cde1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s +++ /dev/null @@ -1,211 +0,0 @@ -.late_rodata -glabel D_80B52BB0 - .word 0x455AC000 - -.text -glabel func_80B4EF64 -/* 005D4 80B4EF64 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 005D8 80B4EF68 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005DC 80B4EF6C 14C80004 */ bne $a2, $t0, .L80B4EF80 -/* 005E0 80B4EF70 AFA50004 */ sw $a1, 0x0004($sp) -/* 005E4 80B4EF74 24043A98 */ addiu $a0, $zero, 0x3A98 ## $a0 = 00003A98 -/* 005E8 80B4EF78 1000001C */ beq $zero, $zero, .L80B4EFEC -/* 005EC 80B4EF7C 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -.L80B4EF80: -/* 005F0 80B4EF80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 005F4 80B4EF84 14C10003 */ bne $a2, $at, .L80B4EF94 -/* 005F8 80B4EF88 240432C8 */ addiu $a0, $zero, 0x32C8 ## $a0 = 000032C8 -/* 005FC 80B4EF8C 10000017 */ beq $zero, $zero, .L80B4EFEC -/* 00600 80B4EF90 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -.L80B4EF94: -/* 00604 80B4EF94 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00608 80B4EF98 14C10003 */ bne $a2, $at, .L80B4EFA8 -/* 0060C 80B4EF9C 24042EE0 */ addiu $a0, $zero, 0x2EE0 ## $a0 = 00002EE0 -/* 00610 80B4EFA0 10000012 */ beq $zero, $zero, .L80B4EFEC -/* 00614 80B4EFA4 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -.L80B4EFA8: -/* 00618 80B4EFA8 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0061C 80B4EFAC 14C10003 */ bne $a2, $at, .L80B4EFBC -/* 00620 80B4EFB0 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00624 80B4EFB4 1000000D */ beq $zero, $zero, .L80B4EFEC -/* 00628 80B4EFB8 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -.L80B4EFBC: -/* 0062C 80B4EFBC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00630 80B4EFC0 14C10003 */ bne $a2, $at, .L80B4EFD0 -/* 00634 80B4EFC4 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00638 80B4EFC8 10000008 */ beq $zero, $zero, .L80B4EFEC -/* 0063C 80B4EFCC 2409000C */ addiu $t1, $zero, 0x000C ## $t1 = 0000000C -.L80B4EFD0: -/* 00640 80B4EFD0 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 00644 80B4EFD4 14C10004 */ bne $a2, $at, .L80B4EFE8 -/* 00648 80B4EFD8 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 0064C 80B4EFDC 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 00650 80B4EFE0 10000002 */ beq $zero, $zero, .L80B4EFEC -/* 00654 80B4EFE4 2409000F */ addiu $t1, $zero, 0x000F ## $t1 = 0000000F -.L80B4EFE8: -/* 00658 80B4EFE8 24090012 */ addiu $t1, $zero, 0x0012 ## $t1 = 00000012 -.L80B4EFEC: -/* 0065C 80B4EFEC 8CEE024C */ lw $t6, 0x024C($a3) ## 0000024C -/* 00660 80B4EFF0 00067840 */ sll $t7, $a2, 1 -/* 00664 80B4EFF4 00EF2821 */ addu $a1, $a3, $t7 -/* 00668 80B4EFF8 11C00088 */ beq $t6, $zero, .L80B4F21C -/* 0066C 80B4EFFC 87B90006 */ lh $t9, 0x0006($sp) -/* 00670 80B4F000 84AD020C */ lh $t5, 0x020C($a1) ## 0000020C -/* 00674 80B4F004 84B801DC */ lh $t8, 0x01DC($a1) ## 000001DC -/* 00678 80B4F008 84AC01AC */ lh $t4, 0x01AC($a1) ## 000001AC -/* 0067C 80B4F00C 032D5023 */ subu $t2, $t9, $t5 -/* 00680 80B4F010 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00684 80B4F014 03191821 */ addu $v1, $t8, $t9 -/* 00688 80B4F018 34018001 */ ori $at, $zero, 0x8001 ## $at = 00008001 -/* 0068C 80B4F01C 46802020 */ cvt.s.w $f0, $f4 -/* 00690 80B4F020 00031C00 */ sll $v1, $v1, 16 -/* 00694 80B4F024 0009C040 */ sll $t8, $t1, 1 -/* 00698 80B4F028 00031C03 */ sra $v1, $v1, 16 -/* 0069C 80B4F02C 00F86821 */ addu $t5, $a3, $t8 -/* 006A0 80B4F030 01801025 */ or $v0, $t4, $zero ## $v0 = 00000000 -/* 006A4 80B4F034 46000005 */ abs.s $f0, $f0 -/* 006A8 80B4F038 4600018D */ trunc.w.s $f6, $f0 -/* 006AC 80B4F03C 440F3000 */ mfc1 $t7, $f6 -/* 006B0 80B4F040 00000000 */ nop -/* 006B4 80B4F044 01E1082A */ slt $at, $t7, $at -/* 006B8 80B4F048 14200007 */ bne $at, $zero, .L80B4F068 -/* 006BC 80B4F04C 00000000 */ nop -/* 006C0 80B4F050 1B200004 */ blez $t9, .L80B4F064 -/* 006C4 80B4F054 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006C8 80B4F058 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 006CC 80B4F05C 10000002 */ beq $zero, $zero, .L80B4F068 -/* 006D0 80B4F060 01415021 */ addu $t2, $t2, $at -.L80B4F064: -/* 006D4 80B4F064 01415021 */ addu $t2, $t2, $at -.L80B4F068: -/* 006D8 80B4F068 0520000A */ bltz $t1, .L80B4F094 -/* 006DC 80B4F06C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 006E0 80B4F070 85AB01AC */ lh $t3, 0x01AC($t5) ## 000001AC -/* 006E4 80B4F074 05600003 */ bltz $t3, .L80B4F084 -/* 006E8 80B4F078 000B4823 */ subu $t1, $zero, $t3 -/* 006EC 80B4F07C 10000001 */ beq $zero, $zero, .L80B4F084 -/* 006F0 80B4F080 01604825 */ or $t1, $t3, $zero ## $t1 = 00000000 -.L80B4F084: -/* 006F4 80B4F084 0121001A */ div $zero, $t1, $at -/* 006F8 80B4F088 00007012 */ mflo $t6 -/* 006FC 80B4F08C 014E5021 */ addu $t2, $t2, $t6 -/* 00700 80B4F090 00000000 */ nop -.L80B4F094: -/* 00704 80B4F094 11400007 */ beq $t2, $zero, .L80B4F0B4 -/* 00708 80B4F098 00644823 */ subu $t1, $v1, $a0 -/* 0070C 80B4F09C 01427823 */ subu $t7, $t2, $v0 -/* 00710 80B4F0A0 05E10003 */ bgez $t7, .L80B4F0B0 -/* 00714 80B4F0A4 000FC903 */ sra $t9, $t7, 4 -/* 00718 80B4F0A8 25E1000F */ addiu $at, $t7, 0x000F ## $at = 0000000F -/* 0071C 80B4F0AC 0001C903 */ sra $t9, $at, 4 -.L80B4F0B0: -/* 00720 80B4F0B0 00591021 */ addu $v0, $v0, $t9 -.L80B4F0B4: -/* 00724 80B4F0B4 10400006 */ beq $v0, $zero, .L80B4F0D0 -/* 00728 80B4F0B8 00094C00 */ sll $t1, $t1, 16 -/* 0072C 80B4F0BC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00730 80B4F0C0 0041001A */ div $zero, $v0, $at -/* 00734 80B4F0C4 0000C012 */ mflo $t8 -/* 00738 80B4F0C8 00581023 */ subu $v0, $v0, $t8 -/* 0073C 80B4F0CC 00000000 */ nop -.L80B4F0D0: -/* 00740 80B4F0D0 00094C03 */ sra $t1, $t1, 16 -/* 00744 80B4F0D4 11200005 */ beq $t1, $zero, .L80B4F0EC -/* 00748 80B4F0D8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0074C 80B4F0DC 0121001A */ div $zero, $t1, $at -/* 00750 80B4F0E0 00006812 */ mflo $t5 -/* 00754 80B4F0E4 004D1023 */ subu $v0, $v0, $t5 -/* 00758 80B4F0E8 00000000 */ nop -.L80B4F0EC: -/* 0075C 80B4F0EC 01820019 */ multu $t4, $v0 -/* 00760 80B4F0F0 00621821 */ addu $v1, $v1, $v0 -/* 00764 80B4F0F4 00644823 */ subu $t1, $v1, $a0 -/* 00768 80B4F0F8 00094C00 */ sll $t1, $t1, 16 -/* 0076C 80B4F0FC 00094C03 */ sra $t1, $t1, 16 -/* 00770 80B4F100 2921FF9D */ slti $at, $t1, 0xFF9D -/* 00774 80B4F104 00007012 */ mflo $t6 -/* 00778 80B4F108 1DC00007 */ bgtz $t6, .L80B4F128 -/* 0077C 80B4F10C 00000000 */ nop -/* 00780 80B4F110 14200005 */ bne $at, $zero, .L80B4F128 -/* 00784 80B4F114 29210064 */ slti $at, $t1, 0x0064 -/* 00788 80B4F118 10200003 */ beq $at, $zero, .L80B4F128 -/* 0078C 80B4F11C 00000000 */ nop -/* 00790 80B4F120 00801825 */ or $v1, $a0, $zero ## $v1 = 00004000 -/* 00794 80B4F124 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4F128: -/* 00798 80B4F128 54C80039 */ bnel $a2, $t0, .L80B4F210 -/* 0079C 80B4F12C A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 007A0 80B4F130 8CE8019C */ lw $t0, 0x019C($a3) ## 0000019C -/* 007A4 80B4F134 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 007A8 80B4F138 11010002 */ beq $t0, $at, .L80B4F144 -/* 007AC 80B4F13C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 007B0 80B4F140 15010015 */ bne $t0, $at, .L80B4F198 -.L80B4F144: -/* 007B4 80B4F144 3C0180B5 */ lui $at, %hi(D_80B52BB0) ## $at = 80B50000 -/* 007B8 80B4F148 C4E00164 */ lwc1 $f0, 0x0164($a3) ## 00000164 -/* 007BC 80B4F14C C4282BB0 */ lwc1 $f8, %lo(D_80B52BB0)($at) -/* 007C0 80B4F150 C4E20278 */ lwc1 $f2, 0x0278($a3) ## 00000278 -/* 007C4 80B4F154 46004282 */ mul.s $f10, $f8, $f0 -/* 007C8 80B4F158 46025403 */ div.s $f16, $f10, $f2 -/* 007CC 80B4F15C 4600848D */ trunc.w.s $f18, $f16 -/* 007D0 80B4F160 44199000 */ mfc1 $t9, $f18 -/* 007D4 80B4F164 00000000 */ nop -/* 007D8 80B4F168 03244021 */ addu $t0, $t9, $a0 -/* 007DC 80B4F16C 0103082A */ slt $at, $t0, $v1 -/* 007E0 80B4F170 54200027 */ bnel $at, $zero, .L80B4F210 -/* 007E4 80B4F174 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 007E8 80B4F178 01001825 */ or $v1, $t0, $zero ## $v1 = 00000002 -/* 007EC 80B4F17C 04410002 */ bgez $v0, .L80B4F188 -/* 007F0 80B4F180 00400821 */ addu $at, $v0, $zero -/* 007F4 80B4F184 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F188: -/* 007F8 80B4F188 00011043 */ sra $v0, $at, 1 -/* 007FC 80B4F18C 00021023 */ subu $v0, $zero, $v0 -/* 00800 80B4F190 1000001F */ beq $zero, $zero, .L80B4F210 -/* 00804 80B4F194 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -.L80B4F198: -/* 00808 80B4F198 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0080C 80B4F19C 11010003 */ beq $t0, $at, .L80B4F1AC -/* 00810 80B4F1A0 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 00814 80B4F1A4 5501000E */ bnel $t0, $at, .L80B4F1E0 -/* 00818 80B4F1A8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -.L80B4F1AC: -/* 0081C 80B4F1AC 24880DAC */ addiu $t0, $a0, 0x0DAC ## $t0 = 00004DAC -/* 00820 80B4F1B0 0103082A */ slt $at, $t0, $v1 -/* 00824 80B4F1B4 54200016 */ bnel $at, $zero, .L80B4F210 -/* 00828 80B4F1B8 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 0082C 80B4F1BC 01001825 */ or $v1, $t0, $zero ## $v1 = 00004DAC -/* 00830 80B4F1C0 04410002 */ bgez $v0, .L80B4F1CC -/* 00834 80B4F1C4 00400821 */ addu $at, $v0, $zero -/* 00838 80B4F1C8 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F1CC: -/* 0083C 80B4F1CC 00011043 */ sra $v0, $at, 1 -/* 00840 80B4F1D0 00021023 */ subu $v0, $zero, $v0 -/* 00844 80B4F1D4 1000000E */ beq $zero, $zero, .L80B4F210 -/* 00848 80B4F1D8 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 0084C 80B4F1DC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -.L80B4F1E0: -/* 00850 80B4F1E0 1501000A */ bne $t0, $at, .L80B4F20C -/* 00854 80B4F1E4 2488FC18 */ addiu $t0, $a0, 0xFC18 ## $t0 = 00003C18 -/* 00858 80B4F1E8 0103082A */ slt $at, $t0, $v1 -/* 0085C 80B4F1EC 54200008 */ bnel $at, $zero, .L80B4F210 -/* 00860 80B4F1F0 A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -/* 00864 80B4F1F4 01001825 */ or $v1, $t0, $zero ## $v1 = 00003C18 -/* 00868 80B4F1F8 04410002 */ bgez $v0, .L80B4F204 -/* 0086C 80B4F1FC 00400821 */ addu $at, $v0, $zero -/* 00870 80B4F200 24410001 */ addiu $at, $v0, 0x0001 ## $at = 00000001 -.L80B4F204: -/* 00874 80B4F204 00011043 */ sra $v0, $at, 1 -/* 00878 80B4F208 00021023 */ subu $v0, $zero, $v0 -.L80B4F20C: -/* 0087C 80B4F20C A4A201AC */ sh $v0, 0x01AC($a1) ## 000001AC -.L80B4F210: -/* 00880 80B4F210 87B80006 */ lh $t8, 0x0006($sp) -/* 00884 80B4F214 00786823 */ subu $t5, $v1, $t8 -/* 00888 80B4F218 A4AD01DC */ sh $t5, 0x01DC($a1) ## 000001DC -.L80B4F21C: -/* 0088C 80B4F21C 87AE0006 */ lh $t6, 0x0006($sp) -/* 00890 80B4F220 00067840 */ sll $t7, $a2, 1 -/* 00894 80B4F224 00EFC821 */ addu $t9, $a3, $t7 -/* 00898 80B4F228 03E00008 */ jr $ra -/* 0089C 80B4F22C A72E020C */ sh $t6, 0x020C($t9) ## 0000020C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s deleted file mode 100644 index d50d896f04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ /dev/null @@ -1,510 +0,0 @@ -.rdata -glabel D_80B52900 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52910 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52920 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52930 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52940 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52950 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52960 - .asciz "../z_en_zl2.c" - .balign 4 - -.late_rodata -glabel D_80B52BB4 - .word 0xC47EC000 -glabel D_80B52BB8 - .word 0x43E98000 -glabel D_80B52BBC - .word 0x43848000 -glabel D_80B52BC0 - .word 0xC3D58000 -glabel D_80B52BC4 - .word 0x43E98000 -glabel D_80B52BC8 - .word 0x43848000 -glabel D_80B52BCC - .word 0xC3D58000 - -.text -glabel func_80B4F45C -/* 00ACC 80B4F45C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00AD0 80B4F460 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) -/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) -/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 -/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) -/* 00AE8 80B4F478 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 -/* 00AEC 80B4F47C 0C031A73 */ jal Graph_Alloc - -/* 00AF0 80B4F480 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) -/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) -/* 00AFC 80B4F48C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00B00 80B4F490 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00B04 80B4F494 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 00B08 80B4F498 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 -/* 00B0C 80B4F49C ACAF0000 */ sw $t7, 0x0000($a1) ## 00000000 -/* 00B10 80B4F4A0 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push -/* 00B18 80B4F4A8 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) -/* 00B20 80B4F4B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B24 80B4F4B4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 -/* 00B28 80B4F4B8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate -/* 00B30 80B4F4C0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) -/* 00B38 80B4F4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B3C 80B4F4CC 84440000 */ lh $a0, 0x0000($v0) ## 00000000 -/* 00B40 80B4F4D0 84450002 */ lh $a1, 0x0002($v0) ## 00000002 -/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateRPY -/* 00B48 80B4F4D8 84460004 */ lh $a2, 0x0004($v0) ## 00000004 -/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push -/* 00B50 80B4F4E0 00000000 */ nop -/* 00B54 80B4F4E4 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 -/* 00B58 80B4F4E8 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 -/* 00B5C 80B4F4EC 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 -/* 00B60 80B4F4F0 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 -/* 00B64 80B4F4F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate -/* 00B6C 80B4F4FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B70 80B4F500 0C034236 */ jal Matrix_Get -/* 00B74 80B4F504 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00B78 80B4F508 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00B7C 80B4F50C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00B80 80B4F510 0C034833 */ jal func_800D20CC -/* 00B84 80B4F514 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 -/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 -/* 00B94 80B4F524 00000000 */ nop -/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) -/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) -/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 -/* 00BA4 80B4F534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) -/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 -/* 00BB4 80B4F544 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) -/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 -/* 00BC4 80B4F554 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80B4F558: -/* 00BC8 80B4F558 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00BCC 80B4F55C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) -/* 00BD4 80B4F564 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00BD8 80B4F568 84591492 */ lh $t9, 0x1492($v0) ## 80161492 -/* 00BDC 80B4F56C 844A1494 */ lh $t2, 0x1494($v0) ## 80161494 -/* 00BE0 80B4F570 844C1496 */ lh $t4, 0x1496($v0) ## 80161496 -/* 00BE4 80B4F574 846D01E0 */ lh $t5, 0x01E0($v1) ## 000001E0 -/* 00BE8 80B4F578 846B01DE */ lh $t3, 0x01DE($v1) ## 000001DE -/* 00BEC 80B4F57C 846901DC */ lh $t1, 0x01DC($v1) ## 000001DC -/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 -/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 -/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 -/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 -/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 -/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 -/* 00C08 80B4F598 246301DC */ addiu $v1, $v1, 0x01DC ## $v1 = 000001DC -/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) -/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 -/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 -/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateRPY -/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 -/* 00C20 80B4F5B0 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 -/* 00C24 80B4F5B4 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 -/* 00C28 80B4F5B8 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 00C2C 80B4F5BC 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 00C30 80B4F5C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate -/* 00C38 80B4F5C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00C3C 80B4F5CC 3C0580B5 */ lui $a1, %hi(D_80B52900) ## $a1 = 80B50000 -/* 00C40 80B4F5D0 24A52900 */ addiu $a1, $a1, %lo(D_80B52900) ## $a1 = 80B52900 -/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) -/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx -/* 00C4C 80B4F5DC 24060420 */ addiu $a2, $zero, 0x0420 ## $a2 = 00000420 -/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get -/* 00C54 80B4F5E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00C58 80B4F5E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00C5C 80B4F5EC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC -/* 00C64 80B4F5F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 -/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) -/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 -/* 00C74 80B4F604 00000000 */ nop -/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) -/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 -/* 00C84 80B4F614 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) -/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 -/* 00C94 80B4F624 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80B4F628: -/* 00C98 80B4F628 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00CA0 80B4F630 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00CA4 80B4F634 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00CA8 80B4F638 846F0006 */ lh $t7, 0x0006($v1) ## 00000006 -/* 00CAC 80B4F63C 84790008 */ lh $t9, 0x0008($v1) ## 00000008 -/* 00CB0 80B4F640 846A000A */ lh $t2, 0x000A($v1) ## 0000000A -/* 00CB4 80B4F644 844E1498 */ lh $t6, 0x1498($v0) ## 80161498 -/* 00CB8 80B4F648 8458149A */ lh $t8, 0x149A($v0) ## 8016149A -/* 00CBC 80B4F64C 8449149C */ lh $t1, 0x149C($v0) ## 8016149C -/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 -/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 -/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 -/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 -/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 -/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 -/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 -/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 -/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateRPY -/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 -/* 00CE8 80B4F678 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 -/* 00CEC 80B4F67C 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 -/* 00CF0 80B4F680 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 00CF4 80B4F684 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 00CF8 80B4F688 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate -/* 00D00 80B4F690 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) -/* 00D08 80B4F698 3C0580B5 */ lui $a1, %hi(D_80B52910) ## $a1 = 80B50000 -/* 00D0C 80B4F69C 24A52910 */ addiu $a1, $a1, %lo(D_80B52910) ## $a1 = 80B52910 -/* 00D10 80B4F6A0 2406044C */ addiu $a2, $zero, 0x044C ## $a2 = 0000044C -/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx -/* 00D18 80B4F6A8 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get -/* 00D20 80B4F6B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00D24 80B4F6B4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00D28 80B4F6B8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC -/* 00D30 80B4F6C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 -/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) -/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 -/* 00D40 80B4F6D0 00000000 */ nop -/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) -/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 -/* 00D50 80B4F6E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) -/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 -/* 00D60 80B4F6F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -.L80B4F6F4: -/* 00D64 80B4F6F4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) -/* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00D70 80B4F700 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D74 80B4F704 846C000C */ lh $t4, 0x000C($v1) ## 0000000C -/* 00D78 80B4F708 846E000E */ lh $t6, 0x000E($v1) ## 0000000E -/* 00D7C 80B4F70C 84780010 */ lh $t8, 0x0010($v1) ## 00000010 -/* 00D80 80B4F710 844B149E */ lh $t3, 0x149E($v0) ## 8016149E -/* 00D84 80B4F714 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 -/* 00D88 80B4F718 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 -/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 -/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 -/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 -/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 -/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 -/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 -/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 -/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateRPY -/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 -/* 00DB4 80B4F744 3C0180B5 */ lui $at, %hi(D_80B52BB4) ## $at = 80B50000 -/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) -/* 00DBC 80B4F74C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 00DC0 80B4F750 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 -/* 00DC4 80B4F754 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate -/* 00DCC 80B4F75C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) -/* 00DD4 80B4F764 3C0580B5 */ lui $a1, %hi(D_80B52920) ## $a1 = 80B50000 -/* 00DD8 80B4F768 24A52920 */ addiu $a1, $a1, %lo(D_80B52920) ## $a1 = 80B52920 -/* 00DDC 80B4F76C 24060460 */ addiu $a2, $zero, 0x0460 ## $a2 = 00000460 -/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx -/* 00DE4 80B4F774 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull -/* 00DEC 80B4F77C 00000000 */ nop -/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push -/* 00DF4 80B4F784 00000000 */ nop -/* 00DF8 80B4F788 3C0180B5 */ lui $at, %hi(D_80B52BB8) ## $at = 80B50000 -/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) -/* 00E00 80B4F790 3C0180B5 */ lui $at, %hi(D_80B52BBC) ## $at = 80B50000 -/* 00E04 80B4F794 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 -/* 00E08 80B4F798 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) -/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate -/* 00E14 80B4F7A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get -/* 00E1C 80B4F7AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00E20 80B4F7B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00E24 80B4F7B4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC -/* 00E2C 80B4F7BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 -/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) -/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 -/* 00E3C 80B4F7CC 00000000 */ nop -/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) -/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 -/* 00E4C 80B4F7DC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) -/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 -/* 00E5C 80B4F7EC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) -/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 -/* 00E6C 80B4F7FC 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -.L80B4F800: -/* 00E70 80B4F800 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) -/* 00E78 80B4F808 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00E7C 80B4F80C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E80 80B4F810 84690012 */ lh $t1, 0x0012($v1) ## 00000012 -/* 00E84 80B4F814 846B0014 */ lh $t3, 0x0014($v1) ## 00000014 -/* 00E88 80B4F818 846D0016 */ lh $t5, 0x0016($v1) ## 00000016 -/* 00E8C 80B4F81C 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 -/* 00E90 80B4F820 844A14A6 */ lh $t2, 0x14A6($v0) ## 801614A6 -/* 00E94 80B4F824 844C14A8 */ lh $t4, 0x14A8($v0) ## 801614A8 -/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 -/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 -/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 -/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 -/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 -/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 -/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 -/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateRPY -/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 -/* 00EC0 80B4F850 3C0180B5 */ lui $at, %hi(D_80B52BC0) ## $at = 80B50000 -/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) -/* 00EC8 80B4F858 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00ECC 80B4F85C 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 00ED0 80B4F860 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate -/* 00ED8 80B4F868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) -/* 00EE0 80B4F870 3C0580B5 */ lui $a1, %hi(D_80B52930) ## $a1 = 80B50000 -/* 00EE4 80B4F874 24A52930 */ addiu $a1, $a1, %lo(D_80B52930) ## $a1 = 80B52930 -/* 00EE8 80B4F878 24060479 */ addiu $a2, $zero, 0x0479 ## $a2 = 00000479 -/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx -/* 00EF0 80B4F880 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get -/* 00EF8 80B4F888 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00EFC 80B4F88C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 00F00 80B4F890 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00F04 80B4F894 0C034833 */ jal func_800D20CC -/* 00F08 80B4F898 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 -/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) -/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC -/* 00F18 80B4F8A8 00000000 */ nop -/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) -/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 -/* 00F28 80B4F8B8 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) -/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 -/* 00F38 80B4F8C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) -/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 -/* 00F48 80B4F8D8 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -.L80B4F8DC: -/* 00F4C 80B4F8DC 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) -/* 00F54 80B4F8E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00F58 80B4F8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F5C 80B4F8EC 846F0018 */ lh $t7, 0x0018($v1) ## 00000018 -/* 00F60 80B4F8F0 8479001A */ lh $t9, 0x001A($v1) ## 0000001A -/* 00F64 80B4F8F4 846A001C */ lh $t2, 0x001C($v1) ## 0000001C -/* 00F68 80B4F8F8 844E14AA */ lh $t6, 0x14AA($v0) ## 801614AA -/* 00F6C 80B4F8FC 845814AC */ lh $t8, 0x14AC($v0) ## 801614AC -/* 00F70 80B4F900 844914AE */ lh $t1, 0x14AE($v0) ## 801614AE -/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 -/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 -/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 -/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 -/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 -/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 -/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 -/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 -/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateRPY -/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 -/* 00F9C 80B4F92C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 00FA0 80B4F930 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 00FA4 80B4F934 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 00FA8 80B4F938 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 00FAC 80B4F93C 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate -/* 00FB4 80B4F944 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) -/* 00FBC 80B4F94C 3C0580B5 */ lui $a1, %hi(D_80B52940) ## $a1 = 80B50000 -/* 00FC0 80B4F950 24A52940 */ addiu $a1, $a1, %lo(D_80B52940) ## $a1 = 80B52940 -/* 00FC4 80B4F954 2406048C */ addiu $a2, $zero, 0x048C ## $a2 = 0000048C -/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx -/* 00FCC 80B4F95C 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull -/* 00FD4 80B4F964 00000000 */ nop -/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push -/* 00FDC 80B4F96C 00000000 */ nop -/* 00FE0 80B4F970 3C0180B5 */ lui $at, %hi(D_80B52BC4) ## $at = 80B50000 -/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) -/* 00FE8 80B4F978 3C0180B5 */ lui $at, %hi(D_80B52BC8) ## $at = 80B50000 -/* 00FEC 80B4F97C 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 -/* 00FF0 80B4F980 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) -/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate -/* 00FFC 80B4F98C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01000 80B4F990 0C034236 */ jal Matrix_Get -/* 01004 80B4F994 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 01008 80B4F998 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 0100C 80B4F99C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC -/* 01014 80B4F9A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 -/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) -/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 -/* 01024 80B4F9B4 00000000 */ nop -/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) -/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 -/* 01034 80B4F9C4 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) -/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 -/* 01044 80B4F9D4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) -/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 -/* 01054 80B4F9E4 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 -.L80B4F9E8: -/* 01058 80B4F9E8 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) -/* 01060 80B4F9F0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01064 80B4F9F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01068 80B4F9F8 846C001E */ lh $t4, 0x001E($v1) ## 0000001E -/* 0106C 80B4F9FC 846E0020 */ lh $t6, 0x0020($v1) ## 00000020 -/* 01070 80B4FA00 84780022 */ lh $t8, 0x0022($v1) ## 00000022 -/* 01074 80B4FA04 844B14B0 */ lh $t3, 0x14B0($v0) ## 801614B0 -/* 01078 80B4FA08 844D14B2 */ lh $t5, 0x14B2($v0) ## 801614B2 -/* 0107C 80B4FA0C 844F14B4 */ lh $t7, 0x14B4($v0) ## 801614B4 -/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 -/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 -/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 -/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 -/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 -/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 -/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 -/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 -/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateRPY -/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 -/* 010A8 80B4FA38 3C0180B5 */ lui $at, %hi(D_80B52BCC) ## $at = 80B50000 -/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) -/* 010B0 80B4FA40 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 010B4 80B4FA44 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 010B8 80B4FA48 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate -/* 010C0 80B4FA50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) -/* 010C8 80B4FA58 3C0580B5 */ lui $a1, %hi(D_80B52950) ## $a1 = 80B50000 -/* 010CC 80B4FA5C 24A52950 */ addiu $a1, $a1, %lo(D_80B52950) ## $a1 = 80B52950 -/* 010D0 80B4FA60 240604A5 */ addiu $a2, $zero, 0x04A5 ## $a2 = 000004A5 -/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx -/* 010D8 80B4FA68 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get -/* 010E0 80B4FA70 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 010E4 80B4FA74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 010E8 80B4FA78 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC -/* 010F0 80B4FA80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 -/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) -/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 -/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) -/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) -/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 -/* 0110C 80B4FA9C 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) -/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 -/* 0111C 80B4FAAC 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) -/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 -/* 0112C 80B4FABC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -.L80B4FAC0: -/* 01130 80B4FAC0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01134 80B4FAC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) -/* 0113C 80B4FACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01140 80B4FAD0 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 -/* 01144 80B4FAD4 844B14B8 */ lh $t3, 0x14B8($v0) ## 801614B8 -/* 01148 80B4FAD8 844D14BA */ lh $t5, 0x14BA($v0) ## 801614BA -/* 0114C 80B4FADC 852A0024 */ lh $t2, 0x0024($t1) ## 00000024 -/* 01150 80B4FAE0 852C0026 */ lh $t4, 0x0026($t1) ## 00000026 -/* 01154 80B4FAE4 852E0028 */ lh $t6, 0x0028($t1) ## 00000028 -/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 -/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 -/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 -/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 -/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 -/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 -/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 -/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 -/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateRPY -/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 -/* 01180 80B4FB10 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 01184 80B4FB14 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 01188 80B4FB18 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 0118C 80B4FB1C 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 01190 80B4FB20 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate -/* 01198 80B4FB28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) -/* 011A0 80B4FB30 3C0580B5 */ lui $a1, %hi(D_80B52960) ## $a1 = 80B50000 -/* 011A4 80B4FB34 24A52960 */ addiu $a1, $a1, %lo(D_80B52960) ## $a1 = 80B52960 -/* 011A8 80B4FB38 240604B8 */ addiu $a2, $zero, 0x04B8 ## $a2 = 000004B8 -/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx -/* 011B0 80B4FB40 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull -/* 011B8 80B4FB48 00000000 */ nop -/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull -/* 011C0 80B4FB50 00000000 */ nop -/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) -/* 011C8 80B4FB58 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 011CC 80B4FB5C AF0F024C */ sw $t7, 0x024C($t8) ## 0000024C -.L80B4FB60: -/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011D4 80B4FB64 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 011D8 80B4FB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011DC 80B4FB6C 03E00008 */ jr $ra -/* 011E0 80B4FB70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s deleted file mode 100644 index b5dedaabe1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ /dev/null @@ -1,102 +0,0 @@ -.rdata -glabel D_80B52970 - .asciz "../z_en_zl2.c" - .balign 4 - -.late_rodata -glabel D_80B52BD0 - .word 0x4474C000 -glabel D_80B52BD4 - .float 1.2 - -.text -glabel func_80B4FB74 -/* 011E4 80B4FB74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 011E8 80B4FB78 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011F0 80B4FB80 AFA60040 */ sw $a2, 0x0040($sp) -/* 011F4 80B4FB84 14A1004D */ bne $a1, $at, .L80B4FCBC -/* 011F8 80B4FB88 AFA70044 */ sw $a3, 0x0044($sp) -/* 011FC 80B4FB8C 8FAE0048 */ lw $t6, 0x0048($sp) -/* 01200 80B4FB90 8DCF0254 */ lw $t7, 0x0254($t6) ## 00000254 -/* 01204 80B4FB94 51E0000F */ beql $t7, $zero, .L80B4FBD4 -/* 01208 80B4FB98 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 0120C 80B4FB9C 94981D74 */ lhu $t8, 0x1D74($a0) ## 00001D74 -/* 01210 80B4FBA0 8FB9004C */ lw $t9, 0x004C($sp) -/* 01214 80B4FBA4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01218 80B4FBA8 2B010384 */ slti $at, $t8, 0x0384 -/* 0121C 80B4FBAC 54200009 */ bnel $at, $zero, .L80B4FBD4 -/* 01220 80B4FBB0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 01224 80B4FBB4 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 -/* 01228 80B4FBB8 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 -/* 0122C 80B4FBBC 254ABAE8 */ addiu $t2, $t2, 0xBAE8 ## $t2 = 0600BAE8 -/* 01230 80B4FBC0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 01234 80B4FBC4 AF280000 */ sw $t0, 0x0000($t9) ## 00000000 -/* 01238 80B4FBC8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 0123C 80B4FBCC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01240 80B4FBD0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -.L80B4FBD4: -/* 01244 80B4FBD4 AFA40038 */ sw $a0, 0x0038($sp) -/* 01248 80B4FBD8 0C034213 */ jal Matrix_Push -/* 0124C 80B4FBDC AFA20024 */ sw $v0, 0x0024($sp) -/* 01250 80B4FBE0 8FA20024 */ lw $v0, 0x0024($sp) -/* 01254 80B4FBE4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01258 80B4FBE8 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 0125C 80B4FBEC 904B015D */ lbu $t3, 0x015D($v0) ## 0000015D -/* 01260 80B4FBF0 258CBAE8 */ addiu $t4, $t4, 0xBAE8 ## $t4 = 0600BAE8 -/* 01264 80B4FBF4 24440A20 */ addiu $a0, $v0, 0x0A20 ## $a0 = 00000A20 -/* 01268 80B4FBF8 1561002E */ bne $t3, $at, .L80B4FCB4 -/* 0126C 80B4FBFC 00000000 */ nop -/* 01270 80B4FC00 0C03423F */ jal Matrix_Put -/* 01274 80B4FC04 AFAC0018 */ sw $t4, 0x0018($sp) -/* 01278 80B4FC08 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 0127C 80B4FC0C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 01280 80B4FC10 3C0180B5 */ lui $at, %hi(D_80B52BD0) ## $at = 80B50000 -/* 01284 80B4FC14 3C06C3BB */ lui $a2, 0xC3BB ## $a2 = C3BB0000 -/* 01288 80B4FC18 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3BB8000 -/* 0128C 80B4FC1C C42E2BD0 */ lwc1 $f14, %lo(D_80B52BD0)($at) -/* 01290 80B4FC20 0C034261 */ jal Matrix_Translate -/* 01294 80B4FC24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01298 80B4FC28 2404A219 */ addiu $a0, $zero, 0xA219 ## $a0 = FFFFA219 -/* 0129C 80B4FC2C 2405AC17 */ addiu $a1, $zero, 0xAC17 ## $a1 = FFFFAC17 -/* 012A0 80B4FC30 24063333 */ addiu $a2, $zero, 0x3333 ## $a2 = 00003333 -/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateRPY -/* 012A8 80B4FC38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80B4FC3C 3C0180B5 */ lui $at, %hi(D_80B52BD4) ## $at = 80B50000 -/* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) -/* 012B4 80B4FC44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B8 80B4FC48 44066000 */ mfc1 $a2, $f12 -/* 012BC 80B4FC4C 0C0342A3 */ jal Matrix_Scale -/* 012C0 80B4FC50 46006386 */ mov.s $f14, $f12 -/* 012C4 80B4FC54 8FA7004C */ lw $a3, 0x004C($sp) -/* 012C8 80B4FC58 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 012CC 80B4FC5C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 012D0 80B4FC60 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 012D4 80B4FC64 3C0580B5 */ lui $a1, %hi(D_80B52970) ## $a1 = 80B50000 -/* 012D8 80B4FC68 24A52970 */ addiu $a1, $a1, %lo(D_80B52970) ## $a1 = 80B52970 -/* 012DC 80B4FC6C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 012E0 80B4FC70 ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 -/* 012E4 80B4FC74 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 012E8 80B4FC78 8FAF0038 */ lw $t7, 0x0038($sp) -/* 012EC 80B4FC7C 240604E5 */ addiu $a2, $zero, 0x04E5 ## $a2 = 000004E5 -/* 012F0 80B4FC80 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012F4 80B4FC84 0C0346A2 */ jal Matrix_NewMtx -/* 012F8 80B4FC88 AFA20020 */ sw $v0, 0x0020($sp) -/* 012FC 80B4FC8C 8FA30020 */ lw $v1, 0x0020($sp) -/* 01300 80B4FC90 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 01304 80B4FC94 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01308 80B4FC98 8FB8004C */ lw $t8, 0x004C($sp) -/* 0130C 80B4FC9C 8F020000 */ lw $v0, 0x0000($t8) ## 00000000 -/* 01310 80B4FCA0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 01314 80B4FCA4 AF080000 */ sw $t0, 0x0000($t8) ## 00000000 -/* 01318 80B4FCA8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0131C 80B4FCAC 8FA90018 */ lw $t1, 0x0018($sp) -/* 01320 80B4FCB0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -.L80B4FCB4: -/* 01324 80B4FCB4 0C034221 */ jal Matrix_Pull -/* 01328 80B4FCB8 00000000 */ nop -.L80B4FCBC: -/* 0132C 80B4FCBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01330 80B4FCC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01334 80B4FCC4 03E00008 */ jr $ra -/* 01338 80B4FCC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s deleted file mode 100644 index 77d09739ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B4FCCC -/* 0133C 80B4FCCC 8C820274 */ lw $v0, 0x0274($a0) ## 00000274 -/* 01340 80B4FCD0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01344 80B4FCD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01348 80B4FCD8 00027100 */ sll $t6, $v0, 4 -/* 0134C 80B4FCDC 01C27021 */ addu $t6, $t6, $v0 -/* 01350 80B4FCE0 000E7080 */ sll $t6, $t6, 2 -/* 01354 80B4FCE4 00AE7821 */ addu $t7, $a1, $t6 -/* 01358 80B4FCE8 030FC021 */ addu $t8, $t8, $t7 -/* 0135C 80B4FCEC 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 -/* 01360 80B4FCF0 0301C821 */ addu $t9, $t8, $at -/* 01364 80B4FCF4 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 01368 80B4FCF8 03E00008 */ jr $ra -/* 0136C 80B4FCFC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s deleted file mode 100644 index 0cd5e9bd8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B4FD00 -/* 01370 80B4FD00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01374 80B4FD04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01378 80B4FD08 AFA40028 */ sw $a0, 0x0028($sp) -/* 0137C 80B4FD0C AFA5002C */ sw $a1, 0x002C($sp) -/* 01380 80B4FD10 AFA60030 */ sw $a2, 0x0030($sp) -/* 01384 80B4FD14 AFA70034 */ sw $a3, 0x0034($sp) -/* 01388 80B4FD18 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0138C 80B4FD1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01390 80B4FD20 8FAE0038 */ lw $t6, 0x0038($sp) -/* 01394 80B4FD24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01398 80B4FD28 8FA5002C */ lw $a1, 0x002C($sp) -/* 0139C 80B4FD2C 15C00007 */ bne $t6, $zero, .L80B4FD4C -/* 013A0 80B4FD30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013A4 80B4FD34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 013A8 80B4FD38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 013AC 80B4FD3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013B0 80B4FD40 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 013B4 80B4FD44 10000006 */ beq $zero, $zero, .L80B4FD60 -/* 013B8 80B4FD48 468020A0 */ cvt.s.w $f2, $f4 -.L80B4FD4C: -/* 013BC 80B4FD4C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 013C0 80B4FD50 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 013C4 80B4FD54 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 013C8 80B4FD58 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 013CC 80B4FD5C 46803020 */ cvt.s.w $f0, $f6 -.L80B4FD60: -/* 013D0 80B4FD60 93AF0033 */ lbu $t7, 0x0033($sp) -/* 013D4 80B4FD64 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 013D8 80B4FD68 44066000 */ mfc1 $a2, $f12 -/* 013DC 80B4FD6C 44070000 */ mfc1 $a3, $f0 -/* 013E0 80B4FD70 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 013E4 80B4FD74 AFAF0014 */ sw $t7, 0x0014($sp) -/* 013E8 80B4FD78 0C029468 */ jal SkelAnime_ChangeAnim - -/* 013EC 80B4FD7C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 013F0 80B4FD80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013F4 80B4FD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013F8 80B4FD88 03E00008 */ jr $ra -/* 013FC 80B4FD8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s deleted file mode 100644 index 8b22547d26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B4FD90 -/* 01400 80B4FD90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01404 80B4FD94 AFA50024 */ sw $a1, 0x0024($sp) -/* 01408 80B4FD98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0140C 80B4FD9C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01410 80B4FDA0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01414 80B4FDA4 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 01418 80B4FDA8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0141C 80B4FDAC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01420 80B4FDB0 0C2D3F40 */ jal func_80B4FD00 -/* 01424 80B4FDB4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01428 80B4FDB8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0142C 80B4FDBC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01430 80B4FDC0 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01434 80B4FDC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01438 80B4FDC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0143C 80B4FDCC 03E00008 */ jr $ra -/* 01440 80B4FDD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s deleted file mode 100644 index d46d24b723..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4FDD4 -/* 01444 80B4FDD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01448 80B4FDD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0144C 80B4FDDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01450 80B4FDE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01454 80B4FDE4 0C0295B2 */ jal func_800A56C8 -/* 01458 80B4FDE8 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 0145C 80B4FDEC 10400004 */ beq $v0, $zero, .L80B4FE00 -/* 01460 80B4FDF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01464 80B4FDF4 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01468 80B4FDF8 0C01E245 */ jal func_80078914 -/* 0146C 80B4FDFC 24050802 */ addiu $a1, $zero, 0x0802 ## $a1 = 00000802 -.L80B4FE00: -/* 01470 80B4FE00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01474 80B4FE04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01478 80B4FE08 03E00008 */ jr $ra -/* 0147C 80B4FE0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s deleted file mode 100644 index 7562fedbeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4FE10 -/* 01480 80B4FE10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01484 80B4FE14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01488 80B4FE18 94821D74 */ lhu $v0, 0x1D74($a0) ## 00001D74 -/* 0148C 80B4FE1C 2841033E */ slti $at, $v0, 0x033E -/* 01490 80B4FE20 14200005 */ bne $at, $zero, .L80B4FE38 -/* 01494 80B4FE24 28410439 */ slti $at, $v0, 0x0439 -/* 01498 80B4FE28 50200004 */ beql $at, $zero, .L80B4FE3C -/* 0149C 80B4FE2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014A0 80B4FE30 0C01E233 */ jal func_800788CC -/* 014A4 80B4FE34 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -.L80B4FE38: -/* 014A8 80B4FE38 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B4FE3C: -/* 014AC 80B4FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014B0 80B4FE40 03E00008 */ jr $ra -/* 014B4 80B4FE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s deleted file mode 100644 index 932383f40a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE48 -/* 014B8 80B4FE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014BC 80B4FE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 014C0 80B4FE50 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 014C4 80B4FE54 0C01E245 */ jal func_80078914 -/* 014C8 80B4FE58 24052086 */ addiu $a1, $zero, 0x2086 ## $a1 = 00002086 -/* 014CC 80B4FE5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014D0 80B4FE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014D4 80B4FE64 03E00008 */ jr $ra -/* 014D8 80B4FE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s deleted file mode 100644 index 9640eb038c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE6C -/* 014DC 80B4FE6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014E0 80B4FE70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014E4 80B4FE74 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 014E8 80B4FE78 0C01E245 */ jal func_80078914 -/* 014EC 80B4FE7C 240539C7 */ addiu $a1, $zero, 0x39C7 ## $a1 = 000039C7 -/* 014F0 80B4FE80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014F4 80B4FE84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014F8 80B4FE88 03E00008 */ jr $ra -/* 014FC 80B4FE8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s deleted file mode 100644 index 884947d12f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FE90 -/* 01500 80B4FE90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01504 80B4FE94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01508 80B4FE98 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 0150C 80B4FE9C 0C01E245 */ jal func_80078914 -/* 01510 80B4FEA0 24056878 */ addiu $a1, $zero, 0x6878 ## $a1 = 00006878 -/* 01514 80B4FEA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01518 80B4FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0151C 80B4FEAC 03E00008 */ jr $ra -/* 01520 80B4FEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s deleted file mode 100644 index a2bbf05739..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FEB4 -/* 01524 80B4FEB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01528 80B4FEB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0152C 80B4FEBC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01530 80B4FEC0 0C01E245 */ jal func_80078914 -/* 01534 80B4FEC4 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -/* 01538 80B4FEC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0153C 80B4FECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01540 80B4FED0 03E00008 */ jr $ra -/* 01544 80B4FED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s deleted file mode 100644 index 745d0a8411..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4FED8 -/* 01548 80B4FED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0154C 80B4FEDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01550 80B4FEE0 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01554 80B4FEE4 0C01E245 */ jal func_80078914 -/* 01558 80B4FEE8 24056875 */ addiu $a1, $zero, 0x6875 ## $a1 = 00006875 -/* 0155C 80B4FEEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01560 80B4FEF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01564 80B4FEF4 03E00008 */ jr $ra -/* 01568 80B4FEF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s deleted file mode 100644 index ed3be04138..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B4FEFC -/* 0156C 80B4FEFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01570 80B4FF00 AFBF002C */ sw $ra, 0x002C($sp) -/* 01574 80B4FF04 AFA40030 */ sw $a0, 0x0030($sp) -/* 01578 80B4FF08 8C8F0244 */ lw $t7, 0x0244($a0) ## 00000244 -/* 0157C 80B4FF0C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01580 80B4FF10 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01584 80B4FF14 15E00017 */ bne $t7, $zero, .L80B4FF74 -/* 01588 80B4FF18 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 0158C 80B4FF1C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01590 80B4FF20 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 01594 80B4FF24 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01598 80B4FF28 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0159C 80B4FF2C C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 015A0 80B4FF30 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 015A4 80B4FF34 44070000 */ mfc1 $a3, $f0 -/* 015A8 80B4FF38 46062080 */ add.s $f2, $f4, $f6 -/* 015AC 80B4FF3C AFA50034 */ sw $a1, 0x0034($sp) -/* 015B0 80B4FF40 AFB80024 */ sw $t8, 0x0024($sp) -/* 015B4 80B4FF44 AFA00020 */ sw $zero, 0x0020($sp) -/* 015B8 80B4FF48 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 015BC 80B4FF4C AFA0001C */ sw $zero, 0x001C($sp) -/* 015C0 80B4FF50 AFA00018 */ sw $zero, 0x0018($sp) -/* 015C4 80B4FF54 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 015C8 80B4FF58 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 015CC 80B4FF5C 8FA40034 */ lw $a0, 0x0034($sp) -/* 015D0 80B4FF60 0C021344 */ jal Item_Give -/* 015D4 80B4FF64 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 -/* 015D8 80B4FF68 8FA80030 */ lw $t0, 0x0030($sp) -/* 015DC 80B4FF6C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015E0 80B4FF70 AD190244 */ sw $t9, 0x0244($t0) ## 00000244 -.L80B4FF74: -/* 015E4 80B4FF74 8FBF002C */ lw $ra, 0x002C($sp) -/* 015E8 80B4FF78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 015EC 80B4FF7C 03E00008 */ jr $ra -/* 015F0 80B4FF80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s deleted file mode 100644 index a181216d15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B4FF84 -/* 015F4 80B4FF84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 015F8 80B4FF88 AFBF0034 */ sw $ra, 0x0034($sp) -/* 015FC 80B4FF8C AFB00030 */ sw $s0, 0x0030($sp) -/* 01600 80B4FF90 8C8E0250 */ lw $t6, 0x0250($a0) ## 00000250 -/* 01604 80B4FF94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01608 80B4FF98 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 0160C 80B4FF9C 15C0000F */ bne $t6, $zero, .L80B4FFDC -/* 01610 80B4FFA0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 01614 80B4FFA4 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01618 80B4FFA8 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 0161C 80B4FFAC C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 01620 80B4FFB0 44070000 */ mfc1 $a3, $f0 -/* 01624 80B4FFB4 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01628 80B4FFB8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0162C 80B4FFBC AFA0001C */ sw $zero, 0x001C($sp) -/* 01630 80B4FFC0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01634 80B4FFC4 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01638 80B4FFC8 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0163C 80B4FFCC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01640 80B4FFD0 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 01644 80B4FFD4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01648 80B4FFD8 AE180250 */ sw $t8, 0x0250($s0) ## 00000250 -.L80B4FFDC: -/* 0164C 80B4FFDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01650 80B4FFE0 8FB00030 */ lw $s0, 0x0030($sp) -/* 01654 80B4FFE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01658 80B4FFE8 03E00008 */ jr $ra -/* 0165C 80B4FFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s deleted file mode 100644 index 03da27eda2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B4FFF0 -/* 01660 80B4FFF0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01664 80B4FFF4 AFBF003C */ sw $ra, 0x003C($sp) -/* 01668 80B4FFF8 AFB00038 */ sw $s0, 0x0038($sp) -/* 0166C 80B4FFFC 8C8E0248 */ lw $t6, 0x0248($a0) ## 00000248 -/* 01670 80B50000 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01674 80B50004 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01678 80B50008 15C0001B */ bne $t6, $zero, .L80B50078 -/* 0167C 80B5000C 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01680 80B50010 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01684 80B50014 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01688 80B50018 44814000 */ mtc1 $at, $f8 ## $f8 = -26.00 -/* 0168C 80B5001C 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 01690 80B50020 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 01694 80B50024 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01698 80B50028 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0169C 80B5002C C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 016A0 80B50030 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 016A4 80B50034 468021A0 */ cvt.s.w $f6, $f4 -/* 016A8 80B50038 24194000 */ addiu $t9, $zero, 0x4000 ## $t9 = 00004000 -/* 016AC 80B5003C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 016B0 80B50040 AFA80028 */ sw $t0, 0x0028($sp) -/* 016B4 80B50044 AFB90020 */ sw $t9, 0x0020($sp) -/* 016B8 80B50048 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016BC 80B5004C 46083280 */ add.s $f10, $f6, $f8 -/* 016C0 80B50050 AFA00024 */ sw $zero, 0x0024($sp) -/* 016C4 80B50054 AFA0001C */ sw $zero, 0x001C($sp) -/* 016C8 80B50058 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 016CC 80B5005C 46105080 */ add.s $f2, $f10, $f16 -/* 016D0 80B50060 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 016D4 80B50064 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 016D8 80B50068 0C00C916 */ jal Actor_SpawnAttached - -/* 016DC 80B5006C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 016E0 80B50070 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 016E4 80B50074 AE090248 */ sw $t1, 0x0248($s0) ## 00000248 -.L80B50078: -/* 016E8 80B50078 8FBF003C */ lw $ra, 0x003C($sp) -/* 016EC 80B5007C 8FB00038 */ lw $s0, 0x0038($sp) -/* 016F0 80B50080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016F4 80B50084 03E00008 */ jr $ra -/* 016F8 80B50088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s deleted file mode 100644 index 5c3fa412d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B5008C -/* 016FC 80B5008C 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 01700 80B50090 10400011 */ beq $v0, $zero, .L80B500D8 -/* 01704 80B50094 00000000 */ nop -/* 01708 80B50098 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0170C 80B5009C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01710 80B500A0 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01714 80B500A4 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 01718 80B500A8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0171C 80B500AC 44815000 */ mtc1 $at, $f10 ## $f10 = -26.00 -/* 01720 80B500B0 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 -/* 01724 80B500B4 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 01728 80B500B8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0172C 80B500BC 00000000 */ nop -/* 01730 80B500C0 46803220 */ cvt.s.w $f8, $f6 -/* 01734 80B500C4 460A4400 */ add.s $f16, $f8, $f10 -/* 01738 80B500C8 46128100 */ add.s $f4, $f16, $f18 -/* 0173C 80B500CC E4440028 */ swc1 $f4, 0x0028($v0) ## 00000028 -/* 01740 80B500D0 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 01744 80B500D4 E446002C */ swc1 $f6, 0x002C($v0) ## 0000002C -.L80B500D8: -/* 01748 80B500D8 03E00008 */ jr $ra -/* 0174C 80B500DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s deleted file mode 100644 index 396e9239e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80B500E0 -/* 01750 80B500E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01754 80B500E4 AFA40040 */ sw $a0, 0x0040($sp) -/* 01758 80B500E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0175C 80B500EC AFA50044 */ sw $a1, 0x0044($sp) -/* 01760 80B500F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01764 80B500F4 0C2D3B65 */ jal func_80B4ED94 -/* 01768 80B500F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0176C 80B500FC 1040002D */ beq $v0, $zero, .L80B501B4 -/* 01770 80B50100 8FAE0044 */ lw $t6, 0x0044($sp) -/* 01774 80B50104 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 01778 80B50108 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 0177C 80B5010C 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 01780 80B50110 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 01784 80B50114 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01788 80B50118 AFA2003C */ sw $v0, 0x003C($sp) -/* 0178C 80B5011C 0C01BE6F */ jal func_8006F9BC -/* 01790 80B50120 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01794 80B50124 8FA3003C */ lw $v1, 0x003C($sp) -/* 01798 80B50128 8FA20040 */ lw $v0, 0x0040($sp) -/* 0179C 80B5012C 8C790010 */ lw $t9, 0x0010($v1) ## 00000010 -/* 017A0 80B50130 8C78000C */ lw $t8, 0x000C($v1) ## 0000000C -/* 017A4 80B50134 8C690018 */ lw $t1, 0x0018($v1) ## 00000018 -/* 017A8 80B50138 8C680014 */ lw $t0, 0x0014($v1) ## 00000014 -/* 017AC 80B5013C 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 017B0 80B50140 8C6B0020 */ lw $t3, 0x0020($v1) ## 00000020 -/* 017B4 80B50144 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 017B8 80B50148 8C6A001C */ lw $t2, 0x001C($v1) ## 0000001C -/* 017BC 80B5014C 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 017C0 80B50150 46803320 */ cvt.s.w $f12, $f6 -/* 017C4 80B50154 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 017C8 80B50158 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 017CC 80B5015C 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 017D0 80B50160 468020A0 */ cvt.s.w $f2, $f4 -/* 017D4 80B50164 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 017D8 80B50168 46805420 */ cvt.s.w $f16, $f10 -/* 017DC 80B5016C 468043A0 */ cvt.s.w $f14, $f8 -/* 017E0 80B50170 46803220 */ cvt.s.w $f8, $f6 -/* 017E4 80B50174 468024A0 */ cvt.s.w $f18, $f4 -/* 017E8 80B50178 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 017EC 80B5017C 46028281 */ sub.s $f10, $f16, $f2 -/* 017F0 80B50180 460C9201 */ sub.s $f8, $f18, $f12 -/* 017F4 80B50184 46005102 */ mul.s $f4, $f10, $f0 -/* 017F8 80B50188 00000000 */ nop -/* 017FC 80B5018C 46004282 */ mul.s $f10, $f8, $f0 -/* 01800 80B50190 46022180 */ add.s $f6, $f4, $f2 -/* 01804 80B50194 460C5100 */ add.s $f4, $f10, $f12 -/* 01808 80B50198 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 0180C 80B5019C E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 01810 80B501A0 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01814 80B501A4 460E3201 */ sub.s $f8, $f6, $f14 -/* 01818 80B501A8 46004282 */ mul.s $f10, $f8, $f0 -/* 0181C 80B501AC 460E5100 */ add.s $f4, $f10, $f14 -/* 01820 80B501B0 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -.L80B501B4: -/* 01824 80B501B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01828 80B501B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0182C 80B501BC 03E00008 */ jr $ra -/* 01830 80B501C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s deleted file mode 100644 index fa6a340d30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B501C4 -/* 01834 80B501C4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 01838 80B501C8 10400005 */ beq $v0, $zero, .L80B501E0 -/* 0183C 80B501CC 00000000 */ nop -/* 01840 80B501D0 44852000 */ mtc1 $a1, $f4 ## $f4 = 0.00 -/* 01844 80B501D4 00000000 */ nop -/* 01848 80B501D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0184C 80B501DC E44601A8 */ swc1 $f6, 0x01A8($v0) ## 000001A8 -.L80B501E0: -/* 01850 80B501E0 03E00008 */ jr $ra -/* 01854 80B501E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s deleted file mode 100644 index 81b0a62a02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B501E8 -/* 01858 80B501E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0185C 80B501EC AFA40018 */ sw $a0, 0x0018($sp) -/* 01860 80B501F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01864 80B501F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01868 80B501F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0186C 80B501FC 0C2D3B65 */ jal func_80B4ED94 -/* 01870 80B50200 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01874 80B50204 10400012 */ beq $v0, $zero, .L80B50250 -/* 01878 80B50208 8FAE001C */ lw $t6, 0x001C($sp) -/* 0187C 80B5020C 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 01880 80B50210 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 01884 80B50214 0C01BE4F */ jal func_8006F93C -/* 01888 80B50218 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 0188C 80B5021C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01890 80B50220 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01894 80B50224 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01898 80B50228 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 -/* 0189C 80B5022C 46002181 */ sub.s $f6, $f4, $f0 -/* 018A0 80B50230 8FA40018 */ lw $a0, 0x0018($sp) -/* 018A4 80B50234 46083282 */ mul.s $f10, $f6, $f8 -/* 018A8 80B50238 4600540D */ trunc.w.s $f16, $f10 -/* 018AC 80B5023C 44058000 */ mfc1 $a1, $f16 -/* 018B0 80B50240 00000000 */ nop -/* 018B4 80B50244 AC8501A8 */ sw $a1, 0x01A8($a0) ## 000001A8 -/* 018B8 80B50248 0C2D4071 */ jal func_80B501C4 -/* 018BC 80B5024C A08500C8 */ sb $a1, 0x00C8($a0) ## 000000C8 -.L80B50250: -/* 018C0 80B50250 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018C4 80B50254 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 80B50258 03E00008 */ jr $ra -/* 018CC 80B5025C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s deleted file mode 100644 index fe75500b54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B50260 -/* 018D0 80B50260 AFA50004 */ sw $a1, 0x0004($sp) -/* 018D4 80B50264 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 018D8 80B50268 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 018DC 80B5026C AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 018E0 80B50270 03E00008 */ jr $ra -/* 018E4 80B50274 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s deleted file mode 100644 index d31c7ca080..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B50278 -/* 018E8 80B50278 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018EC 80B5027C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 018F0 80B50280 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018F4 80B50284 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 018F8 80B50288 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018FC 80B5028C 0C2D3B65 */ jal func_80B4ED94 -/* 01900 80B50290 AFA60018 */ sw $a2, 0x0018($sp) -/* 01904 80B50294 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 01908 80B50298 8FA60018 */ lw $a2, 0x0018($sp) -/* 0190C 80B5029C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01910 80B502A0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 01914 80B502A4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01918 80B502A8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0191C 80B502AC 468021A0 */ cvt.s.w $f6, $f4 -/* 01920 80B502B0 E4C60024 */ swc1 $f6, 0x0024($a2) ## 00000024 -/* 01924 80B502B4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 01928 80B502B8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0192C 80B502BC 00000000 */ nop -/* 01930 80B502C0 468042A0 */ cvt.s.w $f10, $f8 -/* 01934 80B502C4 E4CA0028 */ swc1 $f10, 0x0028($a2) ## 00000028 -/* 01938 80B502C8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0193C 80B502CC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 01940 80B502D0 00000000 */ nop -/* 01944 80B502D4 468084A0 */ cvt.s.w $f18, $f16 -/* 01948 80B502D8 E4D2002C */ swc1 $f18, 0x002C($a2) ## 0000002C -/* 0194C 80B502DC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 01950 80B502E0 A0D900C8 */ sb $t9, 0x00C8($a2) ## 000000C8 -/* 01954 80B502E4 ACC8019C */ sw $t0, 0x019C($a2) ## 0000019C -/* 01958 80B502E8 ACC901A0 */ sw $t1, 0x01A0($a2) ## 000001A0 -/* 0195C 80B502EC A4C300B6 */ sh $v1, 0x00B6($a2) ## 000000B6 -/* 01960 80B502F0 A4C30032 */ sh $v1, 0x0032($a2) ## 00000032 -/* 01964 80B502F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01968 80B502F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0196C 80B502FC 03E00008 */ jr $ra -/* 01970 80B50300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s deleted file mode 100644 index 223b0243e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s +++ /dev/null @@ -1,60 +0,0 @@ -.late_rodata -glabel D_80B52BD8 - .word 0x4622F983 - -.text -glabel func_80B50304 -/* 01974 80B50304 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01978 80B50308 AFB00020 */ sw $s0, 0x0020($sp) -/* 0197C 80B5030C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01980 80B50310 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01984 80B50314 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01988 80B50318 0C2D3B65 */ jal func_80B4ED94 -/* 0198C 80B5031C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01990 80B50320 8C4E0018 */ lw $t6, 0x0018($v0) ## 00000018 -/* 01994 80B50324 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 01998 80B50328 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0199C 80B5032C 24A503BC */ addiu $a1, $a1, 0x03BC ## $a1 = 060003BC -/* 019A0 80B50330 01CFC023 */ subu $t8, $t6, $t7 -/* 019A4 80B50334 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 019A8 80B50338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019AC 80B5033C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 019B0 80B50340 468021A0 */ cvt.s.w $f6, $f4 -/* 019B4 80B50344 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 019B8 80B50348 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 019BC 80B5034C 8C480014 */ lw $t0, 0x0014($v0) ## 00000014 -/* 019C0 80B50350 8C590020 */ lw $t9, 0x0020($v0) ## 00000020 -/* 019C4 80B50354 AFA00010 */ sw $zero, 0x0010($sp) -/* 019C8 80B50358 03284823 */ subu $t1, $t9, $t0 -/* 019CC 80B5035C 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 019D0 80B50360 00000000 */ nop -/* 019D4 80B50364 468042A0 */ cvt.s.w $f10, $f8 -/* 019D8 80B50368 0C2D3F40 */ jal func_80B4FD00 -/* 019DC 80B5036C E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 019E0 80B50370 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 019E4 80B50374 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 019E8 80B50378 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 019EC 80B5037C AE0A019C */ sw $t2, 0x019C($s0) ## 0000019C -/* 019F0 80B50380 AE0B01A0 */ sw $t3, 0x01A0($s0) ## 000001A0 -/* 019F4 80B50384 260300B4 */ addiu $v1, $s0, 0x00B4 ## $v1 = 000000B4 -/* 019F8 80B50388 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 019FC 80B5038C E610023C */ swc1 $f16, 0x023C($s0) ## 0000023C -/* 01A00 80B50390 A06C0014 */ sb $t4, 0x0014($v1) ## 000000C8 -/* 01A04 80B50394 AFA30028 */ sw $v1, 0x0028($sp) -/* 01A08 80B50398 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 01A0C 80B5039C 0C03F494 */ jal Math_atan2f -/* 01A10 80B503A0 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 01A14 80B503A4 3C0180B5 */ lui $at, %hi(D_80B52BD8) ## $at = 80B50000 -/* 01A18 80B503A8 C4322BD8 */ lwc1 $f18, %lo(D_80B52BD8)($at) -/* 01A1C 80B503AC 8FA30028 */ lw $v1, 0x0028($sp) -/* 01A20 80B503B0 46120102 */ mul.s $f4, $f0, $f18 -/* 01A24 80B503B4 4600218D */ trunc.w.s $f6, $f4 -/* 01A28 80B503B8 44023000 */ mfc1 $v0, $f6 -/* 01A2C 80B503BC 00000000 */ nop -/* 01A30 80B503C0 A4620002 */ sh $v0, 0x0002($v1) ## 00000002 -/* 01A34 80B503C4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01A38 80B503C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01A3C 80B503CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01A40 80B503D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01A44 80B503D4 03E00008 */ jr $ra -/* 01A48 80B503D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s deleted file mode 100644 index ba3de96989..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B503DC -/* 01A4C 80B503DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A50 80B503E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A54 80B503E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A58 80B503E8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01A5C 80B503EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A60 80B503F0 0C2D3B65 */ jal func_80B4ED94 -/* 01A64 80B503F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A68 80B503F8 10400008 */ beq $v0, $zero, .L80B5041C -/* 01A6C 80B503FC 8FAE001C */ lw $t6, 0x001C($sp) -/* 01A70 80B50400 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 01A74 80B50404 94580004 */ lhu $t8, 0x0004($v0) ## 00000004 -/* 01A78 80B50408 8FA80018 */ lw $t0, 0x0018($sp) -/* 01A7C 80B5040C 01F8082A */ slt $at, $t7, $t8 -/* 01A80 80B50410 14200002 */ bne $at, $zero, .L80B5041C -/* 01A84 80B50414 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 01A88 80B50418 AD19019C */ sw $t9, 0x019C($t0) ## 0000019C -.L80B5041C: -/* 01A8C 80B5041C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A90 80B50420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A94 80B50424 03E00008 */ jr $ra -/* 01A98 80B50428 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s deleted file mode 100644 index cb6a6fd0a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B5042C -/* 01A9C 80B5042C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AA0 80B50430 AFA50024 */ sw $a1, 0x0024($sp) -/* 01AA4 80B50434 AFBF001C */ sw $ra, 0x001C($sp) -/* 01AA8 80B50438 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01AAC 80B5043C 24A522D0 */ addiu $a1, $a1, 0x22D0 ## $a1 = 060022D0 -/* 01AB0 80B50440 AFA00010 */ sw $zero, 0x0010($sp) -/* 01AB4 80B50444 AFA40020 */ sw $a0, 0x0020($sp) -/* 01AB8 80B50448 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01ABC 80B5044C 0C2D3F40 */ jal func_80B4FD00 -/* 01AC0 80B50450 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01AC4 80B50454 8FA40020 */ lw $a0, 0x0020($sp) -/* 01AC8 80B50458 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01ACC 80B5045C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01AD0 80B50460 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01AD4 80B50464 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01AD8 80B50468 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01ADC 80B5046C AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01AE0 80B50470 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01AE4 80B50474 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 01AE8 80B50478 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AEC 80B5047C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01AF0 80B50480 03E00008 */ jr $ra -/* 01AF4 80B50484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s deleted file mode 100644 index 99f071263e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B50488 -/* 01AF8 80B50488 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AFC 80B5048C 10A0000D */ beq $a1, $zero, .L80B504C4 -/* 01B00 80B50490 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B04 80B50494 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B08 80B50498 24A52750 */ addiu $a1, $a1, 0x2750 ## $a1 = 06002750 -/* 01B0C 80B5049C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01B10 80B504A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01B14 80B504A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01B18 80B504A8 0C2D3F40 */ jal func_80B4FD00 -/* 01B1C 80B504AC AFA40020 */ sw $a0, 0x0020($sp) -/* 01B20 80B504B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B24 80B504B4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01B28 80B504B8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B2C 80B504BC AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01B30 80B504C0 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -.L80B504C4: -/* 01B34 80B504C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B38 80B504C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B3C 80B504CC 03E00008 */ jr $ra -/* 01B40 80B504D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s deleted file mode 100644 index 88b99bd50c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B504D4 -/* 01B44 80B504D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B48 80B504D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01B4C 80B504DC AFBF001C */ sw $ra, 0x001C($sp) -/* 01B50 80B504E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B54 80B504E4 24A5325C */ addiu $a1, $a1, 0x325C ## $a1 = 0600325C -/* 01B58 80B504E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01B5C 80B504EC AFA40020 */ sw $a0, 0x0020($sp) -/* 01B60 80B504F0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01B64 80B504F4 0C2D3F40 */ jal func_80B4FD00 -/* 01B68 80B504F8 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01B6C 80B504FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B70 80B50500 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01B74 80B50504 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01B78 80B50508 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01B7C 80B5050C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01B80 80B50510 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01B84 80B50514 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01B88 80B50518 0C2D3B46 */ jal func_80B4ED18 -/* 01B8C 80B5051C E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 01B90 80B50520 8FA40020 */ lw $a0, 0x0020($sp) -/* 01B94 80B50524 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01B98 80B50528 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01B9C 80B5052C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01BA0 80B50530 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BA4 80B50534 03E00008 */ jr $ra -/* 01BA8 80B50538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s deleted file mode 100644 index 058f01ede7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5053C -/* 01BAC 80B5053C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01BB0 80B50540 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BB4 80B50544 10A0000A */ beq $a1, $zero, .L80B50570 -/* 01BB8 80B50548 AFA40020 */ sw $a0, 0x0020($sp) -/* 01BBC 80B5054C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01BC0 80B50550 24A53538 */ addiu $a1, $a1, 0x3538 ## $a1 = 06003538 -/* 01BC4 80B50554 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01BC8 80B50558 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BCC 80B5055C 0C2D3F40 */ jal func_80B4FD00 -/* 01BD0 80B50560 AFA00010 */ sw $zero, 0x0010($sp) -/* 01BD4 80B50564 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01BD8 80B50568 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01BDC 80B5056C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50570: -/* 01BE0 80B50570 8FBF001C */ lw $ra, 0x001C($sp) -/* 01BE4 80B50574 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BE8 80B50578 03E00008 */ jr $ra -/* 01BEC 80B5057C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s deleted file mode 100644 index d7f99a47b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50580 -/* 01BF0 80B50580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01BF4 80B50584 AFA50024 */ sw $a1, 0x0024($sp) -/* 01BF8 80B50588 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BFC 80B5058C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C00 80B50590 24A50A50 */ addiu $a1, $a1, 0x0A50 ## $a1 = 06000A50 -/* 01C04 80B50594 AFA00010 */ sw $zero, 0x0010($sp) -/* 01C08 80B50598 AFA40020 */ sw $a0, 0x0020($sp) -/* 01C0C 80B5059C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01C10 80B505A0 0C2D3F40 */ jal func_80B4FD00 -/* 01C14 80B505A4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01C18 80B505A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01C1C 80B505AC 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 01C20 80B505B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01C24 80B505B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01C28 80B505B8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01C2C 80B505BC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01C30 80B505C0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01C34 80B505C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C38 80B505C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C3C 80B505CC 03E00008 */ jr $ra -/* 01C40 80B505D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s deleted file mode 100644 index 90855d5e91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B505D4 -/* 01C44 80B505D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01C48 80B505D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 01C4C 80B505DC 10A0000A */ beq $a1, $zero, .L80B50608 -/* 01C50 80B505E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01C54 80B505E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C58 80B505E8 24A50EB0 */ addiu $a1, $a1, 0x0EB0 ## $a1 = 06000EB0 -/* 01C5C 80B505EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C60 80B505F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01C64 80B505F4 0C2D3F40 */ jal func_80B4FD00 -/* 01C68 80B505F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01C6C 80B505FC 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01C70 80B50600 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01C74 80B50604 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50608: -/* 01C78 80B50608 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C7C 80B5060C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C80 80B50610 03E00008 */ jr $ra -/* 01C84 80B50614 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s deleted file mode 100644 index 3dd0cc050e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B50618 -/* 01C88 80B50618 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C8C 80B5061C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C90 80B50620 0C2D3FBF */ jal func_80B4FEFC -/* 01C94 80B50624 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C98 80B50628 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01C9C 80B5062C 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 01CA0 80B50630 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01CA4 80B50634 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CA8 80B50638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CAC 80B5063C 03E00008 */ jr $ra -/* 01CB0 80B50640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s deleted file mode 100644 index a4b5e04e7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B50644 -/* 01CB4 80B50644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01CB8 80B50648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CBC 80B5064C 0C2D3FE1 */ jal func_80B4FF84 -/* 01CC0 80B50650 AFA40018 */ sw $a0, 0x0018($sp) -/* 01CC4 80B50654 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01CC8 80B50658 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01CCC 80B5065C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -/* 01CD0 80B50660 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CD4 80B50664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CD8 80B50668 03E00008 */ jr $ra -/* 01CDC 80B5066C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s deleted file mode 100644 index f888f08f18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50670 -/* 01CE0 80B50670 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CE4 80B50674 AFA50024 */ sw $a1, 0x0024($sp) -/* 01CE8 80B50678 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CEC 80B5067C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01CF0 80B50680 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 01CF4 80B50684 AFA00010 */ sw $zero, 0x0010($sp) -/* 01CF8 80B50688 AFA40020 */ sw $a0, 0x0020($sp) -/* 01CFC 80B5068C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D00 80B50690 0C2D3F40 */ jal func_80B4FD00 -/* 01D04 80B50694 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01D08 80B50698 8FA40020 */ lw $a0, 0x0020($sp) -/* 01D0C 80B5069C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 01D10 80B506A0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01D14 80B506A4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01D18 80B506A8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01D1C 80B506AC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01D20 80B506B0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01D24 80B506B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D28 80B506B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D2C 80B506BC 03E00008 */ jr $ra -/* 01D30 80B506C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s deleted file mode 100644 index 6854e9dfed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B506C4 -/* 01D34 80B506C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D38 80B506C8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01D3C 80B506CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D40 80B506D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01D44 80B506D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D48 80B506D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D4C 80B506DC 24A5AAD4 */ addiu $a1, $a1, 0xAAD4 ## $a1 = 0600AAD4 -/* 01D50 80B506E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01D54 80B506E4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D58 80B506E8 0C2D3F40 */ jal func_80B4FD00 -/* 01D5C 80B506EC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01D60 80B506F0 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01D64 80B506F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01D68 80B506F8 AE0E019C */ sw $t6, 0x019C($s0) ## 0000019C -/* 01D6C 80B506FC AE0F01A0 */ sw $t7, 0x01A0($s0) ## 000001A0 -/* 01D70 80B50700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D74 80B50704 0C2D3B3A */ jal func_80B4ECE8 -/* 01D78 80B50708 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01D7C 80B5070C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D80 80B50710 0C2D3B46 */ jal func_80B4ED18 -/* 01D84 80B50714 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01D88 80B50718 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01D8C 80B5071C A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 01D90 80B50720 0C2D3FA4 */ jal func_80B4FE90 -/* 01D94 80B50724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D98 80B50728 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D9C 80B5072C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01DA0 80B50730 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01DA4 80B50734 03E00008 */ jr $ra -/* 01DA8 80B50738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s deleted file mode 100644 index fd065fca4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5073C -/* 01DAC 80B5073C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DB0 80B50740 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DB4 80B50744 10A0000A */ beq $a1, $zero, .L80B50770 -/* 01DB8 80B50748 AFA40020 */ sw $a0, 0x0020($sp) -/* 01DBC 80B5074C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DC0 80B50750 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 01DC4 80B50754 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DC8 80B50758 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01DCC 80B5075C 0C2D3F40 */ jal func_80B4FD00 -/* 01DD0 80B50760 AFA00010 */ sw $zero, 0x0010($sp) -/* 01DD4 80B50764 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01DD8 80B50768 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01DDC 80B5076C ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B50770: -/* 01DE0 80B50770 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DE4 80B50774 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01DE8 80B50778 03E00008 */ jr $ra -/* 01DEC 80B5077C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s deleted file mode 100644 index ce31fc01ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B50780 -/* 01DF0 80B50780 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DF4 80B50784 AFA50024 */ sw $a1, 0x0024($sp) -/* 01DF8 80B50788 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DFC 80B5078C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01E00 80B50790 24A51670 */ addiu $a1, $a1, 0x1670 ## $a1 = 06001670 -/* 01E04 80B50794 AFA00010 */ sw $zero, 0x0010($sp) -/* 01E08 80B50798 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E0C 80B5079C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E10 80B507A0 0C2D3F40 */ jal func_80B4FD00 -/* 01E14 80B507A4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01E18 80B507A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E1C 80B507AC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01E20 80B507B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01E24 80B507B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01E28 80B507B8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01E2C 80B507BC AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01E30 80B507C0 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01E34 80B507C4 0C2D3FFC */ jal func_80B4FFF0 -/* 01E38 80B507C8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E3C 80B507CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E40 80B507D0 0C2D3B3A */ jal func_80B4ECE8 -/* 01E44 80B507D4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01E48 80B507D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E4C 80B507DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E50 80B507E0 03E00008 */ jr $ra -/* 01E54 80B507E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s deleted file mode 100644 index d5412d43c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B507E8 -/* 01E58 80B507E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E5C 80B507EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01E60 80B507F0 10A0000A */ beq $a1, $zero, .L80B5081C -/* 01E64 80B507F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E68 80B507F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01E6C 80B507FC 24A51B48 */ addiu $a1, $a1, 0x1B48 ## $a1 = 06001B48 -/* 01E70 80B50800 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01E74 80B50804 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E78 80B50808 0C2D3F40 */ jal func_80B4FD00 -/* 01E7C 80B5080C AFA00010 */ sw $zero, 0x0010($sp) -/* 01E80 80B50810 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01E84 80B50814 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 01E88 80B50818 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B5081C: -/* 01E8C 80B5081C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E90 80B50820 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E94 80B50824 03E00008 */ jr $ra -/* 01E98 80B50828 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s deleted file mode 100644 index 71cb2b60b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B5082C -/* 01E9C 80B5082C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EA0 80B50830 AFA50024 */ sw $a1, 0x0024($sp) -/* 01EA4 80B50834 AFBF001C */ sw $ra, 0x001C($sp) -/* 01EA8 80B50838 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01EAC 80B5083C 24A52B14 */ addiu $a1, $a1, 0x2B14 ## $a1 = 06002B14 -/* 01EB0 80B50840 AFA00010 */ sw $zero, 0x0010($sp) -/* 01EB4 80B50844 AFA40020 */ sw $a0, 0x0020($sp) -/* 01EB8 80B50848 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01EBC 80B5084C 0C2D3F40 */ jal func_80B4FD00 -/* 01EC0 80B50850 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01EC4 80B50854 8FA40020 */ lw $a0, 0x0020($sp) -/* 01EC8 80B50858 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01ECC 80B5085C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01ED0 80B50860 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01ED4 80B50864 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01ED8 80B50868 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01EDC 80B5086C A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01EE0 80B50870 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EE4 80B50874 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EE8 80B50878 03E00008 */ jr $ra -/* 01EEC 80B5087C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s deleted file mode 100644 index adb975fcab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50880 -/* 01EF0 80B50880 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EF4 80B50884 10A0000C */ beq $a1, $zero, .L80B508B8 -/* 01EF8 80B50888 AFBF001C */ sw $ra, 0x001C($sp) -/* 01EFC 80B5088C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F00 80B50890 24A52F30 */ addiu $a1, $a1, 0x2F30 ## $a1 = 06002F30 -/* 01F04 80B50894 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01F08 80B50898 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01F0C 80B5089C AFA00010 */ sw $zero, 0x0010($sp) -/* 01F10 80B508A0 0C2D3F40 */ jal func_80B4FD00 -/* 01F14 80B508A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F18 80B508A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F1C 80B508AC 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 01F20 80B508B0 0C2D3FAD */ jal func_80B4FEB4 -/* 01F24 80B508B4 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -.L80B508B8: -/* 01F28 80B508B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F2C 80B508BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F30 80B508C0 03E00008 */ jr $ra -/* 01F34 80B508C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s deleted file mode 100644 index e59a363ee8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B508C8 -/* 01F38 80B508C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F3C 80B508CC AFA50024 */ sw $a1, 0x0024($sp) -/* 01F40 80B508D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F44 80B508D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01F48 80B508D8 24A51010 */ addiu $a1, $a1, 0x1010 ## $a1 = 06001010 -/* 01F4C 80B508DC AFA00010 */ sw $zero, 0x0010($sp) -/* 01F50 80B508E0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F54 80B508E4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01F58 80B508E8 0C2D3F40 */ jal func_80B4FD00 -/* 01F5C 80B508EC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01F60 80B508F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F64 80B508F4 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 01F68 80B508F8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01F6C 80B508FC 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 01F70 80B50900 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 01F74 80B50904 0C2D3B3A */ jal func_80B4ECE8 -/* 01F78 80B50908 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 01F7C 80B5090C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F80 80B50910 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01F84 80B50914 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 01F88 80B50918 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F8C 80B5091C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F90 80B50920 03E00008 */ jr $ra -/* 01F94 80B50924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s deleted file mode 100644 index 63db6d21dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50928 -/* 01F98 80B50928 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F9C 80B5092C 10A0000C */ beq $a1, $zero, .L80B50960 -/* 01FA0 80B50930 AFBF001C */ sw $ra, 0x001C($sp) -/* 01FA4 80B50934 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01FA8 80B50938 24A513A0 */ addiu $a1, $a1, 0x13A0 ## $a1 = 060013A0 -/* 01FAC 80B5093C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01FB0 80B50940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01FB4 80B50944 AFA00010 */ sw $zero, 0x0010($sp) -/* 01FB8 80B50948 0C2D3F40 */ jal func_80B4FD00 -/* 01FBC 80B5094C AFA40020 */ sw $a0, 0x0020($sp) -/* 01FC0 80B50950 8FA40020 */ lw $a0, 0x0020($sp) -/* 01FC4 80B50954 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 01FC8 80B50958 0C2D3FB6 */ jal func_80B4FED8 -/* 01FCC 80B5095C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -.L80B50960: -/* 01FD0 80B50960 8FBF001C */ lw $ra, 0x001C($sp) -/* 01FD4 80B50964 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01FD8 80B50968 03E00008 */ jr $ra -/* 01FDC 80B5096C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s deleted file mode 100644 index 5c1a1076a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B50970 -/* 01FE0 80B50970 AFA50004 */ sw $a1, 0x0004($sp) -/* 01FE4 80B50974 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 01FE8 80B50978 03E00008 */ jr $ra -/* 01FEC 80B5097C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s deleted file mode 100644 index c10fbb11ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B50980 -/* 01FF0 80B50980 AFA50004 */ sw $a1, 0x0004($sp) -/* 01FF4 80B50984 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 01FF8 80B50988 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01FFC 80B5098C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02000 80B50990 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02004 80B50994 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02008 80B50998 03E00008 */ jr $ra -/* 0200C 80B5099C AC9801A8 */ sw $t8, 0x01A8($a0) ## 000001A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s deleted file mode 100644 index 9ab2b5adde..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B509A0 -/* 02010 80B509A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02014 80B509A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02018 80B509A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0201C 80B509AC AFA5001C */ sw $a1, 0x001C($sp) -/* 02020 80B509B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02024 80B509B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02028 80B509B8 0C2D3B65 */ jal func_80B4ED94 -/* 0202C 80B509BC AFA60018 */ sw $a2, 0x0018($sp) -/* 02030 80B509C0 1040000C */ beq $v0, $zero, .L80B509F4 -/* 02034 80B509C4 8FA60018 */ lw $a2, 0x0018($sp) -/* 02038 80B509C8 8FAE001C */ lw $t6, 0x001C($sp) -/* 0203C 80B509CC 94580004 */ lhu $t8, 0x0004($v0) ## 00000004 -/* 02040 80B509D0 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 -/* 02044 80B509D4 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02048 80B509D8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0204C 80B509DC 01F8082A */ slt $at, $t7, $t8 -/* 02050 80B509E0 54200005 */ bnel $at, $zero, .L80B509F8 -/* 02054 80B509E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02058 80B509E8 ACD9019C */ sw $t9, 0x019C($a2) ## 0000019C -/* 0205C 80B509EC 0C2D3F9B */ jal func_80B4FE6C -/* 02060 80B509F0 ACC001A0 */ sw $zero, 0x01A0($a2) ## 000001A0 -.L80B509F4: -/* 02064 80B509F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B509F8: -/* 02068 80B509F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0206C 80B509FC 03E00008 */ jr $ra -/* 02070 80B50A00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s deleted file mode 100644 index e39df4cda1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_80B52980 - .asciz "En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B52BDC -.word L80B50A6C -.word L80B50A80 -.word L80B50A94 -.word L80B50AA8 -.word L80B50ABC -.word L80B50AD0 -.word L80B50AE4 -.word L80B50AF8 -.word L80B50B0C -.word L80B50B20 -.word L80B50B34 -.word L80B50B48 -.word L80B50B5C -.word L80B50B70 -.word L80B50B84 - -.text -glabel func_80B50A04 -/* 02074 80B50A04 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02078 80B50A08 AFB00018 */ sw $s0, 0x0018($sp) -/* 0207C 80B50A0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02080 80B50A10 AFBF001C */ sw $ra, 0x001C($sp) -/* 02084 80B50A14 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02088 80B50A18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0208C 80B50A1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02090 80B50A20 0C2D3B65 */ jal func_80B4ED94 -/* 02094 80B50A24 AFA6002C */ sw $a2, 0x002C($sp) -/* 02098 80B50A28 1040005F */ beq $v0, $zero, .L80B50BA8 -/* 0209C 80B50A2C 8FA6002C */ lw $a2, 0x002C($sp) -/* 020A0 80B50A30 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 020A4 80B50A34 AFAE0020 */ sw $t6, 0x0020($sp) -/* 020A8 80B50A38 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 020AC 80B50A3C 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 020B0 80B50A40 2F01000F */ sltiu $at, $t8, 0x000F -/* 020B4 80B50A44 51C30059 */ beql $t6, $v1, .L80B50BAC -/* 020B8 80B50A48 8FBF001C */ lw $ra, 0x001C($sp) -/* 020BC 80B50A4C 10200052 */ beq $at, $zero, .L80B50B98 -/* 020C0 80B50A50 3C0480B5 */ lui $a0, %hi(D_80B52980) ## $a0 = 80B50000 -/* 020C4 80B50A54 0018C080 */ sll $t8, $t8, 2 -/* 020C8 80B50A58 3C0180B5 */ lui $at, %hi(jtbl_80B52BDC) ## $at = 80B50000 -/* 020CC 80B50A5C 00380821 */ addu $at, $at, $t8 -/* 020D0 80B50A60 8C382BDC */ lw $t8, %lo(jtbl_80B52BDC)($at) -/* 020D4 80B50A64 03000008 */ jr $t8 -/* 020D8 80B50A68 00000000 */ nop -glabel L80B50A6C -/* 020DC 80B50A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020E0 80B50A70 0C2D4098 */ jal func_80B50260 -/* 020E4 80B50A74 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 020E8 80B50A78 1000004A */ beq $zero, $zero, .L80B50BA4 -/* 020EC 80B50A7C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50A80 -/* 020F0 80B50A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020F4 80B50A84 0C2D409E */ jal func_80B50278 -/* 020F8 80B50A88 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 020FC 80B50A8C 10000045 */ beq $zero, $zero, .L80B50BA4 -/* 02100 80B50A90 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50A94 -/* 02104 80B50A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02108 80B50A98 0C2D40C1 */ jal func_80B50304 -/* 0210C 80B50A9C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02110 80B50AA0 10000040 */ beq $zero, $zero, .L80B50BA4 -/* 02114 80B50AA4 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AA8 -/* 02118 80B50AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0211C 80B50AAC 0C2D410B */ jal func_80B5042C -/* 02120 80B50AB0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02124 80B50AB4 1000003B */ beq $zero, $zero, .L80B50BA4 -/* 02128 80B50AB8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50ABC -/* 0212C 80B50ABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02130 80B50AC0 0C2D4135 */ jal func_80B504D4 -/* 02134 80B50AC4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02138 80B50AC8 10000036 */ beq $zero, $zero, .L80B50BA4 -/* 0213C 80B50ACC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AD0 -/* 02140 80B50AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02144 80B50AD4 0C2D4160 */ jal func_80B50580 -/* 02148 80B50AD8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0214C 80B50ADC 10000031 */ beq $zero, $zero, .L80B50BA4 -/* 02150 80B50AE0 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AE4 -/* 02154 80B50AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02158 80B50AE8 0C2D4186 */ jal func_80B50618 -/* 0215C 80B50AEC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02160 80B50AF0 1000002C */ beq $zero, $zero, .L80B50BA4 -/* 02164 80B50AF4 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50AF8 -/* 02168 80B50AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0216C 80B50AFC 0C2D419C */ jal func_80B50670 -/* 02170 80B50B00 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02174 80B50B04 10000027 */ beq $zero, $zero, .L80B50BA4 -/* 02178 80B50B08 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B0C -/* 0217C 80B50B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02180 80B50B10 0C2D41B1 */ jal func_80B506C4 -/* 02184 80B50B14 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02188 80B50B18 10000022 */ beq $zero, $zero, .L80B50BA4 -/* 0218C 80B50B1C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B20 -/* 02190 80B50B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02194 80B50B24 0C2D41E0 */ jal func_80B50780 -/* 02198 80B50B28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0219C 80B50B2C 1000001D */ beq $zero, $zero, .L80B50BA4 -/* 021A0 80B50B30 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B34 -/* 021A4 80B50B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021A8 80B50B38 0C2D420B */ jal func_80B5082C -/* 021AC 80B50B3C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021B0 80B50B40 10000018 */ beq $zero, $zero, .L80B50BA4 -/* 021B4 80B50B44 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B48 -/* 021B8 80B50B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021BC 80B50B4C 0C2D4232 */ jal func_80B508C8 -/* 021C0 80B50B50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021C4 80B50B54 10000013 */ beq $zero, $zero, .L80B50BA4 -/* 021C8 80B50B58 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B5C -/* 021CC 80B50B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D0 80B50B60 0C2D425C */ jal func_80B50970 -/* 021D4 80B50B64 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021D8 80B50B68 1000000E */ beq $zero, $zero, .L80B50BA4 -/* 021DC 80B50B6C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B70 -/* 021E0 80B50B70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E4 80B50B74 0C2D4260 */ jal func_80B50980 -/* 021E8 80B50B78 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 021EC 80B50B7C 10000009 */ beq $zero, $zero, .L80B50BA4 -/* 021F0 80B50B80 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B50B84 -/* 021F4 80B50B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 80B50B88 0C2D4191 */ jal func_80B50644 -/* 021FC 80B50B8C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02200 80B50B90 10000004 */ beq $zero, $zero, .L80B50BA4 -/* 02204 80B50B94 8FB90020 */ lw $t9, 0x0020($sp) -.L80B50B98: -/* 02208 80B50B98 0C00084C */ jal osSyncPrintf - -/* 0220C 80B50B9C 24842980 */ addiu $a0, $a0, %lo(D_80B52980) ## $a0 = 00002980 -/* 02210 80B50BA0 8FB90020 */ lw $t9, 0x0020($sp) -.L80B50BA4: -/* 02214 80B50BA4 AE190240 */ sw $t9, 0x0240($s0) ## 00000240 -.L80B50BA8: -/* 02218 80B50BA8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B50BAC: -/* 0221C 80B50BAC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02220 80B50BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02224 80B50BB4 03E00008 */ jr $ra -/* 02228 80B50BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s deleted file mode 100644 index a6b7bf0524..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B50BBC -/* 0222C 80B50BBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02230 80B50BC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02234 80B50BC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02238 80B50BC8 0C2D3F33 */ jal func_80B4FCCC -/* 0223C 80B50BCC AFA5001C */ sw $a1, 0x001C($sp) -/* 02240 80B50BD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02244 80B50BD4 0C2D4281 */ jal func_80B50A04 -/* 02248 80B50BD8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0224C 80B50BDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02250 80B50BE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02254 80B50BE4 03E00008 */ jr $ra -/* 02258 80B50BE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s deleted file mode 100644 index 0b4acd2b33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50BEC -/* 0225C 80B50BEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02260 80B50BF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02264 80B50BF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02268 80B50BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0226C 80B50BFC 0C2D3F33 */ jal func_80B4FCCC -/* 02270 80B50C00 AFA50024 */ sw $a1, 0x0024($sp) -/* 02274 80B50C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02278 80B50C08 0C2D3B4B */ jal func_80B4ED2C -/* 0227C 80B50C0C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02280 80B50C10 0C2D3A6C */ jal func_80B4E9B0 -/* 02284 80B50C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80B50C18 0C2D3B5D */ jal func_80B4ED74 -/* 0228C 80B50C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02290 80B50C20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02294 80B50C24 0C2D4281 */ jal func_80B50A04 -/* 02298 80B50C28 8FA50024 */ lw $a1, 0x0024($sp) -/* 0229C 80B50C2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 022A0 80B50C30 8FB00018 */ lw $s0, 0x0018($sp) -/* 022A4 80B50C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022A8 80B50C38 03E00008 */ jr $ra -/* 022AC 80B50C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s deleted file mode 100644 index b1b72eace3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B50C40 -/* 022B0 80B50C40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022B4 80B50C44 AFBF001C */ sw $ra, 0x001C($sp) -/* 022B8 80B50C48 AFB00018 */ sw $s0, 0x0018($sp) -/* 022BC 80B50C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022C0 80B50C50 0C2D3F33 */ jal func_80B4FCCC -/* 022C4 80B50C54 AFA50024 */ sw $a1, 0x0024($sp) -/* 022C8 80B50C58 0C2D3F75 */ jal func_80B4FDD4 -/* 022CC 80B50C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022D0 80B50C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022D4 80B50C64 0C2D3B4B */ jal func_80B4ED2C -/* 022D8 80B50C68 8FA50024 */ lw $a1, 0x0024($sp) -/* 022DC 80B50C6C 0C2D3A6C */ jal func_80B4E9B0 -/* 022E0 80B50C70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022E4 80B50C74 0C2D3B5D */ jal func_80B4ED74 -/* 022E8 80B50C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022EC 80B50C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F0 80B50C80 0C2D4038 */ jal func_80B500E0 -/* 022F4 80B50C84 8FA50024 */ lw $a1, 0x0024($sp) -/* 022F8 80B50C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022FC 80B50C8C 0C2D40F7 */ jal func_80B503DC -/* 02300 80B50C90 8FA50024 */ lw $a1, 0x0024($sp) -/* 02304 80B50C94 8FBF001C */ lw $ra, 0x001C($sp) -/* 02308 80B50C98 8FB00018 */ lw $s0, 0x0018($sp) -/* 0230C 80B50C9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02310 80B50CA0 03E00008 */ jr $ra -/* 02314 80B50CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s deleted file mode 100644 index b725c7c482..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50CA8 -/* 02318 80B50CA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0231C 80B50CAC AFBF001C */ sw $ra, 0x001C($sp) -/* 02320 80B50CB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02324 80B50CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02328 80B50CB8 0C2D3F33 */ jal func_80B4FCCC -/* 0232C 80B50CBC AFA50024 */ sw $a1, 0x0024($sp) -/* 02330 80B50CC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02334 80B50CC4 0C2D3B4B */ jal func_80B4ED2C -/* 02338 80B50CC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0233C 80B50CCC 0C2D3A6C */ jal func_80B4E9B0 -/* 02340 80B50CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02344 80B50CD4 0C2D3B5D */ jal func_80B4ED74 -/* 02348 80B50CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0234C 80B50CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02350 80B50CE0 0C2D4281 */ jal func_80B50A04 -/* 02354 80B50CE4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02358 80B50CE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0235C 80B50CEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02360 80B50CF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02364 80B50CF4 03E00008 */ jr $ra -/* 02368 80B50CF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s deleted file mode 100644 index 44230c0259..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50CFC -/* 0236C 80B50CFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02370 80B50D00 AFBF001C */ sw $ra, 0x001C($sp) -/* 02374 80B50D04 AFB00018 */ sw $s0, 0x0018($sp) -/* 02378 80B50D08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0237C 80B50D0C 0C2D3F33 */ jal func_80B4FCCC -/* 02380 80B50D10 AFA50024 */ sw $a1, 0x0024($sp) -/* 02384 80B50D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02388 80B50D18 0C2D3B4B */ jal func_80B4ED2C -/* 0238C 80B50D1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02390 80B50D20 0C2D3A90 */ jal func_80B4EA40 -/* 02394 80B50D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02398 80B50D28 0C2D3B5D */ jal func_80B4ED74 -/* 0239C 80B50D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A0 80B50D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A4 80B50D34 0C2D4122 */ jal func_80B50488 -/* 023A8 80B50D38 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 023AC 80B50D3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 023B0 80B50D40 8FB00018 */ lw $s0, 0x0018($sp) -/* 023B4 80B50D44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023B8 80B50D48 03E00008 */ jr $ra -/* 023BC 80B50D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s deleted file mode 100644 index b42b854064..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B50D50 -/* 023C0 80B50D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 023C4 80B50D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 023C8 80B50D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 023CC 80B50D5C 0C2D3F33 */ jal func_80B4FCCC -/* 023D0 80B50D60 AFA5001C */ sw $a1, 0x001C($sp) -/* 023D4 80B50D64 8FA40018 */ lw $a0, 0x0018($sp) -/* 023D8 80B50D68 0C2D3B4B */ jal func_80B4ED2C -/* 023DC 80B50D6C 8FA5001C */ lw $a1, 0x001C($sp) -/* 023E0 80B50D70 0C2D3B5D */ jal func_80B4ED74 -/* 023E4 80B50D74 8FA40018 */ lw $a0, 0x0018($sp) -/* 023E8 80B50D78 8FA40018 */ lw $a0, 0x0018($sp) -/* 023EC 80B50D7C 0C2D4281 */ jal func_80B50A04 -/* 023F0 80B50D80 8FA5001C */ lw $a1, 0x001C($sp) -/* 023F4 80B50D84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023F8 80B50D88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023FC 80B50D8C 03E00008 */ jr $ra -/* 02400 80B50D90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s deleted file mode 100644 index 6e54f61a0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50D94 -/* 02404 80B50D94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02408 80B50D98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0240C 80B50D9C AFB00018 */ sw $s0, 0x0018($sp) -/* 02410 80B50DA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02414 80B50DA4 0C2D3F33 */ jal func_80B4FCCC -/* 02418 80B50DA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0241C 80B50DAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02420 80B50DB0 0C2D3B4B */ jal func_80B4ED2C -/* 02424 80B50DB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02428 80B50DB8 0C2D3ABD */ jal func_80B4EAF4 -/* 0242C 80B50DBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02430 80B50DC0 0C2D3B5D */ jal func_80B4ED74 -/* 02434 80B50DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02438 80B50DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0243C 80B50DCC 0C2D414F */ jal func_80B5053C -/* 02440 80B50DD0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02444 80B50DD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02448 80B50DD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0244C 80B50DDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02450 80B50DE0 03E00008 */ jr $ra -/* 02454 80B50DE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s deleted file mode 100644 index 8b27e664e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50DE8 -/* 02458 80B50DE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0245C 80B50DEC AFBF001C */ sw $ra, 0x001C($sp) -/* 02460 80B50DF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02464 80B50DF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02468 80B50DF8 0C2D3F33 */ jal func_80B4FCCC -/* 0246C 80B50DFC AFA50024 */ sw $a1, 0x0024($sp) -/* 02470 80B50E00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02474 80B50E04 0C2D3B4B */ jal func_80B4ED2C -/* 02478 80B50E08 8FA50024 */ lw $a1, 0x0024($sp) -/* 0247C 80B50E0C 0C2D3A6C */ jal func_80B4E9B0 -/* 02480 80B50E10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02484 80B50E14 0C2D3B5D */ jal func_80B4ED74 -/* 02488 80B50E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0248C 80B50E1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02490 80B50E20 0C2D4281 */ jal func_80B50A04 -/* 02494 80B50E24 8FA50024 */ lw $a1, 0x0024($sp) -/* 02498 80B50E28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0249C 80B50E2C 8FB00018 */ lw $s0, 0x0018($sp) -/* 024A0 80B50E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024A4 80B50E34 03E00008 */ jr $ra -/* 024A8 80B50E38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s deleted file mode 100644 index fa24de328b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50E3C -/* 024AC 80B50E3C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024B0 80B50E40 AFBF001C */ sw $ra, 0x001C($sp) -/* 024B4 80B50E44 AFB00018 */ sw $s0, 0x0018($sp) -/* 024B8 80B50E48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 024BC 80B50E4C 0C2D3F33 */ jal func_80B4FCCC -/* 024C0 80B50E50 AFA50024 */ sw $a1, 0x0024($sp) -/* 024C4 80B50E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C8 80B50E58 0C2D3B4B */ jal func_80B4ED2C -/* 024CC 80B50E5C 8FA50024 */ lw $a1, 0x0024($sp) -/* 024D0 80B50E60 0C2D3A6C */ jal func_80B4E9B0 -/* 024D4 80B50E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024D8 80B50E68 0C2D3B5D */ jal func_80B4ED74 -/* 024DC 80B50E6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024E0 80B50E70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024E4 80B50E74 0C2D4175 */ jal func_80B505D4 -/* 024E8 80B50E78 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 024EC 80B50E7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 024F0 80B50E80 8FB00018 */ lw $s0, 0x0018($sp) -/* 024F4 80B50E84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024F8 80B50E88 03E00008 */ jr $ra -/* 024FC 80B50E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s deleted file mode 100644 index 4ad0835bf5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50E90 -/* 02500 80B50E90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02504 80B50E94 AFBF001C */ sw $ra, 0x001C($sp) -/* 02508 80B50E98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0250C 80B50E9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02510 80B50EA0 0C2D3F33 */ jal func_80B4FCCC -/* 02514 80B50EA4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02518 80B50EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0251C 80B50EAC 0C2D3B4B */ jal func_80B4ED2C -/* 02520 80B50EB0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02524 80B50EB4 0C2D3A6C */ jal func_80B4E9B0 -/* 02528 80B50EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0252C 80B50EBC 0C2D3B5D */ jal func_80B4ED74 -/* 02530 80B50EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02534 80B50EC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02538 80B50EC8 0C2D4281 */ jal func_80B50A04 -/* 0253C 80B50ECC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02540 80B50ED0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02544 80B50ED4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02548 80B50ED8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0254C 80B50EDC 03E00008 */ jr $ra -/* 02550 80B50EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s deleted file mode 100644 index d94fa009c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50EE4 -/* 02554 80B50EE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02558 80B50EE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0255C 80B50EEC AFB00018 */ sw $s0, 0x0018($sp) -/* 02560 80B50EF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02564 80B50EF4 0C2D3F33 */ jal func_80B4FCCC -/* 02568 80B50EF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0256C 80B50EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02570 80B50F00 0C2D3B4B */ jal func_80B4ED2C -/* 02574 80B50F04 8FA50024 */ lw $a1, 0x0024($sp) -/* 02578 80B50F08 0C2D3A6C */ jal func_80B4E9B0 -/* 0257C 80B50F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02580 80B50F10 0C2D3B5D */ jal func_80B4ED74 -/* 02584 80B50F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02588 80B50F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0258C 80B50F1C 0C2D4281 */ jal func_80B50A04 -/* 02590 80B50F20 8FA50024 */ lw $a1, 0x0024($sp) -/* 02594 80B50F24 8FBF001C */ lw $ra, 0x001C($sp) -/* 02598 80B50F28 8FB00018 */ lw $s0, 0x0018($sp) -/* 0259C 80B50F2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025A0 80B50F30 03E00008 */ jr $ra -/* 025A4 80B50F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s deleted file mode 100644 index 7b4801bd75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B50F38 -/* 025A8 80B50F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 025AC 80B50F3C AFBF001C */ sw $ra, 0x001C($sp) -/* 025B0 80B50F40 AFB00018 */ sw $s0, 0x0018($sp) -/* 025B4 80B50F44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025B8 80B50F48 0C2D3F33 */ jal func_80B4FCCC -/* 025BC 80B50F4C AFA50024 */ sw $a1, 0x0024($sp) -/* 025C0 80B50F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025C4 80B50F54 0C2D3B4B */ jal func_80B4ED2C -/* 025C8 80B50F58 8FA50024 */ lw $a1, 0x0024($sp) -/* 025CC 80B50F5C 0C2D3A6C */ jal func_80B4E9B0 -/* 025D0 80B50F60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025D4 80B50F64 0C2D3B5D */ jal func_80B4ED74 -/* 025D8 80B50F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025DC 80B50F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025E0 80B50F70 0C2D4281 */ jal func_80B50A04 -/* 025E4 80B50F74 8FA50024 */ lw $a1, 0x0024($sp) -/* 025E8 80B50F78 8FBF001C */ lw $ra, 0x001C($sp) -/* 025EC 80B50F7C 8FB00018 */ lw $s0, 0x0018($sp) -/* 025F0 80B50F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025F4 80B50F84 03E00008 */ jr $ra -/* 025F8 80B50F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s deleted file mode 100644 index f7f574d4ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B50F8C -/* 025FC 80B50F8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02600 80B50F90 AFBF001C */ sw $ra, 0x001C($sp) -/* 02604 80B50F94 AFB00018 */ sw $s0, 0x0018($sp) -/* 02608 80B50F98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0260C 80B50F9C 0C2D3F33 */ jal func_80B4FCCC -/* 02610 80B50FA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02614 80B50FA4 0C2D3F84 */ jal func_80B4FE10 -/* 02618 80B50FA8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0261C 80B50FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02620 80B50FB0 0C2D3B4B */ jal func_80B4ED2C -/* 02624 80B50FB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02628 80B50FB8 0C2D3A6C */ jal func_80B4E9B0 -/* 0262C 80B50FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02630 80B50FC0 0C2D3B5D */ jal func_80B4ED74 -/* 02634 80B50FC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02638 80B50FC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0263C 80B50FCC 0C2D4281 */ jal func_80B50A04 -/* 02640 80B50FD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02644 80B50FD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02648 80B50FD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0264C 80B50FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02650 80B50FE0 03E00008 */ jr $ra -/* 02654 80B50FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s deleted file mode 100644 index caf9ae8af3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B50FE8 -/* 02658 80B50FE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0265C 80B50FEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02660 80B50FF0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02664 80B50FF4 0C2D3F33 */ jal func_80B4FCCC -/* 02668 80B50FF8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0266C 80B50FFC 0C2D3F84 */ jal func_80B4FE10 -/* 02670 80B51000 8FA4001C */ lw $a0, 0x001C($sp) -/* 02674 80B51004 8FA40018 */ lw $a0, 0x0018($sp) -/* 02678 80B51008 0C2D3B4B */ jal func_80B4ED2C -/* 0267C 80B5100C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02680 80B51010 0C2D3B5D */ jal func_80B4ED74 -/* 02684 80B51014 8FA40018 */ lw $a0, 0x0018($sp) -/* 02688 80B51018 8FA40018 */ lw $a0, 0x0018($sp) -/* 0268C 80B5101C 0C2D41CF */ jal func_80B5073C -/* 02690 80B51020 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02694 80B51024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02698 80B51028 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0269C 80B5102C 03E00008 */ jr $ra -/* 026A0 80B51030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s deleted file mode 100644 index f27f40fd08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51034 -/* 026A4 80B51034 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026A8 80B51038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026AC 80B5103C AFA40018 */ sw $a0, 0x0018($sp) -/* 026B0 80B51040 0C2D3F33 */ jal func_80B4FCCC -/* 026B4 80B51044 AFA5001C */ sw $a1, 0x001C($sp) -/* 026B8 80B51048 0C2D3F84 */ jal func_80B4FE10 -/* 026BC 80B5104C 8FA4001C */ lw $a0, 0x001C($sp) -/* 026C0 80B51050 8FA40018 */ lw $a0, 0x0018($sp) -/* 026C4 80B51054 0C2D3B4B */ jal func_80B4ED2C -/* 026C8 80B51058 8FA5001C */ lw $a1, 0x001C($sp) -/* 026CC 80B5105C 0C2D3B5D */ jal func_80B4ED74 -/* 026D0 80B51060 8FA40018 */ lw $a0, 0x0018($sp) -/* 026D4 80B51064 8FA40018 */ lw $a0, 0x0018($sp) -/* 026D8 80B51068 0C2D4281 */ jal func_80B50A04 -/* 026DC 80B5106C 8FA5001C */ lw $a1, 0x001C($sp) -/* 026E0 80B51070 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026E4 80B51074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026E8 80B51078 03E00008 */ jr $ra -/* 026EC 80B5107C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s deleted file mode 100644 index afef6176ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51080 -/* 026F0 80B51080 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026F4 80B51084 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026F8 80B51088 AFA40018 */ sw $a0, 0x0018($sp) -/* 026FC 80B5108C 0C2D3F33 */ jal func_80B4FCCC -/* 02700 80B51090 AFA5001C */ sw $a1, 0x001C($sp) -/* 02704 80B51094 0C2D3F84 */ jal func_80B4FE10 -/* 02708 80B51098 8FA4001C */ lw $a0, 0x001C($sp) -/* 0270C 80B5109C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02710 80B510A0 0C2D3B4B */ jal func_80B4ED2C -/* 02714 80B510A4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02718 80B510A8 0C2D3B5D */ jal func_80B4ED74 -/* 0271C 80B510AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02720 80B510B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02724 80B510B4 0C2D41FA */ jal func_80B507E8 -/* 02728 80B510B8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0272C 80B510BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02730 80B510C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02734 80B510C4 03E00008 */ jr $ra -/* 02738 80B510C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s deleted file mode 100644 index 624d586786..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B510CC -/* 0273C 80B510CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02740 80B510D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02744 80B510D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02748 80B510D8 0C2D3F33 */ jal func_80B4FCCC -/* 0274C 80B510DC AFA5001C */ sw $a1, 0x001C($sp) -/* 02750 80B510E0 0C2D3F84 */ jal func_80B4FE10 -/* 02754 80B510E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 02758 80B510E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0275C 80B510EC 0C2D3B4B */ jal func_80B4ED2C -/* 02760 80B510F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02764 80B510F4 0C2D3B5D */ jal func_80B4ED74 -/* 02768 80B510F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0276C 80B510FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02770 80B51100 0C2D4281 */ jal func_80B50A04 -/* 02774 80B51104 8FA5001C */ lw $a1, 0x001C($sp) -/* 02778 80B51108 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0277C 80B5110C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02780 80B51110 03E00008 */ jr $ra -/* 02784 80B51114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s deleted file mode 100644 index e535cfa3c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51118 -/* 02788 80B51118 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0278C 80B5111C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02790 80B51120 AFA40018 */ sw $a0, 0x0018($sp) -/* 02794 80B51124 0C2D3F33 */ jal func_80B4FCCC -/* 02798 80B51128 AFA5001C */ sw $a1, 0x001C($sp) -/* 0279C 80B5112C 0C2D3F84 */ jal func_80B4FE10 -/* 027A0 80B51130 8FA4001C */ lw $a0, 0x001C($sp) -/* 027A4 80B51134 8FA40018 */ lw $a0, 0x0018($sp) -/* 027A8 80B51138 0C2D3B4B */ jal func_80B4ED2C -/* 027AC 80B5113C 8FA5001C */ lw $a1, 0x001C($sp) -/* 027B0 80B51140 0C2D3B5D */ jal func_80B4ED74 -/* 027B4 80B51144 8FA40018 */ lw $a0, 0x0018($sp) -/* 027B8 80B51148 8FA40018 */ lw $a0, 0x0018($sp) -/* 027BC 80B5114C 0C2D4220 */ jal func_80B50880 -/* 027C0 80B51150 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 027C4 80B51154 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027C8 80B51158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027CC 80B5115C 03E00008 */ jr $ra -/* 027D0 80B51160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s deleted file mode 100644 index 7d4ea9c25f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B51164 -/* 027D4 80B51164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027D8 80B51168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027DC 80B5116C AFA40018 */ sw $a0, 0x0018($sp) -/* 027E0 80B51170 0C2D3F33 */ jal func_80B4FCCC -/* 027E4 80B51174 AFA5001C */ sw $a1, 0x001C($sp) -/* 027E8 80B51178 0C2D3F84 */ jal func_80B4FE10 -/* 027EC 80B5117C 8FA4001C */ lw $a0, 0x001C($sp) -/* 027F0 80B51180 8FA40018 */ lw $a0, 0x0018($sp) -/* 027F4 80B51184 0C2D3B4B */ jal func_80B4ED2C -/* 027F8 80B51188 8FA5001C */ lw $a1, 0x001C($sp) -/* 027FC 80B5118C 0C2D3B5D */ jal func_80B4ED74 -/* 02800 80B51190 8FA40018 */ lw $a0, 0x0018($sp) -/* 02804 80B51194 8FA40018 */ lw $a0, 0x0018($sp) -/* 02808 80B51198 0C2D4281 */ jal func_80B50A04 -/* 0280C 80B5119C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02810 80B511A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02814 80B511A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02818 80B511A8 03E00008 */ jr $ra -/* 0281C 80B511AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s deleted file mode 100644 index af39bc5b7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B511B0 -/* 02820 80B511B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02824 80B511B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02828 80B511B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0282C 80B511BC 0C2D3F33 */ jal func_80B4FCCC -/* 02830 80B511C0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02834 80B511C4 0C2D3F84 */ jal func_80B4FE10 -/* 02838 80B511C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0283C 80B511CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02840 80B511D0 0C2D3B4B */ jal func_80B4ED2C -/* 02844 80B511D4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02848 80B511D8 0C2D3B5D */ jal func_80B4ED74 -/* 0284C 80B511DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02850 80B511E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02854 80B511E4 0C2D424A */ jal func_80B50928 -/* 02858 80B511E8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0285C 80B511EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02860 80B511F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02864 80B511F4 03E00008 */ jr $ra -/* 02868 80B511F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s deleted file mode 100644 index fdc4735a75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B511FC -/* 0286C 80B511FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02870 80B51200 AFBF001C */ sw $ra, 0x001C($sp) -/* 02874 80B51204 AFB00018 */ sw $s0, 0x0018($sp) -/* 02878 80B51208 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0287C 80B5120C 0C2D3F33 */ jal func_80B4FCCC -/* 02880 80B51210 AFA50024 */ sw $a1, 0x0024($sp) -/* 02884 80B51214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02888 80B51218 0C2D3B4B */ jal func_80B4ED2C -/* 0288C 80B5121C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02890 80B51220 0C2D3B5D */ jal func_80B4ED74 -/* 02894 80B51224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02898 80B51228 0C2D4023 */ jal func_80B5008C -/* 0289C 80B5122C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A0 80B51230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A4 80B51234 0C2D4281 */ jal func_80B50A04 -/* 028A8 80B51238 8FA50024 */ lw $a1, 0x0024($sp) -/* 028AC 80B5123C 8FBF001C */ lw $ra, 0x001C($sp) -/* 028B0 80B51240 8FB00018 */ lw $s0, 0x0018($sp) -/* 028B4 80B51244 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 028B8 80B51248 03E00008 */ jr $ra -/* 028BC 80B5124C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s deleted file mode 100644 index 98006fae20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B51250 -/* 028C0 80B51250 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 028C4 80B51254 AFBF001C */ sw $ra, 0x001C($sp) -/* 028C8 80B51258 AFB00018 */ sw $s0, 0x0018($sp) -/* 028CC 80B5125C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 028D0 80B51260 0C2D3F33 */ jal func_80B4FCCC -/* 028D4 80B51264 AFA50024 */ sw $a1, 0x0024($sp) -/* 028D8 80B51268 0C2D3F92 */ jal func_80B4FE48 -/* 028DC 80B5126C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E0 80B51270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E4 80B51274 0C2D3B4B */ jal func_80B4ED2C -/* 028E8 80B51278 8FA50024 */ lw $a1, 0x0024($sp) -/* 028EC 80B5127C 0C2D3B5D */ jal func_80B4ED74 -/* 028F0 80B51280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F4 80B51284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 80B51288 0C2D4038 */ jal func_80B500E0 -/* 028FC 80B5128C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02900 80B51290 0C2D4023 */ jal func_80B5008C -/* 02904 80B51294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02908 80B51298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80B5129C 0C2D4281 */ jal func_80B50A04 -/* 02910 80B512A0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02914 80B512A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02918 80B512A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0291C 80B512AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02920 80B512B0 03E00008 */ jr $ra -/* 02924 80B512B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s deleted file mode 100644 index 3f031c20a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B512B8 -/* 02928 80B512B8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0292C 80B512BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02930 80B512C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02934 80B512C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02938 80B512C8 0C2D3F33 */ jal func_80B4FCCC -/* 0293C 80B512CC AFA50024 */ sw $a1, 0x0024($sp) -/* 02940 80B512D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02944 80B512D4 0C2D3B4B */ jal func_80B4ED2C -/* 02948 80B512D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0294C 80B512DC 0C2D3B5D */ jal func_80B4ED74 -/* 02950 80B512E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02954 80B512E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02958 80B512E8 0C2D407A */ jal func_80B501E8 -/* 0295C 80B512EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02960 80B512F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02964 80B512F4 0C2D4268 */ jal func_80B509A0 -/* 02968 80B512F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0296C 80B512FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02970 80B51300 8FB00018 */ lw $s0, 0x0018($sp) -/* 02974 80B51304 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02978 80B51308 03E00008 */ jr $ra -/* 0297C 80B5130C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s deleted file mode 100644 index 0706b81f75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B51310 -/* 02980 80B51310 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02984 80B51314 AFA40018 */ sw $a0, 0x0018($sp) -/* 02988 80B51318 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0298C 80B5131C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02990 80B51320 0C2D3B65 */ jal func_80B4ED94 -/* 02994 80B51324 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02998 80B51328 14400008 */ bne $v0, $zero, .L80B5134C -/* 0299C 80B5132C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 029A0 80B51330 8DC4011C */ lw $a0, 0x011C($t6) ## 0000011C -/* 029A4 80B51334 10800003 */ beq $a0, $zero, .L80B51344 -/* 029A8 80B51338 00000000 */ nop -/* 029AC 80B5133C 0C00B55C */ jal Actor_Kill - -/* 029B0 80B51340 00000000 */ nop -.L80B51344: -/* 029B4 80B51344 0C00B55C */ jal Actor_Kill - -/* 029B8 80B51348 8FA40018 */ lw $a0, 0x0018($sp) -.L80B5134C: -/* 029BC 80B5134C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029C0 80B51350 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029C4 80B51354 03E00008 */ jr $ra -/* 029C8 80B51358 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s deleted file mode 100644 index 548d3c9290..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B5135C -/* 029CC 80B5135C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 029D0 80B51360 AFA50024 */ sw $a1, 0x0024($sp) -/* 029D4 80B51364 AFBF001C */ sw $ra, 0x001C($sp) -/* 029D8 80B51368 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 029DC 80B5136C 24A5A15C */ addiu $a1, $a1, 0xA15C ## $a1 = 0600A15C -/* 029E0 80B51370 AFA00010 */ sw $zero, 0x0010($sp) -/* 029E4 80B51374 AFA40020 */ sw $a0, 0x0020($sp) -/* 029E8 80B51378 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029EC 80B5137C 0C2D3F40 */ jal func_80B4FD00 -/* 029F0 80B51380 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 029F4 80B51384 8FA40020 */ lw $a0, 0x0020($sp) -/* 029F8 80B51388 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 029FC 80B5138C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02A00 80B51390 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02A04 80B51394 AC8F0254 */ sw $t7, 0x0254($a0) ## 00000254 -/* 02A08 80B51398 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A0C 80B5139C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02A10 80B513A0 03E00008 */ jr $ra -/* 02A14 80B513A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s deleted file mode 100644 index eebd9fce1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B513A8 -/* 02A18 80B513A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02A1C 80B513AC AFBF002C */ sw $ra, 0x002C($sp) -/* 02A20 80B513B0 AFA40030 */ sw $a0, 0x0030($sp) -/* 02A24 80B513B4 8C8F0250 */ lw $t7, 0x0250($a0) ## 00000250 -/* 02A28 80B513B8 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 02A2C 80B513BC 55E00013 */ bnel $t7, $zero, .L80B5140C -/* 02A30 80B513C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A34 80B513C4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 02A38 80B513C8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 02A3C 80B513CC 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 02A40 80B513D0 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 02A44 80B513D4 C4420028 */ lwc1 $f2, 0x0028($v0) ## 00000028 -/* 02A48 80B513D8 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 02A4C 80B513DC 44070000 */ mfc1 $a3, $f0 -/* 02A50 80B513E0 AFB80024 */ sw $t8, 0x0024($sp) -/* 02A54 80B513E4 AFA00020 */ sw $zero, 0x0020($sp) -/* 02A58 80B513E8 AFA0001C */ sw $zero, 0x001C($sp) -/* 02A5C 80B513EC AFA00018 */ sw $zero, 0x0018($sp) -/* 02A60 80B513F0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02A64 80B513F4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 02A68 80B513F8 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 02A6C 80B513FC 8FA80030 */ lw $t0, 0x0030($sp) -/* 02A70 80B51400 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02A74 80B51404 AD190250 */ sw $t9, 0x0250($t0) ## 00000250 -/* 02A78 80B51408 8FBF002C */ lw $ra, 0x002C($sp) -.L80B5140C: -/* 02A7C 80B5140C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02A80 80B51410 03E00008 */ jr $ra -/* 02A84 80B51414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s deleted file mode 100644 index d8d30da7e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B51418 -/* 02A88 80B51418 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A8C 80B5141C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A90 80B51420 AFA5001C */ sw $a1, 0x001C($sp) -/* 02A94 80B51424 0C2D3A6C */ jal func_80B4E9B0 -/* 02A98 80B51428 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A9C 80B5142C 8FAE001C */ lw $t6, 0x001C($sp) -/* 02AA0 80B51430 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AA4 80B51434 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02AA8 80B51438 29E101AF */ slti $at, $t7, 0x01AF -/* 02AAC 80B5143C 10200005 */ beq $at, $zero, .L80B51454 -/* 02AB0 80B51440 00000000 */ nop -/* 02AB4 80B51444 0C2D3B46 */ jal func_80B4ED18 -/* 02AB8 80B51448 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02ABC 80B5144C 10000004 */ beq $zero, $zero, .L80B51460 -/* 02AC0 80B51450 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51454: -/* 02AC4 80B51454 0C2D3B46 */ jal func_80B4ED18 -/* 02AC8 80B51458 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02ACC 80B5145C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51460: -/* 02AD0 80B51460 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AD4 80B51464 03E00008 */ jr $ra -/* 02AD8 80B51468 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s deleted file mode 100644 index 7ac0136fb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B5146C -/* 02ADC 80B5146C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AE0 80B51470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AE4 80B51474 AFA40018 */ sw $a0, 0x0018($sp) -/* 02AE8 80B51478 0C2D3A90 */ jal func_80B4EA40 -/* 02AEC 80B5147C AFA5001C */ sw $a1, 0x001C($sp) -/* 02AF0 80B51480 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AF4 80B51484 0C2D3B46 */ jal func_80B4ED18 -/* 02AF8 80B51488 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02AFC 80B5148C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B00 80B51490 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B04 80B51494 03E00008 */ jr $ra -/* 02B08 80B51498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s deleted file mode 100644 index debbbb4e8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B5149C -/* 02B0C 80B5149C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B10 80B514A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B14 80B514A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B18 80B514A8 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 02B1C 80B514AC 29C103DC */ slti $at, $t6, 0x03DC -/* 02B20 80B514B0 10200008 */ beq $at, $zero, .L80B514D4 -/* 02B24 80B514B4 00000000 */ nop -/* 02B28 80B514B8 0C2D3B3A */ jal func_80B4ECE8 -/* 02B2C 80B514BC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 02B30 80B514C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B34 80B514C4 0C2D3B41 */ jal func_80B4ED04 -/* 02B38 80B514C8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 02B3C 80B514CC 10000004 */ beq $zero, $zero, .L80B514E0 -/* 02B40 80B514D0 8FA40018 */ lw $a0, 0x0018($sp) -.L80B514D4: -/* 02B44 80B514D4 0C2D3A6C */ jal func_80B4E9B0 -/* 02B48 80B514D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B4C 80B514DC 8FA40018 */ lw $a0, 0x0018($sp) -.L80B514E0: -/* 02B50 80B514E0 0C2D3B46 */ jal func_80B4ED18 -/* 02B54 80B514E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02B58 80B514E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B5C 80B514EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B60 80B514F0 03E00008 */ jr $ra -/* 02B64 80B514F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s deleted file mode 100644 index 29336daaef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B514F8 -/* 02B68 80B514F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B6C 80B514FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B70 80B51500 AFA5001C */ sw $a1, 0x001C($sp) -/* 02B74 80B51504 0C2D3A6C */ jal func_80B4E9B0 -/* 02B78 80B51508 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B7C 80B5150C 8FAE001C */ lw $t6, 0x001C($sp) -/* 02B80 80B51510 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B84 80B51514 95CF1D74 */ lhu $t7, 0x1D74($t6) ## 00001D74 -/* 02B88 80B51518 29E104A6 */ slti $at, $t7, 0x04A6 -/* 02B8C 80B5151C 10200005 */ beq $at, $zero, .L80B51534 -/* 02B90 80B51520 00000000 */ nop -/* 02B94 80B51524 0C2D3B46 */ jal func_80B4ED18 -/* 02B98 80B51528 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02B9C 80B5152C 10000004 */ beq $zero, $zero, .L80B51540 -/* 02BA0 80B51530 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51534: -/* 02BA4 80B51534 0C2D3B46 */ jal func_80B4ED18 -/* 02BA8 80B51538 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02BAC 80B5153C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B51540: -/* 02BB0 80B51540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BB4 80B51544 03E00008 */ jr $ra -/* 02BB8 80B51548 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s deleted file mode 100644 index b92ad57f49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B5154C -/* 02BBC 80B5154C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BC0 80B51550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BC4 80B51554 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 02BC8 80B51558 51C00006 */ beql $t6, $zero, .L80B51574 -/* 02BCC 80B5155C 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -/* 02BD0 80B51560 0C2D3A6C */ jal func_80B4E9B0 -/* 02BD4 80B51564 00000000 */ nop -/* 02BD8 80B51568 10000013 */ beq $zero, $zero, .L80B515B8 -/* 02BDC 80B5156C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02BE0 80B51570 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -.L80B51574: -/* 02BE4 80B51574 29E105F0 */ slti $at, $t7, 0x05F0 -/* 02BE8 80B51578 50200006 */ beql $at, $zero, .L80B51594 -/* 02BEC 80B5157C 94B81D74 */ lhu $t8, 0x1D74($a1) ## 00001D74 -/* 02BF0 80B51580 0C2D3AEE */ jal func_80B4EBB8 -/* 02BF4 80B51584 00000000 */ nop -/* 02BF8 80B51588 1000000B */ beq $zero, $zero, .L80B515B8 -/* 02BFC 80B5158C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C00 80B51590 94B81D74 */ lhu $t8, 0x1D74($a1) ## 00001D74 -.L80B51594: -/* 02C04 80B51594 240105F0 */ addiu $at, $zero, 0x05F0 ## $at = 000005F0 -/* 02C08 80B51598 17010004 */ bne $t8, $at, .L80B515AC -/* 02C0C 80B5159C 00000000 */ nop -/* 02C10 80B515A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02C14 80B515A4 10000003 */ beq $zero, $zero, .L80B515B4 -/* 02C18 80B515A8 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -.L80B515AC: -/* 02C1C 80B515AC 0C2D3B12 */ jal func_80B4EC48 -/* 02C20 80B515B0 00000000 */ nop -.L80B515B4: -/* 02C24 80B515B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B515B8: -/* 02C28 80B515B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C2C 80B515BC 03E00008 */ jr $ra -/* 02C30 80B515C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s deleted file mode 100644 index bfa029a20e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B515C4 -/* 02C34 80B515C4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 02C38 80B515C8 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02C3C 80B515CC AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 02C40 80B515D0 03E00008 */ jr $ra -/* 02C44 80B515D4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s deleted file mode 100644 index ebfe783c1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B515D8 -/* 02C48 80B515D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02C4C 80B515DC AFA50024 */ sw $a1, 0x0024($sp) -/* 02C50 80B515E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C54 80B515E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02C58 80B515E8 24A5A15C */ addiu $a1, $a1, 0xA15C ## $a1 = 0600A15C -/* 02C5C 80B515EC AFA00010 */ sw $zero, 0x0010($sp) -/* 02C60 80B515F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 02C64 80B515F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C68 80B515F8 0C2D3F40 */ jal func_80B4FD00 -/* 02C6C 80B515FC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02C70 80B51600 8FA40020 */ lw $a0, 0x0020($sp) -/* 02C74 80B51604 8FA50024 */ lw $a1, 0x0024($sp) -/* 02C78 80B51608 0C2D3B6E */ jal func_80B4EDB8 -/* 02C7C 80B5160C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C80 80B51610 8FA40020 */ lw $a0, 0x0020($sp) -/* 02C84 80B51614 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02C88 80B51618 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 02C8C 80B5161C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02C90 80B51620 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02C94 80B51624 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02C98 80B51628 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02C9C 80B5162C A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02CA0 80B51630 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02CA4 80B51634 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CA8 80B51638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02CAC 80B5163C 03E00008 */ jr $ra -/* 02CB0 80B51640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s deleted file mode 100644 index f115ad9dd0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B51644 -/* 02CB4 80B51644 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CB8 80B51648 10A00007 */ beq $a1, $zero, .L80B51668 -/* 02CBC 80B5164C AFBF001C */ sw $ra, 0x001C($sp) -/* 02CC0 80B51650 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02CC4 80B51654 24A587B8 */ addiu $a1, $a1, 0x87B8 ## $a1 = 060087B8 -/* 02CC8 80B51658 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02CCC 80B5165C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02CD0 80B51660 0C2D3F40 */ jal func_80B4FD00 -/* 02CD4 80B51664 AFA00010 */ sw $zero, 0x0010($sp) -.L80B51668: -/* 02CD8 80B51668 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CDC 80B5166C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02CE0 80B51670 03E00008 */ jr $ra -/* 02CE4 80B51674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s deleted file mode 100644 index e1da3006e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51678 -/* 02CE8 80B51678 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CEC 80B5167C AFBF001C */ sw $ra, 0x001C($sp) -/* 02CF0 80B51680 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02CF4 80B51684 24A57D0C */ addiu $a1, $a1, 0x7D0C ## $a1 = 06007D0C -/* 02CF8 80B51688 AFA00010 */ sw $zero, 0x0010($sp) -/* 02CFC 80B5168C AFA40020 */ sw $a0, 0x0020($sp) -/* 02D00 80B51690 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02D04 80B51694 0C2D3F40 */ jal func_80B4FD00 -/* 02D08 80B51698 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D0C 80B5169C 8FA40020 */ lw $a0, 0x0020($sp) -/* 02D10 80B516A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02D14 80B516A4 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 02D18 80B516A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02D1C 80B516AC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02D20 80B516B0 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02D24 80B516B4 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02D28 80B516B8 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02D2C 80B516BC E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02D30 80B516C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D34 80B516C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D38 80B516C8 03E00008 */ jr $ra -/* 02D3C 80B516CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s deleted file mode 100644 index b713f9bf79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B516D0 -/* 02D40 80B516D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D44 80B516D4 10A00007 */ beq $a1, $zero, .L80B516F4 -/* 02D48 80B516D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D4C 80B516DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D50 80B516E0 24A59AD4 */ addiu $a1, $a1, 0x9AD4 ## $a1 = 06009AD4 -/* 02D54 80B516E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02D58 80B516E8 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D5C 80B516EC 0C2D3F40 */ jal func_80B4FD00 -/* 02D60 80B516F0 AFA00010 */ sw $zero, 0x0010($sp) -.L80B516F4: -/* 02D64 80B516F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D68 80B516F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D6C 80B516FC 03E00008 */ jr $ra -/* 02D70 80B51700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s deleted file mode 100644 index 0e7a168c65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51704 -/* 02D74 80B51704 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D78 80B51708 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D7C 80B5170C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D80 80B51710 24A590D8 */ addiu $a1, $a1, 0x90D8 ## $a1 = 060090D8 -/* 02D84 80B51714 AFA00010 */ sw $zero, 0x0010($sp) -/* 02D88 80B51718 AFA40020 */ sw $a0, 0x0020($sp) -/* 02D8C 80B5171C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02D90 80B51720 0C2D3F40 */ jal func_80B4FD00 -/* 02D94 80B51724 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02D98 80B51728 8FA40020 */ lw $a0, 0x0020($sp) -/* 02D9C 80B5172C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02DA0 80B51730 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 02DA4 80B51734 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02DA8 80B51738 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02DAC 80B5173C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02DB0 80B51740 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02DB4 80B51744 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02DB8 80B51748 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02DBC 80B5174C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DC0 80B51750 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DC4 80B51754 03E00008 */ jr $ra -/* 02DC8 80B51758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s deleted file mode 100644 index 667aa4e43a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B5175C -/* 02DCC 80B5175C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02DD0 80B51760 10A00007 */ beq $a1, $zero, .L80B51780 -/* 02DD4 80B51764 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DD8 80B51768 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02DDC 80B5176C 24A56778 */ addiu $a1, $a1, 0x6778 ## $a1 = 06006778 -/* 02DE0 80B51770 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02DE4 80B51774 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02DE8 80B51778 0C2D3F40 */ jal func_80B4FD00 -/* 02DEC 80B5177C AFA00010 */ sw $zero, 0x0010($sp) -.L80B51780: -/* 02DF0 80B51780 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DF4 80B51784 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DF8 80B51788 03E00008 */ jr $ra -/* 02DFC 80B5178C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s deleted file mode 100644 index 23ee19e622..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B51790 -/* 02E00 80B51790 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E04 80B51794 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E08 80B51798 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E0C 80B5179C 24A55F40 */ addiu $a1, $a1, 0x5F40 ## $a1 = 06005F40 -/* 02E10 80B517A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02E14 80B517A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02E18 80B517A8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02E1C 80B517AC 0C2D3F40 */ jal func_80B4FD00 -/* 02E20 80B517B0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02E24 80B517B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02E28 80B517B8 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D -/* 02E2C 80B517BC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E30 80B517C0 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02E34 80B517C4 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02E38 80B517C8 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02E3C 80B517CC A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02E40 80B517D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E44 80B517D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E48 80B517D8 03E00008 */ jr $ra -/* 02E4C 80B517DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s deleted file mode 100644 index 00d77216db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B517E0 -/* 02E50 80B517E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E54 80B517E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E58 80B517E8 10A0000A */ beq $a1, $zero, .L80B51814 -/* 02E5C 80B517EC AFA40020 */ sw $a0, 0x0020($sp) -/* 02E60 80B517F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E64 80B517F4 24A52750 */ addiu $a1, $a1, 0x2750 ## $a1 = 06002750 -/* 02E68 80B517F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E6C 80B517FC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02E70 80B51800 0C2D3F40 */ jal func_80B4FD00 -/* 02E74 80B51804 AFA00010 */ sw $zero, 0x0010($sp) -/* 02E78 80B51808 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02E7C 80B5180C 240E001F */ addiu $t6, $zero, 0x001F ## $t6 = 0000001F -/* 02E80 80B51810 ADEE019C */ sw $t6, 0x019C($t7) ## 0000019C -.L80B51814: -/* 02E84 80B51814 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E88 80B51818 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E8C 80B5181C 03E00008 */ jr $ra -/* 02E90 80B51820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s deleted file mode 100644 index e0cde027e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51824 -/* 02E94 80B51824 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E98 80B51828 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E9C 80B5182C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02EA0 80B51830 24A522D0 */ addiu $a1, $a1, 0x22D0 ## $a1 = 060022D0 -/* 02EA4 80B51834 AFA00010 */ sw $zero, 0x0010($sp) -/* 02EA8 80B51838 AFA40020 */ sw $a0, 0x0020($sp) -/* 02EAC 80B5183C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02EB0 80B51840 0C2D3F40 */ jal func_80B4FD00 -/* 02EB4 80B51844 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02EB8 80B51848 8FA40020 */ lw $a0, 0x0020($sp) -/* 02EBC 80B5184C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02EC0 80B51850 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 02EC4 80B51854 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02EC8 80B51858 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02ECC 80B5185C AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 02ED0 80B51860 AC8F01A0 */ sw $t7, 0x01A0($a0) ## 000001A0 -/* 02ED4 80B51864 A09800C8 */ sb $t8, 0x00C8($a0) ## 000000C8 -/* 02ED8 80B51868 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02EDC 80B5186C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02EE0 80B51870 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02EE4 80B51874 03E00008 */ jr $ra -/* 02EE8 80B51878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s deleted file mode 100644 index 22eb3b5453..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5187C -/* 02EEC 80B5187C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02EF0 80B51880 AFBF001C */ sw $ra, 0x001C($sp) -/* 02EF4 80B51884 10A0000A */ beq $a1, $zero, .L80B518B0 -/* 02EF8 80B51888 AFA40020 */ sw $a0, 0x0020($sp) -/* 02EFC 80B5188C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02F00 80B51890 24A5A79C */ addiu $a1, $a1, 0xA79C ## $a1 = 0600A79C -/* 02F04 80B51894 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02F08 80B51898 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02F0C 80B5189C 0C2D3F40 */ jal func_80B4FD00 -/* 02F10 80B518A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02F14 80B518A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F18 80B518A8 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02F1C 80B518AC E5C4027C */ swc1 $f4, 0x027C($t6) ## 0000027C -.L80B518B0: -/* 02F20 80B518B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F24 80B518B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02F28 80B518B8 03E00008 */ jr $ra -/* 02F2C 80B518BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s deleted file mode 100644 index d07ccd721f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B518C0 -/* 02F30 80B518C0 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 02F34 80B518C4 24424900 */ addiu $v0, $v0, 0x4900 ## $v0 = 06004900 -/* 02F38 80B518C8 00027100 */ sll $t6, $v0, 4 -/* 02F3C 80B518CC 000E7F02 */ srl $t7, $t6, 28 -/* 02F40 80B518D0 000FC080 */ sll $t8, $t7, 2 -/* 02F44 80B518D4 3C198016 */ lui $t9, %hi(gSegments) -/* 02F48 80B518D8 0338C821 */ addu $t9, $t9, $t8 -/* 02F4C 80B518DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02F50 80B518E0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 02F54 80B518E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02F58 80B518E8 00414024 */ and $t0, $v0, $at -/* 02F5C 80B518EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02F60 80B518F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02F64 80B518F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02F68 80B518F8 03282821 */ addu $a1, $t9, $t0 -/* 02F6C 80B518FC 00A12821 */ addu $a1, $a1, $at -/* 02F70 80B51900 AFA00010 */ sw $zero, 0x0010($sp) -/* 02F74 80B51904 AFA40020 */ sw $a0, 0x0020($sp) -/* 02F78 80B51908 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02F7C 80B5190C 0C2D3F40 */ jal func_80B4FD00 -/* 02F80 80B51910 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02F84 80B51914 8FA40020 */ lw $a0, 0x0020($sp) -/* 02F88 80B51918 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F8C 80B5191C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 02F90 80B51920 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02F94 80B51924 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 02F98 80B51928 AC89019C */ sw $t1, 0x019C($a0) ## 0000019C -/* 02F9C 80B5192C AC8A01A0 */ sw $t2, 0x01A0($a0) ## 000001A0 -/* 02FA0 80B51930 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -/* 02FA4 80B51934 E484027C */ swc1 $f4, 0x027C($a0) ## 0000027C -/* 02FA8 80B51938 8FBF001C */ lw $ra, 0x001C($sp) -/* 02FAC 80B5193C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02FB0 80B51940 03E00008 */ jr $ra -/* 02FB4 80B51944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s deleted file mode 100644 index 2fe3759a8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_80B529B8 - .asciz "En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B52C18 -.word L80B519AC -.word L80B519BC -.word L80B51A34 -.word L80B51A00 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B51A34 -.word L80B519D0 -.word L80B519E0 -.word L80B519F0 -.word L80B51A34 -.word L80B51A10 -.word L80B51A20 -.word 0x00000000 - -.text -glabel func_80B51948 -/* 02FB8 80B51948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02FBC 80B5194C AFB00018 */ sw $s0, 0x0018($sp) -/* 02FC0 80B51950 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FC4 80B51954 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FC8 80B51958 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02FCC 80B5195C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02FD0 80B51960 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02FD4 80B51964 0C2D3B65 */ jal func_80B4ED94 -/* 02FD8 80B51968 AFA6002C */ sw $a2, 0x002C($sp) -/* 02FDC 80B5196C 10400036 */ beq $v0, $zero, .L80B51A48 -/* 02FE0 80B51970 8FA6002C */ lw $a2, 0x002C($sp) -/* 02FE4 80B51974 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 02FE8 80B51978 AFAE0020 */ sw $t6, 0x0020($sp) -/* 02FEC 80B5197C 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 02FF0 80B51980 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 02FF4 80B51984 2F010015 */ sltiu $at, $t8, 0x0015 -/* 02FF8 80B51988 51C30030 */ beql $t6, $v1, .L80B51A4C -/* 02FFC 80B5198C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03000 80B51990 10200028 */ beq $at, $zero, .L80B51A34 -/* 03004 80B51994 0018C080 */ sll $t8, $t8, 2 -/* 03008 80B51998 3C0180B5 */ lui $at, %hi(jtbl_80B52C18) ## $at = 80B50000 -/* 0300C 80B5199C 00380821 */ addu $at, $at, $t8 -/* 03010 80B519A0 8C382C18 */ lw $t8, %lo(jtbl_80B52C18)($at) -/* 03014 80B519A4 03000008 */ jr $t8 -/* 03018 80B519A8 00000000 */ nop -glabel L80B519AC -/* 0301C 80B519AC 0C2D4571 */ jal func_80B515C4 -/* 03020 80B519B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03024 80B519B4 10000023 */ beq $zero, $zero, .L80B51A44 -/* 03028 80B519B8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519BC -/* 0302C 80B519BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03030 80B519C0 0C2D4576 */ jal func_80B515D8 -/* 03034 80B519C4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 03038 80B519C8 1000001E */ beq $zero, $zero, .L80B51A44 -/* 0303C 80B519CC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519D0 -/* 03040 80B519D0 0C2D459E */ jal func_80B51678 -/* 03044 80B519D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03048 80B519D8 1000001A */ beq $zero, $zero, .L80B51A44 -/* 0304C 80B519DC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519E0 -/* 03050 80B519E0 0C2D45C1 */ jal func_80B51704 -/* 03054 80B519E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03058 80B519E8 10000016 */ beq $zero, $zero, .L80B51A44 -/* 0305C 80B519EC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B519F0 -/* 03060 80B519F0 0C2D45E4 */ jal func_80B51790 -/* 03064 80B519F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03068 80B519F8 10000012 */ beq $zero, $zero, .L80B51A44 -/* 0306C 80B519FC 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A00 -/* 03070 80B51A00 0C2D4609 */ jal func_80B51824 -/* 03074 80B51A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03078 80B51A08 1000000E */ beq $zero, $zero, .L80B51A44 -/* 0307C 80B51A0C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A10 -/* 03080 80B51A10 0C2D4630 */ jal func_80B518C0 -/* 03084 80B51A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03088 80B51A18 1000000A */ beq $zero, $zero, .L80B51A44 -/* 0308C 80B51A1C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A20 -/* 03090 80B51A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03094 80B51A24 0C2D44EA */ jal func_80B513A8 -/* 03098 80B51A28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0309C 80B51A2C 10000005 */ beq $zero, $zero, .L80B51A44 -/* 030A0 80B51A30 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B51A34 -.L80B51A34: -/* 030A4 80B51A34 3C0480B5 */ lui $a0, %hi(D_80B529B8) ## $a0 = 80B50000 -/* 030A8 80B51A38 0C00084C */ jal osSyncPrintf - -/* 030AC 80B51A3C 248429B8 */ addiu $a0, $a0, %lo(D_80B529B8) ## $a0 = 80B529B8 -/* 030B0 80B51A40 8FB90020 */ lw $t9, 0x0020($sp) -.L80B51A44: -/* 030B4 80B51A44 AE190240 */ sw $t9, 0x0240($s0) ## 00000240 -.L80B51A48: -/* 030B8 80B51A48 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51A4C: -/* 030BC 80B51A4C 8FB00018 */ lw $s0, 0x0018($sp) -/* 030C0 80B51A50 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 030C4 80B51A54 03E00008 */ jr $ra -/* 030C8 80B51A58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s deleted file mode 100644 index a8e85ef507..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B51A5C -/* 030CC 80B51A5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030D0 80B51A60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030D4 80B51A64 AFA40018 */ sw $a0, 0x0018($sp) -/* 030D8 80B51A68 0C2D3F33 */ jal func_80B4FCCC -/* 030DC 80B51A6C AFA5001C */ sw $a1, 0x001C($sp) -/* 030E0 80B51A70 8FA40018 */ lw $a0, 0x0018($sp) -/* 030E4 80B51A74 0C2D4652 */ jal func_80B51948 -/* 030E8 80B51A78 8FA5001C */ lw $a1, 0x001C($sp) -/* 030EC 80B51A7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 030F0 80B51A80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 030F4 80B51A84 03E00008 */ jr $ra -/* 030F8 80B51A88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s deleted file mode 100644 index 304b12aa0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51A8C -/* 030FC 80B51A8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03100 80B51A90 AFBF001C */ sw $ra, 0x001C($sp) -/* 03104 80B51A94 AFB00018 */ sw $s0, 0x0018($sp) -/* 03108 80B51A98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0310C 80B51A9C 0C2D3F33 */ jal func_80B4FCCC -/* 03110 80B51AA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03114 80B51AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03118 80B51AA8 0C2D3B4B */ jal func_80B4ED2C -/* 0311C 80B51AAC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03120 80B51AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03124 80B51AB4 0C2D4506 */ jal func_80B51418 -/* 03128 80B51AB8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0312C 80B51ABC 0C2D3B5D */ jal func_80B4ED74 -/* 03130 80B51AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03134 80B51AC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03138 80B51AC8 0C2D4652 */ jal func_80B51948 -/* 0313C 80B51ACC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03140 80B51AD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03144 80B51AD4 8FB00018 */ lw $s0, 0x0018($sp) -/* 03148 80B51AD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0314C 80B51ADC 03E00008 */ jr $ra -/* 03150 80B51AE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s deleted file mode 100644 index dce3b12baa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B51AE4 -/* 03154 80B51AE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03158 80B51AE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0315C 80B51AEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03160 80B51AF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03164 80B51AF4 0C2D3F33 */ jal func_80B4FCCC -/* 03168 80B51AF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0316C 80B51AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03170 80B51B00 0C2D3B4B */ jal func_80B4ED2C -/* 03174 80B51B04 8FA50024 */ lw $a1, 0x0024($sp) -/* 03178 80B51B08 0C2D3A6C */ jal func_80B4E9B0 -/* 0317C 80B51B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03180 80B51B10 0C2D3B5D */ jal func_80B4ED74 -/* 03184 80B51B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03188 80B51B18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0318C 80B51B1C 0C2D4591 */ jal func_80B51644 -/* 03190 80B51B20 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03194 80B51B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03198 80B51B28 0C2D4652 */ jal func_80B51948 -/* 0319C 80B51B2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 031A0 80B51B30 8FBF001C */ lw $ra, 0x001C($sp) -/* 031A4 80B51B34 8FB00018 */ lw $s0, 0x0018($sp) -/* 031A8 80B51B38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 031AC 80B51B3C 03E00008 */ jr $ra -/* 031B0 80B51B40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s deleted file mode 100644 index 4de7c1700f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51B44 -/* 031B4 80B51B44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 031B8 80B51B48 AFBF001C */ sw $ra, 0x001C($sp) -/* 031BC 80B51B4C AFB00018 */ sw $s0, 0x0018($sp) -/* 031C0 80B51B50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031C4 80B51B54 0C2D3F33 */ jal func_80B4FCCC -/* 031C8 80B51B58 AFA50024 */ sw $a1, 0x0024($sp) -/* 031CC 80B51B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031D0 80B51B60 0C2D3B4B */ jal func_80B4ED2C -/* 031D4 80B51B64 8FA50024 */ lw $a1, 0x0024($sp) -/* 031D8 80B51B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031DC 80B51B6C 0C2D4527 */ jal func_80B5149C -/* 031E0 80B51B70 8FA50024 */ lw $a1, 0x0024($sp) -/* 031E4 80B51B74 0C2D3B5D */ jal func_80B4ED74 -/* 031E8 80B51B78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031EC 80B51B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031F0 80B51B80 0C2D45B4 */ jal func_80B516D0 -/* 031F4 80B51B84 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 031F8 80B51B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031FC 80B51B8C 0C2D4652 */ jal func_80B51948 -/* 03200 80B51B90 8FA50024 */ lw $a1, 0x0024($sp) -/* 03204 80B51B94 8FBF001C */ lw $ra, 0x001C($sp) -/* 03208 80B51B98 8FB00018 */ lw $s0, 0x0018($sp) -/* 0320C 80B51B9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03210 80B51BA0 03E00008 */ jr $ra -/* 03214 80B51BA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s deleted file mode 100644 index 57a5fb1f1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51BA8 -/* 03218 80B51BA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0321C 80B51BAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03220 80B51BB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03224 80B51BB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03228 80B51BB8 0C2D3F33 */ jal func_80B4FCCC -/* 0322C 80B51BBC AFA50024 */ sw $a1, 0x0024($sp) -/* 03230 80B51BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03234 80B51BC4 0C2D3B4B */ jal func_80B4ED2C -/* 03238 80B51BC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0323C 80B51BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03240 80B51BD0 0C2D453E */ jal func_80B514F8 -/* 03244 80B51BD4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03248 80B51BD8 0C2D3B5D */ jal func_80B4ED74 -/* 0324C 80B51BDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03250 80B51BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03254 80B51BE4 0C2D45D7 */ jal func_80B5175C -/* 03258 80B51BE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0325C 80B51BEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03260 80B51BF0 0C2D4652 */ jal func_80B51948 -/* 03264 80B51BF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03268 80B51BF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0326C 80B51BFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03270 80B51C00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03274 80B51C04 03E00008 */ jr $ra -/* 03278 80B51C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s deleted file mode 100644 index 6d08d09ecc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B51C0C -/* 0327C 80B51C0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03280 80B51C10 AFBF001C */ sw $ra, 0x001C($sp) -/* 03284 80B51C14 AFB00018 */ sw $s0, 0x0018($sp) -/* 03288 80B51C18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0328C 80B51C1C 0C2D3F33 */ jal func_80B4FCCC -/* 03290 80B51C20 AFA50024 */ sw $a1, 0x0024($sp) -/* 03294 80B51C24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03298 80B51C28 0C2D3B4B */ jal func_80B4ED2C -/* 0329C 80B51C2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 032A0 80B51C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032A4 80B51C34 0C2D451B */ jal func_80B5146C -/* 032A8 80B51C38 8FA50024 */ lw $a1, 0x0024($sp) -/* 032AC 80B51C3C 0C2D3B5D */ jal func_80B4ED74 -/* 032B0 80B51C40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B4 80B51C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B8 80B51C48 0C2D45F8 */ jal func_80B517E0 -/* 032BC 80B51C4C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 032C0 80B51C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 032C4 80B51C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 032C8 80B51C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 032CC 80B51C5C 03E00008 */ jr $ra -/* 032D0 80B51C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s deleted file mode 100644 index 59f3255102..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B51C64 -/* 032D4 80B51C64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032D8 80B51C68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 032DC 80B51C6C AFA40018 */ sw $a0, 0x0018($sp) -/* 032E0 80B51C70 0C2D3F33 */ jal func_80B4FCCC -/* 032E4 80B51C74 AFA5001C */ sw $a1, 0x001C($sp) -/* 032E8 80B51C78 8FA40018 */ lw $a0, 0x0018($sp) -/* 032EC 80B51C7C 0C2D3B4B */ jal func_80B4ED2C -/* 032F0 80B51C80 8FA5001C */ lw $a1, 0x001C($sp) -/* 032F4 80B51C84 0C2D3B5D */ jal func_80B4ED74 -/* 032F8 80B51C88 8FA40018 */ lw $a0, 0x0018($sp) -/* 032FC 80B51C8C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03300 80B51C90 0C2D4652 */ jal func_80B51948 -/* 03304 80B51C94 8FA5001C */ lw $a1, 0x001C($sp) -/* 03308 80B51C98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0330C 80B51C9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03310 80B51CA0 03E00008 */ jr $ra -/* 03314 80B51CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s deleted file mode 100644 index 2c502f3f44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B51CA8 -/* 03318 80B51CA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0331C 80B51CAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03320 80B51CB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03324 80B51CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03328 80B51CB8 0C2D3F33 */ jal func_80B4FCCC -/* 0332C 80B51CBC AFA50024 */ sw $a1, 0x0024($sp) -/* 03330 80B51CC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80B51CC4 0C2D3B4B */ jal func_80B4ED2C -/* 03338 80B51CC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0333C 80B51CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03340 80B51CD0 0C2D4553 */ jal func_80B5154C -/* 03344 80B51CD4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03348 80B51CD8 0C2D3B5D */ jal func_80B4ED74 -/* 0334C 80B51CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03350 80B51CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03354 80B51CE4 0C2D461F */ jal func_80B5187C -/* 03358 80B51CE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0335C 80B51CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03360 80B51CF0 0C2D4652 */ jal func_80B51948 -/* 03364 80B51CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03368 80B51CF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0336C 80B51CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03370 80B51D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03374 80B51D04 03E00008 */ jr $ra -/* 03378 80B51D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s deleted file mode 100644 index 7dfa2d7d3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B51D0C -/* 0337C 80B51D0C AFA50004 */ sw $a1, 0x0004($sp) -/* 03380 80B51D10 240E0021 */ addiu $t6, $zero, 0x0021 ## $t6 = 00000021 -/* 03384 80B51D14 AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 03388 80B51D18 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 0338C 80B51D1C 03E00008 */ jr $ra -/* 03390 80B51D20 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s deleted file mode 100644 index f50778a80a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B51D24 -/* 03394 80B51D24 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03398 80B51D28 AFB00018 */ sw $s0, 0x0018($sp) -/* 0339C 80B51D2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 033A0 80B51D30 AFBF001C */ sw $ra, 0x001C($sp) -/* 033A4 80B51D34 AFA5003C */ sw $a1, 0x003C($sp) -/* 033A8 80B51D38 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 80B51D3C AFA40020 */ sw $a0, 0x0020($sp) -/* 033B0 80B51D40 0C0295B2 */ jal func_800A56C8 -/* 033B4 80B51D44 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 033B8 80B51D48 14400005 */ bne $v0, $zero, .L80B51D60 -/* 033BC 80B51D4C 8FA40020 */ lw $a0, 0x0020($sp) -/* 033C0 80B51D50 0C0295B2 */ jal func_800A56C8 -/* 033C4 80B51D54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 033C8 80B51D58 5040000E */ beql $v0, $zero, .L80B51D94 -/* 033CC 80B51D5C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51D60: -/* 033D0 80B51D60 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 033D4 80B51D64 8FA4003C */ lw $a0, 0x003C($sp) -/* 033D8 80B51D68 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 033DC 80B51D6C 11E00008 */ beq $t7, $zero, .L80B51D90 -/* 033E0 80B51D70 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 033E4 80B51D74 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 033E8 80B51D78 0C0107CD */ jal func_80041F34 -/* 033EC 80B51D7C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 033F0 80B51D80 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 033F4 80B51D84 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 033F8 80B51D88 0C01E245 */ jal func_80078914 -/* 033FC 80B51D8C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80B51D90: -/* 03400 80B51D90 8FBF001C */ lw $ra, 0x001C($sp) -.L80B51D94: -/* 03404 80B51D94 8FB00018 */ lw $s0, 0x0018($sp) -/* 03408 80B51D98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0340C 80B51D9C 03E00008 */ jr $ra -/* 03410 80B51DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s deleted file mode 100644 index 817331cb88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80B51DA4 -/* 03414 80B51DA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03418 80B51DA8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0341C 80B51DAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03420 80B51DB0 AFA50044 */ sw $a1, 0x0044($sp) -/* 03424 80B51DB4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03428 80B51DB8 0C2D3B65 */ jal func_80B4ED94 -/* 0342C 80B51DBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03430 80B51DC0 10400035 */ beq $v0, $zero, .L80B51E98 -/* 03434 80B51DC4 8FAE0044 */ lw $t6, 0x0044($sp) -/* 03438 80B51DC8 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 0343C 80B51DCC 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 03440 80B51DD0 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 03444 80B51DD4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 03448 80B51DD8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0344C 80B51DDC AFA2003C */ sw $v0, 0x003C($sp) -/* 03450 80B51DE0 0C01BE6F */ jal func_8006F9BC -/* 03454 80B51DE4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03458 80B51DE8 8FA3003C */ lw $v1, 0x003C($sp) -/* 0345C 80B51DEC 8FA40040 */ lw $a0, 0x0040($sp) -/* 03460 80B51DF0 8C790010 */ lw $t9, 0x0010($v1) ## 00000010 -/* 03464 80B51DF4 8C78000C */ lw $t8, 0x000C($v1) ## 0000000C -/* 03468 80B51DF8 8C690018 */ lw $t1, 0x0018($v1) ## 00000018 -/* 0346C 80B51DFC 8C680014 */ lw $t0, 0x0014($v1) ## 00000014 -/* 03470 80B51E00 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 03474 80B51E04 8C6B0020 */ lw $t3, 0x0020($v1) ## 00000020 -/* 03478 80B51E08 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0347C 80B51E0C 8C6A001C */ lw $t2, 0x001C($v1) ## 0000001C -/* 03480 80B51E10 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 03484 80B51E14 46803320 */ cvt.s.w $f12, $f6 -/* 03488 80B51E18 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 0348C 80B51E1C 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 03490 80B51E20 24820024 */ addiu $v0, $a0, 0x0024 ## $v0 = 00000024 -/* 03494 80B51E24 468020A0 */ cvt.s.w $f2, $f4 -/* 03498 80B51E28 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 0349C 80B51E2C 46805420 */ cvt.s.w $f16, $f10 -/* 034A0 80B51E30 468043A0 */ cvt.s.w $f14, $f8 -/* 034A4 80B51E34 46803220 */ cvt.s.w $f8, $f6 -/* 034A8 80B51E38 468024A0 */ cvt.s.w $f18, $f4 -/* 034AC 80B51E3C E7A80020 */ swc1 $f8, 0x0020($sp) -/* 034B0 80B51E40 46028281 */ sub.s $f10, $f16, $f2 -/* 034B4 80B51E44 460C9201 */ sub.s $f8, $f18, $f12 -/* 034B8 80B51E48 46005102 */ mul.s $f4, $f10, $f0 -/* 034BC 80B51E4C 00000000 */ nop -/* 034C0 80B51E50 46004282 */ mul.s $f10, $f8, $f0 -/* 034C4 80B51E54 46022180 */ add.s $f6, $f4, $f2 -/* 034C8 80B51E58 460C5100 */ add.s $f4, $f10, $f12 -/* 034CC 80B51E5C E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 034D0 80B51E60 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 034D4 80B51E64 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 034D8 80B51E68 460E3201 */ sub.s $f8, $f6, $f14 -/* 034DC 80B51E6C 46004282 */ mul.s $f10, $f8, $f0 -/* 034E0 80B51E70 460E5100 */ add.s $f4, $f10, $f14 -/* 034E4 80B51E74 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -/* 034E8 80B51E78 8FAD0044 */ lw $t5, 0x0044($sp) -/* 034EC 80B51E7C 946C0004 */ lhu $t4, 0x0004($v1) ## 00000004 -/* 034F0 80B51E80 95AE1D74 */ lhu $t6, 0x1D74($t5) ## 00001D74 -/* 034F4 80B51E84 018E082A */ slt $at, $t4, $t6 -/* 034F8 80B51E88 10200003 */ beq $at, $zero, .L80B51E98 -/* 034FC 80B51E8C 00000000 */ nop -/* 03500 80B51E90 0C00B55C */ jal Actor_Kill - -/* 03504 80B51E94 00000000 */ nop -.L80B51E98: -/* 03508 80B51E98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0350C 80B51E9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03510 80B51EA0 03E00008 */ jr $ra -/* 03514 80B51EA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s deleted file mode 100644 index a97e922589..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B51EA8 -/* 03518 80B51EA8 240E0021 */ addiu $t6, $zero, 0x0021 ## $t6 = 00000021 -/* 0351C 80B51EAC AC8E019C */ sw $t6, 0x019C($a0) ## 0000019C -/* 03520 80B51EB0 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 03524 80B51EB4 03E00008 */ jr $ra -/* 03528 80B51EB8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s deleted file mode 100644 index fef81bd43b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B51EBC -/* 0352C 80B51EBC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03530 80B51EC0 AFB00020 */ sw $s0, 0x0020($sp) -/* 03534 80B51EC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03538 80B51EC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0353C 80B51ECC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03540 80B51ED0 0C2D3B65 */ jal func_80B4ED94 -/* 03544 80B51ED4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03548 80B51ED8 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 0354C 80B51EDC 260800B4 */ addiu $t0, $s0, 0x00B4 ## $t0 = 000000B4 -/* 03550 80B51EE0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 03554 80B51EE4 A5030002 */ sh $v1, 0x0002($t0) ## 000000B6 -/* 03558 80B51EE8 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -/* 0355C 80B51EEC AFA80028 */ sw $t0, 0x0028($sp) -/* 03560 80B51EF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 03564 80B51EF4 24A5B224 */ addiu $a1, $a1, 0xB224 ## $a1 = 0600B224 -/* 03568 80B51EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0356C 80B51EFC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03570 80B51F00 0C2D3F40 */ jal func_80B4FD00 -/* 03574 80B51F04 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03578 80B51F08 8FA80028 */ lw $t0, 0x0028($sp) -/* 0357C 80B51F0C 240E0022 */ addiu $t6, $zero, 0x0022 ## $t6 = 00000022 -/* 03580 80B51F10 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03584 80B51F14 AE0E019C */ sw $t6, 0x019C($s0) ## 0000019C -/* 03588 80B51F18 AE0F01A0 */ sw $t7, 0x01A0($s0) ## 000001A0 -/* 0358C 80B51F1C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03590 80B51F20 A1180014 */ sb $t8, 0x0014($t0) ## 00000014 -/* 03594 80B51F24 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03598 80B51F28 8FB00020 */ lw $s0, 0x0020($sp) -/* 0359C 80B51F2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 035A0 80B51F30 03E00008 */ jr $ra -/* 035A4 80B51F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s deleted file mode 100644 index b9f03b14da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B51F38 -/* 035A8 80B51F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 035AC 80B51F3C AFA40020 */ sw $a0, 0x0020($sp) -/* 035B0 80B51F40 AFBF001C */ sw $ra, 0x001C($sp) -/* 035B4 80B51F44 AFA50024 */ sw $a1, 0x0024($sp) -/* 035B8 80B51F48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 035BC 80B51F4C 0C2D3B65 */ jal func_80B4ED94 -/* 035C0 80B51F50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 035C4 80B51F54 10400010 */ beq $v0, $zero, .L80B51F98 -/* 035C8 80B51F58 8FAF0024 */ lw $t7, 0x0024($sp) -/* 035CC 80B51F5C 95F81D74 */ lhu $t8, 0x1D74($t7) ## 00001D74 -/* 035D0 80B51F60 944E0004 */ lhu $t6, 0x0004($v0) ## 00000004 -/* 035D4 80B51F64 8FA40020 */ lw $a0, 0x0020($sp) -/* 035D8 80B51F68 2719FFF8 */ addiu $t9, $t8, 0xFFF8 ## $t9 = FFFFFFF8 -/* 035DC 80B51F6C 032E082A */ slt $at, $t9, $t6 -/* 035E0 80B51F70 14200009 */ bne $at, $zero, .L80B51F98 -/* 035E4 80B51F74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 035E8 80B51F78 24A5B5FC */ addiu $a1, $a1, 0xB5FC ## $a1 = 0600B5FC -/* 035EC 80B51F7C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 035F0 80B51F80 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 035F4 80B51F84 0C2D3F40 */ jal func_80B4FD00 -/* 035F8 80B51F88 AFA00010 */ sw $zero, 0x0010($sp) -/* 035FC 80B51F8C 8FA90020 */ lw $t1, 0x0020($sp) -/* 03600 80B51F90 24080023 */ addiu $t0, $zero, 0x0023 ## $t0 = 00000023 -/* 03604 80B51F94 AD28019C */ sw $t0, 0x019C($t1) ## 0000019C -.L80B51F98: -/* 03608 80B51F98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0360C 80B51F9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03610 80B51FA0 03E00008 */ jr $ra -/* 03614 80B51FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s deleted file mode 100644 index aa1c2096f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s +++ /dev/null @@ -1,63 +0,0 @@ -.rdata -glabel D_80B529F4 - .asciz "En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B51FA8 -/* 03618 80B51FA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0361C 80B51FAC AFB00018 */ sw $s0, 0x0018($sp) -/* 03620 80B51FB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03624 80B51FB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03628 80B51FB8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0362C 80B51FBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03630 80B51FC0 0C2D3B65 */ jal func_80B4ED94 -/* 03634 80B51FC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03638 80B51FC8 50400023 */ beql $v0, $zero, .L80B52058 -/* 0363C 80B51FCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03640 80B51FD0 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 03644 80B51FD4 8E030240 */ lw $v1, 0x0240($s0) ## 00000240 -/* 03648 80B51FD8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0364C 80B51FDC 50C3001E */ beql $a2, $v1, .L80B52058 -/* 03650 80B51FE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03654 80B51FE4 10C10009 */ beq $a2, $at, .L80B5200C -/* 03658 80B51FE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0365C 80B51FEC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03660 80B51FF0 10C1000A */ beq $a2, $at, .L80B5201C -/* 03664 80B51FF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03668 80B51FF8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 0366C 80B51FFC 10C1000C */ beq $a2, $at, .L80B52030 -/* 03670 80B52000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03674 80B52004 1000000E */ beq $zero, $zero, .L80B52040 -/* 03678 80B52008 3C0480B5 */ lui $a0, %hi(D_80B529F4) ## $a0 = 80B50000 -.L80B5200C: -/* 0367C 80B5200C 0C2D47AA */ jal func_80B51EA8 -/* 03680 80B52010 AFA60020 */ sw $a2, 0x0020($sp) -/* 03684 80B52014 1000000E */ beq $zero, $zero, .L80B52050 -/* 03688 80B52018 8FA60020 */ lw $a2, 0x0020($sp) -.L80B5201C: -/* 0368C 80B5201C 8FA5002C */ lw $a1, 0x002C($sp) -/* 03690 80B52020 0C2D47AF */ jal func_80B51EBC -/* 03694 80B52024 AFA60020 */ sw $a2, 0x0020($sp) -/* 03698 80B52028 10000009 */ beq $zero, $zero, .L80B52050 -/* 0369C 80B5202C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52030: -/* 036A0 80B52030 0C00B55C */ jal Actor_Kill - -/* 036A4 80B52034 AFA60020 */ sw $a2, 0x0020($sp) -/* 036A8 80B52038 10000005 */ beq $zero, $zero, .L80B52050 -/* 036AC 80B5203C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52040: -/* 036B0 80B52040 248429F4 */ addiu $a0, $a0, %lo(D_80B529F4) ## $a0 = 000029F4 -/* 036B4 80B52044 0C00084C */ jal osSyncPrintf - -/* 036B8 80B52048 AFA60020 */ sw $a2, 0x0020($sp) -/* 036BC 80B5204C 8FA60020 */ lw $a2, 0x0020($sp) -.L80B52050: -/* 036C0 80B52050 AE060240 */ sw $a2, 0x0240($s0) ## 00000240 -/* 036C4 80B52054 8FBF001C */ lw $ra, 0x001C($sp) -.L80B52058: -/* 036C8 80B52058 8FB00018 */ lw $s0, 0x0018($sp) -/* 036CC 80B5205C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 036D0 80B52060 03E00008 */ jr $ra -/* 036D4 80B52064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s deleted file mode 100644 index be383933c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B52068 -/* 036D8 80B52068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036DC 80B5206C AFBF0014 */ sw $ra, 0x0014($sp) -/* 036E0 80B52070 AFA40018 */ sw $a0, 0x0018($sp) -/* 036E4 80B52074 0C2D3F33 */ jal func_80B4FCCC -/* 036E8 80B52078 AFA5001C */ sw $a1, 0x001C($sp) -/* 036EC 80B5207C 8FA40018 */ lw $a0, 0x0018($sp) -/* 036F0 80B52080 0C2D47EA */ jal func_80B51FA8 -/* 036F4 80B52084 8FA5001C */ lw $a1, 0x001C($sp) -/* 036F8 80B52088 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036FC 80B5208C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03700 80B52090 03E00008 */ jr $ra -/* 03704 80B52094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s deleted file mode 100644 index 7db9bfeac9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B52098 -/* 03708 80B52098 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0370C 80B5209C AFBF001C */ sw $ra, 0x001C($sp) -/* 03710 80B520A0 AFB10018 */ sw $s1, 0x0018($sp) -/* 03714 80B520A4 AFB00014 */ sw $s0, 0x0014($sp) -/* 03718 80B520A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0371C 80B520AC 0C2D3F33 */ jal func_80B4FCCC -/* 03720 80B520B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03724 80B520B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03728 80B520B8 0C2D3B4B */ jal func_80B4ED2C -/* 0372C 80B520BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03730 80B520C0 0C2D3A6C */ jal func_80B4E9B0 -/* 03734 80B520C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03738 80B520C8 0C2D3B5D */ jal func_80B4ED74 -/* 0373C 80B520CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03740 80B520D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03744 80B520D4 0C2D4749 */ jal func_80B51D24 -/* 03748 80B520D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0374C 80B520DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03750 80B520E0 0C2D47CE */ jal func_80B51F38 -/* 03754 80B520E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03758 80B520E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0375C 80B520EC 0C2D4769 */ jal func_80B51DA4 -/* 03760 80B520F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03764 80B520F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03768 80B520F8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0376C 80B520FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 03770 80B52100 03E00008 */ jr $ra -/* 03774 80B52104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s deleted file mode 100644 index eaefd8afda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B52108 -/* 03778 80B52108 AFA40000 */ sw $a0, 0x0000($sp) -/* 0377C 80B5210C 03E00008 */ jr $ra -/* 03780 80B52110 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s deleted file mode 100644 index bcb044bd5e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s +++ /dev/null @@ -1,48 +0,0 @@ -.rdata -glabel D_80B52A30 - .asciz " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B52114 -/* 03784 80B52114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03788 80B52118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0378C 80B5211C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 03790 80B52120 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03794 80B52124 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03798 80B52128 1040000F */ beq $v0, $zero, .L80B52168 -/* 0379C 80B5212C 00000000 */ nop -/* 037A0 80B52130 10410005 */ beq $v0, $at, .L80B52148 -/* 037A4 80B52134 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 037A8 80B52138 10410007 */ beq $v0, $at, .L80B52158 -/* 037AC 80B5213C 3C0480B5 */ lui $a0, %hi(D_80B52A30) ## $a0 = 80B50000 -/* 037B0 80B52140 1000000D */ beq $zero, $zero, .L80B52178 -/* 037B4 80B52144 24842A30 */ addiu $a0, $a0, %lo(D_80B52A30) ## $a0 = 80B52A30 -.L80B52148: -/* 037B8 80B52148 0C2D44D7 */ jal func_80B5135C -/* 037BC 80B5214C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037C0 80B52150 10000010 */ beq $zero, $zero, .L80B52194 -/* 037C4 80B52154 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52158: -/* 037C8 80B52158 0C2D4743 */ jal func_80B51D0C -/* 037CC 80B5215C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037D0 80B52160 1000000C */ beq $zero, $zero, .L80B52194 -/* 037D4 80B52164 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52168: -/* 037D8 80B52168 0C2D3F64 */ jal func_80B4FD90 -/* 037DC 80B5216C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 037E0 80B52170 10000008 */ beq $zero, $zero, .L80B52194 -/* 037E4 80B52174 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52178: -/* 037E8 80B52178 AFA5001C */ sw $a1, 0x001C($sp) -/* 037EC 80B5217C 0C00084C */ jal osSyncPrintf - -/* 037F0 80B52180 AFA60018 */ sw $a2, 0x0018($sp) -/* 037F4 80B52184 8FA5001C */ lw $a1, 0x001C($sp) -/* 037F8 80B52188 0C2D3F64 */ jal func_80B4FD90 -/* 037FC 80B5218C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03800 80B52190 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52194: -/* 03804 80B52194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03808 80B52198 03E00008 */ jr $ra -/* 0380C 80B5219C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s deleted file mode 100644 index 389b6ad17b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s +++ /dev/null @@ -1,55 +0,0 @@ -.rdata -glabel D_80B52A74 - .asciz "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B521A0 -/* 03810 80B521A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03814 80B521A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03818 80B521A8 AFA40030 */ sw $a0, 0x0030($sp) -/* 0381C 80B521AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 03820 80B521B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03824 80B521B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 03828 80B521B8 00A12021 */ addu $a0, $a1, $at -/* 0382C 80B521BC AFA4001C */ sw $a0, 0x001C($sp) -/* 03830 80B521C0 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 03834 80B521C4 2405014E */ addiu $a1, $zero, 0x014E ## $a1 = 0000014E -/* 03838 80B521C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0383C 80B521CC 04410006 */ bgez $v0, .L80B521E8 -/* 03840 80B521D0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 03844 80B521D4 3C0480B5 */ lui $a0, %hi(D_80B52A74) ## $a0 = 80B50000 -/* 03848 80B521D8 0C00084C */ jal osSyncPrintf - -/* 0384C 80B521DC 24842A74 */ addiu $a0, $a0, %lo(D_80B52A74) ## $a0 = 80B52A74 -/* 03850 80B521E0 10000015 */ beq $zero, $zero, .L80B52238 -/* 03854 80B521E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B521E8: -/* 03858 80B521E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0385C 80B521EC 0C026062 */ jal Object_IsLoaded - -/* 03860 80B521F0 AFA60024 */ sw $a2, 0x0024($sp) -/* 03864 80B521F4 1040000F */ beq $v0, $zero, .L80B52234 -/* 03868 80B521F8 8FA60024 */ lw $a2, 0x0024($sp) -/* 0386C 80B521FC 8FA40030 */ lw $a0, 0x0030($sp) -/* 03870 80B52200 AC860274 */ sw $a2, 0x0274($a0) ## 00000274 -/* 03874 80B52204 0C2D3F33 */ jal func_80B4FCCC -/* 03878 80B52208 8FA50034 */ lw $a1, 0x0034($sp) -/* 0387C 80B5220C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03880 80B52210 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03884 80B52214 248422D0 */ addiu $a0, $a0, 0x22D0 ## $a0 = 060022D0 -/* 03888 80B52218 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0388C 80B5221C 8FAE0030 */ lw $t6, 0x0030($sp) -/* 03890 80B52220 468021A0 */ cvt.s.w $f6, $f4 -/* 03894 80B52224 E5C60278 */ swc1 $f6, 0x0278($t6) ## 00000278 -/* 03898 80B52228 8FA50034 */ lw $a1, 0x0034($sp) -/* 0389C 80B5222C 0C2D4845 */ jal func_80B52114 -/* 038A0 80B52230 8FA40030 */ lw $a0, 0x0030($sp) -.L80B52234: -/* 038A4 80B52234 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B52238: -/* 038A8 80B52238 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 038AC 80B5223C 03E00008 */ jr $ra -/* 038B0 80B52240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s deleted file mode 100644 index d80262deba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s +++ /dev/null @@ -1,40 +0,0 @@ -.rdata -glabel D_80B52AF8 - .asciz "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B52348 -/* 039B8 80B52348 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 039BC 80B5234C 8FAE003C */ lw $t6, 0x003C($sp) -/* 039C0 80B52350 AFBF0024 */ sw $ra, 0x0024($sp) -/* 039C4 80B52354 8DC20264 */ lw $v0, 0x0264($t6) ## 00000264 -/* 039C8 80B52358 04400009 */ bltz $v0, .L80B52380 -/* 039CC 80B5235C 00000000 */ nop -/* 039D0 80B52360 1C400007 */ bgtz $v0, .L80B52380 -/* 039D4 80B52364 00027880 */ sll $t7, $v0, 2 -/* 039D8 80B52368 3C0380B5 */ lui $v1, %hi(D_80B528D0) ## $v1 = 80B50000 -/* 039DC 80B5236C 006F1821 */ addu $v1, $v1, $t7 -/* 039E0 80B52370 8C6328D0 */ lw $v1, %lo(D_80B528D0)($v1) -/* 039E4 80B52374 8FB80038 */ lw $t8, 0x0038($sp) -/* 039E8 80B52378 54600007 */ bnel $v1, $zero, .L80B52398 -/* 039EC 80B5237C 8FB9003C */ lw $t9, 0x003C($sp) -.L80B52380: -/* 039F0 80B52380 3C0480B5 */ lui $a0, %hi(D_80B52AF8) ## $a0 = 80B50000 -/* 039F4 80B52384 0C00084C */ jal osSyncPrintf - -/* 039F8 80B52388 24842AF8 */ addiu $a0, $a0, %lo(D_80B52AF8) ## $a0 = 80B52AF8 -/* 039FC 80B5238C 10000007 */ beq $zero, $zero, .L80B523AC -/* 03A00 80B52390 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03A04 80B52394 8FB9003C */ lw $t9, 0x003C($sp) -.L80B52398: -/* 03A08 80B52398 8FA80040 */ lw $t0, 0x0040($sp) -/* 03A0C 80B5239C AFB80010 */ sw $t8, 0x0010($sp) -/* 03A10 80B523A0 AFB90014 */ sw $t9, 0x0014($sp) -/* 03A14 80B523A4 0060F809 */ jalr $ra, $v1 -/* 03A18 80B523A8 AFA80018 */ sw $t0, 0x0018($sp) -.L80B523AC: -/* 03A1C 80B523AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03A20 80B523B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03A24 80B523B4 03E00008 */ jr $ra -/* 03A28 80B523B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s deleted file mode 100644 index e22870c90b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B523BC -/* 03A2C 80B523BC AFA40000 */ sw $a0, 0x0000($sp) -/* 03A30 80B523C0 03E00008 */ jr $ra -/* 03A34 80B523C4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s deleted file mode 100644 index 10a531b875..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ /dev/null @@ -1,142 +0,0 @@ -.rdata -glabel D_80B52B38 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B48 - .asciz "../z_en_zl2.c" - .balign 4 - -.text -glabel func_80B523C8 -/* 03A38 80B523C8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) -/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) -/* 03A4C 80B523DC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 03A50 80B523E0 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 03A54 80B523E4 3C0980B5 */ lui $t1, %hi(D_80B52810) ## $t1 = 80B50000 -/* 03A58 80B523E8 25292810 */ addiu $t1, $t1, %lo(D_80B52810) ## $t1 = 80B52810 -/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 -/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 -/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 -/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 -/* 03A6C 80B523FC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03A70 80B52400 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 03A74 80B52404 3C0D80B5 */ lui $t5, %hi(D_80B52834) ## $t5 = 80B50000 -/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) -/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) -/* 03A80 80B52410 84880198 */ lh $t0, 0x0198($a0) ## 00000198 -/* 03A84 80B52414 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 03A88 80B52418 3C0680B5 */ lui $a2, %hi(D_80B52B38) ## $a2 = 80B50000 -/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 -/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 -/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) -/* 03A98 80B52428 24C62B38 */ addiu $a2, $a2, %lo(D_80B52B38) ## $a2 = 80B52B38 -/* 03A9C 80B5242C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) -/* 03AA4 80B52434 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03AA8 80B52438 24070657 */ addiu $a3, $zero, 0x0657 ## $a3 = 00000657 -/* 03AAC 80B5243C 0C031AB1 */ jal Graph_OpenDisps -/* 03AB0 80B52440 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) -/* 03AB8 80B52448 0C024F46 */ jal func_80093D18 -/* 03ABC 80B5244C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) -/* 03AC4 80B52454 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03AC8 80B52458 3C048016 */ lui $a0, %hi(gSegments) -/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 -/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 -/* 03AD4 80B52464 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03AD8 80B52468 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03ADC 80B5246C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 03AE0 80B52470 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 -/* 03AE8 80B52478 24846FA8 */ addiu $a0, %lo(gSegments) -/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 -/* 03AF0 80B52480 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03AF4 80B52484 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 03AF8 80B52488 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 03AFC 80B5248C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 -/* 03B04 80B52494 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 -/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 -/* 03B10 80B524A0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) -/* 03B18 80B524A8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B1C 80B524AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 -/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 -/* 03B28 80B524B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03B2C 80B524BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 -/* 03B34 80B524C4 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 -/* 03B3C 80B524CC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03B40 80B524D0 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 -/* 03B48 80B524D8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 -/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 -/* 03B54 80B524E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) -/* 03B5C 80B524EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B60 80B524F0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 -/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 -/* 03B6C 80B524FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03B70 80B52500 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 -/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 -/* 03B7C 80B5250C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03B80 80B52510 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 -/* 03B88 80B52518 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 -/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 -/* 03B94 80B52524 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03B98 80B52528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B9C 80B5252C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 03BA0 80B52530 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 03BA4 80B52534 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 03BA8 80B52538 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 03BAC 80B5253C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03BB0 80B52540 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 03BB4 80B52544 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03BB8 80B52548 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03BBC 80B5254C 354A002C */ ori $t2, $t2, 0x002C ## $t2 = DB06002C -/* 03BC0 80B52550 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03BC4 80B52554 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03BC8 80B52558 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 03BCC 80B5255C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03BD0 80B52560 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03BD4 80B52564 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 03BD8 80B52568 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 03BDC 80B5256C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 03BE0 80B52570 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03BE4 80B52574 3C0D80B5 */ lui $t5, %hi(func_80B4FB74) ## $t5 = 80B50000 -/* 03BE8 80B52578 3C0C80B5 */ lui $t4, %hi(func_80B52348) ## $t4 = 80B50000 -/* 03BEC 80B5257C 258C2348 */ addiu $t4, $t4, %lo(func_80B52348) ## $t4 = 80B52348 -/* 03BF0 80B52580 25ADFB74 */ addiu $t5, $t5, %lo(func_80B4FB74) ## $t5 = 80B4FB74 -/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) -/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) -/* 03C00 80B52590 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) -/* 03C08 80B52598 0C0289CF */ jal SkelAnime_DrawSV2 -/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) -/* 03C10 80B525A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) -/* 03C18 80B525A8 3C0680B5 */ lui $a2, %hi(D_80B52B48) ## $a2 = 80B50000 -/* 03C1C 80B525AC 24C62B48 */ addiu $a2, $a2, %lo(D_80B52B48) ## $a2 = 80B52B48 -/* 03C20 80B525B0 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03C24 80B525B4 24070670 */ addiu $a3, $zero, 0x0670 ## $a3 = 00000670 -/* 03C28 80B525B8 0C031AD5 */ jal Graph_CloseDisps -/* 03C2C 80B525BC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) -/* 03C3C 80B525CC 03E00008 */ jr $ra -/* 03C40 80B525D0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s deleted file mode 100644 index 427588f708..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ /dev/null @@ -1,129 +0,0 @@ -.rdata -glabel D_80B52B58 - .asciz "../z_en_zl2.c" - .balign 4 - -glabel D_80B52B68 - .asciz "../z_en_zl2.c" - .balign 4 - -.text -glabel func_80B525D4 -/* 03C44 80B525D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) -/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) -/* 03C58 80B525E8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 03C5C 80B525EC 3C0F80B5 */ lui $t7, %hi(D_80B52810) ## $t7 = 80B50000 -/* 03C60 80B525F0 3C1980B5 */ lui $t9, %hi(D_80B52834) ## $t9 = 80B50000 -/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 -/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 -/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) -/* 03C70 80B52600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 03C74 80B52604 3C0680B5 */ lui $a2, %hi(D_80B52B58) ## $a2 = 80B50000 -/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) -/* 03C7C 80B5260C 84830198 */ lh $v1, 0x0198($a0) ## 00000198 -/* 03C80 80B52610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 03C84 80B52614 24C62B58 */ addiu $a2, $a2, %lo(D_80B52B58) ## $a2 = 80B52B58 -/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 -/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 -/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) -/* 03C94 80B52624 2407067F */ addiu $a3, $zero, 0x067F ## $a3 = 0000067F -/* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) -/* 03C9C 80B5262C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03CA0 80B52630 0C031AB1 */ jal Graph_OpenDisps -/* 03CA4 80B52634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) -/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 -/* 03CB0 80B52640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) -/* 03CB8 80B52648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03CBC 80B5264C 3C078016 */ lui $a3, %hi(gSegments) -/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 -/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 -/* 03CC8 80B52658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03CCC 80B5265C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03CD0 80B52660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03CD4 80B52664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 -/* 03CDC 80B5266C 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 -/* 03CE4 80B52674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03CE8 80B52678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 03CEC 80B5267C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 03CF0 80B52680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 -/* 03CF8 80B52688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 -/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 -/* 03D04 80B52694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03D08 80B52698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D0C 80B5269C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03D10 80B526A0 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 03D14 80B526A4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03D18 80B526A8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03D1C 80B526AC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03D20 80B526B0 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 03D24 80B526B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03D28 80B526B8 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 -/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 -/* 03D34 80B526C4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) -/* 03D3C 80B526CC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 -/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 -/* 03D48 80B526D8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03D4C 80B526DC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 -/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 -/* 03D58 80B526E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03D5C 80B526EC 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 -/* 03D64 80B526F4 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 -/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 -/* 03D70 80B52700 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 03D74 80B52704 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D78 80B52708 3C198011 */ lui $t9, %hi(D_80116280) -/* 03D7C 80B5270C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 03D80 80B52710 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03D84 80B52714 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 03D88 80B52718 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03D8C 80B5271C 8E2D01A8 */ lw $t5, 0x01A8($s1) ## 000001A8 -/* 03D90 80B52720 3718002C */ ori $t8, $t8, 0x002C ## $t8 = DB06002C -/* 03D94 80B52724 27396280 */ addiu $t9, %lo(D_80116280) -/* 03D98 80B52728 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 -/* 03D9C 80B5272C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03DA0 80B52730 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03DA4 80B52734 3C0A80B5 */ lui $t2, %hi(func_80B52348) ## $t2 = 80B50000 -/* 03DA8 80B52738 254A2348 */ addiu $t2, $t2, %lo(func_80B52348) ## $t2 = 80B52348 -/* 03DAC 80B5273C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03DB0 80B52740 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 03DB4 80B52744 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03DB8 80B52748 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03DBC 80B5274C 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 03DC0 80B52750 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 03DC4 80B52754 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 03DC8 80B52758 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) -/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03DD8 80B52768 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) -/* 03DE0 80B52770 0C0289CF */ jal SkelAnime_DrawSV2 -/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) -/* 03DE8 80B52778 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) -/* 03DF0 80B52780 3C0680B5 */ lui $a2, %hi(D_80B52B68) ## $a2 = 80B50000 -/* 03DF4 80B52784 24C62B68 */ addiu $a2, $a2, %lo(D_80B52B68) ## $a2 = 80B52B68 -/* 03DF8 80B52788 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 03DFC 80B5278C 2407069C */ addiu $a3, $zero, 0x069C ## $a3 = 0000069C -/* 03E00 80B52790 0C031AD5 */ jal Graph_CloseDisps -/* 03E04 80B52794 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) -/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 03E14 80B527A4 03E00008 */ jr $ra -/* 03E18 80B527A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s index 4b40b8e1bd..937d5d232d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BC00.s @@ -44,7 +44,7 @@ glabel func_80B5BC00 /* 004F0 80B5BCA0 E7020838 */ swc1 $f2, 0x0838($t8) ## 00000838 /* 004F4 80B5BCA4 0C2D6E22 */ jal func_80B5B888 /* 004F8 80B5BCA8 8FA40034 */ lw $a0, 0x0034($sp) -/* 004FC 80B5BCAC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 004FC 80B5BCAC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 00500 80B5BCB0 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 00504 80B5BCB4 0C020978 */ jal Interface_ChangeAlpha /* 00508 80B5BCB8 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s index 04df754743..d087434b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5DE1C.s @@ -56,7 +56,7 @@ glabel L80B5DE84 /* 02708 80B5DEB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0270C 80B5DEBC 0C020978 */ jal Interface_ChangeAlpha /* 02710 80B5DEC0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 02714 80B5DEC4 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 02714 80B5DEC4 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 02718 80B5DEC8 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 0271C 80B5DECC 920A0209 */ lbu $t2, 0x0209($s0) ## 00000209 /* 02720 80B5DED0 A2000208 */ sb $zero, 0x0208($s0) ## 00000208 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s index d0235d45f7..92b48dcb3a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7825C.s @@ -606,7 +606,7 @@ glabel L80B78890 /* 0EF88 80B78928 3C0180B8 */ lui $at, %hi(D_80B7FECC) ## $at = 80B80000 /* 0EF8C 80B7892C E428FECC */ swc1 $f8, %lo(D_80B7FECC)($at) glabel L80B78930 -/* 0EF90 80B78930 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0EF90 80B78930 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 0EF94 80B78934 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 0EF98 80B78938 8FAC00E4 */ lw $t4, 0x00E4($sp) /* 0EF9C 80B7893C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s deleted file mode 100644 index 9a9e80c6e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel ShotSun_Destroy -/* 000CC 80BADD8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000D0 80BADD90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D4 80BADD94 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 000D8 80BADD98 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 000DC 80BADD9C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000E0 80BADDA0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 000E4 80BADDA4 10410005 */ beq $v0, $at, .L80BADDBC -/* 000E8 80BADDA8 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 000EC 80BADDAC 10410003 */ beq $v0, $at, .L80BADDBC -/* 000F0 80BADDB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000F4 80BADDB4 0C0170EB */ jal Collider_DestroyCylinder - -/* 000F8 80BADDB8 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -.L80BADDBC: -/* 000FC 80BADDBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00100 80BADDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00104 80BADDC4 03E00008 */ jr $ra -/* 00108 80BADDC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s deleted file mode 100644 index 9071ba34e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s +++ /dev/null @@ -1,64 +0,0 @@ -.rdata -glabel D_80BAE320 - .asciz "%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel ShotSun_Init -/* 00000 80BADCC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80BADCC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00008 80BADCC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80BADCCC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 80BADCD0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00014 80BADCD4 3C0480BB */ lui $a0, %hi(D_80BAE320) ## $a0 = 80BB0000 -/* 00018 80BADCD8 2484E320 */ addiu $a0, $a0, %lo(D_80BAE320) ## $a0 = 80BAE320 -/* 0001C 80BADCDC 0C00084C */ jal osSyncPrintf - -/* 00020 80BADCE0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00024 80BADCE4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00028 80BADCE8 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 0002C 80BADCEC 3C0880BB */ lui $t0, %hi(func_80BADF0C) ## $t0 = 80BB0000 -/* 00030 80BADCF0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 00034 80BADCF4 10410004 */ beq $v0, $at, .L80BADD08 -/* 00038 80BADCF8 2508DF0C */ addiu $t0, $t0, %lo(func_80BADF0C) ## $t0 = 80BADF0C -/* 0003C 80BADCFC 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 00040 80BADD00 1441000D */ bne $v0, $at, .L80BADD38 -/* 00044 80BADD04 8FA40034 */ lw $a0, 0x0034($sp) -.L80BADD08: -/* 00048 80BADD08 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0004C 80BADD0C 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 00050 80BADD10 A20001A4 */ sb $zero, 0x01A4($s0) ## 000001A4 -/* 00054 80BADD14 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 00058 80BADD18 01E1C825 */ or $t9, $t7, $at ## $t9 = 02000010 -/* 0005C 80BADD1C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00060 80BADD20 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 00064 80BADD24 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00068 80BADD28 03215025 */ or $t2, $t9, $at ## $t2 = 0A000010 -/* 0006C 80BADD2C AE080198 */ sw $t0, 0x0198($s0) ## 00000198 -/* 00070 80BADD30 10000011 */ beq $zero, $zero, .L80BADD78 -/* 00074 80BADD34 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -.L80BADD38: -/* 00078 80BADD38 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0007C 80BADD3C 0C0170D9 */ jal Collider_InitCylinder - -/* 00080 80BADD40 AFA50024 */ sw $a1, 0x0024($sp) -/* 00084 80BADD44 3C0780BB */ lui $a3, %hi(D_80BAE2F0) ## $a3 = 80BB0000 -/* 00088 80BADD48 8FA50024 */ lw $a1, 0x0024($sp) -/* 0008C 80BADD4C 24E7E2F0 */ addiu $a3, $a3, %lo(D_80BAE2F0) ## $a3 = 80BAE2F0 -/* 00090 80BADD50 8FA40034 */ lw $a0, 0x0034($sp) -/* 00094 80BADD54 0C01712B */ jal Collider_SetCylinder - -/* 00098 80BADD58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0009C 80BADD5C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 000A0 80BADD60 3C0B80BB */ lui $t3, %hi(func_80BAE05C) ## $t3 = 80BB0000 -/* 000A4 80BADD64 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000A8 80BADD68 256BE05C */ addiu $t3, $t3, %lo(func_80BAE05C) ## $t3 = 80BAE05C -/* 000AC 80BADD6C 01816824 */ and $t5, $t4, $at -/* 000B0 80BADD70 AE0B0198 */ sw $t3, 0x0198($s0) ## 00000198 -/* 000B4 80BADD74 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L80BADD78: -/* 000B8 80BADD78 8FBF001C */ lw $ra, 0x001C($sp) -/* 000BC 80BADD7C 8FB00018 */ lw $s0, 0x0018($sp) -/* 000C0 80BADD80 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000C4 80BADD84 03E00008 */ jr $ra -/* 000C8 80BADD88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s deleted file mode 100644 index 4bdba76da0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel ShotSun_Update -/* 005E0 80BAE2A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005E4 80BAE2A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005E8 80BAE2A8 8C990198 */ lw $t9, 0x0198($a0) ## 00000198 -/* 005EC 80BAE2AC 0320F809 */ jalr $ra, $t9 -/* 005F0 80BAE2B0 00000000 */ nop -/* 005F4 80BAE2B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005F8 80BAE2B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005FC 80BAE2BC 03E00008 */ jr $ra -/* 00600 80BAE2C0 00000000 */ nop -/* 00604 80BAE2C4 00000000 */ nop -/* 00608 80BAE2C8 00000000 */ nop -/* 0060C 80BAE2CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s deleted file mode 100644 index be1b39e288..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80BADDCC -/* 0010C 80BADDCC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00110 80BADDD0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00114 80BADDD4 AFB00030 */ sw $s0, 0x0030($sp) -/* 00118 80BADDD8 848301A2 */ lh $v1, 0x01A2($a0) ## 000001A2 -/* 0011C 80BADDDC 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00120 80BADDE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00124 80BADDE4 18600004 */ blez $v1, .L80BADDF8 -/* 00128 80BADDE8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 0012C 80BADDEC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00130 80BADDF0 1000001B */ beq $zero, $zero, .L80BADE60 -/* 00134 80BADDF4 A48E01A2 */ sh $t6, 0x01A2($a0) ## 000001A2 -.L80BADDF8: -/* 00138 80BADDF8 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 0013C 80BADDFC 10410006 */ beq $v0, $at, .L80BADE18 -/* 00140 80BADE00 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00144 80BADE04 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 00148 80BADE08 10410006 */ beq $v0, $at, .L80BADE24 -/* 0014C 80BADE0C 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 00150 80BADE10 10000006 */ beq $zero, $zero, .L80BADE2C -/* 00154 80BADE14 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -.L80BADE18: -/* 00158 80BADE18 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 0015C 80BADE1C 10000002 */ beq $zero, $zero, .L80BADE28 -/* 00160 80BADE20 AFAF0038 */ sw $t7, 0x0038($sp) -.L80BADE24: -/* 00164 80BADE24 AFB80038 */ sw $t8, 0x0038($sp) -.L80BADE28: -/* 00168 80BADE28 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -.L80BADE2C: -/* 0016C 80BADE2C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00170 80BADE30 8FB90038 */ lw $t9, 0x0038($sp) -/* 00174 80BADE34 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00178 80BADE38 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 0017C 80BADE3C AFA00020 */ sw $zero, 0x0020($sp) -/* 00180 80BADE40 AFA0001C */ sw $zero, 0x001C($sp) -/* 00184 80BADE44 AFA00018 */ sw $zero, 0x0018($sp) -/* 00188 80BADE48 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 0018C 80BADE4C AFB90024 */ sw $t9, 0x0024($sp) -/* 00190 80BADE50 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00194 80BADE54 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00198 80BADE58 0C00B55C */ jal Actor_Kill - -/* 0019C 80BADE5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80BADE60: -/* 001A0 80BADE60 8FBF0034 */ lw $ra, 0x0034($sp) -/* 001A4 80BADE64 8FB00030 */ lw $s0, 0x0030($sp) -/* 001A8 80BADE68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001AC 80BADE6C 03E00008 */ jr $ra -/* 001B0 80BADE70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s deleted file mode 100644 index 68751b971e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80BADE74 -/* 001B4 80BADE74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 001B8 80BADE78 AFBF0034 */ sw $ra, 0x0034($sp) -/* 001BC 80BADE7C AFB00030 */ sw $s0, 0x0030($sp) -/* 001C0 80BADE80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001C4 80BADE84 0C016C66 */ jal func_8005B198 -/* 001C8 80BADE88 AFA5003C */ sw $a1, 0x003C($sp) -/* 001CC 80BADE8C 920E0002 */ lbu $t6, 0x0002($s0) ## 00000002 -/* 001D0 80BADE90 3C1880BB */ lui $t8, %hi(func_80BADDCC) ## $t8 = 80BB0000 -/* 001D4 80BADE94 8FA5003C */ lw $a1, 0x003C($sp) -/* 001D8 80BADE98 104E0004 */ beq $v0, $t6, .L80BADEAC -/* 001DC 80BADE9C 2718DDCC */ addiu $t8, $t8, %lo(func_80BADDCC) ## $t8 = 80BADDCC -/* 001E0 80BADEA0 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 -/* 001E4 80BADEA4 51E00015 */ beql $t7, $zero, .L80BADEFC -/* 001E8 80BADEA8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80BADEAC: -/* 001EC 80BADEAC C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 001F0 80BADEB0 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 001F4 80BADEB4 AE180198 */ sw $t8, 0x0198($s0) ## 00000198 -/* 001F8 80BADEB8 A61901A2 */ sh $t9, 0x01A2($s0) ## 000001A2 -/* 001FC 80BADEBC 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00200 80BADEC0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00204 80BADEC4 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 00208 80BADEC8 24080011 */ addiu $t0, $zero, 0x0011 ## $t0 = 00000011 -/* 0020C 80BADECC AFA80024 */ sw $t0, 0x0024($sp) -/* 00210 80BADED0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00214 80BADED4 AFA0001C */ sw $zero, 0x001C($sp) -/* 00218 80BADED8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0021C 80BADEDC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00220 80BADEE0 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 00224 80BADEE4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00228 80BADEE8 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0022C 80BADEEC 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 00230 80BADEF0 0C01E245 */ jal func_80078914 -/* 00234 80BADEF4 2405287B */ addiu $a1, $zero, 0x287B ## $a1 = 0000287B -/* 00238 80BADEF8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80BADEFC: -/* 0023C 80BADEFC 8FB00030 */ lw $s0, 0x0030($sp) -/* 00240 80BADF00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00244 80BADF04 03E00008 */ jr $ra -/* 00248 80BADF08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s deleted file mode 100644 index fb6db93b38..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s +++ /dev/null @@ -1,98 +0,0 @@ -.late_rodata -glabel D_80BAE36C - .word 0x46AFC800 - -.text -glabel func_80BADF0C -/* 0024C 80BADF0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00250 80BADF10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00254 80BADF14 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00258 80BADF18 8488001C */ lh $t0, 0x001C($a0) ## 0000001C -/* 0025C 80BADF1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00260 80BADF20 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00264 80BADF24 310800FF */ andi $t0, $t0, 0x00FF ## $t0 = 00000000 -/* 00268 80BADF28 AFA8001C */ sw $t0, 0x001C($sp) -/* 0026C 80BADF2C AFA7002C */ sw $a3, 0x002C($sp) -/* 00270 80BADF30 AFA60028 */ sw $a2, 0x0028($sp) -/* 00274 80BADF34 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00278 80BADF38 24650024 */ addiu $a1, $v1, 0x0024 ## $a1 = 00000024 -/* 0027C 80BADF3C 0C032D94 */ jal func_800CB650 -/* 00280 80BADF40 AFA30024 */ sw $v1, 0x0024($sp) -/* 00284 80BADF44 3C0180BB */ lui $at, %hi(D_80BAE36C) ## $at = 80BB0000 -/* 00288 80BADF48 C424E36C */ lwc1 $f4, %lo(D_80BAE36C)($at) -/* 0028C 80BADF4C 8FA30024 */ lw $v1, 0x0024($sp) -/* 00290 80BADF50 8FA60028 */ lw $a2, 0x0028($sp) -/* 00294 80BADF54 4600203C */ c.lt.s $f4, $f0 -/* 00298 80BADF58 8FA7002C */ lw $a3, 0x002C($sp) -/* 0029C 80BADF5C 8FA8001C */ lw $t0, 0x001C($sp) -/* 002A0 80BADF60 45020004 */ bc1fl .L80BADF74 -/* 002A4 80BADF64 90C201A4 */ lbu $v0, 0x01A4($a2) ## 000001A4 -/* 002A8 80BADF68 10000038 */ beq $zero, $zero, .L80BAE04C -/* 002AC 80BADF6C A0C001A4 */ sb $zero, 0x01A4($a2) ## 000001A4 -/* 002B0 80BADF70 90C201A4 */ lbu $v0, 0x01A4($a2) ## 000001A4 -.L80BADF74: -/* 002B4 80BADF74 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002B8 80BADF78 1440000C */ bne $v0, $zero, .L80BADFAC -/* 002BC 80BADF7C 00000000 */ nop -/* 002C0 80BADF80 8C620680 */ lw $v0, 0x0680($v1) ## 00000680 -/* 002C4 80BADF84 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 002C8 80BADF88 000271C0 */ sll $t6, $v0, 7 -/* 002CC 80BADF8C 05C20006 */ bltzl $t6, .L80BADFA8 -/* 002D0 80BADF90 A0D801A4 */ sb $t8, 0x01A4($a2) ## 000001A4 -/* 002D4 80BADF94 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 002D8 80BADF98 00417825 */ or $t7, $v0, $at ## $t7 = 00800000 -/* 002DC 80BADF9C 1000002B */ beq $zero, $zero, .L80BAE04C -/* 002E0 80BADFA0 AC6F0680 */ sw $t7, 0x0680($v1) ## 00000680 -/* 002E4 80BADFA4 A0D801A4 */ sb $t8, 0x01A4($a2) ## 000001A4 -.L80BADFA8: -/* 002E8 80BADFA8 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000001 -.L80BADFAC: -/* 002EC 80BADFAC 14410008 */ bne $v0, $at, .L80BADFD0 -/* 002F0 80BADFB0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 002F4 80BADFB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 002F8 80BADFB8 0C042F56 */ jal func_8010BD58 -/* 002FC 80BADFBC AFA60028 */ sw $a2, 0x0028($sp) -/* 00300 80BADFC0 8FA60028 */ lw $a2, 0x0028($sp) -/* 00304 80BADFC4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00308 80BADFC8 10000020 */ beq $zero, $zero, .L80BAE04C -/* 0030C 80BADFCC A0D901A4 */ sb $t9, 0x01A4($a2) ## 000001A4 -.L80BADFD0: -/* 00310 80BADFD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00314 80BADFD4 1441001D */ bne $v0, $at, .L80BAE04C -/* 00318 80BADFD8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0031C 80BADFDC 00E11021 */ addu $v0, $a3, $at -/* 00320 80BADFE0 944904C6 */ lhu $t1, 0x04C6($v0) ## 000004C6 -/* 00324 80BADFE4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00328 80BADFE8 15210018 */ bne $t1, $at, .L80BAE04C -/* 0032C 80BADFEC 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 00330 80BADFF0 55010005 */ bnel $t0, $at, .L80BAE008 -/* 00334 80BADFF4 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 00338 80BADFF8 944A04C4 */ lhu $t2, 0x04C4($v0) ## 000004C4 -/* 0033C 80BADFFC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00340 80BAE000 11410006 */ beq $t2, $at, .L80BAE01C -/* 00344 80BAE004 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -.L80BAE008: -/* 00348 80BAE008 55010010 */ bnel $t0, $at, .L80BAE04C -/* 0034C 80BAE00C A0C001A4 */ sb $zero, 0x01A4($a2) ## 000001A4 -/* 00350 80BAE010 944B04C4 */ lhu $t3, 0x04C4($v0) ## 000004C4 -/* 00354 80BAE014 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00358 80BAE018 1561000B */ bne $t3, $at, .L80BAE048 -.L80BAE01C: -/* 0035C 80BAE01C 3C0C80BB */ lui $t4, %hi(func_80BADE74) ## $t4 = 80BB0000 -/* 00360 80BAE020 258CDE74 */ addiu $t4, $t4, %lo(func_80BADE74) ## $t4 = 80BADE74 -/* 00364 80BAE024 ACCC0198 */ sw $t4, 0x0198($a2) ## 00000198 -/* 00368 80BAE028 AFA60028 */ sw $a2, 0x0028($sp) -/* 0036C 80BAE02C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00370 80BAE030 0C020120 */ jal func_80080480 -/* 00374 80BAE034 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00378 80BAE038 8FA60028 */ lw $a2, 0x0028($sp) -/* 0037C 80BAE03C A4C001A2 */ sh $zero, 0x01A2($a2) ## 000001A2 -/* 00380 80BAE040 10000002 */ beq $zero, $zero, .L80BAE04C -/* 00384 80BAE044 A0C001A4 */ sb $zero, 0x01A4($a2) ## 000001A4 -.L80BAE048: -/* 00388 80BAE048 A0C001A4 */ sb $zero, 0x01A4($a2) ## 000001A4 -.L80BAE04C: -/* 0038C 80BAE04C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00390 80BAE050 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 80BAE054 03E00008 */ jr $ra -/* 00398 80BAE058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s deleted file mode 100644 index f4dfe7d081..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s +++ /dev/null @@ -1,170 +0,0 @@ -.rdata -glabel D_80BAE34C - .asciz "SHOT_SUN HIT!!!!!!!\n" - .balign 4 - -.late_rodata -glabel D_80BAE370 - .word 0x45E2E800 -glabel D_80BAE374 - .word 0x45E2E800 -glabel D_80BAE378 - .word 0x3E2AAAAB, 0x00000000 - -.text -glabel func_80BAE05C -/* 0039C 80BAE05C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 003A0 80BAE060 AFBF0034 */ sw $ra, 0x0034($sp) -/* 003A4 80BAE064 AFB00030 */ sw $s0, 0x0030($sp) -/* 003A8 80BAE068 908E015D */ lbu $t6, 0x015D($a0) ## 0000015D -/* 003AC 80BAE06C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 003B0 80BAE070 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003B4 80BAE074 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 003B8 80BAE078 11E00048 */ beq $t7, $zero, .L80BAE19C -/* 003BC 80BAE07C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 003C0 80BAE080 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 003C4 80BAE084 0C01E221 */ jal func_80078884 -/* 003C8 80BAE088 AFA70060 */ sw $a3, 0x0060($sp) -/* 003CC 80BAE08C 3C0480BB */ lui $a0, %hi(D_80BAE34C) ## $a0 = 80BB0000 -/* 003D0 80BAE090 0C00084C */ jal osSyncPrintf - -/* 003D4 80BAE094 2484E34C */ addiu $a0, $a0, %lo(D_80BAE34C) ## $a0 = 80BAE34C -/* 003D8 80BAE098 3C188012 */ lui $t8, %hi(gItemSlots+4) -/* 003DC 80BAE09C 93187468 */ lbu $t8, %lo(gItemSlots+4)($t8) -/* 003E0 80BAE0A0 3C198016 */ lui $t9, %hi(gSaveContext+0x74) -/* 003E4 80BAE0A4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 003E8 80BAE0A8 0338C821 */ addu $t9, $t9, $t8 -/* 003EC 80BAE0AC 9339E6D4 */ lbu $t9, %lo(gSaveContext+0x74)($t9) -/* 003F0 80BAE0B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F4 80BAE0B4 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE0 -/* 003F8 80BAE0B8 17210024 */ bne $t9, $at, .L80BAE14C -/* 003FC 80BAE0BC 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 00400 80BAE0C0 3C01C448 */ lui $at, 0xC448 ## $at = C4480000 -/* 00404 80BAE0C4 44812000 */ mtc1 $at, $f4 ## $f4 = -800.00 -/* 00408 80BAE0C8 3C0180BB */ lui $at, %hi(D_80BAE370) ## $at = 80BB0000 -/* 0040C 80BAE0CC C426E370 */ lwc1 $f6, %lo(D_80BAE370)($at) -/* 00410 80BAE0D0 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 -/* 00414 80BAE0D4 AFA80024 */ sw $t0, 0x0024($sp) -/* 00418 80BAE0D8 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 0041C 80BAE0DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00420 80BAE0E0 2406010F */ addiu $a2, $zero, 0x010F ## $a2 = 0000010F -/* 00424 80BAE0E4 3C07442F */ lui $a3, 0x442F ## $a3 = 442F0000 -/* 00428 80BAE0E8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0042C 80BAE0EC AFA0001C */ sw $zero, 0x001C($sp) -/* 00430 80BAE0F0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00434 80BAE0F4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00438 80BAE0F8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 0043C 80BAE0FC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00440 80BAE100 3C030200 */ lui $v1, 0x0200 ## $v1 = 02000000 -/* 00444 80BAE104 24637020 */ addiu $v1, $v1, 0x7020 ## $v1 = 02007020 -/* 00448 80BAE108 00034900 */ sll $t1, $v1, 4 -/* 0044C 80BAE10C 00095702 */ srl $t2, $t1, 28 -/* 00450 80BAE110 000A5880 */ sll $t3, $t2, 2 -/* 00454 80BAE114 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00458 80BAE118 018B6021 */ addu $t4, $t4, $t3 -/* 0045C 80BAE11C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00460 80BAE120 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00464 80BAE124 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00468 80BAE128 00616824 */ and $t5, $v1, $at -/* 0046C 80BAE12C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00470 80BAE130 018D7021 */ addu $t6, $t4, $t5 -/* 00474 80BAE134 01C17821 */ addu $t7, $t6, $at -/* 00478 80BAE138 AE0F1D68 */ sw $t7, 0x1D68($s0) ## 00001D68 -/* 0047C 80BAE13C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 00480 80BAE140 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00484 80BAE144 10000011 */ beq $zero, $zero, .L80BAE18C -/* 00488 80BAE148 A038FA74 */ sb $t8, %lo(gSaveContext+0x1414)($at) -.L80BAE14C: -/* 0048C 80BAE14C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 00490 80BAE150 44814000 */ mtc1 $at, $f8 ## $f8 = 700.00 -/* 00494 80BAE154 3C01C448 */ lui $at, 0xC448 ## $at = C4480000 -/* 00498 80BAE158 44815000 */ mtc1 $at, $f10 ## $f10 = -800.00 -/* 0049C 80BAE15C 3C0180BB */ lui $at, %hi(D_80BAE374) ## $at = 80BB0000 -/* 004A0 80BAE160 C430E374 */ lwc1 $f16, %lo(D_80BAE374)($at) -/* 004A4 80BAE164 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 004A8 80BAE168 E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 004AC 80BAE16C 0C007D52 */ jal Item_DropCollectible - -/* 004B0 80BAE170 E7B00048 */ swc1 $f16, 0x0048($sp) -/* 004B4 80BAE174 10400005 */ beq $v0, $zero, .L80BAE18C -/* 004B8 80BAE178 00000000 */ nop -/* 004BC 80BAE17C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 004C0 80BAE180 24191770 */ addiu $t9, $zero, 0x1770 ## $t9 = 00001770 -/* 004C4 80BAE184 A459015A */ sh $t9, 0x015A($v0) ## 0000015A -/* 004C8 80BAE188 E4520068 */ swc1 $f18, 0x0068($v0) ## 00000068 -.L80BAE18C: -/* 004CC 80BAE18C 0C00B55C */ jal Actor_Kill - -/* 004D0 80BAE190 8FA40060 */ lw $a0, 0x0060($sp) -/* 004D4 80BAE194 1000003E */ beq $zero, $zero, .L80BAE290 -/* 004D8 80BAE198 8FBF0034 */ lw $ra, 0x0034($sp) -.L80BAE19C: -/* 004DC 80BAE19C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 004E0 80BAE1A0 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 -/* 004E4 80BAE1A4 C4E60090 */ lwc1 $f6, 0x0090($a3) ## 00000090 -/* 004E8 80BAE1A8 3C028016 */ lui $v0, %hi(gSaveContext+0xc) -/* 004EC 80BAE1AC 4606203C */ c.lt.s $f4, $f6 -/* 004F0 80BAE1B0 00000000 */ nop -/* 004F4 80BAE1B4 45030036 */ bc1tl .L80BAE290 -/* 004F8 80BAE1B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004FC 80BAE1BC 9442E66C */ lhu $v0, %lo(gSaveContext+0xc)($v0) -/* 00500 80BAE1C0 28414555 */ slti $at, $v0, 0x4555 -/* 00504 80BAE1C4 14200031 */ bne $at, $zero, .L80BAE28C -/* 00508 80BAE1C8 28415000 */ slti $at, $v0, 0x5000 -/* 0050C 80BAE1CC 1020002F */ beq $at, $zero, .L80BAE28C -/* 00510 80BAE1D0 3C0180BB */ lui $at, %hi(D_80BAE378) ## $at = 80BB0000 -/* 00514 80BAE1D4 C420E378 */ lwc1 $f0, %lo(D_80BAE378)($at) -/* 00518 80BAE1D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0051C 80BAE1DC 02011021 */ addu $v0, $s0, $at -/* 00520 80BAE1E0 C44A0A28 */ lwc1 $f10, 0x0A28($v0) ## 80160A28 -/* 00524 80BAE1E4 C468095C */ lwc1 $f8, 0x095C($v1) ## 0000095C -/* 00528 80BAE1E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0052C 80BAE1EC 46005402 */ mul.s $f16, $f10, $f0 -/* 00530 80BAE1F0 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 00534 80BAE1F4 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFF8 -/* 00538 80BAE1F8 24E6014C */ addiu $a2, $a3, 0x014C ## $a2 = 0000014C -/* 0053C 80BAE1FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 0000014C -/* 00540 80BAE200 46104480 */ add.s $f18, $f8, $f16 -/* 00544 80BAE204 4600910D */ trunc.w.s $f4, $f18 -/* 00548 80BAE208 44092000 */ mfc1 $t1, $f4 -/* 0054C 80BAE20C 00000000 */ nop -/* 00550 80BAE210 A7A90058 */ sh $t1, 0x0058($sp) -/* 00554 80BAE214 C4500A2C */ lwc1 $f16, 0x0A2C($v0) ## 80160A2C -/* 00558 80BAE218 C4660960 */ lwc1 $f6, 0x0960($v1) ## 00000960 -/* 0055C 80BAE21C 46008482 */ mul.s $f18, $f16, $f0 -/* 00560 80BAE220 460A3201 */ sub.s $f8, $f6, $f10 -/* 00564 80BAE224 46124100 */ add.s $f4, $f8, $f18 -/* 00568 80BAE228 4600218D */ trunc.w.s $f6, $f4 -/* 0056C 80BAE22C 440B3000 */ mfc1 $t3, $f6 -/* 00570 80BAE230 00000000 */ nop -/* 00574 80BAE234 A7AB005A */ sh $t3, 0x005A($sp) -/* 00578 80BAE238 C4500A30 */ lwc1 $f16, 0x0A30($v0) ## 80160A30 -/* 0057C 80BAE23C C46A0964 */ lwc1 $f10, 0x0964($v1) ## 00000964 -/* 00580 80BAE240 46008202 */ mul.s $f8, $f16, $f0 -/* 00584 80BAE244 46085480 */ add.s $f18, $f10, $f8 -/* 00588 80BAE248 4600910D */ trunc.w.s $f4, $f18 -/* 0058C 80BAE24C 440D2000 */ mfc1 $t5, $f4 -/* 00590 80BAE250 00000000 */ nop -/* 00594 80BAE254 A7AD005C */ sh $t5, 0x005C($sp) -/* 00598 80BAE258 8CAF0000 */ lw $t7, 0x0000($a1) ## FFFFFFF8 -/* 0059C 80BAE25C A8EF019C */ swl $t7, 0x019C($a3) ## 0000019C -/* 005A0 80BAE260 B8EF019F */ swr $t7, 0x019F($a3) ## 0000019F -/* 005A4 80BAE264 94AF0004 */ lhu $t7, 0x0004($a1) ## FFFFFFFC -/* 005A8 80BAE268 A4EF01A0 */ sh $t7, 0x01A0($a3) ## 000001A0 -/* 005AC 80BAE26C 0C0189C6 */ jal func_80062718 -/* 005B0 80BAE270 AFA6003C */ sw $a2, 0x003C($sp) -/* 005B4 80BAE274 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005B8 80BAE278 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 005BC 80BAE27C 8FA6003C */ lw $a2, 0x003C($sp) -/* 005C0 80BAE280 02012821 */ addu $a1, $s0, $at -/* 005C4 80BAE284 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 005C8 80BAE288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80BAE28C: -/* 005CC 80BAE28C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80BAE290: -/* 005D0 80BAE290 8FB00030 */ lw $s0, 0x0030($sp) -/* 005D4 80BAE294 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 005D8 80BAE298 03E00008 */ jr $ra -/* 005DC 80BAE29C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s index 2966b35d72..9f4508d987 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s @@ -95,7 +95,7 @@ glabel func_80836448 /* 04390 808365A0 00063403 */ sra $a2, $a2, 16 /* 04394 808365A4 0C02003E */ jal func_800800F8 /* 04398 808365A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0439C 808365AC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0439C 808365AC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 043A0 808365B0 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 /* 043A4 808365B4 8FBF0024 */ lw $ra, 0x0024($sp) .L808365B8: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s index 061cec61ba..523e868e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s @@ -75,7 +75,7 @@ glabel func_80848B44 /* 16A30 80848C40 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 /* 16A34 80848C44 87A70036 */ lh $a3, 0x0036($sp) /* 16A38 80848C48 46128101 */ sub.s $f4, $f16, $f18 -/* 16A3C 80848C4C 0C00A757 */ jal func_80029D5C +/* 16A3C 80848C4C 0C00A757 */ jal EffectSsFhgFlash_Spawn2 /* 16A40 80848C50 E7A40044 */ swc1 $f4, 0x0044($sp) /* 16A44 80848C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 16A48 80848C58 0C00BE3C */ jal func_8002F8F0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s deleted file mode 100644 index 6b47976cfa..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809AC130 -/* 00000 809AC130 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809AC134 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809AC138 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809AC13C 3C0A809B */ lui $t2, %hi(func_809AC1AC) ## $t2 = 809B0000 -/* 00010 809AC140 254AC1AC */ addiu $t2, $t2, %lo(func_809AC1AC) ## $t2 = 809AC1AC -/* 00014 809AC144 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809AC148 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0001C 809AC14C 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 00020 809AC150 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00024 809AC154 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809AC158 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0002C 809AC15C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00030 809AC160 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00034 809AC164 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00038 809AC168 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 0003C 809AC16C ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00040 809AC170 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00044 809AC174 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00048 809AC178 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0004C 809AC17C ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00050 809AC180 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 00054 809AC184 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00058 809AC188 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 0005C 809AC18C ACCA0024 */ sw $t2, 0x0024($a2) ## 00000024 -/* 00060 809AC190 A4CB005C */ sh $t3, 0x005C($a2) ## 0000005C -/* 00064 809AC194 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00068 809AC198 84EC0024 */ lh $t4, 0x0024($a3) ## 00000024 -/* 0006C 809AC19C A4CC0042 */ sh $t4, 0x0042($a2) ## 00000042 -/* 00070 809AC1A0 8CED0028 */ lw $t5, 0x0028($a3) ## 00000028 -/* 00074 809AC1A4 03E00008 */ jr $ra -/* 00078 809AC1A8 ACCD003C */ sw $t5, 0x003C($a2) ## 0000003C diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s deleted file mode 100644 index b0928e9a9e..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809AC1AC -/* 0007C 809AC1AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00080 809AC1B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00084 809AC1B4 AFA40030 */ sw $a0, 0x0030($sp) -/* 00088 809AC1B8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0008C 809AC1BC 8CCF003C */ lw $t7, 0x003C($a2) ## 0000003C -/* 00090 809AC1C0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 00094 809AC1C4 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 00098 809AC1C8 AFAF001C */ sw $t7, 0x001C($sp) -/* 0009C 809AC1CC C4C60000 */ lwc1 $f6, 0x0000($a2) ## 00000000 -/* 000A0 809AC1D0 C4CA0004 */ lwc1 $f10, 0x0004($a2) ## 00000004 -/* 000A4 809AC1D4 C4D20008 */ lwc1 $f18, 0x0008($a2) ## 00000008 -/* 000A8 809AC1D8 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 000AC 809AC1DC C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 000B0 809AC1E0 C450002C */ lwc1 $f16, 0x002C($v0) ## 0000002C -/* 000B4 809AC1E4 46062081 */ sub.s $f2, $f4, $f6 -/* 000B8 809AC1E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 000BC 809AC1EC 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 000C0 809AC1F0 460A4301 */ sub.s $f12, $f8, $f10 -/* 000C4 809AC1F4 E7A20028 */ swc1 $f2, 0x0028($sp) -/* 000C8 809AC1F8 AFA70038 */ sw $a3, 0x0038($sp) -/* 000CC 809AC1FC 46128381 */ sub.s $f14, $f16, $f18 -/* 000D0 809AC200 E7AC0024 */ swc1 $f12, 0x0024($sp) -/* 000D4 809AC204 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 000D8 809AC208 0C00F8C3 */ jal func_8003E30C -/* 000DC 809AC20C E7AE0020 */ swc1 $f14, 0x0020($sp) -/* 000E0 809AC210 8FA70038 */ lw $a3, 0x0038($sp) -/* 000E4 809AC214 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 000E8 809AC218 C7AC0024 */ lwc1 $f12, 0x0024($sp) -/* 000EC 809AC21C 14400011 */ bne $v0, $zero, .L809AC264 -/* 000F0 809AC220 C7AE0020 */ lwc1 $f14, 0x0020($sp) -/* 000F4 809AC224 46021102 */ mul.s $f4, $f2, $f2 -/* 000F8 809AC228 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 000FC 809AC22C 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -/* 00100 809AC230 460C6182 */ mul.s $f6, $f12, $f12 -/* 00104 809AC234 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00108 809AC238 8FB9001C */ lw $t9, 0x001C($sp) -/* 0010C 809AC23C 460E7282 */ mul.s $f10, $f14, $f14 -/* 00110 809AC240 46062200 */ add.s $f8, $f4, $f6 -/* 00114 809AC244 460A4000 */ add.s $f0, $f8, $f10 -/* 00118 809AC248 46000004 */ sqrt.s $f0, $f0 -/* 0011C 809AC24C 4610003C */ c.lt.s $f0, $f16 -/* 00120 809AC250 00000000 */ nop -/* 00124 809AC254 4502000A */ bc1fl .L809AC280 -/* 00128 809AC258 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 809AC25C 10000007 */ beq $zero, $zero, .L809AC27C -/* 00130 809AC260 A7380000 */ sh $t8, 0x0000($t9) ## 00000000 -.L809AC264: -/* 00134 809AC264 84E8005C */ lh $t0, 0x005C($a3) ## 0000005C -/* 00138 809AC268 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0013C 809AC26C 29010002 */ slti $at, $t0, 0x0002 -/* 00140 809AC270 54200003 */ bnel $at, $zero, .L809AC280 -/* 00144 809AC274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00148 809AC278 A4E9005C */ sh $t1, 0x005C($a3) ## 0000005C -.L809AC27C: -/* 0014C 809AC27C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809AC280: -/* 00150 809AC280 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00154 809AC284 03E00008 */ jr $ra -/* 00158 809AC288 00000000 */ nop -/* 0015C 809AC28C 00000000 */ nop diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index 61237ef056..1a8cc5b763 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -336,7 +336,7 @@ glabel func_808113A8 /* 0DBA0 808118E0 A4674ADC */ sh $a3, 0x4ADC($v1) ## 00004ADC /* 0DBA4 808118E4 A4684ADE */ sh $t0, 0x4ADE($v1) ## 00004ADE /* 0DBA8 808118E8 AFA30030 */ sw $v1, 0x0030($sp) -/* 0DBAC 808118EC 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr +/* 0DBAC 808118EC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr /* 0DBB0 808118F0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 0DBB4 808118F4 3C118016 */ lui $s1, %hi(gSaveContext) /* 0DBB8 808118F8 2631E660 */ addiu $s1, %lo(gSaveContext) diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/Select_UpdateMenu.s b/asm/non_matchings/overlays/gamestates/ovl_select/Select_UpdateMenu.s deleted file mode 100644 index 6224a1a9c3..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_select/Select_UpdateMenu.s +++ /dev/null @@ -1,671 +0,0 @@ -glabel Select_UpdateMenu -/* 00124 80800CB4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00128 80800CB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0012C 80800CBC AFB00020 */ sw $s0, 0x0020($sp) -/* 00130 80800CC0 8C8E021C */ lw $t6, 0x021C($a0) ## 0000021C -/* 00134 80800CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00138 80800CC8 55C0017D */ bnel $t6, $zero, .L808012C0 -/* 0013C 80800CCC 96180020 */ lhu $t8, 0x0020($s0) ## 00000020 -/* 00140 80800CD0 26090014 */ addiu $t1, $s0, 0x0014 ## $t1 = 00000014 -/* 00144 80800CD4 9522000C */ lhu $v0, 0x000C($t1) ## 00000020 -/* 00148 80800CD8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0014C 80800CDC 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00150 80800CE0 00417827 */ nor $t7, $v0, $at -/* 00154 80800CE4 11E00004 */ beq $t7, $zero, .L80800CF8 -/* 00158 80800CE8 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 0015C 80800CEC 0041C027 */ nor $t8, $v0, $at -/* 00160 80800CF0 57000011 */ bnel $t8, $zero, .L80800D38 -/* 00164 80800CF4 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -.L80800CF8: -/* 00168 80800CF8 8E0B01D8 */ lw $t3, 0x01D8($s0) ## 000001D8 -/* 0016C 80800CFC 8E1901D4 */ lw $t9, 0x01D4($s0) ## 000001D4 -/* 00170 80800D00 000B6080 */ sll $t4, $t3, 2 -/* 00174 80800D04 018B6023 */ subu $t4, $t4, $t3 -/* 00178 80800D08 000C6080 */ sll $t4, $t4, 2 -/* 0017C 80800D0C 032C1821 */ addu $v1, $t9, $t4 -/* 00180 80800D10 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 00184 80800D14 50C00008 */ beql $a2, $zero, .L80800D38 -/* 00188 80800D18 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 0018C 80800D1C 8C650008 */ lw $a1, 0x0008($v1) ## 00000008 -/* 00190 80800D20 AFA9002C */ sw $t1, 0x002C($sp) -/* 00194 80800D24 00C0F809 */ jalr $ra, $a2 -/* 00198 80800D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0019C 80800D2C 8FA9002C */ lw $t1, 0x002C($sp) -/* 001A0 80800D30 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 001A4 80800D34 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -.L80800D38: -/* 001A8 80800D38 00416827 */ nor $t5, $v0, $at -/* 001AC 80800D3C 15A00010 */ bne $t5, $zero, .L80800D80 -/* 001B0 80800D40 3C038016 */ lui $v1, %hi(gSaveContext) -/* 001B4 80800D44 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 001B8 80800D48 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 001BC 80800D4C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 001C0 80800D50 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 001C4 80800D54 11C00003 */ beq $t6, $zero, .L80800D64 -/* 001C8 80800D58 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 001CC 80800D5C 10000001 */ beq $zero, $zero, .L80800D64 -/* 001D0 80800D60 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80800D64: -/* 001D4 80800D64 54410005 */ bnel $v0, $at, .L80800D7C -/* 001D8 80800D68 AC600004 */ sw $zero, 0x0004($v1) ## 8015E664 -/* 001DC 80800D6C AC6A0004 */ sw $t2, 0x0004($v1) ## 8015E664 -/* 001E0 80800D70 10000003 */ beq $zero, $zero, .L80800D80 -/* 001E4 80800D74 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 001E8 80800D78 AC600004 */ sw $zero, 0x0004($v1) ## 8015E664 -.L80800D7C: -/* 001EC 80800D7C 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -.L80800D80: -/* 001F0 80800D80 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 001F4 80800D84 3C038016 */ lui $v1, %hi(gSaveContext) -/* 001F8 80800D88 00417827 */ nor $t7, $v0, $at -/* 001FC 80800D8C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00200 80800D90 15E00042 */ bne $t7, $zero, .L80800E9C -/* 00204 80800D94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00208 80800D98 8C620008 */ lw $v0, 0x0008($v1) ## 8015E668 -/* 0020C 80800D9C 34068000 */ ori $a2, $zero, 0x8000 ## $a2 = 00008000 -/* 00210 80800DA0 14C20003 */ bne $a2, $v0, .L80800DB0 -/* 00214 80800DA4 00000000 */ nop -/* 00218 80800DA8 10000080 */ beq $zero, $zero, .L80800FAC -/* 0021C 80800DAC AC600008 */ sw $zero, 0x0008($v1) ## 8015E668 -.L80800DB0: -/* 00220 80800DB0 14400004 */ bne $v0, $zero, .L80800DC4 -/* 00224 80800DB4 3404FFF0 */ ori $a0, $zero, 0xFFF0 ## $a0 = 0000FFF0 -/* 00228 80800DB8 3404FFF0 */ ori $a0, $zero, 0xFFF0 ## $a0 = 0000FFF0 -/* 0022C 80800DBC 1000007B */ beq $zero, $zero, .L80800FAC -/* 00230 80800DC0 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800DC4: -/* 00234 80800DC4 14820004 */ bne $a0, $v0, .L80800DD8 -/* 00238 80800DC8 3405FFF1 */ ori $a1, $zero, 0xFFF1 ## $a1 = 0000FFF1 -/* 0023C 80800DCC 3405FFF1 */ ori $a1, $zero, 0xFFF1 ## $a1 = 0000FFF1 -/* 00240 80800DD0 10000076 */ beq $zero, $zero, .L80800FAC -/* 00244 80800DD4 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800DD8: -/* 00248 80800DD8 14A20004 */ bne $a1, $v0, .L80800DEC -/* 0024C 80800DDC 3404FFF2 */ ori $a0, $zero, 0xFFF2 ## $a0 = 0000FFF2 -/* 00250 80800DE0 3404FFF2 */ ori $a0, $zero, 0xFFF2 ## $a0 = 0000FFF2 -/* 00254 80800DE4 10000071 */ beq $zero, $zero, .L80800FAC -/* 00258 80800DE8 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800DEC: -/* 0025C 80800DEC 14820004 */ bne $a0, $v0, .L80800E00 -/* 00260 80800DF0 3405FFF3 */ ori $a1, $zero, 0xFFF3 ## $a1 = 0000FFF3 -/* 00264 80800DF4 3405FFF3 */ ori $a1, $zero, 0xFFF3 ## $a1 = 0000FFF3 -/* 00268 80800DF8 1000006C */ beq $zero, $zero, .L80800FAC -/* 0026C 80800DFC AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800E00: -/* 00270 80800E00 14A20004 */ bne $a1, $v0, .L80800E14 -/* 00274 80800E04 3404FFF4 */ ori $a0, $zero, 0xFFF4 ## $a0 = 0000FFF4 -/* 00278 80800E08 3404FFF4 */ ori $a0, $zero, 0xFFF4 ## $a0 = 0000FFF4 -/* 0027C 80800E0C 10000067 */ beq $zero, $zero, .L80800FAC -/* 00280 80800E10 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800E14: -/* 00284 80800E14 14820004 */ bne $a0, $v0, .L80800E28 -/* 00288 80800E18 3405FFF5 */ ori $a1, $zero, 0xFFF5 ## $a1 = 0000FFF5 -/* 0028C 80800E1C 3405FFF5 */ ori $a1, $zero, 0xFFF5 ## $a1 = 0000FFF5 -/* 00290 80800E20 10000062 */ beq $zero, $zero, .L80800FAC -/* 00294 80800E24 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800E28: -/* 00298 80800E28 14A20004 */ bne $a1, $v0, .L80800E3C -/* 0029C 80800E2C 3404FFF6 */ ori $a0, $zero, 0xFFF6 ## $a0 = 0000FFF6 -/* 002A0 80800E30 3404FFF6 */ ori $a0, $zero, 0xFFF6 ## $a0 = 0000FFF6 -/* 002A4 80800E34 1000005D */ beq $zero, $zero, .L80800FAC -/* 002A8 80800E38 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800E3C: -/* 002AC 80800E3C 14820004 */ bne $a0, $v0, .L80800E50 -/* 002B0 80800E40 3405FFF7 */ ori $a1, $zero, 0xFFF7 ## $a1 = 0000FFF7 -/* 002B4 80800E44 3405FFF7 */ ori $a1, $zero, 0xFFF7 ## $a1 = 0000FFF7 -/* 002B8 80800E48 10000058 */ beq $zero, $zero, .L80800FAC -/* 002BC 80800E4C AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800E50: -/* 002C0 80800E50 14A20004 */ bne $a1, $v0, .L80800E64 -/* 002C4 80800E54 3404FFF8 */ ori $a0, $zero, 0xFFF8 ## $a0 = 0000FFF8 -/* 002C8 80800E58 3404FFF8 */ ori $a0, $zero, 0xFFF8 ## $a0 = 0000FFF8 -/* 002CC 80800E5C 10000053 */ beq $zero, $zero, .L80800FAC -/* 002D0 80800E60 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800E64: -/* 002D4 80800E64 14820004 */ bne $a0, $v0, .L80800E78 -/* 002D8 80800E68 3405FFF9 */ ori $a1, $zero, 0xFFF9 ## $a1 = 0000FFF9 -/* 002DC 80800E6C 3405FFF9 */ ori $a1, $zero, 0xFFF9 ## $a1 = 0000FFF9 -/* 002E0 80800E70 1000004E */ beq $zero, $zero, .L80800FAC -/* 002E4 80800E74 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800E78: -/* 002E8 80800E78 14A20004 */ bne $a1, $v0, .L80800E8C -/* 002EC 80800E7C 3401FFFA */ ori $at, $zero, 0xFFFA ## $at = 0000FFFA -/* 002F0 80800E80 3418FFFA */ ori $t8, $zero, 0xFFFA ## $t8 = 0000FFFA -/* 002F4 80800E84 10000049 */ beq $zero, $zero, .L80800FAC -/* 002F8 80800E88 AC780008 */ sw $t8, 0x0008($v1) ## 8015E668 -.L80800E8C: -/* 002FC 80800E8C 54410048 */ bnel $v0, $at, .L80800FB0 -/* 00300 80800E90 8C6C0008 */ lw $t4, 0x0008($v1) ## 8015E668 -/* 00304 80800E94 10000045 */ beq $zero, $zero, .L80800FAC -/* 00308 80800E98 AC660008 */ sw $a2, 0x0008($v1) ## 8015E668 -.L80800E9C: -/* 0030C 80800E9C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00310 80800EA0 00415827 */ nor $t3, $v0, $at -/* 00314 80800EA4 55600042 */ bnel $t3, $zero, .L80800FB0 -/* 00318 80800EA8 8C6C0008 */ lw $t4, 0x0008($v1) ## 8015E668 -/* 0031C 80800EAC 8C620008 */ lw $v0, 0x0008($v1) ## 8015E668 -/* 00320 80800EB0 34068000 */ ori $a2, $zero, 0x8000 ## $a2 = 00008000 -/* 00324 80800EB4 14C20004 */ bne $a2, $v0, .L80800EC8 -/* 00328 80800EB8 00000000 */ nop -/* 0032C 80800EBC 3419FFFA */ ori $t9, $zero, 0xFFFA ## $t9 = 0000FFFA -/* 00330 80800EC0 1000003A */ beq $zero, $zero, .L80800FAC -/* 00334 80800EC4 AC790008 */ sw $t9, 0x0008($v1) ## 8015E668 -.L80800EC8: -/* 00338 80800EC8 54400004 */ bnel $v0, $zero, .L80800EDC -/* 0033C 80800ECC 3404FFF0 */ ori $a0, $zero, 0xFFF0 ## $a0 = 0000FFF0 -/* 00340 80800ED0 10000036 */ beq $zero, $zero, .L80800FAC -/* 00344 80800ED4 AC660008 */ sw $a2, 0x0008($v1) ## 8015E668 -/* 00348 80800ED8 3404FFF0 */ ori $a0, $zero, 0xFFF0 ## $a0 = 0000FFF0 -.L80800EDC: -/* 0034C 80800EDC 54820004 */ bnel $a0, $v0, .L80800EF0 -/* 00350 80800EE0 3405FFF1 */ ori $a1, $zero, 0xFFF1 ## $a1 = 0000FFF1 -/* 00354 80800EE4 10000031 */ beq $zero, $zero, .L80800FAC -/* 00358 80800EE8 AC600008 */ sw $zero, 0x0008($v1) ## 8015E668 -/* 0035C 80800EEC 3405FFF1 */ ori $a1, $zero, 0xFFF1 ## $a1 = 0000FFF1 -.L80800EF0: -/* 00360 80800EF0 54A20004 */ bnel $a1, $v0, .L80800F04 -/* 00364 80800EF4 3404FFF2 */ ori $a0, $zero, 0xFFF2 ## $a0 = 0000FFF2 -/* 00368 80800EF8 1000002C */ beq $zero, $zero, .L80800FAC -/* 0036C 80800EFC AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -/* 00370 80800F00 3404FFF2 */ ori $a0, $zero, 0xFFF2 ## $a0 = 0000FFF2 -.L80800F04: -/* 00374 80800F04 54820004 */ bnel $a0, $v0, .L80800F18 -/* 00378 80800F08 3405FFF3 */ ori $a1, $zero, 0xFFF3 ## $a1 = 0000FFF3 -/* 0037C 80800F0C 10000027 */ beq $zero, $zero, .L80800FAC -/* 00380 80800F10 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -/* 00384 80800F14 3405FFF3 */ ori $a1, $zero, 0xFFF3 ## $a1 = 0000FFF3 -.L80800F18: -/* 00388 80800F18 54A20004 */ bnel $a1, $v0, .L80800F2C -/* 0038C 80800F1C 3404FFF4 */ ori $a0, $zero, 0xFFF4 ## $a0 = 0000FFF4 -/* 00390 80800F20 10000022 */ beq $zero, $zero, .L80800FAC -/* 00394 80800F24 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -/* 00398 80800F28 3404FFF4 */ ori $a0, $zero, 0xFFF4 ## $a0 = 0000FFF4 -.L80800F2C: -/* 0039C 80800F2C 54820004 */ bnel $a0, $v0, .L80800F40 -/* 003A0 80800F30 3405FFF5 */ ori $a1, $zero, 0xFFF5 ## $a1 = 0000FFF5 -/* 003A4 80800F34 1000001D */ beq $zero, $zero, .L80800FAC -/* 003A8 80800F38 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -/* 003AC 80800F3C 3405FFF5 */ ori $a1, $zero, 0xFFF5 ## $a1 = 0000FFF5 -.L80800F40: -/* 003B0 80800F40 54A20004 */ bnel $a1, $v0, .L80800F54 -/* 003B4 80800F44 3404FFF6 */ ori $a0, $zero, 0xFFF6 ## $a0 = 0000FFF6 -/* 003B8 80800F48 10000018 */ beq $zero, $zero, .L80800FAC -/* 003BC 80800F4C AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -/* 003C0 80800F50 3404FFF6 */ ori $a0, $zero, 0xFFF6 ## $a0 = 0000FFF6 -.L80800F54: -/* 003C4 80800F54 54820004 */ bnel $a0, $v0, .L80800F68 -/* 003C8 80800F58 3405FFF7 */ ori $a1, $zero, 0xFFF7 ## $a1 = 0000FFF7 -/* 003CC 80800F5C 10000013 */ beq $zero, $zero, .L80800FAC -/* 003D0 80800F60 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -/* 003D4 80800F64 3405FFF7 */ ori $a1, $zero, 0xFFF7 ## $a1 = 0000FFF7 -.L80800F68: -/* 003D8 80800F68 54A20004 */ bnel $a1, $v0, .L80800F7C -/* 003DC 80800F6C 3404FFF8 */ ori $a0, $zero, 0xFFF8 ## $a0 = 0000FFF8 -/* 003E0 80800F70 1000000E */ beq $zero, $zero, .L80800FAC -/* 003E4 80800F74 AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -/* 003E8 80800F78 3404FFF8 */ ori $a0, $zero, 0xFFF8 ## $a0 = 0000FFF8 -.L80800F7C: -/* 003EC 80800F7C 54820004 */ bnel $a0, $v0, .L80800F90 -/* 003F0 80800F80 3405FFF9 */ ori $a1, $zero, 0xFFF9 ## $a1 = 0000FFF9 -/* 003F4 80800F84 10000009 */ beq $zero, $zero, .L80800FAC -/* 003F8 80800F88 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -/* 003FC 80800F8C 3405FFF9 */ ori $a1, $zero, 0xFFF9 ## $a1 = 0000FFF9 -.L80800F90: -/* 00400 80800F90 14A20003 */ bne $a1, $v0, .L80800FA0 -/* 00404 80800F94 3401FFFA */ ori $at, $zero, 0xFFFA ## $at = 0000FFFA -/* 00408 80800F98 10000004 */ beq $zero, $zero, .L80800FAC -/* 0040C 80800F9C AC640008 */ sw $a0, 0x0008($v1) ## 8015E668 -.L80800FA0: -/* 00410 80800FA0 54410003 */ bnel $v0, $at, .L80800FB0 -/* 00414 80800FA4 8C6C0008 */ lw $t4, 0x0008($v1) ## 8015E668 -/* 00418 80800FA8 AC650008 */ sw $a1, 0x0008($v1) ## 8015E668 -.L80800FAC: -/* 0041C 80800FAC 8C6C0008 */ lw $t4, 0x0008($v1) ## 8015E668 -.L80800FB0: -/* 00420 80800FB0 AC600010 */ sw $zero, 0x0010($v1) ## 8015E670 -/* 00424 80800FB4 55800003 */ bnel $t4, $zero, .L80800FC4 -/* 00428 80800FB8 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 0042C 80800FBC AC6A0010 */ sw $t2, 0x0010($v1) ## 8015E670 -/* 00430 80800FC0 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -.L80800FC4: -/* 00434 80800FC4 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 00438 80800FC8 00416827 */ nor $t5, $v0, $at -/* 0043C 80800FCC 15A00005 */ bne $t5, $zero, .L80800FE4 -/* 00440 80800FD0 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 00444 80800FD4 8E0E0208 */ lw $t6, 0x0208($s0) ## 00000208 -/* 00448 80800FD8 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 0044C 80800FDC AE0F0208 */ sw $t7, 0x0208($s0) ## 00000208 -/* 00450 80800FE0 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -.L80800FE4: -/* 00454 80800FE4 0041C027 */ nor $t8, $v0, $at -/* 00458 80800FE8 17000005 */ bne $t8, $zero, .L80801000 -/* 0045C 80800FEC 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 00460 80800FF0 8E0B0208 */ lw $t3, 0x0208($s0) ## 00000208 -/* 00464 80800FF4 25790001 */ addiu $t9, $t3, 0x0001 ## $t9 = 00000001 -/* 00468 80800FF8 AE190208 */ sw $t9, 0x0208($s0) ## 00000208 -/* 0046C 80800FFC 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -.L80801000: -/* 00470 80801000 00416027 */ nor $t4, $v0, $at -/* 00474 80801004 5580001E */ bnel $t4, $zero, .L80801080 -/* 00478 80801008 952C0000 */ lhu $t4, 0x0000($t1) ## 00000000 -/* 0047C 8080100C 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 00480 80801010 3C188013 */ lui $t8, %hi(D_801333E8) -/* 00484 80801014 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00488 80801018 154D0002 */ bne $t2, $t5, .L80801024 -/* 0048C 8080101C 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 00490 80801020 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -.L80801024: -/* 00494 80801024 8E0E0224 */ lw $t6, 0x0224($s0) ## 00000224 -/* 00498 80801028 55C00015 */ bnel $t6, $zero, .L80801080 -/* 0049C 8080102C 952C0000 */ lhu $t4, 0x0000($t1) ## 00000000 -/* 004A0 80801030 3C078013 */ lui $a3, %hi(D_801333E0) -/* 004A4 80801034 AE0F0224 */ sw $t7, 0x0224($s0) ## 00000224 -/* 004A8 80801038 AE0A022C */ sw $t2, 0x022C($s0) ## 0000022C -/* 004AC 8080103C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 004B0 80801040 3C058013 */ lui $a1, %hi(D_801333D4) -/* 004B4 80801044 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 004B8 80801048 AFA70010 */ sw $a3, 0x0010($sp) -/* 004BC 8080104C AFA9002C */ sw $t1, 0x002C($sp) -/* 004C0 80801050 AFB80014 */ sw $t8, 0x0014($sp) -/* 004C4 80801054 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 004C8 80801058 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 004CC 8080105C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 004D0 80801060 3C088016 */ lui $t0, %hi(gGameInfo) -/* 004D4 80801064 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 004D8 80801068 8D0B0000 */ lw $t3, 0x0000($t0) ## 8015FA90 -/* 004DC 8080106C 8FA9002C */ lw $t1, 0x002C($sp) -/* 004E0 80801070 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 004E4 80801074 85790110 */ lh $t9, 0x0110($t3) ## 00000110 -/* 004E8 80801078 AE190220 */ sw $t9, 0x0220($s0) ## 00000220 -/* 004EC 8080107C 952C0000 */ lhu $t4, 0x0000($t1) ## 00000000 -.L80801080: -/* 004F0 80801080 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 004F4 80801084 01816827 */ nor $t5, $t4, $at -/* 004F8 80801088 55A0001A */ bnel $t5, $zero, .L808010F4 -/* 004FC 8080108C 952C000C */ lhu $t4, 0x000C($t1) ## 0000000C -/* 00500 80801090 8E0E0224 */ lw $t6, 0x0224($s0) ## 00000224 -/* 00504 80801094 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 00508 80801098 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 0050C 8080109C 55C00015 */ bnel $t6, $zero, .L808010F4 -/* 00510 808010A0 952C000C */ lhu $t4, 0x000C($t1) ## 0000000C -/* 00514 808010A4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00518 808010A8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0051C 808010AC 3C058013 */ lui $a1, %hi(D_801333D4) -/* 00520 808010B0 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00524 808010B4 AFA70010 */ sw $a3, 0x0010($sp) -/* 00528 808010B8 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 0052C 808010BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00530 808010C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00534 808010C4 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 00538 808010C8 AFA9002C */ sw $t1, 0x002C($sp) -/* 0053C 808010CC 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00540 808010D0 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 00544 808010D4 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 -/* 00548 808010D8 8FA9002C */ lw $t1, 0x002C($sp) -/* 0054C 808010DC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00550 808010E0 870B0110 */ lh $t3, 0x0110($t8) ## 00000110 -/* 00554 808010E4 000BC880 */ sll $t9, $t3, 2 -/* 00558 808010E8 032BC823 */ subu $t9, $t9, $t3 -/* 0055C 808010EC AE190220 */ sw $t9, 0x0220($s0) ## 00000220 -/* 00560 808010F0 952C000C */ lhu $t4, 0x000C($t1) ## 0000000C -.L808010F4: -/* 00564 808010F4 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 00568 808010F8 01816827 */ nor $t5, $t4, $at -/* 0056C 808010FC 55A0001E */ bnel $t5, $zero, .L80801178 -/* 00570 80801100 952E0000 */ lhu $t6, 0x0000($t1) ## 00000000 -/* 00574 80801104 8E0E0230 */ lw $t6, 0x0230($s0) ## 00000230 -/* 00578 80801108 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 0057C 8080110C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00580 80801110 154E0002 */ bne $t2, $t6, .L8080111C -/* 00584 80801114 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 00588 80801118 AE000228 */ sw $zero, 0x0228($s0) ## 00000228 -.L8080111C: -/* 0058C 8080111C 8E0F0228 */ lw $t7, 0x0228($s0) ## 00000228 -/* 00590 80801120 55E00015 */ bnel $t7, $zero, .L80801178 -/* 00594 80801124 952E0000 */ lhu $t6, 0x0000($t1) ## 00000000 -/* 00598 80801128 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0059C 8080112C AE180228 */ sw $t8, 0x0228($s0) ## 00000228 -/* 005A0 80801130 AE0A0230 */ sw $t2, 0x0230($s0) ## 00000230 -/* 005A4 80801134 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 005A8 80801138 3C058013 */ lui $a1, %hi(D_801333D4) -/* 005AC 8080113C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 005B0 80801140 AFA70010 */ sw $a3, 0x0010($sp) -/* 005B4 80801144 AFA9002C */ sw $t1, 0x002C($sp) -/* 005B8 80801148 AFAB0014 */ sw $t3, 0x0014($sp) -/* 005BC 8080114C 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 005C0 80801150 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 005C4 80801154 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 005C8 80801158 3C088016 */ lui $t0, %hi(gGameInfo) -/* 005CC 8080115C 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 005D0 80801160 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 -/* 005D4 80801164 8FA9002C */ lw $t1, 0x002C($sp) -/* 005D8 80801168 872C0110 */ lh $t4, 0x0110($t9) ## 00000110 -/* 005DC 8080116C 000C6823 */ subu $t5, $zero, $t4 -/* 005E0 80801170 AE0D0220 */ sw $t5, 0x0220($s0) ## 00000220 -/* 005E4 80801174 952E0000 */ lhu $t6, 0x0000($t1) ## 00000000 -.L80801178: -/* 005E8 80801178 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 005EC 8080117C 01C17827 */ nor $t7, $t6, $at -/* 005F0 80801180 55E0001A */ bnel $t7, $zero, .L808011EC -/* 005F4 80801184 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 005F8 80801188 8E180228 */ lw $t8, 0x0228($s0) ## 00000228 -/* 005FC 8080118C 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 00600 80801190 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 00604 80801194 57000015 */ bnel $t8, $zero, .L808011EC -/* 00608 80801198 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 0060C 8080119C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00610 808011A0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00614 808011A4 3C058013 */ lui $a1, %hi(D_801333D4) -/* 00618 808011A8 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 0061C 808011AC AFA70010 */ sw $a3, 0x0010($sp) -/* 00620 808011B0 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 00624 808011B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00628 808011B8 AFAB0014 */ sw $t3, 0x0014($sp) -/* 0062C 808011BC 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 00630 808011C0 AFA9002C */ sw $t1, 0x002C($sp) -/* 00634 808011C4 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00638 808011C8 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 0063C 808011CC 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 -/* 00640 808011D0 8FA9002C */ lw $t1, 0x002C($sp) -/* 00644 808011D4 872C0110 */ lh $t4, 0x0110($t9) ## 00000110 -/* 00648 808011D8 000C6823 */ subu $t5, $zero, $t4 -/* 0064C 808011DC 000D7080 */ sll $t6, $t5, 2 -/* 00650 808011E0 01CD7023 */ subu $t6, $t6, $t5 -/* 00654 808011E4 AE0E0220 */ sw $t6, 0x0220($s0) ## 00000220 -/* 00658 808011E8 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -.L808011EC: -/* 0065C 808011EC 2403FDFF */ addiu $v1, $zero, 0xFDFF ## $v1 = FFFFFDFF -/* 00660 808011F0 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 00664 808011F4 00437827 */ nor $t7, $v0, $v1 -/* 00668 808011F8 11E00005 */ beq $t7, $zero, .L80801210 -/* 0066C 808011FC 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 00670 80801200 95380000 */ lhu $t8, 0x0000($t1) ## 00000000 -/* 00674 80801204 03035827 */ nor $t3, $t8, $v1 -/* 00678 80801208 55600014 */ bnel $t3, $zero, .L8080125C -/* 0067C 8080120C 2403FEFF */ addiu $v1, $zero, 0xFEFF ## $v1 = FFFFFEFF -.L80801210: -/* 00680 80801210 3C198013 */ lui $t9, %hi(D_801333E0) -/* 00684 80801214 273933E0 */ addiu $t9, %lo(D_801333E0) -/* 00688 80801218 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0068C 8080121C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00690 80801220 03203825 */ or $a3, $t9, $zero ## $a3 = 801333E0 -/* 00694 80801224 AFB90010 */ sw $t9, 0x0010($sp) -/* 00698 80801228 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 0069C 8080122C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 006A0 80801230 AFAC0014 */ sw $t4, 0x0014($sp) -/* 006A4 80801234 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 006A8 80801238 AFA9002C */ sw $t1, 0x002C($sp) -/* 006AC 8080123C 3C088016 */ lui $t0, %hi(gGameInfo) -/* 006B0 80801240 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 006B4 80801244 8D0D0000 */ lw $t5, 0x0000($t0) ## 8015FA90 -/* 006B8 80801248 8FA9002C */ lw $t1, 0x002C($sp) -/* 006BC 8080124C 85AE0110 */ lh $t6, 0x0110($t5) ## 00000110 -/* 006C0 80801250 AE0E0220 */ sw $t6, 0x0220($s0) ## 00000220 -/* 006C4 80801254 9522000C */ lhu $v0, 0x000C($t1) ## 0000000C -/* 006C8 80801258 2403FEFF */ addiu $v1, $zero, 0xFEFF ## $v1 = FFFFFEFF -.L8080125C: -/* 006CC 8080125C 00437827 */ nor $t7, $v0, $v1 -/* 006D0 80801260 11E00005 */ beq $t7, $zero, .L80801278 -/* 006D4 80801264 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 006D8 80801268 95380000 */ lhu $t8, 0x0000($t1) ## 00000000 -/* 006DC 8080126C 03035827 */ nor $t3, $t8, $v1 -/* 006E0 80801270 55600013 */ bnel $t3, $zero, .L808012C0 -/* 006E4 80801274 96180020 */ lhu $t8, 0x0020($s0) ## 00000020 -.L80801278: -/* 006E8 80801278 3C198013 */ lui $t9, %hi(D_801333E0) -/* 006EC 8080127C 273933E0 */ addiu $t9, %lo(D_801333E0) -/* 006F0 80801280 3C058013 */ lui $a1, %hi(D_801333D4) -/* 006F4 80801284 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 006F8 80801288 AFAC0014 */ sw $t4, 0x0014($sp) -/* 006FC 8080128C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00700 80801290 03203825 */ or $a3, $t9, $zero ## $a3 = 801333E0 -/* 00704 80801294 AFB90010 */ sw $t9, 0x0010($sp) -/* 00708 80801298 24041800 */ addiu $a0, $zero, 0x1800 ## $a0 = 00001800 -/* 0070C 8080129C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* 00710 808012A0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00714 808012A4 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00718 808012A8 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 0071C 808012AC 8D0D0000 */ lw $t5, 0x0000($t0) ## 8015FA90 -/* 00720 808012B0 85AE0110 */ lh $t6, 0x0110($t5) ## 00000110 -/* 00724 808012B4 000E7823 */ subu $t7, $zero, $t6 -/* 00728 808012B8 AE0F0220 */ sw $t7, 0x0220($s0) ## 00000220 -/* 0072C 808012BC 96180020 */ lhu $t8, 0x0020($s0) ## 00000020 -.L808012C0: -/* 00730 808012C0 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 00734 808012C4 3C088016 */ lui $t0, %hi(gGameInfo) -/* 00738 808012C8 03015827 */ nor $t3, $t8, $at -/* 0073C 808012CC 1560000E */ bne $t3, $zero, .L80801308 -/* 00740 808012D0 2508FA90 */ addiu $t0, %lo(gGameInfo) -/* 00744 808012D4 8E1901DC */ lw $t9, 0x01DC($s0) ## 000001DC -/* 00748 808012D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0074C 808012DC 272C0001 */ addiu $t4, $t9, 0x0001 ## $t4 = 00000001 -/* 00750 808012E0 258E0007 */ addiu $t6, $t4, 0x0007 ## $t6 = 00000008 -/* 00754 808012E4 01C1001A */ div $zero, $t6, $at -/* 00758 808012E8 0000C010 */ mfhi $t8 -/* 0075C 808012EC AE0C01DC */ sw $t4, 0x01DC($s0) ## 000001DC -/* 00760 808012F0 00185880 */ sll $t3, $t8, 2 -/* 00764 808012F4 AE1801DC */ sw $t8, 0x01DC($s0) ## 000001DC -/* 00768 808012F8 020BC821 */ addu $t9, $s0, $t3 -/* 0076C 808012FC 8F2201E0 */ lw $v0, 0x01E0($t9) ## 000001E0 -/* 00770 80801300 AE02020C */ sw $v0, 0x020C($s0) ## 0000020C -/* 00774 80801304 AE0201D8 */ sw $v0, 0x01D8($s0) ## 000001D8 -.L80801308: -/* 00778 80801308 8E0C021C */ lw $t4, 0x021C($s0) ## 0000021C -/* 0077C 8080130C 8E0D0220 */ lw $t5, 0x0220($s0) ## 00000220 -/* 00780 80801310 018D7021 */ addu $t6, $t4, $t5 -/* 00784 80801314 29C1FFF9 */ slti $at, $t6, 0xFFF9 -/* 00788 80801318 AE0E021C */ sw $t6, 0x021C($s0) ## 0000021C -/* 0078C 8080131C 10200036 */ beq $at, $zero, .L808013F8 -/* 00790 80801320 01C07825 */ or $t7, $t6, $zero ## $t7 = 00000008 -/* 00794 80801324 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -/* 00798 80801328 8E1801D8 */ lw $t8, 0x01D8($s0) ## 000001D8 -/* 0079C 8080132C 8E03020C */ lw $v1, 0x020C($s0) ## 0000020C -/* 007A0 80801330 AE000220 */ sw $zero, 0x0220($s0) ## 00000220 -/* 007A4 80801334 270B0001 */ addiu $t3, $t8, 0x0001 ## $t3 = 00000001 -/* 007A8 80801338 01626021 */ addu $t4, $t3, $v0 -/* 007AC 8080133C 0182001A */ div $zero, $t4, $v0 -/* 007B0 80801340 00627021 */ addu $t6, $v1, $v0 -/* 007B4 80801344 25CF0013 */ addiu $t7, $t6, 0x0013 ## $t7 = 0000001B -/* 007B8 80801348 00006810 */ mfhi $t5 -/* 007BC 8080134C AE0B01D8 */ sw $t3, 0x01D8($s0) ## 000001D8 -/* 007C0 80801350 AE0D01D8 */ sw $t5, 0x01D8($s0) ## 000001D8 -/* 007C4 80801354 01E2001A */ div $zero, $t7, $v0 -/* 007C8 80801358 0160C825 */ or $t9, $t3, $zero ## $t9 = 00000001 -/* 007CC 8080135C 8E0B01D8 */ lw $t3, 0x01D8($s0) ## 000001D8 -/* 007D0 80801360 0000C010 */ mfhi $t8 -/* 007D4 80801364 AE00021C */ sw $zero, 0x021C($s0) ## 0000021C -/* 007D8 80801368 14400002 */ bne $v0, $zero, .L80801374 -/* 007DC 8080136C 00000000 */ nop -/* 007E0 80801370 0007000D */ break 7 -.L80801374: -/* 007E4 80801374 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 007E8 80801378 14410004 */ bne $v0, $at, .L8080138C -/* 007EC 8080137C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007F0 80801380 15810002 */ bne $t4, $at, .L8080138C -/* 007F4 80801384 00000000 */ nop -/* 007F8 80801388 0006000D */ break 6 -.L8080138C: -/* 007FC 8080138C 14400002 */ bne $v0, $zero, .L80801398 -/* 00800 80801390 00000000 */ nop -/* 00804 80801394 0007000D */ break 7 -.L80801398: -/* 00808 80801398 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0080C 8080139C 14410004 */ bne $v0, $at, .L808013B0 -/* 00810 808013A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00814 808013A4 15E10002 */ bne $t7, $at, .L808013B0 -/* 00818 808013A8 00000000 */ nop -/* 0081C 808013AC 0006000D */ break 6 -.L808013B0: -/* 00820 808013B0 570B0012 */ bnel $t8, $t3, .L808013FC -/* 00824 808013B4 8E0F021C */ lw $t7, 0x021C($s0) ## 0000021C -/* 00828 808013B8 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000001 -/* 0082C 808013BC 03226821 */ addu $t5, $t9, $v0 -/* 00830 808013C0 01A2001A */ div $zero, $t5, $v0 -/* 00834 808013C4 00007010 */ mfhi $t6 -/* 00838 808013C8 AE19020C */ sw $t9, 0x020C($s0) ## 0000020C -/* 0083C 808013CC AE0E020C */ sw $t6, 0x020C($s0) ## 0000020C -/* 00840 808013D0 03206025 */ or $t4, $t9, $zero ## $t4 = 00000001 -/* 00844 808013D4 14400002 */ bne $v0, $zero, .L808013E0 -/* 00848 808013D8 00000000 */ nop -/* 0084C 808013DC 0007000D */ break 7 -.L808013E0: -/* 00850 808013E0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00854 808013E4 14410004 */ bne $v0, $at, .L808013F8 -/* 00858 808013E8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0085C 808013EC 15A10002 */ bne $t5, $at, .L808013F8 -/* 00860 808013F0 00000000 */ nop -/* 00864 808013F4 0006000D */ break 6 -.L808013F8: -/* 00868 808013F8 8E0F021C */ lw $t7, 0x021C($s0) ## 0000021C -.L808013FC: -/* 0086C 808013FC 8E0401D8 */ lw $a0, 0x01D8($s0) ## 000001D8 -/* 00870 80801400 8E03020C */ lw $v1, 0x020C($s0) ## 0000020C -/* 00874 80801404 29E10008 */ slti $at, $t7, 0x0008 -/* 00878 80801408 5420004A */ bnel $at, $zero, .L80801534 -/* 0087C 8080140C 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -/* 00880 80801410 AE000220 */ sw $zero, 0x0220($s0) ## 00000220 -/* 00884 80801414 14640014 */ bne $v1, $a0, .L80801468 -/* 00888 80801418 AE00021C */ sw $zero, 0x021C($s0) ## 0000021C -/* 0088C 8080141C 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -/* 00890 80801420 2478FFFE */ addiu $t8, $v1, 0xFFFE ## $t8 = FFFFFFFE -/* 00894 80801424 AE18020C */ sw $t8, 0x020C($s0) ## 0000020C -/* 00898 80801428 0302C821 */ addu $t9, $t8, $v0 -/* 0089C 8080142C 0322001A */ div $zero, $t9, $v0 -/* 008A0 80801430 00006010 */ mfhi $t4 -/* 008A4 80801434 AE0C020C */ sw $t4, 0x020C($s0) ## 0000020C -/* 008A8 80801438 01801825 */ or $v1, $t4, $zero ## $v1 = 00000001 -/* 008AC 8080143C 03005825 */ or $t3, $t8, $zero ## $t3 = FFFFFFFE -/* 008B0 80801440 8E0401D8 */ lw $a0, 0x01D8($s0) ## 000001D8 -/* 008B4 80801444 14400002 */ bne $v0, $zero, .L80801450 -/* 008B8 80801448 00000000 */ nop -/* 008BC 8080144C 0007000D */ break 7 -.L80801450: -/* 008C0 80801450 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 008C4 80801454 14410004 */ bne $v0, $at, .L80801468 -/* 008C8 80801458 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008CC 8080145C 17210002 */ bne $t9, $at, .L80801468 -/* 008D0 80801460 00000000 */ nop -/* 008D4 80801464 0006000D */ break 6 -.L80801468: -/* 008D8 80801468 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -/* 008DC 8080146C 248DFFFF */ addiu $t5, $a0, 0xFFFF ## $t5 = FFFFFFFF -/* 008E0 80801470 AE0D01D8 */ sw $t5, 0x01D8($s0) ## 000001D8 -/* 008E4 80801474 01A27821 */ addu $t7, $t5, $v0 -/* 008E8 80801478 01E2001A */ div $zero, $t7, $v0 -/* 008EC 8080147C 00625821 */ addu $t3, $v1, $v0 -/* 008F0 80801480 0000C010 */ mfhi $t8 -/* 008F4 80801484 03002025 */ or $a0, $t8, $zero ## $a0 = FFFFFFFE -/* 008F8 80801488 AE1801D8 */ sw $t8, 0x01D8($s0) ## 000001D8 -/* 008FC 8080148C 0162001A */ div $zero, $t3, $v0 -/* 00900 80801490 0000C810 */ mfhi $t9 -/* 00904 80801494 01A07025 */ or $t6, $t5, $zero ## $t6 = FFFFFFFF -/* 00908 80801498 14400002 */ bne $v0, $zero, .L808014A4 -/* 0090C 8080149C 00000000 */ nop -/* 00910 808014A0 0007000D */ break 7 -.L808014A4: -/* 00914 808014A4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00918 808014A8 14410004 */ bne $v0, $at, .L808014BC -/* 0091C 808014AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00920 808014B0 15E10002 */ bne $t7, $at, .L808014BC -/* 00924 808014B4 00000000 */ nop -/* 00928 808014B8 0006000D */ break 6 -.L808014BC: -/* 0092C 808014BC 14400002 */ bne $v0, $zero, .L808014C8 -/* 00930 808014C0 00000000 */ nop -/* 00934 808014C4 0007000D */ break 7 -.L808014C8: -/* 00938 808014C8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0093C 808014CC 14410004 */ bne $v0, $at, .L808014E0 -/* 00940 808014D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00944 808014D4 15610002 */ bne $t3, $at, .L808014E0 -/* 00948 808014D8 00000000 */ nop -/* 0094C 808014DC 0006000D */ break 6 -.L808014E0: -/* 00950 808014E0 57240014 */ bnel $t9, $a0, .L80801534 -/* 00954 808014E4 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -/* 00958 808014E8 246CFFFF */ addiu $t4, $v1, 0xFFFF ## $t4 = 00000000 -/* 0095C 808014EC 01827021 */ addu $t6, $t4, $v0 -/* 00960 808014F0 01C2001A */ div $zero, $t6, $v0 -/* 00964 808014F4 00007810 */ mfhi $t7 -/* 00968 808014F8 AE0C020C */ sw $t4, 0x020C($s0) ## 0000020C -/* 0096C 808014FC AE0F020C */ sw $t7, 0x020C($s0) ## 0000020C -/* 00970 80801500 01E01825 */ or $v1, $t7, $zero ## $v1 = 0000001B -/* 00974 80801504 01806825 */ or $t5, $t4, $zero ## $t5 = 00000000 -/* 00978 80801508 14400002 */ bne $v0, $zero, .L80801514 -/* 0097C 8080150C 00000000 */ nop -/* 00980 80801510 0007000D */ break 7 -.L80801514: -/* 00984 80801514 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00988 80801518 14410004 */ bne $v0, $at, .L8080152C -/* 0098C 8080151C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00990 80801520 15C10002 */ bne $t6, $at, .L8080152C -/* 00994 80801524 00000000 */ nop -/* 00998 80801528 0006000D */ break 6 -.L8080152C: -/* 0099C 8080152C 8E0401D8 */ lw $a0, 0x01D8($s0) ## 000001D8 -/* 009A0 80801530 8E0201D0 */ lw $v0, 0x01D0($s0) ## 000001D0 -.L80801534: -/* 009A4 80801534 0082C021 */ addu $t8, $a0, $v0 -/* 009A8 80801538 0302001A */ div $zero, $t8, $v0 -/* 009AC 8080153C 00005810 */ mfhi $t3 -/* 009B0 80801540 0062C821 */ addu $t9, $v1, $v0 -/* 009B4 80801544 AE0B01D8 */ sw $t3, 0x01D8($s0) ## 000001D8 -/* 009B8 80801548 0322001A */ div $zero, $t9, $v0 -/* 009BC 8080154C 00006010 */ mfhi $t4 -/* 009C0 80801550 AE0C020C */ sw $t4, 0x020C($s0) ## 0000020C -/* 009C4 80801554 8D0E0000 */ lw $t6, 0x0000($t0) ## 8015FA90 -/* 009C8 80801558 8E0D01D8 */ lw $t5, 0x01D8($s0) ## 000001D8 -/* 009CC 8080155C 14400002 */ bne $v0, $zero, .L80801568 -/* 009D0 80801560 00000000 */ nop -/* 009D4 80801564 0007000D */ break 7 -.L80801568: -/* 009D8 80801568 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 009DC 8080156C 14410004 */ bne $v0, $at, .L80801580 -/* 009E0 80801570 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 009E4 80801574 17010002 */ bne $t8, $at, .L80801580 -/* 009E8 80801578 00000000 */ nop -/* 009EC 8080157C 0006000D */ break 6 -.L80801580: -/* 009F0 80801580 A5CD1434 */ sh $t5, 0x1434($t6) ## 00001433 -/* 009F4 80801584 8D180000 */ lw $t8, 0x0000($t0) ## 8015FA90 -/* 009F8 80801588 8E0F020C */ lw $t7, 0x020C($s0) ## 0000020C -/* 009FC 8080158C 14400002 */ bne $v0, $zero, .L80801598 -/* 00A00 80801590 00000000 */ nop -/* 00A04 80801594 0007000D */ break 7 -.L80801598: -/* 00A08 80801598 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00A0C 8080159C 14410004 */ bne $v0, $at, .L808015B0 -/* 00A10 808015A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00A14 808015A4 17210002 */ bne $t9, $at, .L808015B0 -/* 00A18 808015A8 00000000 */ nop -/* 00A1C 808015AC 0006000D */ break 6 -.L808015B0: -/* 00A20 808015B0 A70F1436 */ sh $t7, 0x1436($t8) ## 00001434 -/* 00A24 808015B4 8D190000 */ lw $t9, 0x0000($t0) ## 8015FA90 -/* 00A28 808015B8 8E0B01DC */ lw $t3, 0x01DC($s0) ## 000001DC -/* 00A2C 808015BC A72B1438 */ sh $t3, 0x1438($t9) ## 00001439 -/* 00A30 808015C0 8E050224 */ lw $a1, 0x0224($s0) ## 00000224 -/* 00A34 808015C4 10A00003 */ beq $a1, $zero, .L808015D4 -/* 00A38 808015C8 24ACFFFF */ addiu $t4, $a1, 0xFFFF ## $t4 = FFFFFFFF -/* 00A3C 808015CC AE0C0224 */ sw $t4, 0x0224($s0) ## 00000224 -/* 00A40 808015D0 01802825 */ or $a1, $t4, $zero ## $a1 = FFFFFFFF -.L808015D4: -/* 00A44 808015D4 54A00003 */ bnel $a1, $zero, .L808015E4 -/* 00A48 808015D8 8E020228 */ lw $v0, 0x0228($s0) ## 00000228 -/* 00A4C 808015DC AE00022C */ sw $zero, 0x022C($s0) ## 0000022C -/* 00A50 808015E0 8E020228 */ lw $v0, 0x0228($s0) ## 00000228 -.L808015E4: -/* 00A54 808015E4 10400003 */ beq $v0, $zero, .L808015F4 -/* 00A58 808015E8 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 00A5C 808015EC AE0D0228 */ sw $t5, 0x0228($s0) ## 00000228 -/* 00A60 808015F0 01A01025 */ or $v0, $t5, $zero ## $v0 = FFFFFFFF -.L808015F4: -/* 00A64 808015F4 54400003 */ bnel $v0, $zero, .L80801604 -/* 00A68 808015F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A6C 808015FC AE000230 */ sw $zero, 0x0230($s0) ## 00000230 -/* 00A70 80801600 8FBF0024 */ lw $ra, 0x0024($sp) -.L80801604: -/* 00A74 80801604 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A78 80801608 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00A7C 8080160C 03E00008 */ jr $ra -/* 00A80 80801610 00000000 */ nop diff --git a/data/code_801014C0.bss.s b/data/__libm_qnan_f.rodata.s similarity index 75% rename from data/code_801014C0.bss.s rename to data/__libm_qnan_f.rodata.s index 2a66a0234f..8edfc0bfc0 100644 --- a/data/code_801014C0.bss.s +++ b/data/__libm_qnan_f.rodata.s @@ -5,9 +5,7 @@ .set noreorder # don't insert nops after branches .set gp=64 # allow use of 64-bit general purpose registers -.section .bss +.section .rodata -.balign 16 - -glabel D_80175860 - .space 0x100 +glabel __libm_qnan_f + .word 0x7F810000 diff --git a/data/code_80102420.data.s b/data/code_80102420.data.s deleted file mode 100644 index f2856ad1d3..0000000000 --- a/data/code_80102420.data.s +++ /dev/null @@ -1,16 +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_80134CF0 - .incbin "baserom.z64", 0xBABE90, 0x4 - -glabel __osPfsInodeCacheBank - .incbin "baserom.z64", 0xBABE94, 0xC diff --git a/data/code_80105CF0.data.s b/data/code_80105CF0.data.s deleted file mode 100644 index f3749995cf..0000000000 --- a/data/code_80105CF0.data.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 .data - -.balign 16 - -glabel __osPfsLastChannel - .incbin "baserom.z64", 0xBABEC0, 0x10 diff --git a/data/db_camera.data.s b/data/db_camera.data.s index 29d94c4898..b73a4a0e85 100644 --- a/data/db_camera.data.s +++ b/data/db_camera.data.s @@ -9,15 +9,6 @@ .balign 16 -glabel D_8012CED0 - .incbin "baserom.z64", 0xBA4070, 0x4 - -glabel D_8012CED4 - .incbin "baserom.z64", 0xBA4074, 0x4 - -glabel D_8012CED8 - .incbin "baserom.z64", 0xBA4078, 0x8 - glabel D_8012CEE0 .word D_80143170 diff --git a/data/db_camera.rodata.s b/data/db_camera.rodata.s index 865076091c..99f87e7584 100644 --- a/data/db_camera.rodata.s +++ b/data/db_camera.rodata.s @@ -9,22 +9,6 @@ .balign 16 -glabel D_80143100 - .asciz "shrink_window_setval(%d)\n" - .balign 4 - -glabel D_8014311C - .asciz "shrink_window_setnowval(%d)\n" - .balign 4 - -glabel D_8014313C - .asciz "shrink_window_init()\n" - .balign 4 - -glabel D_80143154 - .asciz "shrink_window_cleanup()\n" - .balign 4 - glabel D_80143170 .asciz "\x8Cｷ-ﾌﾚ-ﾑ\x8Dｶﾞ" .balign 4 diff --git a/data/overlays/actors/z_demo_sa.data.s b/data/overlays/actors/z_demo_sa.data.s deleted file mode 100644 index fabbaba005..0000000000 --- a/data/overlays/actors/z_demo_sa.data.s +++ /dev/null @@ -1,53 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809900E0 - .word 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48 -glabel D_809900F4 - .word 0x06003588, 0x06004C48, 0x06003348, 0x06004448, 0x06004648 -glabel D_80990108 - .word 0x00000000 -glabel D_8099010C - .word 0x0000001D, 0x00000BB9, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x02640000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020264, 0x02650000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040265, 0x02AC0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000202AC, 0x02DC0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0xC032AAAB, 0x00000000, 0x000302DC, 0x0B600000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x000D0000, 0x01050000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050105, 0x02580000, 0x95550000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130258, 0x04DB0000, 0x15550000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002B, 0x00000003, 0x00010000, 0x00A50000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000200A5, 0x01D20000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000301D2, 0x0BB90000, 0x00000000, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0xFFFFFF9E, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x0001024E, 0x025F025F, 0x0000002D, 0x00000001, 0x00050269, 0x02870287, 0x0000002D, 0x00000001, 0x0001036B, 0x03890389, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0xFFFFFF9E, 0x00000000, 0x00000062, 0xFFFFFF9E, 0x00000000, 0x00000062, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, 0x00000001, 0x00040000, 0x0BB80000, 0x00000000, 0xFFFFFFDD, 0x00000061, 0xFFFFFFC4, 0xFFFFFFDD, 0x00000061, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x006403CE, 0x041A041A, 0x00000013, 0x0000000A, 0xFFFF0000, 0x012FFFFF, 0xFFFFFFFF, 0x106A012F, 0x01430000, 0x00000000, 0xFFFF0143, 0x0158FFFF, 0xFFFFFFFF, 0x108F0158, 0x018A0000, 0x00000000, 0xFFFF018A, 0x019FFFFF, 0xFFFFFFFF, 0x1090019F, 0x01D10000, 0x00000000, 0xFFFF01D1, 0x0367FFFF, 0xFFFFFFFF, 0x003E0367, 0x036B0000, 0x00000000, 0xFFFF036B, 0x03A8FFFF, 0xFFFFFFFF, 0x106B03A8, 0x03B20000, 0x00000000, 0x00000056, 0x00000001, 0x004402AE, 0x02AF0000, 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040226, 0x02580000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04D90000, 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B0072, 0x00000000, 0x432A32CA, 0x009F0AC6, 0x002B006F, 0x00000000, 0x432A32CA, 0x009F0969, 0x002B002F, 0x00000000, 0x432A32CA, 0x009F00CA, 0x002B0073, 0x00000000, 0x4235998B, 0x009E00DE, 0x002A0061, 0x00000000, 0x4235998B, 0x009E0095, 0x002A006F, 0x00000000, 0x4235998B, 0x009E006F, 0x002A006D, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0065, 0x00000000, 0x4235998B, 0x009E006F, 0x002A0061, 0xFF000000, 0x4235998B, 0x009E006F, 0x002A0061, 0x00000001, 0x000100BE, 0x01870000, 0x00000000, 0x4223FFEE, 0xFFA50012, 0xFF620072, 0x00000000, 0x4223FFEE, 0xFFA60011, 0xFF63006F, 0x00000000, 0x4223FFEE, 0xFFA6001F, 0xFF63002F, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630073, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF630061, 0x00000000, 0x4223FFEE, 0xFFA60025, 0xFF63006F, 0xFF000000, 0x4223FFEE, 0xFFA60025, 0xFF63006D, 0x00000001, 0x00010107, 0x054A0000, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0072, 0x00000000, 0x41C332EC, 0x00070061, 0x007F006F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F002F, 0x00000000, 0x41C332EC, 0x00070061, 0x007F0073, 0xFF000000, 0x41C332EC, 0x00070061, 0x007F0061, 0x00000001, 0x0001014D, 0x05900000, 0x00000000, 0x4235998B, 0xFEE90067, 0x00440072, 0x00000000, 0x4235998B, 0xFEE90067, 0x0044006F, 0x00000000, 0x4235998B, 0xFEE90067, 0x0044002F, 0x00000000, 0x4235998B, 0xFEE90067, 0x00440073, 0xFF000000, 0x4235998B, 0xFEE90067, 0x00440061, 0x00000001, 0x00010193, 0x05D60000, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD0072, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD006F, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD002F, 0x00000000, 0x4235998C, 0xFFCC0023, 0xFFAD0073, 0xFF000000, 0x4235998C, 0xFFCC0023, 0xFFAD0061, 0x00000001, 0x000101D9, 0x06B40000, 0x00000000, 0x4235998C, 0xFFBF003D, 0xFF910072, 0x00000000, 0x4235998C, 0xFFBF003D, 0xFF91006F, 0x00000000, 0x4235998C, 0xFFCD004A, 0xFFAA002F, 0x00000000, 0x42726668, 0x00000088, 0x000B0073, 0x00000000, 0x42726668, 0x01820202, 0x02E00061, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006F, 0x00000000, 0x42A0CCAE, 0x0243009C, 0x044B006D, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0065, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0061, 0x00000000, 0x424A665D, 0x0243009C, 0x044B0061, 0xFF000000, 0x424A665D, 0x0243009C, 0x044B0072, 0x00000001, 0x00010261, 0x03B70000, 0x00000000, 0x42700000, 0x000D0356, 0x00020072, 0x00000000, 0x42700000, 0x00090355, 0x0005006F, 0x00000000, 0x42700000, 0xFFFD0355, 0x0005002F, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0073, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF0061, 0x00000000, 0x42700000, 0x00090354, 0xFFEF006F, 0x00000000, 0x42700000, 0x00100354, 0xFFFA006D, 0x00000000, 0x42700000, 0x00090354, 0x00050065, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00050061, 0x00000005, 0x000102AD, 0x074A0000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50072, 0x00000000, 0x4289332C, 0x00000021, 0xFFE5006F, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6002F, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60073, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60061, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6006F, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6006D, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60065, 0x00000002, 0x00010000, 0x04F60000, 0x0000001E, 0x432A32CA, 0x009A0A24, 0x00290072, 0x0000001E, 0x432A32CA, 0x009A0A24, 0x0029006F, 0x0000001E, 0x432A32CA, 0x009A08C8, 0x0029002F, 0x0000001E, 0x432A32CA, 0x009A002A, 0x00290073, 0x0000001E, 0x4270CCCD, 0x0052005E, 0x00170061, 0x0000001E, 0x424BFFF7, 0x0021004F, 0x0000006F, 0x0000001E, 0x4235998B, 0x001E003E, 0xFFF2006D, 0x000003E8, 0x4235998B, 0x001E003E, 0xFFF20065, 0x0000001E, 0x4235998B, 0x001E003E, 0xFFF20061, 0xFF00001E, 0x4235998B, 0x001F003E, 0xFFF20061, 0x00000002, 0x000100BE, 0x01A40000, 0x00000032, 0x4223FFEE, 0x000D002A, 0x00140072, 0x0000001E, 0x4223FFEE, 0x000C002F, 0x0012006F, 0x0000001E, 0x4223FFEE, 0x000B0032, 0x0014002F, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x00140073, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x00140061, 0x0000001E, 0x4223FFEE, 0x000B0035, 0x0014006F, 0xFF00001E, 0x4223FFEE, 0x000B0035, 0x0014006D, 0x00000002, 0x00010107, 0x05670000, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A0072, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A006F, 0x000003E8, 0x41C332EC, 0xFFD60011, 0xFF6A002F, 0x0000001E, 0x41C332EC, 0xFFD60011, 0xFF6A0073, 0xFF00001E, 0x41C332EC, 0xFFD60011, 0xFF6A0061, 0x00000002, 0x0001014D, 0x05AD0000, 0x0001001E, 0x4234CCBE, 0xFFE6000D, 0xFFAB0072, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB006F, 0x000003E8, 0x4235998B, 0xFFE6000D, 0xFFAB002F, 0x0000001E, 0x4235998B, 0xFFE6000D, 0xFFAB0073, 0xFF00001E, 0x4235998B, 0xFFE6000D, 0xFFAB0061, 0x00000002, 0x00010193, 0x05F30000, 0x0000001E, 0x41F6662E, 0xFF1E000A, 0xFE5D0072, 0x0000001E, 0x41F7FFC8, 0xFF1E000A, 0xFE5D006F, 0x000003E8, 0x420E664F, 0xFF1E000A, 0xFE5D002F, 0x0000001E, 0x42219987, 0xFF1E000A, 0xFE5E0073, 0xFF00001E, 0x4235998C, 0xFF1E000A, 0xFE5E0061, 0x00000002, 0x000101D9, 0x06D10000, 0x0000001E, 0x4235998C, 0xFF26FFA8, 0xFE740072, 0x0000001E, 0x4235998C, 0xFF26FFA8, 0xFE74006F, 0x0000001E, 0x4235998C, 0xFF34FFB5, 0xFE8E002F, 0x0000001E, 0x4282CCCC, 0xFF6BFFF6, 0xFEF30073, 0x00000019, 0x428D998E, 0x011F00EF, 0x02270061, 0x0000001E, 0x42A0CCAE, 0x023A01ED, 0x043B006F, 0x0000000A, 0x42499990, 0x024201EC, 0x0449006D, 0x0000001E, 0x424A665D, 0x024201EC, 0x04490065, 0x000003E8, 0x424A665D, 0x024201EB, 0x04490061, 0x0000001B, 0x424A665D, 0x024201EB, 0x04490061, 0xFF00001E, 0x424A665D, 0x024201EB, 0x04490072, 0x00000002, 0x00010261, 0x03E80000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA0072, 0x00000028, 0x42700000, 0x00030006, 0xFFFA006F, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFA002F, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0073, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA0061, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA006F, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA006D, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0065, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA0061, 0x00000006, 0x000102AD, 0x07670000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050072, 0x0000001E, 0x4289332C, 0x00000065, 0x0006006F, 0x0000001E, 0x4289332C, 0x00010063, 0x0029002F, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100073, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100061, 0x000003E8, 0x4289332C, 0x0000002A, 0x0010006F, 0x0000001E, 0x4289332C, 0x0000002A, 0x0010006D, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100065, 0xFFFFFFFF, 0x00000000 -glabel D_80990D5C - .word func_8098EBB8 -.word func_8098EBD8 -.word func_8098EBF8 -.word func_8098EC28 -.word func_8098EC60 -.word func_8098EC94 -.word func_8098ECCC -.word func_8098F0E8 -.word func_8098F118 -.word func_8098F16C -.word func_8098F3F0 -.word func_8098F714 -.word func_8098F734 -.word func_8098F77C -.word func_8098F7BC -.word func_8098F7FC -.word func_8098FC44 -.word func_8098FC64 -.word func_8098FC9C -.word func_8098FCD4 -.word func_8098FD0C -glabel D_80990DB0 - .word func_8098FEA8 -.word func_8098FEB4 -.word func_8098F1C0 -glabel Demo_Sa_InitVars - .word 0x00C90400, 0x00000010, 0x00BC0000, 0x000001B4 -.word DemoSa_Init -.word DemoSa_Destroy -.word DemoSa_Update -.word DemoSa_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_demo_sa.reloc.s b/data/overlays/actors/z_demo_sa.reloc.s deleted file mode 100644 index 91224b1087..0000000000 --- a/data/overlays/actors/z_demo_sa.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80990F40 - .incbin "baserom/ovl_Demo_Sa", 0x2AE0, 0x000002F0 diff --git a/data/overlays/actors/z_en_blkobj.data.s b/data/overlays/actors/z_en_blkobj.data.s deleted file mode 100644 index fd5859c1b7..0000000000 --- a/data/overlays/actors/z_en_blkobj.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Blkobj_InitVars - .word 0x01360600, 0x00000030, 0x01250000, 0x0000016C -.word EnBlkobj_Init -.word EnBlkobj_Destroy -.word EnBlkobj_Update -.word EnBlkobj_Draw -glabel D_809C2580 - .word 0xC0500001, 0xB0F40320, 0xB0F800C8, 0x30FC012C -glabel D_809C2590 - .word 0xE200001C, 0xC8112078, 0xDF000000, 0x00000000 -glabel D_809C25A0 - .word 0xE200001C, 0xC81049D8, 0xDF000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_blkobj.reloc.s b/data/overlays/actors/z_en_blkobj.reloc.s deleted file mode 100644 index 9582dccfeb..0000000000 --- a/data/overlays/actors/z_en_blkobj.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_809C2620 - .incbin "baserom/ovl_En_Blkobj", 0x5C0, 0x000000B0 diff --git a/data/overlays/actors/z_en_fhg_fire.data.s b/data/overlays/actors/z_en_fhg_fire.data.s index d769465875..22030a778c 100644 --- a/data/overlays/actors/z_en_fhg_fire.data.s +++ b/data/overlays/actors/z_en_fhg_fire.data.s @@ -9,12 +9,6 @@ .balign 16 -glabel En_Fhg_Fire_InitVars - .word 0x00000900, 0x00000030, 0x005A0000, 0x00000204 -.word EnFhgFire_Init -.word EnFhgFire_Destroy -.word EnFhgFire_Update -.word EnFhgFire_Draw glabel D_80A11790 .word 0x0A110939, 0x10010000, 0x06000000, 0x00100700, 0x03200000, 0x0D900700, 0x00000000, 0x01010100, 0x0014001E, 0x000A0000, 0x00000000 glabel D_80A117BC diff --git a/data/overlays/actors/z_en_heishi1.data.s b/data/overlays/actors/z_en_heishi1.data.s deleted file mode 100644 index 611f5d845f..0000000000 --- a/data/overlays/actors/z_en_heishi1.data.s +++ /dev/null @@ -1,36 +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_80A527A0 - .word 0x00000000 -glabel En_Heishi1_InitVars - .word 0x00000400, 0x00000010, 0x00970000, 0x000002AC -.word EnHeishi1_Init -.word EnHeishi1_Destroy -.word EnHeishi1_Update -.word EnHeishi1_Draw -glabel D_80A527C4 - .word 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000, 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000 -glabel D_80A52844 - .word 0x0014000A, 0x0014000A, 0x000D0000 -glabel D_80A52850 - .word 0x00000000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x41F00000, 0xC25C0000, 0x00000000, 0xC1F00000, 0x00000000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0x41F00000, 0x425C0000, 0x00000000, 0x42B40000 -glabel D_80A528B0 - .word 0x00000007, 0x00000007, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000003, 0x00000004, 0x00000004, 0x00000005, 0x00000006, 0x00000004, 0x00000004, 0x00000005, 0x00000006 -glabel D_80A528F0 - .word 0x00000004, 0x00010005, 0x00020006, 0x00030007 -glabel D_80A52900 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A5290C - .word 0x00000000, 0x00000000, 0x41A00000 -glabel D_80A52918 - .word 0x3E99999A, 0x3E99999A, 0x3E99999A, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_heishi1.reloc.s b/data/overlays/actors/z_en_heishi1.reloc.s deleted file mode 100644 index b111ac72a6..0000000000 --- a/data/overlays/actors/z_en_heishi1.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_80A52C50 - .incbin "baserom/ovl_En_Heishi1", 0x1980, 0x00000250 diff --git a/data/overlays/actors/z_en_heishi2.reloc.s b/data/overlays/actors/z_en_heishi2.reloc.s deleted file mode 100644 index 46d4b241d2..0000000000 --- a/data/overlays/actors/z_en_heishi2.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_80A55310 - .incbin "baserom/ovl_En_Heishi2", 0x2470, 0x00000330 diff --git a/data/overlays/actors/z_en_md.data.s b/data/overlays/actors/z_en_md.data.s deleted file mode 100644 index 7df6878e72..0000000000 --- a/data/overlays/actors/z_en_md.data.s +++ /dev/null @@ -1,28 +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_Md_InitVars - .word 0x016D0400, 0x02000019, 0x00FB0000, 0x00000324 -.word EnMd_Init -.word EnMd_Destroy -.word EnMd_Update -.word EnMd_Draw -glabel D_80AAC310 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0024002E, 0x00000000, 0x00000000 -glabel D_80AAC33C - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_80AAC348 - .word 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x0600917C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06009E68, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06009B1C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06008E84, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060097F0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060092B0, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x0600A138, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06008FC0, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06008510, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060095BC, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06008738, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000 -glabel D_80AAC498 - .word 0x43C80000, 0x00000000, 0x00000000 -glabel D_80AAC4A4 - .word 0x06004FF0, 0x06005930, 0x06005D30 - diff --git a/data/overlays/actors/z_en_md.reloc.s b/data/overlays/actors/z_en_md.reloc.s deleted file mode 100644 index b62098aeb1..0000000000 --- a/data/overlays/actors/z_en_md.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_80AAC5A0 - .incbin "baserom/ovl_En_Md", 0x2350, 0x00000360 diff --git a/data/overlays/actors/z_en_si.data.s b/data/overlays/actors/z_en_si.data.s deleted file mode 100644 index d8db0a05cd..0000000000 --- a/data/overlays/actors/z_en_si.data.s +++ /dev/null @@ -1,23 +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_80AFBAB0 - .word 0x0A00093D, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000090, 0x00000000, 0x00050100, 0x00140012, 0x00020000, 0x00000000 -glabel D_80AFBADC - .word 0x00000000, 0x00000000, 0xFF000000 -glabel En_Si_InitVars - .word 0x019C0700, 0x00000201, 0x00240000, 0x000001A0 -.word EnSi_Init -.word EnSi_Destroy -.word EnSi_Update -.word EnSi_Draw -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_si.reloc.s b/data/overlays/actors/z_en_si.reloc.s deleted file mode 100644 index dcf4893fac..0000000000 --- a/data/overlays/actors/z_en_si.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_80AFBB10 - .incbin "baserom/ovl_En_Si", 0x480, 0x00000070 diff --git a/data/overlays/actors/z_en_zl2.data.s b/data/overlays/actors/z_en_zl2.data.s deleted file mode 100644 index 10da87e82f..0000000000 --- a/data/overlays/actors/z_en_zl2.data.s +++ /dev/null @@ -1,65 +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_80B52810 - .word 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148 -glabel D_80B52834 - .word 0x06003508, 0x06005548, 0x06005948 -glabel D_80B52840 - .word func_80B521A0 -.word func_80B50BBC -.word func_80B50BEC -.word func_80B50C40 -.word func_80B50CA8 -.word func_80B50CFC -.word func_80B50D50 -.word func_80B50D94 -.word func_80B50DE8 -.word func_80B50E3C -.word func_80B50E90 -.word func_80B50EE4 -.word func_80B50F38 -.word func_80B50F8C -.word func_80B50FE8 -.word func_80B51034 -.word func_80B51080 -.word func_80B510CC -.word func_80B51118 -.word func_80B51164 -.word func_80B511B0 -.word func_80B511FC -.word func_80B51250 -.word func_80B512B8 -.word func_80B51310 -.word func_80B51A5C -.word func_80B51A8C -.word func_80B51AE4 -.word func_80B51B44 -.word func_80B51BA8 -.word func_80B51C0C -.word func_80B51C64 -.word func_80B51CA8 -.word func_80B52068 -.word func_80B52098 -.word func_80B52108 -glabel D_80B528D0 - .word func_80B4F45C -glabel D_80B528D4 - .word func_80B523BC -.word func_80B523C8 -.word func_80B525D4 -glabel En_Zl2_InitVars - .word 0x004D0400, 0x00000010, 0x00600000, 0x00000280 -.word EnZl2_Init -.word EnZl2_Destroy -.word EnZl2_Update -.word EnZl2_Draw - diff --git a/data/overlays/actors/z_shot_sun.data.s b/data/overlays/actors/z_shot_sun.data.s deleted file mode 100644 index cebdba817c..0000000000 --- a/data/overlays/actors/z_shot_sun.data.s +++ /dev/null @@ -1,20 +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 Shot_Sun_InitVars - .word 0x01830600, 0x00000009, 0x00010000, 0x000001A8 -.word ShotSun_Init -.word ShotSun_Destroy -.word ShotSun_Update -.word 0x00000000 -glabel D_80BAE2F0 - .word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x00010100, 0x001E003C, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_shot_sun.reloc.s b/data/overlays/actors/z_shot_sun.reloc.s deleted file mode 100644 index 0de446d0e9..0000000000 --- a/data/overlays/actors/z_shot_sun.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_80BAE380 - .incbin "baserom/ovl_Shot_Sun", 0x6C0, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s deleted file mode 100644 index 6ad0673731..0000000000 --- a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Solder_Srch_Ball_InitVars -.word 0x00000018 -.word func_809AC130 -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s b/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s deleted file mode 100644 index d3063d3caa..0000000000 --- a/data/overlays/effects/z_eff_ss_solder_srch_ball.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_809AC2A0 - .incbin "baserom/ovl_Effect_Ss_Solder_Srch_Ball", 0x170, 0x00000030 diff --git a/data/overlays/gamestates/z_select.reloc.s b/data/overlays/gamestates/z_select.reloc.s deleted file mode 100644 index fee13f5e8e..0000000000 --- a/data/overlays/gamestates/z_select.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_80803620 - .incbin "baserom/ovl_select", 0x2A90, 0x000005D0 diff --git a/data/sins.data.s b/data/sins.data.s deleted file mode 100644 index 6f9b74f2ee..0000000000 --- a/data/sins.data.s +++ /dev/null @@ -1,16 +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_801344D0 - .incbin "baserom.z64", 0xBAB670, 0x7FE - -glabel D_80134CCE - .incbin "baserom.z64", 0xBABE6E, 0x2 \ No newline at end of file diff --git a/data/z_lifemeter.data.s b/data/z_lifemeter.data.s index fc841b6176..0b506e4ab5 100644 --- a/data/z_lifemeter.data.s +++ b/data/z_lifemeter.data.s @@ -10,22 +10,10 @@ .balign 16 glabel D_8011FF10 - .incbin "baserom.z64", 0xB970B0, 0x2 - -glabel D_8011FF12 - .incbin "baserom.z64", 0xB970B2, 0x2 - -glabel D_8011FF14 - .incbin "baserom.z64", 0xB970B4, 0x10 + .incbin "baserom.z64", 0xB970B0, 0x14 glabel D_8011FF24 - .incbin "baserom.z64", 0xB970C4, 0x2 - -glabel D_8011FF26 - .incbin "baserom.z64", 0xB970C6, 0x2 - -glabel D_8011FF28 - .incbin "baserom.z64", 0xB970C8, 0x10 + .incbin "baserom.z64", 0xB970C4, 0x14 glabel D_8011FF38 .incbin "baserom.z64", 0xB970D8, 0x14 @@ -34,40 +22,16 @@ glabel D_8011FF4C .incbin "baserom.z64", 0xB970EC, 0x14 glabel D_8011FF60 - .incbin "baserom.z64", 0xB97100, 0x2 - -glabel D_8011FF62 - .incbin "baserom.z64", 0xB97102, 0x2 - -glabel D_8011FF64 - .incbin "baserom.z64", 0xB97104, 0x10 + .incbin "baserom.z64", 0xB97100, 0x14 glabel D_8011FF74 - .incbin "baserom.z64", 0xB97114, 0x2 - -glabel D_8011FF76 - .incbin "baserom.z64", 0xB97116, 0x2 - -glabel D_8011FF78 - .incbin "baserom.z64", 0xB97118, 0x10 + .incbin "baserom.z64", 0xB97114, 0x14 glabel D_8011FF88 - .incbin "baserom.z64", 0xB97128, 0x2 - -glabel D_8011FF8A - .incbin "baserom.z64", 0xB9712A, 0x2 - -glabel D_8011FF8C - .incbin "baserom.z64", 0xB9712C, 0x10 + .incbin "baserom.z64", 0xB97128, 0x14 glabel D_8011FF9C - .incbin "baserom.z64", 0xB9713C, 0x2 - -glabel D_8011FF9E - .incbin "baserom.z64", 0xB9713E, 0x2 - -glabel D_8011FFA0 - .incbin "baserom.z64", 0xB97140, 0x10 + .incbin "baserom.z64", 0xB9713C, 0x14 glabel D_8011FFB0 .incbin "baserom.z64", 0xB97150, 0x40 diff --git a/first_diff.py b/first_diff.py old mode 100644 new mode 100755 diff --git a/include/functions.h b/include/functions.h index cd096c8281..c639eecbda 100644 --- a/include/functions.h +++ b/include/functions.h @@ -158,8 +158,8 @@ void __osSetHWIntrRoutine(s32 idx, OSMesgQueue* queue, OSMesg msg); void __osGetHWIntrRoutine(s32 idx, OSMesgQueue** outQueue, OSMesg* outMsg); void __osSetWatchLo(u32); -Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); -Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); +EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); +EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params); void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2); void EffectBlure_AddSpace(EffectBlure* this); @@ -258,13 +258,14 @@ void func_800299AC(GlobalContext* globalCtx, Vec3f* v); // ? func_80029C50(?); void func_80029CA4(GlobalContext* globalCtx, s32 a, Vec3f* pos); // ? func_80029CC8(?); -// ? func_80029CF0(?); -// ? func_80029D5C(?); +void EffectSsFhgFlash_Spawn(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, s16, u8); +void EffectSsFhgFlash_Spawn2(GlobalContext *, Actor *, Vec3f *, s16, u8); // ? func_80029DBC(?); -// ? func_80029E24(?); void func_80029E8C(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* burstDepthX, Vec3f* burstOrigin, s16 gravityInfluence, s16 u0, s16 rotSpeed, s16 burstVel, u8 u1, s16 scale, u8 u2, s16 jitter, s32 duration, s16 u3, s16 objectId, u32 dList); +void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, + s16* linkDetected); // ? func_80029F44(?); // ? func_80029FAC(?); // ? func_8002A140(?); @@ -393,7 +394,7 @@ void func_8002F8F0(Actor* actor, u16 sfxId); void func_8002F91C(Actor* actor, u16 sfxId); void func_8002F948(Actor* actor, u16 sfxId); void func_8002F974(Actor* actor, u16 sfxId); -void func_8002F994(Actor* actor, s32 sfxId); +void func_8002F994(Actor* actor, s32 arg1); s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE arg2, UNK_TYPE arg3, UNK_TYPE arg4); void func_800304B0(GlobalContext* globalCtx); void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* actorEntry); @@ -442,6 +443,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD PostLimbDraw2 postLimbDraw, Actor* actor, s16 alpha); void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 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_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3); void Actor_Noop(Actor* actor, GlobalContext* globalCtx); @@ -536,6 +538,7 @@ s32 func_8003DF10(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, CollisionPoly**, u3 // ? func_8003E0FC(?); // ? func_8003E188(?); // ? func_8003E214(?); +s32 func_8003E30C(CollisionContext* colCtx, Vec3f* center, f32 radius); // ? func_8003E398(?); // ? func_8003E3AC(?); // ? func_8003E4DC(?); @@ -592,7 +595,7 @@ struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041DB8(?); // ? func_80041EC8(?); // ? func_80041F10(?); -// ? func_80041F34(?); +u16 func_80041F34(CollisionContext*, CollisionPoly*, u8); // ? func_80042048(?); // ? func_80042108(?); s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, UNK_PTR); @@ -688,6 +691,7 @@ void func_80059EC8(Camera* camera); s32 func_8005A77C(Camera* camera, s16 button); // ? func_8005A7A8(?); // ? func_8005A8C4(?); +s16 func_8005A948(Camera* camera); Vec3s* func_8005A970(Vec3s*, Camera*); s16 func_8005A9F4(Camera* camera); s32 func_8005AA1C(Camera* camera, s32, s16, s32); @@ -699,6 +703,7 @@ s32 Camera_SetParam(Camera*, s32, void*); // ? func_8005AE64(?); Vec3f* func_8005AFB4(Vec3f* dst, Camera* camera); // ? func_8005B044(?); +s32 func_8005B198(); // ? func_8005B1A4(?); DamageTable* DamageTable_Get(s32 index); // ? func_8005B280(?); @@ -830,6 +835,7 @@ s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckCo Vec3f* arg3, Actor** arg4, s32 arg5); // ? func_800626B0(?); void Collider_CylinderUpdate(Actor* actor, ColliderCylinder* collider); +void func_80062718(ColliderCylinder* collider, Vec3s* pos); // ? func_80062734(?); void func_800627A0(ColliderTris* collider, s32 index, Vec3f* a, Vec3f* b, Vec3f* c); void func_80062A28(GlobalContext*, Vec3f*); @@ -1427,13 +1433,13 @@ void TransitionFade_Draw(TransitionFade* this, Gfx** gfxP); s32 TransitionFade_IsDone(TransitionFade* this); void TransitionFade_SetColor(TransitionFade* this, u32 color); void TransitionFade_SetType(TransitionFade* this, s32 type); -// ? func_800B3840(?); -// ? func_800B3898(?); -// ? func_800B38A4(?); -// ? func_800B38FC(?); -// ? func_800B3908(?); -// ? func_800B3968(?); -// ? func_800B39B8(?); +void ShrinkWindow_SetVal(s32 value); +u32 ShrinkWindow_GetVal(void); +void ShrinkWindow_SetCurrentVal(s32 nowVal); +u32 ShrinkWindow_GetCurrentVal(void); +void ShrinkWindow_Init(void); +void ShrinkWindow_Destroy(void); +void ShrinkWindow_Update(s32 updateRate); // ? func_800B3B50(?); // ? func_800B3BD4(?); // ? func_800B3DF8(?); @@ -2402,7 +2408,7 @@ s32 JpegDecoder_Decode(JpegDecoder* decoder, u16* mcuBuff, s32 count, u8 isFollo s32 JpegDecoder_ProcessMcu(JpegHuffmanTable* hTable0, JpegHuffmanTable* hTable1, s16* mcu, s16* unk); s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, u8* outZeroCount); u16 JpegDecoder_ReadBits(u8 len); -s32 osPfsFreeBlocks(OSPfs* pfs, s32 *bytes_not_used); +s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes); void guScale(Mtx* m, f32 x, f32 y, f32 z); f32 sinf(f32); s16 sins(u16); @@ -2426,26 +2432,26 @@ void __osPackReadData(); // ? __osSpRawStartDma(?); s32 __osSiRawStartDma(s32 dir, void *addr); // ? osSpTaskYield(?); -// ? func_801014C0(?); -s32 osPfsReadWriteFile(OSPfs* pfs, s32 file_no, u8 flag, s32 offset, s32 nbytes, u8* data_buffer); +s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page); +s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8* data); s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel); void __osPfsRequestOneChannel(s32 channel, u8 poll); void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData); // ? guMtxIdentF(?); -void guLookAtF(MtxF* mf, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); +void guLookAtF(float mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); void guLookAt(Mtx*, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); s32 osPfsAllocateFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32 length, s32* file_no); -// ? func_801021E4(?); +s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, s32* finalPage); // ? osStopTimer(?); -// ? func_80102420(?); -// ? func_80102494(?); -// ? func_80102590(?); -// ? func_801028E0(?); -// ? func_80102A44(?); -// ? func_80102BF0(?); -// ? func_80102CC4(?); +u16 __osSumcalc(u8* ptr, s32 length); +s32 __osIdCheckSum(u16 *ptr, u16 *csum, u16 *icsum); +s32 __osRepairPackId(OSPfs* pfs, __OSPackId* badid, __OSPackId* newid); +s32 __osCheckPackId(OSPfs* pfs, __OSPackId* temp); +s32 __osGetId(OSPfs* pfs); +s32 __osCheckId(OSPfs* pfs); +s32 __osPfsRWInode(OSPfs* pfs, __OSInode* inode, u8 flag, u8 bank); // ? func_80102FA0(?); -s32 osPfsFindFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32* file_no); +s32 osPfsFindFile(OSPfs *pfs, u16 companyCode, u32 gameCode, u8 *gameName, u8 *extName, s32 *fileNo); // ? osAfterPreNMI(?); // ? osContStartQuery(?); void osContGetQuery(OSContStatus* data); @@ -2466,7 +2472,7 @@ void guRotate(Mtx*, f32 angle, f32 x, f32 y, f32 z); u32 osDpGetStatus(void); void osDpSetStatus(u32 status); s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name); -// ? func_801043B8(?); +s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage); void guOrthoF(f32[4][4], f32, f32, f32, f32, f32, f32, f32); void guOrtho(Mtx*, f32, f32, f32, f32, f32, f32, f32); f32 cosf(f32); @@ -2476,20 +2482,20 @@ s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern); void __osPfsRequestData(u8 poll); void __osPfsGetInitData(u8 *pattern, OSContStatus* contData); void guS2DInitBg(uObjBg *bg); -// ? func_80104C80(?); +s32 __osPfsSelectBank(OSPfs *pfs, u8 bank); s32 osContSetCh(u8 ch); s32 osPfsFileState(OSPfs* pfs, s32 file_no, OSPfsState* state); -s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 controller_no); -// ? func_80105148(?); -// ? func_80105250(?); -// ? func_80105788(?); -// ? func_80105A60(?); +s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 channel); +s32 __osPfsCheckRamArea(OSPfs* pfs); +s32 osPfsChecker(OSPfs* pfs); +s32 func_80105788(OSPfs* pfs, __OSInodeCache* cache); +s32 func_80105A60(OSPfs* pfs, __OSInodeUnit fpage, __OSInodeCache* cache); // ? osAiGetLength(?); void guTranslate(Mtx* m, f32 x, f32 y, f32 z); -// ? func_80105CF0(?); -s32 osReadMempak(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data); -u8 osMempakAddrCRC(u16 addr); -u8 osMempakDataCRC(u8* data); +s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 force); +s32 __osContRamRead(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data); +u8 __osContAddressCrc(u16 addr); +u8 __osContDataCrc(u8* data); u32 __osSpGetStatus(); void __osSpSetStatus(u32 status); void osWritebackDCacheAll(void); @@ -2525,7 +2531,7 @@ void func_80106CCC(GlobalContext*); // ? func_80109968(?); // ? func_80109B3C(?); // ? func_8010B0C0(?); -void func_8010B680(GlobalContext*, u16, s32); +void func_8010B680(GlobalContext*, u16 textID, Actor* actor); void func_8010B720(GlobalContext* globalCtx, u16 textId); // ? func_8010B820(?); // ? func_8010BD58(?); diff --git a/include/macros.h b/include/macros.h index 8f0efd4d6d..a21374b15b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -12,6 +12,7 @@ #define SQ(x) ((x)*(x)) #define ABS(x) ((x) >= 0 ? (x) : -(x)) +#define ULTRA_ABS(x) ((x) > 0) ? (x) : -(x) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) #define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) #define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x)) diff --git a/include/math.h b/include/math.h index 48331dad7e..4524283aa1 100644 --- a/include/math.h +++ b/include/math.h @@ -14,4 +14,20 @@ float cosf(float); double cos(double); float sqrtf(float f); +typedef union { + struct { + unsigned int hi; + unsigned int lo; + } word; + + double d; +} du; + +typedef union { + unsigned int i; + float f; +} fu; + +extern float __libm_qnan_f; + #endif diff --git a/include/sfx.h b/include/sfx.h index 30069a5c42..25da99ea42 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -1,248 +1,254 @@ #ifndef SFX_H #define SFX_H -#define NA_SE_PL_WALK_GROUND 0x0 -#define NA_SE_PL_WALK_SAND 0x1 -#define NA_SE_PL_WALK_CONCRETE 0x2 -#define NA_SE_PL_WALK_DIRT 0x3 -#define NA_SE_PL_WALK_WATER0 0x4 -#define NA_SE_PL_WALK_WATER1 0x5 -#define NA_SE_PL_WALK_WATER2 0x6 -#define NA_SE_PL_WALK_MAGMA 0x7 -#define NA_SE_PL_WALK_GRASS 0x8 -#define NA_SE_PL_WALK_IRON 0x9 -#define NA_SE_PL_WALK_LADDER 0xA -#define NA_SE_PL_WALK_GLASS 0xB -#define NA_SE_PL_WALK_WALL 0xC -#define NA_SE_PL_WALK_HEAVYBOOTS 0xD -#define NA_SE_PL_DUMMY_14 0xE -#define NA_SE_PL_WALK_ICE 0xF -#define NA_SE_PL_JUMP 0x10 -#define NA_SE_PL_JUMP_SAND 0x11 -#define NA_SE_PL_JUMP_CONCRETE 0x12 -#define NA_SE_PL_JUMP_DIRT 0x13 -#define NA_SE_PL_JUMP_WATER0 0x14 -#define NA_SE_PL_JUMP_WATER1 0x15 -#define NA_SE_PL_JUMP_WATER2 0x16 -#define NA_SE_PL_JUMP_MAGMA 0x17 -#define NA_SE_PL_JUMP_GRASS 0x18 -#define NA_SE_PL_JUMP_IRON 0x19 -#define NA_SE_PL_JUMP_LADDER 0x1A -#define NA_SE_PL_JUMP_GLASS 0x1B -#define NA_SE_PL_DUMMY28 0x1C -#define NA_SE_PL_JUMP_HEAVYBOOTS 0x1D -#define NA_SE_PL_DUMMY30 0x1E -#define NA_SE_PL_JUMP_ICE 0x1F -#define NA_SE_PL_LAND 0x20 -#define NA_SE_PL_LAND_SAND 0x21 -#define NA_SE_PL_LAND_CONCRETE 0x22 -#define NA_SE_PL_LAND_DIRT 0x23 -#define NA_SE_PL_LAND_WATER0 0x24 -#define NA_SE_PL_LAND_WATER1 0x25 -#define NA_SE_PL_LAND_WATER2 0x26 -#define NA_SE_PL_LAND_MAGMA 0x27 -#define NA_SE_PL_LAND_GRASS 0x28 -#define NA_SE_PL_LAND_IRON 0x29 -#define NA_SE_PL_LAND_LADDER 0x2A -#define NA_SE_PL_LAND_GLASS 0x2B -#define NA_SE_PL_DUMMY_44 0x2C -#define NA_SE_PL_LAND_HEAVYBOOTS 0x2D -#define NA_SE_PL_DUMMY_46 0x2E -#define NA_SE_PL_LAND_ICE 0x2F -#define NA_SE_PL_SLIPDOWN 0x30 -#define NA_SE_PL_CLIMB_CLIFF 0x31 -#define NA_SE_PL_SIT_ON_HORSE 0x32 -#define NA_SE_PL_GET_OFF_HORSE 0x33 -#define NA_SE_PL_TAKE_OUT_SHIELD 0x34 -#define NA_SE_PL_CHANGE_ARMS 0x35 -#define NA_SE_PL_CATCH_BOOMERANG 0x36 -#define NA_SE_PL_DUMMY_55 0x37 -#define NA_SE_PL_DUMMY_56 0x38 -#define NA_SE_PL_SWIM 0x39 -#define NA_SE_PL_THROW 0x3A -#define NA_SE_PL_BODY_BOUND 0x3B -#define NA_SE_PL_ROLL 0x3C -#define NA_SE_PL_SKIP 0x3D -#define NA_SE_PL_BODY_HIT 0x3E -#define NA_SE_PL_DAMAGE 0x3F -#define NA_SE_PL_SLIP 0x40 -#define NA_SE_PL_SLIP_SAND 0x41 -#define NA_SE_PL_SLIP_CONCRETE 0x42 -#define NA_SE_PL_SLIP_DIRT 0x43 -#define NA_SE_PL_SLIP_WATER0 0x44 -#define NA_SE_PL_SLIP_WATER1 0x45 -#define NA_SE_PL_SLIP_WATER2 0x46 -#define NA_SE_PL_SLIP_MAGMA 0x47 -#define NA_SE_PL_SLIP_GRASS 0x48 -#define NA_SE_PL_SLIP_IRON 0x49 -#define NA_SE_PL_SLIP_LADDER 0x4A -#define NA_SE_PL_SLIP_GLASS 0x4B -#define NA_SE_PL_DUMMY76 0x4C -#define NA_SE_PL_SLIP_HEAVYBOOTS 0x4D -#define NA_SE_PL_DUMMY78 0x4E -#define NA_SE_PL_SLIP_ICE 0x4F -#define NA_SE_PL_BOUND 0x50 -#define NA_SE_PL_BOUND_SAND 0x51 -#define NA_SE_PL_BOUND_CONCRETE 0x52 -#define NA_SE_PL_BOUND_DIRT 0x53 -#define NA_SE_PL_BOUND_WATER0 0x54 -#define NA_SE_PL_BOUND_WATER1 0x55 -#define NA_SE_PL_BOUND_WATER2 0x56 -#define NA_SE_PL_BOUND_MAGMA 0x57 -#define NA_SE_PL_BOUND_GRASS 0x58 -#define NA_SE_PL_BOUND_IRON 0x59 -#define NA_SE_PL_BOUND_LADDER 0x5A -#define NA_SE_PL_BOUND_WOOD 0x5B -#define NA_SE_PL_DUMMY_92 0x5C -#define NA_SE_PL_BOUND_HEAVYBOOTS 0x5D -#define NA_SE_PL_DUMMY_94 0x5E -#define NA_SE_PL_BOUND_ICE 0x5F -#define NA_SE_PL_DUMMY_96 0x60 -#define NA_SE_PL_DUMMY_97 0x61 -#define NA_SE_PL_DUMMY_98 0x62 -#define NA_SE_PL_FACE_UP 0x63 -#define NA_SE_PL_DIVE_BUBBLE 0x64 -#define NA_SE_PL_MOVE_BUBBLE 0x65 -#define NA_SE_PL_METALEFFECT_KID 0x66 -#define NA_SE_PL_METALEFFECT_ADULT 0x67 -#define NA_SE_PL_SPARK 0x68 -#define NA_SE_PL_PULL_UP_PLANT 0x69 -#define NA_SE_PL_PULL_UP_ROCK 0x6A -#define NA_SE_PL_IN_BUBBLE 0x6B -#define NA_SE_PL_PULL_UP_BIGROCK 0x6C -#define NA_SE_PL_SWORD_CHARGE 0x6D -#define NA_SE_PL_FREEZE 0x6E -#define NA_SE_PL_PULL_UP_POT 0x6F -#define NA_SE_PL_KNOCK 0x70 -#define NA_SE_PL_CALM_HIT 0x71 -#define NA_SE_PL_CALM_PAT 0x72 -#define NA_SE_PL_SUBMERGE 0x73 -#define NA_SE_PL_FREEZE_S 0x74 -#define NA_SE_PL_ICE_BROKEN 0x75 -#define NA_SE_PL_SLIP_ICE_LELEL 0x76 -#define NA_SE_PL_PUT_OUT_ITEM 0x77 -#define NA_SE_PL_PULL_UP_WOODBOX 0x78 -#define NA_SE_PL_MAGIC_FIRE 0x79 -#define NA_SE_PL_MAGIC_WIND_NORMAL 0x7A -#define NA_SE_PL_MAGIC_WIND_WARP 0x7B -#define NA_SE_PL_MAGIC_SOUL_NORMAL 0x7C -#define NA_SE_PL_ARROW_CHARGE_FIRE 0x7D -#define NA_SE_PL_ARROW_CHARGE_ICE 0x7E -#define NA_SE_PL_ARROW_CHARGE_LIGHT 0x7F -#define NA_SE_PL_DUMMY_128 0x80 -#define NA_SE_PL_DUMMY_129 0x81 -#define NA_SE_PL_DUMMY_130 0x82 -#define NA_SE_PL_PULL_UP_RUTO 0x83 -#define NA_SE_PL_DUMMY_132 0x84 -#define NA_SE_PL_DUMMY_133 0x85 -#define NA_SE_PL_DUMMY_134 0x86 -#define NA_SE_PL_DUMMY_135 0x87 -#define NA_SE_PL_DUMMY_136 0x88 -#define NA_SE_PL_DUMMY_137 0x89 -#define NA_SE_PL_DUMMY_138 0x8A -#define NA_SE_PL_DUMMY_139 0x8B -#define NA_SE_PL_DUMMY_140 0x8C -#define NA_SE_PL_DUMMY_141 0x8D -#define NA_SE_PL_DUMMY_142 0x8E -#define NA_SE_PL_DUMMY_143 0x8F -#define NA_SE_PL_DUMMY_144 0x90 -#define NA_SE_PL_DUMMY_145 0x91 -#define NA_SE_PL_DUMMY_146 0x92 -#define NA_SE_PL_DUMMY_147 0x93 -#define NA_SE_PL_DUMMY_148 0x94 -#define NA_SE_PL_DUMMY_149 0x95 -#define NA_SE_PL_DUMMY_150 0x96 -#define NA_SE_PL_DUMMY_151 0x97 -#define NA_SE_PL_DUMMY_152 0x98 -#define NA_SE_PL_DUMMY_153 0x99 -#define NA_SE_PL_DUMMY_154 0x9A -#define NA_SE_PL_DUMMY_155 0x9B -#define NA_SE_PL_DUMMY_156 0x9C -#define NA_SE_PL_DUMMY_157 0x9D -#define NA_SE_PL_DUMMY_158 0x9E -#define NA_SE_PL_DUMMY_159 0x9F -#define NA_SE_PL_DUMMY_160 0xA0 -#define NA_SE_PL_DUMMY_161 0xA1 -#define NA_SE_PL_DUMMY_162 0xA2 -#define NA_SE_PL_DUMMY_163 0xA3 -#define NA_SE_PL_DUMMY_164 0xA4 -#define NA_SE_PL_DUMMY_165 0xA5 -#define NA_SE_PL_DUMMY_166 0xA6 -#define NA_SE_PL_DUMMY_167 0xA7 -#define NA_SE_PL_DUMMY_168 0xA8 -#define NA_SE_PL_DUMMY_169 0xA9 -#define NA_SE_PL_DUMMY_170 0xAA -#define NA_SE_PL_DUMMY_171 0xAB -#define NA_SE_PL_DUMMY_172 0xAC -#define NA_SE_PL_DUMMY_173 0xAD -#define NA_SE_PL_DUMMY_174 0xAE -#define NA_SE_PL_DUMMY_175 0xAF -#define NA_SE_PL_CRAWL 0xB0 -#define NA_SE_PL_CRAWL_SAND 0xB1 -#define NA_SE_PL_CRAWL_CONCRETE 0xB2 -#define NA_SE_PL_CRAWL_DIRT 0xB3 -#define NA_SE_PL_CRAWL_WATER0 0xB4 -#define NA_SE_PL_DUMMY_181 0xB5 -#define NA_SE_PL_DUMMY_182 0xB6 -#define NA_SE_PL_DUMMY_183 0xB7 -#define NA_SE_PL_DUMMY_184 0xB8 -#define NA_SE_PL_DUMMY_185 0xB9 -#define NA_SE_PL_DUMMY_186 0xBA -#define NA_SE_PL_CRAWL_WOOD 0xBB -#define NA_SE_PL_CRAWL_ICE 0xBC -#define NA_SE_PL_DUMMY_189 0xBD -#define NA_SE_PL_DUMMY_190 0xBE -#define NA_SE_PL_DUMMY_191 0xBF -#define NA_SE_PL_MAGIC_SOUL_FLASH 0xC0 -#define NA_SE_PL_ROLL_DUST 0xC1 -#define NA_SE_PL_DUMMY_192 0xC2 -#define NA_SE_PL_MAGIC_SOUL_BALL 0xC3 -#define NA_SE_PL_SPIRAL_HEAL_BEAM 0xC4 -#define NA_SE_PL_BOUND_NOWEAPON 0xC5 -#define NA_SE_PL_PLANT_GROW_UP 0xC6 -#define NA_SE_PL_PLANT_TALLER 0xC7 -#define NA_SE_PL_MAGIC_WIND_VANISH 0xC8 -#define NA_SE_PL_HOBBERBOOTS_LV 0xC9 -#define NA_SE_PL_PLANT_MOVE 0xCA -#define NA_SE_EV_WALL_MOVE_SP 0xCB -#define NA_SE_PL_DUMMY_204 0xCC -#define NA_SE_PL_DUMMY_205 0xCD -#define NA_SE_PL_DUMMY_206 0xCE -#define NA_SE_PL_DUMMY_207 0xCF -#define NA_SE_PL_SLIP_LEVEL 0xD0 -#define NA_SE_PL_SLIP_SAND_LEVEL 0xD1 -#define NA_SE_PL_SLIP_CONCRETE_LEVEL 0xD2 -#define NA_SE_PL_SLIP_DIRT_LEVEL 0xD3 -#define NA_SE_PL_SLIP_WATER0_LEVEL 0xD4 -#define NA_SE_PL_SLIP_WATER1_LEVEL 0xD5 -#define NA_SE_PL_SLIP_WATER2_LEVEL 0xD6 -#define NA_SE_PL_SLIP_MAGMA_LEVEL 0xD7 -#define NA_SE_PL_SLIP_GRASS_LEVEL 0xD8 -#define NA_SE_PL_SLIP_IRON_LEVEL 0xD9 -#define NA_SE_PL_SLIP_GLASS_LEVEL 0xDA -#define NA_SE_PL_SLIP_WOOD_LEVEL 0xDB -#define NA_SE_PL_DUMMY_220 0xDC -#define NA_SE_PL_DUMMY_221 0xDD -#define NA_SE_PL_SLIP_HEAVYBOOTS_LEVEL 0xDE -#define NA_SE_PL_SLIP_ICE_LEVEL 0xDF -#define NA_SE_PL_JUMP_METAL 0xE0 -#define NA_SE_PL_LAND_METAL 0xE1 -#define NA_SE_PL_WALK_RUNNINGMAN 0xE2 -#define NA_SE_PL_WALK_ZELDA_DEMO 0xE3 -#define NA_SE_PL_YOBI_DATA02 0xE4 -#define NA_SE_PL_YOBI_DATA03 0xE5 -#define NA_SE_PL_YOBI_DATA04 0xE6 -#define NA_SE_PL_YOBI_DATA05 0xE7 -#define NA_SE_PL_YOBI_DATA06 0xE8 -#define NA_SE_PL_YOBI_DATA07 0xE9 -#define NA_SE_PL_YOBI_DATA08 0xEA -#define NA_SE_PL_YOBI_DATA09 0xEB -#define NA_SE_PL_YOBI_DATA10 0xEC -#define NA_SE_PL_YOBI_DATA11 0xED -#define NA_SE_PL_YOBI_DATA12 0xEE -#define NA_SE_PL_YOBI_DATA13 0xEF -#define NA_SE_PL_YOBI_DATA14 0xF0 -//------------ITEM------------ +#define SFX_FLAG 0x800 + +// ------------ PLAYER ------------ + +#define NA_SE_PL_WALK_GROUND 0x800 +#define NA_SE_PL_WALK_SAND 0x801 +#define NA_SE_PL_WALK_CONCRETE 0x802 +#define NA_SE_PL_WALK_DIRT 0x803 +#define NA_SE_PL_WALK_WATER0 0x804 +#define NA_SE_PL_WALK_WATER1 0x805 +#define NA_SE_PL_WALK_WATER2 0x806 +#define NA_SE_PL_WALK_MAGMA 0x807 +#define NA_SE_PL_WALK_GRASS 0x808 +#define NA_SE_PL_WALK_IRON 0x809 +#define NA_SE_PL_WALK_LADDER 0x80A +#define NA_SE_PL_WALK_GLASS 0x80B +#define NA_SE_PL_WALK_WALL 0x80C +#define NA_SE_PL_WALK_HEAVYBOOTS 0x80D +#define NA_SE_PL_DUMMY_14 0x80E +#define NA_SE_PL_WALK_ICE 0x80F +#define NA_SE_PL_JUMP 0x810 +#define NA_SE_PL_JUMP_SAND 0x811 +#define NA_SE_PL_JUMP_CONCRETE 0x812 +#define NA_SE_PL_JUMP_DIRT 0x813 +#define NA_SE_PL_JUMP_WATER0 0x814 +#define NA_SE_PL_JUMP_WATER1 0x815 +#define NA_SE_PL_JUMP_WATER2 0x816 +#define NA_SE_PL_JUMP_MAGMA 0x817 +#define NA_SE_PL_JUMP_GRASS 0x818 +#define NA_SE_PL_JUMP_IRON 0x819 +#define NA_SE_PL_JUMP_LADDER 0x81A +#define NA_SE_PL_JUMP_GLASS 0x81B +#define NA_SE_PL_DUMMY28 0x81C +#define NA_SE_PL_JUMP_HEAVYBOOTS 0x81D +#define NA_SE_PL_DUMMY30 0x81E +#define NA_SE_PL_JUMP_ICE 0x81F +#define NA_SE_PL_LAND 0x820 +#define NA_SE_PL_LAND_SAND 0x821 +#define NA_SE_PL_LAND_CONCRETE 0x822 +#define NA_SE_PL_LAND_DIRT 0x823 +#define NA_SE_PL_LAND_WATER0 0x824 +#define NA_SE_PL_LAND_WATER1 0x825 +#define NA_SE_PL_LAND_WATER2 0x826 +#define NA_SE_PL_LAND_MAGMA 0x827 +#define NA_SE_PL_LAND_GRASS 0x828 +#define NA_SE_PL_LAND_IRON 0x829 +#define NA_SE_PL_LAND_LADDER 0x82A +#define NA_SE_PL_LAND_GLASS 0x82B +#define NA_SE_PL_DUMMY_44 0x82C +#define NA_SE_PL_LAND_HEAVYBOOTS 0x82D +#define NA_SE_PL_DUMMY_46 0x82E +#define NA_SE_PL_LAND_ICE 0x82F +#define NA_SE_PL_SLIPDOWN 0x830 +#define NA_SE_PL_CLIMB_CLIFF 0x831 +#define NA_SE_PL_SIT_ON_HORSE 0x832 +#define NA_SE_PL_GET_OFF_HORSE 0x833 +#define NA_SE_PL_TAKE_OUT_SHIELD 0x834 +#define NA_SE_PL_CHANGE_ARMS 0x835 +#define NA_SE_PL_CATCH_BOOMERANG 0x836 +#define NA_SE_PL_DUMMY_55 0x837 +#define NA_SE_PL_DUMMY_56 0x838 +#define NA_SE_PL_SWIM 0x839 +#define NA_SE_PL_THROW 0x83A +#define NA_SE_PL_BODY_BOUND 0x83B +#define NA_SE_PL_ROLL 0x83C +#define NA_SE_PL_SKIP 0x83D +#define NA_SE_PL_BODY_HIT 0x83E +#define NA_SE_PL_DAMAGE 0x83F +#define NA_SE_PL_SLIP 0x840 +#define NA_SE_PL_SLIP_SAND 0x841 +#define NA_SE_PL_SLIP_CONCRETE 0x842 +#define NA_SE_PL_SLIP_DIRT 0x843 +#define NA_SE_PL_SLIP_WATER0 0x844 +#define NA_SE_PL_SLIP_WATER1 0x845 +#define NA_SE_PL_SLIP_WATER2 0x846 +#define NA_SE_PL_SLIP_MAGMA 0x847 +#define NA_SE_PL_SLIP_GRASS 0x848 +#define NA_SE_PL_SLIP_IRON 0x849 +#define NA_SE_PL_SLIP_LADDER 0x84A +#define NA_SE_PL_SLIP_GLASS 0x84B +#define NA_SE_PL_DUMMY76 0x84C +#define NA_SE_PL_SLIP_HEAVYBOOTS 0x84D +#define NA_SE_PL_DUMMY78 0x84E +#define NA_SE_PL_SLIP_ICE 0x84F +#define NA_SE_PL_BOUND 0x850 +#define NA_SE_PL_BOUND_SAND 0x851 +#define NA_SE_PL_BOUND_CONCRETE 0x852 +#define NA_SE_PL_BOUND_DIRT 0x853 +#define NA_SE_PL_BOUND_WATER0 0x854 +#define NA_SE_PL_BOUND_WATER1 0x855 +#define NA_SE_PL_BOUND_WATER2 0x856 +#define NA_SE_PL_BOUND_MAGMA 0x857 +#define NA_SE_PL_BOUND_GRASS 0x858 +#define NA_SE_PL_BOUND_IRON 0x859 +#define NA_SE_PL_BOUND_LADDER 0x85A +#define NA_SE_PL_BOUND_WOOD 0x85B +#define NA_SE_PL_DUMMY_92 0x85C +#define NA_SE_PL_BOUND_HEAVYBOOTS 0x85D +#define NA_SE_PL_DUMMY_94 0x85E +#define NA_SE_PL_BOUND_ICE 0x85F +#define NA_SE_PL_DUMMY_96 0x860 +#define NA_SE_PL_DUMMY_97 0x861 +#define NA_SE_PL_DUMMY_98 0x862 +#define NA_SE_PL_FACE_UP 0x863 +#define NA_SE_PL_DIVE_BUBBLE 0x864 +#define NA_SE_PL_MOVE_BUBBLE 0x865 +#define NA_SE_PL_METALEFFECT_KID 0x866 +#define NA_SE_PL_METALEFFECT_ADULT 0x867 +#define NA_SE_PL_SPARK 0x868 +#define NA_SE_PL_PULL_UP_PLANT 0x869 +#define NA_SE_PL_PULL_UP_ROCK 0x86A +#define NA_SE_PL_IN_BUBBLE 0x86B +#define NA_SE_PL_PULL_UP_BIGROCK 0x86C +#define NA_SE_PL_SWORD_CHARGE 0x86D +#define NA_SE_PL_FREEZE 0x86E +#define NA_SE_PL_PULL_UP_POT 0x86F +#define NA_SE_PL_KNOCK 0x870 +#define NA_SE_PL_CALM_HIT 0x871 +#define NA_SE_PL_CALM_PAT 0x872 +#define NA_SE_PL_SUBMERGE 0x873 +#define NA_SE_PL_FREEZE_S 0x874 +#define NA_SE_PL_ICE_BROKEN 0x875 +#define NA_SE_PL_SLIP_ICE_LELEL 0x876 +#define NA_SE_PL_PUT_OUT_ITEM 0x877 +#define NA_SE_PL_PULL_UP_WOODBOX 0x878 +#define NA_SE_PL_MAGIC_FIRE 0x879 +#define NA_SE_PL_MAGIC_WIND_NORMAL 0x87A +#define NA_SE_PL_MAGIC_WIND_WARP 0x87B +#define NA_SE_PL_MAGIC_SOUL_NORMAL 0x87C +#define NA_SE_PL_ARROW_CHARGE_FIRE 0x87D +#define NA_SE_PL_ARROW_CHARGE_ICE 0x87E +#define NA_SE_PL_ARROW_CHARGE_LIGHT 0x87F +#define NA_SE_PL_DUMMY_128 0x880 +#define NA_SE_PL_DUMMY_129 0x881 +#define NA_SE_PL_DUMMY_130 0x882 +#define NA_SE_PL_PULL_UP_RUTO 0x883 +#define NA_SE_PL_DUMMY_132 0x884 +#define NA_SE_PL_DUMMY_133 0x885 +#define NA_SE_PL_DUMMY_134 0x886 +#define NA_SE_PL_DUMMY_135 0x887 +#define NA_SE_PL_DUMMY_136 0x888 +#define NA_SE_PL_DUMMY_137 0x889 +#define NA_SE_PL_DUMMY_138 0x88A +#define NA_SE_PL_DUMMY_139 0x88B +#define NA_SE_PL_DUMMY_140 0x88C +#define NA_SE_PL_DUMMY_141 0x88D +#define NA_SE_PL_DUMMY_142 0x88E +#define NA_SE_PL_DUMMY_143 0x88F +#define NA_SE_PL_DUMMY_144 0x890 +#define NA_SE_PL_DUMMY_145 0x891 +#define NA_SE_PL_DUMMY_146 0x892 +#define NA_SE_PL_DUMMY_147 0x893 +#define NA_SE_PL_DUMMY_148 0x894 +#define NA_SE_PL_DUMMY_149 0x895 +#define NA_SE_PL_DUMMY_150 0x896 +#define NA_SE_PL_DUMMY_151 0x897 +#define NA_SE_PL_DUMMY_152 0x898 +#define NA_SE_PL_DUMMY_153 0x899 +#define NA_SE_PL_DUMMY_154 0x89A +#define NA_SE_PL_DUMMY_155 0x89B +#define NA_SE_PL_DUMMY_156 0x89C +#define NA_SE_PL_DUMMY_157 0x89D +#define NA_SE_PL_DUMMY_158 0x89E +#define NA_SE_PL_DUMMY_159 0x89F +#define NA_SE_PL_DUMMY_160 0x8A0 +#define NA_SE_PL_DUMMY_161 0x8A1 +#define NA_SE_PL_DUMMY_162 0x8A2 +#define NA_SE_PL_DUMMY_163 0x8A3 +#define NA_SE_PL_DUMMY_164 0x8A4 +#define NA_SE_PL_DUMMY_165 0x8A5 +#define NA_SE_PL_DUMMY_166 0x8A6 +#define NA_SE_PL_DUMMY_167 0x8A7 +#define NA_SE_PL_DUMMY_168 0x8A8 +#define NA_SE_PL_DUMMY_169 0x8A9 +#define NA_SE_PL_DUMMY_170 0x8AA +#define NA_SE_PL_DUMMY_171 0x8AB +#define NA_SE_PL_DUMMY_172 0x8AC +#define NA_SE_PL_DUMMY_173 0x8AD +#define NA_SE_PL_DUMMY_174 0x8AE +#define NA_SE_PL_DUMMY_175 0x8AF +#define NA_SE_PL_CRAWL 0x8B0 +#define NA_SE_PL_CRAWL_SAND 0x8B1 +#define NA_SE_PL_CRAWL_CONCRETE 0x8B2 +#define NA_SE_PL_CRAWL_DIRT 0x8B3 +#define NA_SE_PL_CRAWL_WATER0 0x8B4 +#define NA_SE_PL_DUMMY_181 0x8B5 +#define NA_SE_PL_DUMMY_182 0x8B6 +#define NA_SE_PL_DUMMY_183 0x8B7 +#define NA_SE_PL_DUMMY_184 0x8B8 +#define NA_SE_PL_DUMMY_185 0x8B9 +#define NA_SE_PL_DUMMY_186 0x8BA +#define NA_SE_PL_CRAWL_WOOD 0x8BB +#define NA_SE_PL_CRAWL_ICE 0x8BC +#define NA_SE_PL_DUMMY_189 0x8BD +#define NA_SE_PL_DUMMY_190 0x8BE +#define NA_SE_PL_DUMMY_191 0x8BF +#define NA_SE_PL_MAGIC_SOUL_FLASH 0x8C0 +#define NA_SE_PL_ROLL_DUST 0x8C1 +#define NA_SE_PL_DUMMY_192 0x8C2 +#define NA_SE_PL_MAGIC_SOUL_BALL 0x8C3 +#define NA_SE_PL_SPIRAL_HEAL_BEAM 0x8C4 +#define NA_SE_PL_BOUND_NOWEAPON 0x8C5 +#define NA_SE_PL_PLANT_GROW_UP 0x8C6 +#define NA_SE_PL_PLANT_TALLER 0x8C7 +#define NA_SE_PL_MAGIC_WIND_VANISH 0x8C8 +#define NA_SE_PL_HOBBERBOOTS_LV 0x8C9 +#define NA_SE_PL_PLANT_MOVE 0x8CA +#define NA_SE_EV_WALL_MOVE_SP 0x8CB // EV sound inside PL? +#define NA_SE_PL_DUMMY_204 0x8CC +#define NA_SE_PL_DUMMY_205 0x8CD 0xCC +#define NA_SE_PL_DUMMY_206 0x8CE +#define NA_SE_PL_DUMMY_207 0x8CF +#define NA_SE_PL_SLIP_LEVEL 0x8D0 +#define NA_SE_PL_SLIP_SAND_LEVEL 0x8D1 +#define NA_SE_PL_SLIP_CONCRETE_LEVEL 0x8D2 +#define NA_SE_PL_SLIP_DIRT_LEVEL 0x8D3 +#define NA_SE_PL_SLIP_WATER0_LEVEL 0x8D4 +#define NA_SE_PL_SLIP_WATER1_LEVEL 0x8D5 +#define NA_SE_PL_SLIP_WATER2_LEVEL 0x8D6 +#define NA_SE_PL_SLIP_MAGMA_LEVEL 0x8D7 +#define NA_SE_PL_SLIP_GRASS_LEVEL 0x8D8 +#define NA_SE_PL_SLIP_IRON_LEVEL 0x8D9 +#define NA_SE_PL_SLIP_GLASS_LEVEL 0x8DA +#define NA_SE_PL_SLIP_WOOD_LEVEL 0x8DB +#define NA_SE_PL_DUMMY_220 0x8DC +#define NA_SE_PL_DUMMY_221 0x8DD +#define NA_SE_PL_SLIP_HEAVYBOOTS_LEVEL 0x8DE +#define NA_SE_PL_SLIP_ICE_LEVEL 0x8DF +#define NA_SE_PL_JUMP_METAL 0x8E0 +#define NA_SE_PL_LAND_METAL 0x8E1 +#define NA_SE_PL_WALK_RUNNINGMAN 0x8E2 +#define NA_SE_PL_WALK_ZELDA_DEMO 0x8E3 +#define NA_SE_PL_YOBI_DATA02 0x8E4 +#define NA_SE_PL_YOBI_DATA03 0x8E5 +#define NA_SE_PL_YOBI_DATA04 0x8E6 +#define NA_SE_PL_YOBI_DATA05 0x8E7 +#define NA_SE_PL_YOBI_DATA06 0x8E8 +#define NA_SE_PL_YOBI_DATA07 0x8E9 +#define NA_SE_PL_YOBI_DATA08 0x8EA +#define NA_SE_PL_YOBI_DATA09 0x8EB +#define NA_SE_PL_YOBI_DATA10 0x8EC +#define NA_SE_PL_YOBI_DATA11 0x8ED +#define NA_SE_PL_YOBI_DATA12 0x8EE +#define NA_SE_PL_YOBI_DATA13 0x8EF +#define NA_SE_PL_YOBI_DATA14 0x8F0 + +// ------------ ITEM ------------ + #define NA_SE_IT_SWORD_IMPACT 0x1800 #define NA_SE_IT_SWORD_SWING 0x1801 #define NA_SE_IT_SWORD_PUTAWAY 0x1802 @@ -324,7 +330,7 @@ #define NA_SE_IT_MASTER_SWORD_SWING 0x184E #define NA_SE_IT_DUMMY5 0x184F #define NA_SE_IT_YOBI19 0x1850 -#define NA_SE_FISHING_REEL_SLOW2 0x1851 +#define NA_SE_FISHING_REEL_SLOW2 0x1851 // not IT? #define NA_SE_IT_SPIDERNET_HIT1 0x1852 #define NA_SE_IT_LURE_LAND1 0x1853 #define NA_SE_IT_HOOKSHOT_STICK_OBJ_WATER 0x1854 @@ -344,7 +350,9 @@ #define NA_SE_IT_YOBI16 0x1862 #define NA_SE_IT_YOBI17 0x1863 #define NA_SE_IT_YOBI18 0x1864 -//------------ENVIRONMENT------------ + +// ------------ ENVIRONMENT ------------ + #define NA_SE_EV_DOOR_OPEN 0x2800 #define NA_SE_EV_DOOR_CLOSE 0x2801 #define NA_SE_EV_EXPLOSION 0x2802 @@ -378,7 +386,7 @@ #define NA_SE_EV_STONE_STATUE_OPEN 0x281E #define NA_SE_EV_TBOX_UNLOCK 0x281F #define NA_SE_EV_TBOX_OPEN 0x2820 -#define NA_SE_SY_TIMER 0x2821 +#define NA_SE_SY_TIMER 0x2821 // SY sound inside EV? #define NA_SE_EV_FLAME_IGNITION 0x2822 #define NA_SE_EV_SPEAR_HIT 0x2823 #define NA_SE_EV_ELEVATOR_MOVE 0x2824 @@ -481,7 +489,7 @@ #define NA_SE_EV_WINDMILL_LEVEL 0x2885 #define NA_SE_EV_GOTO_HEAVEN 0x2886 #define NA_SE_EV_POT_BROKEN 0x2887 -#define NA_SE_PL_PUT_DOWN_POT 0x2888 +#define NA_SE_PL_PUT_DOWN_POT 0x2888 // PL sound inside EV? #define NA_SE_EV_DIVE_INTO_WATER 0x2889 #define NA_SE_EV_JUMP_OUT_WATER 0x288A #define NA_SE_EV_GOD_FLYING 0x288B @@ -626,7 +634,9 @@ #define NA_SE_EV_YOBI23 0x2916 #define NA_SE_EV_YOBI24 0x2917 #define NA_SE_EV_YOBI25 0x2918 -//------------ENEMY------------ + +// ------------ ENEMY ------------ + #define NA_SE_EN_FLOORMASTER_SLIDING 0x3034 #define NA_SE_EN_FLOORMASTER_SM_STICK 0x3136 #define NA_SE_EN_DODO_J_WALK 0x3800 @@ -1160,7 +1170,9 @@ #define NA_SE_EN_YOBI28 0x3A12 #define NA_SE_EN_YOBI29 0x3A13 #define NA_SE_EN_YOBI30 0x3A14 -//------------SYSTEM------------ + +// ------------ SYSTEM ------------ + #define NA_SE_SY_WIN_OPEN 0x4800 #define NA_SE_SY_WIN_CLOSE 0x4801 #define NA_SE_SY_CORRECT_CHIME 0x4802 @@ -1231,7 +1243,7 @@ #define NA_SE_SY_KINSTA_MARK_APPEAR 0x4843 #define NA_SE_SY_FIVE_COUNT_LUPY 0x4844 #define NA_SE_SY_CARROT_RECOVER 0x4845 -#define NA_SE_EV_FAIVE_LUPY_COUNT 0x4846 +#define NA_SE_EV_FAIVE_LUPY_COUNT 0x4846 // EV sound inside SY? #define NA_SE_SY_DUMMY_71 0x4847 #define NA_SE_SY_KANADE_ISHI 0x4848 #define NA_SE_SY_NA_HELLO_2 0x4849 @@ -1252,7 +1264,9 @@ #define NA_SE_SY_YOBI15 0x4858 #define NA_SE_SY_YOBI16 0x4859 #define NA_SE_SY_YOBI17 0x485A -//------------OCARINA------------ + +// ------------ OCARINA ------------ + #define NA_SE_OC_OCARINA 0x5800 #define NA_SE_OC_ABYSS 0x5801 #define NA_SE_OC_DOOR_OPEN 0x5802 @@ -1264,7 +1278,9 @@ #define NA_SE_OC_HINT_MOVIE2_WHITE 0x5808 #define NA_SE_OC_HINT_MOVIE_ZOOMIN 0x5809 #define NA_SE_OC_HIBIKI_ISHI 0x580A -//------------VOICE------------ + +// ------------ VOICE ------------ + #define NA_SE_VO_LI_SWORD_N 0x6800 #define NA_SE_VO_LI_SWORD_L 0x6801 #define NA_SE_VO_LI_LASH 0x6802 diff --git a/include/ultra64/controller.h b/include/ultra64/controller.h index 019ccf89f9..18629225ac 100644 --- a/include/ultra64/controller.h +++ b/include/ultra64/controller.h @@ -8,6 +8,9 @@ #define SIAccessQueueSize 2 #define BLOCKSIZE 32 #define MAXCONTROLLERS 4 +#define PFS_ONE_PAGE 8 + +#define PFS_PAGE_SIZE (BLOCKSIZE*PFS_ONE_PAGE) #define CONT_CMD_REQUEST_STATUS 0 #define CONT_CMD_READ_BUTTON 1 diff --git a/include/ultra64/gu.h b/include/ultra64/gu.h index 7e7ec1dc02..2fa10e5dd9 100644 --- a/include/ultra64/gu.h +++ b/include/ultra64/gu.h @@ -4,6 +4,8 @@ #define GU_PI 3.1415926 /* Functions */ +#define ROUND(x) (s32)(((x) >= 0.0) ? ((x) + 0.5) : ((x) - 0.5)) + void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, float near, float far, float scale); void guPerspective(Mtx *m, u16 *perspNorm, float fovy, float aspect, float near, diff --git a/include/ultra64/pfs.h b/include/ultra64/pfs.h index 6d59a58c8f..d3d2928a1e 100644 --- a/include/ultra64/pfs.h +++ b/include/ultra64/pfs.h @@ -3,35 +3,12 @@ #include -typedef struct { - int status; - OSMesgQueue* queue; - int channel; - u8 id[32]; - u8 label[32]; - int version; - int dir_size; - int inode_table; /* block location */ - int minode_table; /* mirrioring inode_table */ - int dir_table; /* block location */ - int inode_start_page; /* page # */ - u8 banks; - u8 activebank; -} OSPfs; - -typedef struct { - u32 file_size; /* bytes */ - u32 game_code; - u16 company_code; - char ext_name[4]; - char game_name[16]; -} OSPfsState; - /* File System size */ #define OS_PFS_VERSION 0x0200 #define OS_PFS_VERSION_HI (OS_PFS_VERSION >> 8) #define OS_PFS_VERSION_LO (OS_PFS_VERSION & 255) +#define PFS_INODE_SIZE_PER_PAGE 128 #define PFS_FILE_NAME_LEN 16 #define PFS_FILE_EXT_LEN 4 #define BLOCKSIZE 32 @@ -51,6 +28,11 @@ typedef struct { #define PFS_MOTOR_INITIALIZED 0x8 #define PFS_GBPAK_INITIALIZED 0x10 +/* Definition for page usage */ +#define PFS_EOF 1 +#define PFS_PAGE_NOT_EXIST 2 +#define PFS_PAGE_NOT_USED 3 + /* File System error number */ #define PFS_ERR_NOPACK 1 /* no memory card is plugged or */ @@ -67,4 +49,89 @@ typedef struct { #define PFS_ERR_NO_GBCART 12 /* no gb cartridge (64GB-PAK) */ #define PFS_ERR_NEW_GBCART 13 /* gb cartridge may be changed */ +/* Definition for bank */ +#define PFS_ID_BANK_256K 0 +#define PFS_ID_BANK_1M 4 +#define PFS_BANKS_256K 1 + +#define PFS_WRITTEN 2 +#define DEF_DIR_PAGES 2 + +#define PFS_ID_0AREA 1 +#define PFS_ID_1AREA 3 +#define PFS_ID_2AREA 4 +#define PFS_ID_3AREA 6 +#define PFS_LABEL_AREA 7 +#define PFS_ID_PAGE PFS_ONE_PAGE * 0 + +#define PFS_BANK_LAPPED_BY 8 /* => u8 */ +#define PFS_SECTOR_PER_BANK 32 +#define PFS_INODE_DIST_MAP (PFS_BANK_LAPPED_BY * PFS_SECTOR_PER_BANK) +#define PFS_SECTOR_SIZE (PFS_INODE_SIZE_PER_PAGE/PFS_SECTOR_PER_BANK) + +typedef struct { + int status; + OSMesgQueue* queue; + int channel; + u8 id[32]; + u8 label[32]; + int version; + int dir_size; + int inode_table; /* block location */ + int minode_table; /* mirrioring inode_table */ + int dir_table; /* block location */ + int inodeStartPage; /* page # */ + u8 banks; + u8 activebank; +} OSPfs; + +typedef struct { + u32 file_size; /* bytes */ + u32 game_code; + u16 company_code; + char ext_name[4]; + char game_name[16]; +} OSPfsState; + +typedef union { + struct { + u8 bank; + u8 page; + } inode_t; + u16 ipage; +} __OSInodeUnit; + +typedef struct { + __OSInodeUnit inodePage[128]; +} __OSInode; + +typedef struct { + u32 game_code; + u16 company_code; + __OSInodeUnit start_page; + u8 status; + s8 reserved; + u16 data_sum; + u8 ext_name[PFS_FILE_EXT_LEN]; + u8 game_name[PFS_FILE_NAME_LEN]; +} __OSDir; + +typedef struct { + u32 repaired; + u32 random; + u64 serialMid; + u64 serialLow; + u16 deviceid; + u8 banks; + u8 version; + u16 checksum; + u16 invertedChecksum; +} __OSPackId; + +typedef struct { + __OSInode inode; + u8 bank; + u8 map[PFS_INODE_DIST_MAP]; +} __OSInodeCache; + #endif diff --git a/include/variables.h b/include/variables.h index 8d22b1f3f8..da69973878 100644 --- a/include/variables.h +++ b/include/variables.h @@ -461,6 +461,7 @@ extern u32 gUpgradeNegMasks[8]; extern u8 gEquipShifts[4]; extern u8 gUpgradeShifts[8]; extern u16 gUpgradeCapacities[8][4]; +extern u32 D_8012724C[4]; extern u32 gItemIcons[0x82]; extern u8 gItemSlots[56]; extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*); @@ -510,9 +511,6 @@ extern u8 gFontFF[]; // original name: "font_ff" //extern ? D_8012C7A8; //extern ? D_8012CDC8; //extern ? D_8012CEA0; -//extern ? D_8012CED0; -//extern ? D_8012CED4; -//extern ? D_8012CED8; //extern ? D_8012CEE0; //extern ? D_8012CEE4; //extern ? D_8012CEE8; @@ -822,7 +820,7 @@ extern s32 gSystemArenaLogSeverity; //extern ? D_801344C0; extern u32 gOSSiAccessQueueCreated; // = 0; extern u32 gOSContInitialized; // = 0 -//extern ? D_80134CF0; +extern s32 __osPfsInodeCacheChannel; extern u8 __osPfsInodeCacheBank; extern s32 __osPfsLastChannel; //extern ? D_80135130; @@ -3740,7 +3738,7 @@ extern u8 __osContLastPoll; extern u8 __osMaxControllers; extern OSMesgQueue __osContMesgQueue; extern OSMesg __osContMesgBuff[4]; -//extern ? D_80175860; +extern __OSInode __osPfsInodeCache; extern OSPifRam pifMempakBuf; //extern ? D_801759A0; //extern ? D_801759A4; diff --git a/include/z64.h b/include/z64.h index a608decfca..190e462dba 100644 --- a/include/z64.h +++ b/include/z64.h @@ -142,7 +142,7 @@ typedef struct { /* 0x0E88 */ s32 tempCollectFlags; } fw; /* 0x0E8C */ char unk_E8C[0x0010]; - /* 0x0E9C */ u8 gsFlags[24]; + /* 0x0E9C */ u32 gsFlags[6]; /* 0x0EB4 */ char unk_EB4[0x0010]; /* 0x0EC4 */ s32 unk_EC4; /* 0x0EC8 */ char unk_EC8[0x000C]; @@ -531,8 +531,8 @@ typedef struct { } DbgCamera; // size = 0x10CC; typedef struct { - /* 0x00 */ u8 musicSeq; - /* 0x01 */ u8 nighttimeSFX; + /* 0x00 */ u8 seqIndex; + /* 0x01 */ u8 nightSeqIndex; /* 0x02 */ char unk_02[0x2]; } SoundContext; // size = 0x4 @@ -701,7 +701,8 @@ typedef struct { /* 0xE3E5 */ u8 choiceIndex; /* 0xE3E6 */ char unk_E3E6[0x01]; /* 0xE3E7 */ u8 unk_E3E7; - /* 0xE3E8 */ char unk_E3E8[0x6]; + /* 0xE3E8 */ char unk_E3E8[0x04]; + /* 0xE3EC */ u16 unk_E3EC; /* 0xE3EE */ u16 unk_E3EE; /* 0xE3F0 */ u16 unk_E3F0; /* 0xE3F2 */ char unk_E3F2[0x02]; @@ -894,7 +895,8 @@ typedef struct { /* 0xB8 */ UNK_PTR lightSettingsList; /* 0xBC */ char unk_BC[0x03]; /* 0xBF */ u8 unk_BF; - /* 0xC0 */ char unk_C0[0x18]; + /* 0xC0 */ char unk_C0[0x16]; + /* 0xD6 */ s16 unk_D6; /* 0xD8 */ f32 unk_D8; /* 0xDC */ u8 unk_DC; /* 0xDD */ u8 gloomySkyEvent; @@ -1146,13 +1148,15 @@ typedef struct { /* 0x01E2 */ char unk_1E2[0x06]; } TitleContext; // size = 0x1E8 +struct SelectContext; + typedef struct { /* 0x00 */ char* name; /* 0x04 */ void (*loadFunc)(struct SelectContext*, s32); /* 0x08 */ s32 entranceIndex; } SceneSelectEntry; // size = 0xC -typedef struct { +typedef struct SelectContext { /* 0x0000 */ GameState state; /* 0x00A4 */ s32 unk_A4; /* 0x00A8 */ View view; diff --git a/include/z64actor.h b/include/z64actor.h index 5944523346..8d61dd8fd4 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -146,7 +146,7 @@ typedef struct Actor { /* 0x10C */ u8 unk_10C; // Z-Target related /* 0x10D */ u8 unk_10D; // Z-Target related /* 0x10E */ u16 textId; // Text id to pass to link/display when interacting with an actor - /* 0x110 */ u16 freeze; + /* 0x110 */ u16 freezeTimer; /* 0x112 */ u16 dmgEffectParams; // Specifies damage effect color (white/red/blue) and if opaque or translucent /* 0x114 */ u8 dmgEffectTimer; /* 0x115 */ u8 isDrawn; // Indicates whether the actor is currently being drawn (but not seen through lens) @@ -340,7 +340,9 @@ typedef struct Player { /* 0x08B4 */ Struct_80090480_arg2 swordDimensions; // Trail active, tip, base? /* 0x08D0 */ Struct_80090480_arg2 unk_8D0; /* 0x08EC */ Struct_80090480_arg2 unk_8EC; - /* 0x0908 */ char unk_908[0xD8]; + /* 0x0908 */ char unk_908[0x54]; + /* 0x095C */ Vec3f unk_95C; + /* 0x0968 */ char unk_968[0x78]; /* 0x09E0 */ MtxF mf_9E0; /* 0x0A20 */ MtxF mf_A20; /* 0x0A60 */ char unk_A60[0x08]; @@ -354,6 +356,84 @@ typedef struct Player { /* 0x0A79 */ char unk_A79[0x1B]; } Player; // size = 0xA94 +typedef enum { + /* 0x00 */ ITEM00_RUPEE_GREEN, + /* 0x01 */ ITEM00_RUPEE_BLUE, + /* 0x02 */ ITEM00_RUPEE_RED, + /* 0x03 */ ITEM00_HEART, + /* 0x04 */ ITEM00_BOMBS_A, + /* 0x05 */ ITEM00_ARROWS_SINGLE, + /* 0x06 */ ITEM00_HEART_PIECE, + /* 0x07 */ ITEM00_HEART_CONTAINER, + /* 0x08 */ ITEM00_ARROWS_SMALL, + /* 0x09 */ ITEM00_ARROWS_MEDIUM, + /* 0x0A */ ITEM00_ARROWS_LARGE, + /* 0x0B */ ITEM00_BOMBS_B, + /* 0x0C */ ITEM00_NUTS, + /* 0x0D */ ITEM00_STICK, + /* 0x0E */ ITEM00_MAGIC_LARGE, + /* 0x0F */ ITEM00_MAGIC_SMALL, + /* 0x10 */ ITEM00_SEEDS, + /* 0x11 */ ITEM00_SMALL_KEY, + /* 0x12 */ ITEM00_FLEXIBLE, + /* 0x13 */ ITEM00_RUPEE_ORANGE, + /* 0x14 */ ITEM00_RUPEE_PURPLE, + /* 0x15 */ ITEM00_SHIELD_DEKU, + /* 0x16 */ ITEM00_SHIELD_HYLIAN, + /* 0x17 */ ITEM00_TUNIC_ZORA, + /* 0x18 */ ITEM00_TUNIC_GORON, + /* 0x19 */ ITEM00_BOMBS_SPECIAL +} Item00Type; + +struct EnItem00; + +typedef void (*EnItem00ActionFunc)(struct EnItem00*, struct GlobalContext*); + +typedef struct EnItem00 { + /* 0x000 */ Actor actor; + /* 0x14C */ EnItem00ActionFunc actionFunc; + /* 0x150 */ s16 collectibleFlag; + /* 0x152 */ s16 unk_152; + /* 0x154 */ s16 unk_154; + /* 0x156 */ s16 unk_156; + /* 0x158 */ s16 unk_158; + /* 0x15A */ s16 unk_15A; + /* 0x15C */ f32 unk_15C; + /* 0x160 */ ColliderCylinder collider; +} EnItem00; // size = 0x1AC + +typedef enum { + /* 0x00 */ A_OBJ_BLOCK_SMALL, + /* 0x01 */ A_OBJ_BLOCK_LARGE, + /* 0x02 */ A_OBJ_BLOCK_HUGE, + /* 0x03 */ A_OBJ_BLOCK_SMALL_ROT, + /* 0x04 */ A_OBJ_BLOCK_LARGE_ROT, + /* 0x05 */ A_OBJ_CUBE_SMALL, + /* 0x06 */ A_OBJ_UNKNOWN_6, + /* 0x07 */ A_OBJ_GRASS_CLUMP, + /* 0x08 */ A_OBJ_TREE_STUMP, + /* 0x09 */ A_OBJ_SIGNPOST_OBLONG, + /* 0x0A */ A_OBJ_SIGNPOST_ARROW, + /* 0x0B */ A_OBJ_KNOB +} AObjType; + +struct EnAObj; + +typedef void (*EnAObjActionFunc)(struct EnAObj*, struct GlobalContext*); + +typedef struct EnAObj { + /* 0x000 */ DynaPolyActor dyna; + /* 0x164 */ EnAObjActionFunc actionFunc; + /* 0x168 */ s32 unk_168; + /* 0x16C */ s16 textId; + /* 0x16E */ s16 unk_16E; + /* 0x170 */ s16 unk_170; + /* 0x172 */ s16 unk_172; + /* 0x174 */ s16 unk_174; + /* 0x178 */ f32 unk_178; + /* 0x17C */ ColliderCylinder collider; +} EnAObj; // size = 0x1C8 + typedef enum { /* 0x00 */ ACTORTYPE_SWITCH, /* 0x01 */ ACTORTYPE_BG, diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index 074b40c5c3..c11eee3c57 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -435,8 +435,6 @@ /** * Marks the end of a cutscene */ -#define CS_END() 0xFFFFFFFF - -#define CS_PAD() 0x00000000 +#define CS_END() 0xFFFFFFFF, 0x00000000 #endif diff --git a/include/z64effect.h b/include/z64effect.h index 9383aa97d4..6c6aa0d74c 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -175,7 +175,7 @@ typedef struct { typedef struct { /* 0x00 */ u32 size; - /* 0x04 */ void (*init)(void* effect, void* initParms); + /* 0x04 */ void (*init)(void* effect, void* initParams); /* 0x08 */ void (*destroy)(void* effect); /* 0x0C */ s32 (*update)(void* effect); /* 0x10 */ void (*draw)(void* effect, struct GraphicsContext* gfxCtx); @@ -215,7 +215,7 @@ typedef struct EffectSs { /* 0x28 */ void (*draw)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); /* 0x2C */ Vec3f unk_2C; /* 0x38 */ u32 unk_38; - /* 0x3C */ u32 unk_3C; + /* 0x3C */ UNK_PTR unk_3C; /* 0x40 */ s16 regs[13]; // specific per effect /* 0x5A */ u16 flags; /* 0x5C */ s16 life; // -1 means this entry is free diff --git a/include/z64scene.h b/include/z64scene.h index 470b0f849c..068808eafe 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -157,8 +157,8 @@ typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 bgmId; /* 0x02 */ char pad[4]; - /* 0x06 */ u8 nighttimeSFX; - /* 0x07 */ u8 musicSeq; + /* 0x06 */ u8 nightSeqIndex; + /* 0x07 */ u8 seqIndex; } SCmdSoundSettings; typedef struct { diff --git a/spec b/spec index 302e39d4b0..215ece301f 100644 --- a/spec +++ b/spec @@ -372,6 +372,7 @@ beginseg include "build/src/code/z_fbdemo_wipe1.o" include "build/src/code/z_fbdemo_circle.o" include "build/src/code/z_fbdemo_fade.o" + include "build/src/code/shrink_window.o" include "build/src/code/db_camera.o" include "build/data/db_camera.data.o" include "build/data/db_camera.rodata.o" @@ -456,11 +457,10 @@ beginseg include "build/src/code/sleep.o" include "build/src/code/jpegutils.o" include "build/src/code/jpegdecoder.o" - include "build/asm/code_80100040.o" + include "build/src/libultra_code/osPfsFreeBlocks.o" include "build/asm/guScale.o" include "build/src/libultra_code/sinf.o" include "build/src/libultra_code/sins.o" - include "build/data/sins.data.o" include "build/src/libultra_code/sptask.o" include "build/src/libultra_code/osRumblePak.o" include "build/src/libultra_code/__osSiCreateAccessQueue.o" @@ -470,19 +470,18 @@ beginseg include "build/src/libultra_code/__osSpRawStartDma.o" include "build/src/libultra_code/__osSiRawStartDma.o" include "build/src/libultra_code/osSpTaskYield.o" - include "build/asm/code_801014C0.o" - include "build/data/code_801014C0.bss.o" + include "build/src/libultra_code/pfsreadwritefile.o" include "build/src/libultra_code/__osPfsGetStatus.o" include "build/asm/guMtxIdentF.o" include "build/src/libultra_code/guLookAt.o" - include "build/asm/code_80101EB0.o" + include "build/src/libultra_code/pfsallocatefile.o" include "build/src/libultra_code/osStopTimer.o" - include "build/asm/code_80102420.o" - include "build/data/code_80102420.data.o" + include "build/src/libultra_code/contpfs.o" include "build/asm/code_80102FA0.o" - include "build/asm/code_80103010.o" + include "build/src/libultra_code/osPfsFindFile.o" include "build/src/libultra_code/sqrtf.o" - include "build/src/libultra_code/code_801031F0.o" + include "build/src/libultra_code/osAfterPreNMI.o" + include "build/src/libultra_code/contquery.o" include "build/src/libultra_code/guLookAtHilite.o" include "build/src/libultra_code/sp.o" include "build/asm/guMtxIdent.o" @@ -494,24 +493,24 @@ beginseg include "build/asm/guNormalize.o" include "build/src/libultra_code/osDpGetStatus.o" include "build/src/libultra_code/osDpSetStatus.o" - include "build/asm/code_801041E0.o" + include "build/src/libultra_code/osPfsDeleteFile.o" include "build/src/libultra_code/ortho.o" include "build/src/libultra_code/cosf.o" + include "build/data/__libm_qnan_f.rodata.o" include "build/src/libultra_code/coss.o" include "build/src/libultra_code/osViSetEvent.o" include "build/src/libultra_code/osPfsIsPlug.o" include "build/src/libultra_code/guS2DInitBg.o" - include "build/asm/code_80104C80.o" + include "build/src/libultra_code/__osPfsSelectBank.o" include "build/src/libultra_code/osContSetCh.o" include "build/asm/code_80104D60.o" - include "build/asm/code_80104F40.o" - include "build/asm/code_80105250.o" + include "build/src/libultra_code/pfsinitpak.o" + include "build/src/libultra_code/pfschecker.o" include "build/src/libultra_code/osAiGetLength.o" include "build/asm/guTranslate.o" - include "build/asm/code_80105CF0.o" - include "build/data/code_80105CF0.data.o" - include "build/src/libultra_code/osReadMempak.o" - include "build/src/libultra_code/osMempakAddrCRC.o" + include "build/src/libultra_code/__osContRamWrite.o" + include "build/src/libultra_code/__osContRamRead.o" + include "build/src/libultra_code/__osContAddressCrc.o" include "build/src/libultra_code/osSetTimer.o" include "build/src/libultra_code/__osSpGetStatus.o" include "build/src/libultra_code/__osSpSetStatus.o" @@ -537,6 +536,7 @@ endseg beginseg name "buffers" + align 0x40 include "build/src/buffers/zbuffer.o" include "build/src/buffers/gfxbuffers.o" include "build/src/buffers/heaps.o" @@ -552,11 +552,7 @@ endseg beginseg name "ovl_select" include "build/src/overlays/gamestates/ovl_select/z_select.o" -#ifdef NON_MATCHING include "build/src/overlays/gamestates/ovl_select/ovl_select_reloc.o" -#else - include "build/data/overlays/gamestates/z_select.reloc.o" -#endif endseg beginseg @@ -1238,7 +1234,11 @@ endseg beginseg name "ovl_Bg_Spot01_Idohashira" include "build/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_Bg_Spot01_Idohashira/ovl_Bg_Spot01_Idohashira_reloc.o" +#else include "build/data/overlays/actors/z_bg_spot01_idohashira.reloc.o" +#endif endseg beginseg @@ -1423,6 +1423,9 @@ endseg beginseg name "ovl_Bg_Toki_Swd" + include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.o" + include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.o" + include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.o" include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o" include "build/src/overlays/actors/ovl_Bg_Toki_Swd/ovl_Bg_Toki_Swd_reloc.o" endseg @@ -1655,8 +1658,7 @@ endseg beginseg name "ovl_Demo_Sa" include "build/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.o" - include "build/data/overlays/actors/z_demo_sa.data.o" - include "build/data/overlays/actors/z_demo_sa.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Sa/ovl_Demo_Sa_reloc.o" endseg beginseg @@ -1995,8 +1997,7 @@ endseg beginseg name "ovl_Effect_Ss_Solder_Srch_Ball" include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.o" - include "build/data/overlays/effects/z_eff_ss_solder_srch_ball.data.o" - include "build/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball_reloc.o" endseg beginseg @@ -2126,8 +2127,7 @@ endseg beginseg name "ovl_En_Blkobj" include "build/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.o" - include "build/data/overlays/actors/z_en_blkobj.data.o" - include "build/data/overlays/actors/z_en_blkobj.reloc.o" + include "build/src/overlays/actors/ovl_En_Blkobj/ovl_En_Blkobj_reloc.o" endseg beginseg @@ -2618,18 +2618,13 @@ endseg beginseg name "ovl_En_Heishi1" include "build/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.o" - include "build/data/overlays/actors/z_en_heishi1.data.o" - include "build/data/overlays/actors/z_en_heishi1.reloc.o" + include "build/src/overlays/actors/ovl_En_Heishi1/ovl_En_Heishi1_reloc.o" endseg beginseg name "ovl_En_Heishi2" include "build/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.o" -#ifdef NON_MATCHING include "build/src/overlays/actors/ovl_En_Heishi2/ovl_En_Heishi2_reloc.o" -#else - include "build/data/overlays/actors/z_en_heishi2.reloc.o" -#endif endseg beginseg @@ -2912,8 +2907,7 @@ endseg beginseg name "ovl_En_Md" include "build/src/overlays/actors/ovl_En_Md/z_en_md.o" - include "build/data/overlays/actors/z_en_md.data.o" - include "build/data/overlays/actors/z_en_md.reloc.o" + include "build/src/overlays/actors/ovl_En_Md/ovl_En_Md_reloc.o" endseg beginseg @@ -3179,8 +3173,7 @@ endseg beginseg name "ovl_En_Si" include "build/src/overlays/actors/ovl_En_Si/z_en_si.o" - include "build/data/overlays/actors/z_en_si.data.o" - include "build/data/overlays/actors/z_en_si.reloc.o" + include "build/src/overlays/actors/ovl_En_Si/ovl_En_Si_reloc.o" endseg beginseg @@ -3499,8 +3492,11 @@ endseg beginseg name "ovl_En_Zl2" include "build/src/overlays/actors/ovl_En_Zl2/z_en_zl2.o" - include "build/data/overlays/actors/z_en_zl2.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Zl2/ovl_En_Zl2_reloc.o" +#else include "build/data/overlays/actors/z_en_zl2.reloc.o" +#endif endseg beginseg @@ -3831,8 +3827,7 @@ endseg beginseg name "ovl_Shot_Sun" include "build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o" - include "build/data/overlays/actors/z_shot_sun.data.o" - include "build/data/overlays/actors/z_shot_sun.reloc.o" + include "build/src/overlays/actors/ovl_Shot_Sun/ovl_Shot_Sun_reloc.o" endseg beginseg diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c index 90cb9494b8..ebb93da34c 100644 --- a/src/code/code_800ACE70.c +++ b/src/code/code_800ACE70.c @@ -53,10 +53,10 @@ Gfx D_8012AC58[] = { void func_800ACE70(struct_801664F0* this) { this->type = 0; this->setScissor = false; - this->color.r = 0xFF; - this->color.g = 0xFF; - this->color.b = 0xFF; - this->color.a = 0xFF; + this->color.r = 255; + this->color.g = 255; + this->color.b = 255; + this->color.a = 255; } // Destroy diff --git a/src/code/code_800AD920.c b/src/code/code_800AD920.c index 147c47c093..5123960068 100644 --- a/src/code/code_800AD920.c +++ b/src/code/code_800AD920.c @@ -9,14 +9,14 @@ extern u16 D_0E000000[]; void func_800AD920(struct_80166500* this) { this->useRgba = false; this->setScissor = false; - this->primColor.r = 0xFF; - this->primColor.g = 0xFF; - this->primColor.b = 0xFF; - this->primColor.a = 0xFF; - this->envColor.a = 0xFF; - this->envColor.r = 0x00; - this->envColor.g = 0x00; - this->envColor.b = 0x00; + this->primColor.r = 255; + this->primColor.g = 255; + this->primColor.b = 255; + this->primColor.a = 255; + this->envColor.a = 255; + this->envColor.r = 0; + this->envColor.g = 0; + this->envColor.b = 0; } // Destroy diff --git a/src/code/code_800C3C20.c b/src/code/code_800C3C20.c index 52d02ca681..714de72549 100644 --- a/src/code/code_800C3C20.c +++ b/src/code/code_800C3C20.c @@ -6,7 +6,7 @@ u8 D_8012D200[] = { void func_800C3C20(void) { s32 i; - + for (i = 0; i < ARRAY_COUNT(D_8012D200) & 0xFFFFFFFFu; i++) { func_800F87A0(D_8012D200[i]); } diff --git a/src/code/db_camera.c b/src/code/db_camera.c index b1e858e638..b693051d9a 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,20 +1,6 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3840.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3898.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B38A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B38FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3908.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3968.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B39B8.s") - #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3B50.s") #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3BD4.s") diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index 60fc9b2f65..593696173e 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -36,26 +36,40 @@ const u32 sFaultDrawerFont[] = { }; // data -// clang-format off FaultDrawer sFaultDrawerDefault = { - (u16*)0x803DA800, // fb - 320, 240, // w, h - 16, 223, // yStart, yEnd - 22, 297, // xStart, xEnd - 0xFFFF, 0x0000, // foreColor, backColor - 22, 16, // cursorX, cursorY - sFaultDrawerFont, // font - 8, 8, 0, 0, - { // printColors - 0x0001, 0xF801, 0x07C1, 0xFFC1, - 0x003F, 0xF83F, 0x07FF, 0xFFFF, - 0x7BDF, 0xB5AD + (u16*)0x803DA800, // fb + 320, // w + 240, // h + 16, // yStart + 223, // yEnd + 22, // xStart + 297, // xEnd + GPACK_RGBA5551(255, 255, 255, 255), // foreColor + GPACK_RGBA5551(0, 0, 0, 0), // backColor + 22, // cursorX + 16, // cursorY + sFaultDrawerFont, // font + 8, + 8, + 0, + 0, + { + // printColors + GPACK_RGBA5551(0, 0, 0, 1), + GPACK_RGBA5551(255, 0, 0, 1), + GPACK_RGBA5551(0, 255, 0, 1), + GPACK_RGBA5551(255, 255, 0, 1), + GPACK_RGBA5551(0, 0, 255, 1), + GPACK_RGBA5551(255, 0, 255, 1), + GPACK_RGBA5551(0, 255, 255, 1), + GPACK_RGBA5551(255, 255, 255, 1), + GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(176, 176, 176, 1), }, - 0, // escCode - 0, // osSyncPrintfEnabled + 0, // escCode + 0, // osSyncPrintfEnabled NULL, // inputCallback }; -// clang-format on // bss extern FaultDrawer sFaultDrawerStruct; diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 170d144558..b49c10947e 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -52,7 +52,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { GfxPrint_Init(&printer); GfxPrint_Open(&printer, gfx); - GfxPrint_SetColor(&printer, 0xFA, 0x32, 0x32, 0xFF); + GfxPrint_SetColor(&printer, 250, 50, 50, 255); GfxPrint_SetPos(&printer, 4, 13); GfxPrint_Printf(&printer, entries[entryIdx].name); GfxPrint_SetPos(&printer, 4, 15); diff --git a/src/code/game.c b/src/code/game.c index 2aa4bf6ea5..782a9934f7 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -120,12 +120,12 @@ void func_800C4344(GameState* gameState) { // regalloc differences void GameState_DrawInputDisplay(u16 input, Gfx** gfx) { static const u16 sInpDispBtnColors[] = { - GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), - GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0x00, 0xFF, 0xFF, 1), GPACK_RGBA5551(0xFF, 0x00, 0xFF, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), - GPACK_RGBA5551(0xFF, 0x00, 0x00, 1), GPACK_RGBA5551(0x78, 0x78, 0x78, 1), GPACK_RGBA5551(0x00, 0xFF, 0x00, 1), - GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), + GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(255, 255, 0, 1), + GPACK_RGBA5551(255, 255, 0, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(0, 255, 255, 1), GPACK_RGBA5551(255, 0, 255, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(120, 120, 120, 1), + GPACK_RGBA5551(255, 0, 0, 1), GPACK_RGBA5551(120, 120, 120, 1), GPACK_RGBA5551(0, 255, 0, 1), + GPACK_RGBA5551(0, 0, 255, 1), }; s32 i, j, k; Gfx* gfxP = *gfx; diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c new file mode 100644 index 0000000000..212195ce6e --- /dev/null +++ b/src/code/shrink_window.c @@ -0,0 +1,99 @@ +#include + +s32 D_8012CED0 = 0; + +s32 sShrinkWindowVal = 0; + +s32 sShrinkWindowCurrentVal = 0; + +void ShrinkWindow_SetVal(s32 value) { + + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_setval(%d)\n", value); + } + sShrinkWindowVal = value; +} + +u32 ShrinkWindow_GetVal(void) { + return sShrinkWindowVal; +} + +void ShrinkWindow_SetCurrentVal(s32 currentVal) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_setnowval(%d)\n", currentVal); + } + sShrinkWindowCurrentVal = currentVal; +} + +u32 ShrinkWindow_GetCurrentVal(void) { + return sShrinkWindowCurrentVal; +} + +void ShrinkWindow_Init(void) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_init()\n"); + } + D_8012CED0 = 0; + sShrinkWindowVal = 0; + sShrinkWindowCurrentVal = 0; +} + +void ShrinkWindow_Destroy(void) { + if (HREG(80) == 0x13 && HREG(81) == 1) { + osSyncPrintf("shrink_window_cleanup()\n"); + } + sShrinkWindowCurrentVal = 0; +} + +void ShrinkWindow_Update(s32 updateRate) { + s32 off; + + if (updateRate == 3) { + off = 10; + } else { + off = 30 / updateRate; + } + + if (sShrinkWindowCurrentVal < sShrinkWindowVal) { + if (D_8012CED0 != 1) { + D_8012CED0 = 1; + } + + if (sShrinkWindowCurrentVal + off < sShrinkWindowVal) { + sShrinkWindowCurrentVal += off; + } else { + sShrinkWindowCurrentVal = sShrinkWindowVal; + } + } else if (sShrinkWindowVal < sShrinkWindowCurrentVal) { + if (D_8012CED0 != 2) { + D_8012CED0 = 2; + } + + if (sShrinkWindowVal < sShrinkWindowCurrentVal - off) { + sShrinkWindowCurrentVal -= off; + } else { + sShrinkWindowCurrentVal = sShrinkWindowVal; + } + } else { + D_8012CED0 = 0; + } + + if (HREG(80) == 0x13) { + if (HREG(94) != 0x13) { + HREG(94) = 0x13; + HREG(81) = 0; + HREG(82) = 0; + HREG(83) = 0; + HREG(84) = 0; + HREG(85) = 0; + HREG(86) = 0; + HREG(87) = 0; + HREG(88) = 0; + HREG(89) = 0; + } + HREG(83) = D_8012CED0; + HREG(84) = sShrinkWindowCurrentVal; + HREG(85) = sShrinkWindowVal; + HREG(86) = off; + } +} diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index d30b10c464..b7cbc412e6 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -18,12 +18,9 @@ volatile OSTime gRDPTotalTime; SpeedMeterTimeEntry* gSpeedMeterTimeEntryPtr; SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = { - { &D_8016A520, 0, 0, GPACK_RGBA5551(0xFF, 0x00, 0x00, 1) }, - { &D_8016A528, 0, 2, GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1) }, - { &D_8016A530, 0, 4, GPACK_RGBA5551(0x00, 0x00, 0xFF, 1) }, - { &D_8016A538, 0, 6, GPACK_RGBA5551(0xFF, 0x80, 0x80, 1) }, - { &D_8016A540, 0, 8, GPACK_RGBA5551(0x00, 0xFF, 0x00, 1) }, - { &D_8016A548, 0, 10, GPACK_RGBA5551(0xFF, 0x00, 0xFF, 1) }, + { &D_8016A520, 0, 0, GPACK_RGBA5551(255, 0, 0, 1) }, { &D_8016A528, 0, 2, GPACK_RGBA5551(255, 255, 0, 1) }, + { &D_8016A530, 0, 4, GPACK_RGBA5551(0, 0, 255, 1) }, { &D_8016A538, 0, 6, GPACK_RGBA5551(255, 128, 128, 1) }, + { &D_8016A540, 0, 8, GPACK_RGBA5551(0, 255, 0, 1) }, { &D_8016A548, 0, 10, GPACK_RGBA5551(255, 0, 255, 1) }, }; #define DrawRec(gfx, color, ulx, uly, lrx, lry) \ @@ -88,10 +85,10 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { G_TD_CLAMP | G_TP_NONE | G_CYC_FILL | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2); - DrawRec(gfx++, GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), baseX + 64 * 0, uly, baseX + 64 * 1, lry); - DrawRec(gfx++, GPACK_RGBA5551(0x00, 0xFF, 0x00, 1), baseX + 64 * 1, uly, baseX + 64 * 2, lry); - DrawRec(gfx++, GPACK_RGBA5551(0xFF, 0x00, 0x00, 1), baseX + 64 * 2, uly, baseX + 64 * 3, lry); - DrawRec(gfx++, GPACK_RGBA5551(0xFF, 0x00, 0xFF, 1), baseX + 64 * 3, uly, baseX + 64 * 4, lry); + DrawRec(gfx++, GPACK_RGBA5551(0, 0, 255, 1), baseX + 64 * 0, uly, baseX + 64 * 1, lry); + DrawRec(gfx++, GPACK_RGBA5551(0, 255, 0, 1), baseX + 64 * 1, uly, baseX + 64 * 2, lry); + DrawRec(gfx++, GPACK_RGBA5551(255, 0, 0, 1), baseX + 64 * 2, uly, baseX + 64 * 3, lry); + DrawRec(gfx++, GPACK_RGBA5551(255, 0, 255, 1), baseX + 64 * 3, uly, baseX + 64 * 4, lry); gSpeedMeterTimeEntryPtr = sSpeedMeterTimeEntryArray; for (i = 0; i < ARRAY_COUNT(sSpeedMeterTimeEntryArray); i++) { @@ -174,8 +171,8 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam if (SREG(0) > 2) { if (ZeldaArena_IsInitalized()) { ZeldaArena_GetSizes(&zeldaFreeMax, &zeldaFree, &zeldaAlloc); - SpeedMeter_InitAllocEntry(&entry, zeldaFree + zeldaAlloc, zeldaAlloc, GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), - GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1), ulx, lrx, y, y + 1); + SpeedMeter_InitAllocEntry(&entry, zeldaFree + zeldaAlloc, zeldaAlloc, GPACK_RGBA5551(0, 0, 255, 1), + GPACK_RGBA5551(255, 255, 255, 1), ulx, lrx, y, y + 1); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; y++; @@ -185,33 +182,32 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam if (SREG(0) > 1) { SystemArena_GetSizes(&sysFreeMax, &sysFree, &sysAlloc); SpeedMeter_InitAllocEntry(&entry, sysFree + sysAlloc - state->tha.size, sysAlloc - state->tha.size, - GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), GPACK_RGBA5551(0xFF, 0x80, 0x80, 1), ulx, lrx, y, - y); + GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(255, 128, 128, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; } thga = (TwoHeadGfxArena*)&state->tha; SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THA_GetSize((TwoHeadArena*)thga), - GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), GPACK_RGBA5551(0x00, 0xFF, 0x00, 1), ulx, lrx, y, y); + GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(0, 255, 0, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; thga = &gfxCtx->polyOpa; - SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), - GPACK_RGBA5551(0xFF, 0x00, 0xFF, 1), ulx, lrx, y, y); + SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1), + GPACK_RGBA5551(255, 0, 255, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; thga = &gfxCtx->polyXlu; - SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), - GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1), ulx, lrx, y, y); + SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1), + GPACK_RGBA5551(255, 255, 0, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; thga = &gfxCtx->overlay; - SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0x00, 0x00, 0xFF, 1), - GPACK_RGBA5551(0xFF, 0x00, 0x00, 1), ulx, lrx, y, y); + SpeedMeter_InitAllocEntry(&entry, thga->size, thga->size - THGA_GetSize(thga), GPACK_RGBA5551(0, 0, 255, 1), + GPACK_RGBA5551(255, 0, 0, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); y++; } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 85ab507f06..db059634d5 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -64,7 +64,7 @@ void ActorShadow_DrawFunc_Circle(Actor* actor, LightMapper* lightMapper, GlobalC func_8002B200(actor, lightMapper, globalCtx, &D_04049210, NULL); } -Color_RGBA8 D_80115F80 = { 0xFF, 0xFF, 0xFF, 0xFF }; +Color_RGBA8 D_80115F80 = { 255, 255, 255, 255 }; void ActorShadow_DrawFunc_WhiteCircle(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) { func_8002B200(actor, lightMapper, globalCtx, &D_04049210, &D_80115F80); @@ -238,19 +238,13 @@ typedef struct { } NaviColor; // size = 0x8 NaviColor sNaviColorList[] = { - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0x00, 0x00, 0xFF, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x96, 0x96, 0xFF, 0xFF }, { 0x96, 0x96, 0xFF, 0x00 } }, - { { 0xFF, 0xFF, 0x00, 0xFF }, { 0xC8, 0x9B, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0xFF, 0xFF, 0x00, 0xFF }, { 0xC8, 0x9B, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, - { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, + { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, + { { 255, 255, 255, 255 }, { 0, 0, 255, 0 } }, { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, + { { 150, 150, 255, 255 }, { 150, 150, 255, 0 } }, { { 255, 255, 0, 255 }, { 200, 155, 0, 0 } }, + { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, + { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, { { 255, 255, 0, 255 }, { 200, 155, 0, 0 } }, + { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, + { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, }; // unused @@ -428,7 +422,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Matrix_RotateY((f32)((u16)(globalCtx->gameplayFrames * 3000)) * (M_PI / 32768), MTXMODE_APPLY); Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0400CB70); @@ -1430,34 +1424,30 @@ PosRot* func_8002EF44(PosRot* arg0, Actor* actor) { return arg0; } -#ifdef NON_MATCHING -// single regalloc difference f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { - s16 var; - s16 abs_var; + s16 yawTemp; + s16 yawTempAbs; + f32 ret; - var = (s16)(actor->yawTowardsLink - 0x8000) - arg2; - abs_var = ABS(var); + yawTemp = (s16)(actor->yawTowardsLink - 0x8000) - arg2; + yawTempAbs = ABS(yawTemp); if (player->unk_664 != NULL) { - if ((abs_var > 0x4000) || (actor->flags & 0x8000000)) { + if ((yawTempAbs > 0x4000) || (actor->flags & 0x8000000)) { return FLT_MAX; } else { - return actor->xyzDistFromLinkSq - - actor->xyzDistFromLinkSq * 0.8f * ((0x4000 - abs_var) * 3.0517578125e-05f); + ret = actor->xyzDistFromLinkSq - + actor->xyzDistFromLinkSq * 0.8f * ((0x4000 - yawTempAbs) * 3.0517578125e-05f); + return ret; } } - if (abs_var > 0x2AAA) { + if (yawTempAbs > 0x2AAA) { return FLT_MAX; } return actor->xyzDistFromLinkSq; } -#else -extern f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002EFC0.s") -#endif typedef struct { f32 unk_0, unk_4; @@ -1697,16 +1687,16 @@ void func_8002F850(GlobalContext* globalCtx, Actor* actor) { if (actor->bgCheckFlags & 0x20) { if (actor->waterY < 20.0f) { - sfxId = NA_SE_PL_WALK_WATER0; + sfxId = NA_SE_PL_WALK_WATER0 - SFX_FLAG; } else { - sfxId = NA_SE_PL_WALK_WATER1; + sfxId = NA_SE_PL_WALK_WATER1 - SFX_FLAG; } } else { - sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource, actor); + sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource); } func_80078914(&actor->projectedPos, NA_SE_EV_BOMB_BOUND); - func_80078914(&actor->projectedPos, sfxId + 0x800); + func_80078914(&actor->projectedPos, sfxId + SFX_FLAG); } void func_8002F8F0(Actor* actor, u16 sfxId) { @@ -1732,15 +1722,15 @@ void func_8002F974(Actor* actor, u16 sfxId) { actor->sfx = sfxId; } -void func_8002F994(Actor* actor, s32 sfxId) { +void func_8002F994(Actor* actor, s32 arg1) { actor->flags |= 0x10000000; actor->flags &= ~0x00380000; - if (sfxId < NA_SE_PL_LAND_GRASS) { - actor->sfx = NA_SE_PL_WALK_DIRT; - } else if (sfxId < NA_SE_PL_DIVE_BUBBLE) { - actor->sfx = NA_SE_PL_WALK_CONCRETE; + if (arg1 < 40) { + actor->sfx = NA_SE_PL_WALK_DIRT - SFX_FLAG; + } else if (arg1 < 100) { + actor->sfx = NA_SE_PL_WALK_CONCRETE - SFX_FLAG; } else { - actor->sfx = NA_SE_PL_WALK_SAND; + actor->sfx = NA_SE_PL_WALK_SAND - SFX_FLAG; } } @@ -1795,8 +1785,8 @@ void func_8002FA60(GlobalContext* globalCtx) { Vec3f D_80116048 = { 0.0f, -0.05f, 0.0f }; Vec3f D_80116054 = { 0.0f, -0.025f, 0.0f }; -Color_RGB8 D_80116060 = { 0xFF, 0xFF, 0xFF }; -Color_RGB8 D_80116064 = { 0x64, 0xC8, 0x00 }; +Color_RGB8 D_80116060 = { 255, 255, 255 }; +Color_RGB8 D_80116064 = { 100, 200, 0 }; #ifdef NON_MATCHING // saved register, stack usage and minor ordering differences @@ -1932,8 +1922,8 @@ void func_8002FBAC(GlobalContext* globalCtx) { Matrix_Push(); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xC8, spD0); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0xC8, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 200, spD0); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 200, 0, 255); phi_f10 = (globalCtx->gameplayFrames * 1500) & 0xFFFF; Matrix_RotateZ((phi_f10 * M_PI) / 32768.0f, MTXMODE_APPLY); @@ -2110,7 +2100,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { actor->yawTowardsLink = func_8002DA78(actor, &player->actor); actor->flags &= ~0x1000000; - if ((DECR(actor->freeze) == 0) && (actor->flags & 0x50)) { + if ((DECR(actor->freezeTimer) == 0) && (actor->flags & 0x50)) { if (actor == player->unk_664) { actor->unk_10C = 1; } else { @@ -2220,7 +2210,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { if (actor->dmgEffectTimer != 0) { // Must be inline data to match - Color_RGBA8 sp2C = { 0x00, 0x00, 0x00, 0xFF }; + Color_RGBA8 sp2C = { 0, 0, 0, 255 }; if (actor->dmgEffectParams & 0x8000) { sp2C.r = sp2C.g = sp2C.b = ((actor->dmgEffectParams & 0x1F00) >> 5) | 7; } else if (actor->dmgEffectParams & 0x4000) { @@ -2263,7 +2253,7 @@ void func_80030ED8(Actor* actor) { } else if (actor->flags & 0x200000) { func_800788CC(actor->sfx); } else if (actor->flags & 0x10000000) { - func_800F4C58(&D_801333D4, 0x2021, (s8)(actor->sfx - 1)); + func_800F4C58(&D_801333D4, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1)); } else { func_80078914(&actor->projectedPos, actor->sfx); } @@ -2305,7 +2295,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PRIM | Z_UPD | G_RM_CLD_SURF | G_RM_CLD_SURF2); gDPSetCombineMode(gfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0x00, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 0, 0, 255); } else { gDPSetOtherMode(gfxCtx->polyXlu.p++, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | @@ -2315,7 +2305,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi GBL_c2(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA)); gDPSetCombineLERP(gfxCtx->polyXlu.p++, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0xFF, 0x4A, 0x4A, 0x4A, 0x4A); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0xFF, 74, 74, 74, 74); } gDPSetPrimDepth(gfxCtx->polyXlu.p++, 0, 0); @@ -2346,7 +2336,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PRIM | G_RM_CLD_SURF | G_RM_CLD_SURF2); gDPSetCombineMode(gfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0x00, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 0, 0, 255); func_80030FA8(gfxCtx); @@ -2370,7 +2360,8 @@ s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { var = (arg3 < 1.0f) ? 1.0f : 1.0f / arg3; - if ((((fabsf(arg2->x) - actor->uncullZoneScale) * var) < 1.0f) && (((arg2->y + actor->uncullZoneDownward) * var) > -1.0f) && + if ((((fabsf(arg2->x) - actor->uncullZoneScale) * var) < 1.0f) && + (((arg2->y + actor->uncullZoneDownward) * var) > -1.0f) && (((arg2->y - actor->uncullZoneScale) * var) < 1.0f)) { return 1; } @@ -2502,14 +2493,14 @@ void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) { u8 sEnemyActorTypes[] = { ACTORTYPE_ENEMY, ACTORTYPE_BOSS }; -void Actor_FreezeAllEnemies(GlobalContext* globalCtx, ActorContext* actorCtx, s32 freezeValue) { +void Actor_FreezeAllEnemies(GlobalContext* globalCtx, ActorContext* actorCtx, s32 duration) { Actor* actor; s32 i; for (i = 0; i < ARRAY_COUNT(sEnemyActorTypes); i++) { actor = actorCtx->actorList[sEnemyActorTypes[i]].first; while (actor != NULL) { - actor->freeze = freezeValue; + actor->freezeTimer = duration; actor = actor->next; } } @@ -3469,7 +3460,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0x00, 0x00, 0x00, alpha); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, alpha); sp50.x = arg0->x; sp50.y = arg0->y + 1.0f; @@ -3710,31 +3701,31 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, sp44 = Math_Vec3f_Yaw(&sp30, &arg1->unk_18); sp40 = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18) - actor->shape.rot.y; - temp1 = (sp40 < -arg2) ? -arg2 : ((sp40 > arg2) ? arg2 : sp40); + temp1 = CLAMP(sp40, -arg2, arg2); Math_SmoothScaleMaxMinS(&arg1->unk_08.y, temp1, 6, 2000, 1); - sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); - arg1->unk_08.y = ((arg1->unk_08.y < -sp40) ? -sp40 : ((arg1->unk_08.y > sp40) ? sp40 : arg1->unk_08.y)); + sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40); + arg1->unk_08.y = CLAMP(arg1->unk_08.y, -sp40, sp40); sp40 = sp40 - arg1->unk_08.y; - temp1 = (sp40 < -arg5) ? -arg5 : ((sp40 > arg5) ? arg5 : sp40); - Math_SmoothScaleMaxMinS(&arg1->unk_08.z, temp1, 6, 2000, 1); + temp1 = CLAMP(sp40, -arg5, arg5); + Math_SmoothScaleMaxMinS(&arg1->unk_0E.y, temp1, 6, 2000, 1); - sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); - arg1->unk_08.z = ((arg1->unk_08.z < -sp40) ? -sp40 : ((arg1->unk_08.z > sp40) ? sp40 : arg1->unk_08.z)); + sp40 = (ABS(sp40) >= 0x8000) ? 0 : ABS(sp40); + arg1->unk_0E.y = CLAMP(arg1->unk_0E.y, -sp40, sp40); if (arg8 != 0) { if (arg3) {} // Seems necessary to match Math_SmoothScaleMaxMinS(&actor->shape.rot.y, sp44, 6, 2000, 1); } - temp1 = (sp46 < arg4) ? arg4 : ((sp46 > arg3) ? arg3 : sp46); - Math_SmoothScaleMaxMinS(&arg1->unk_08, temp1, 6, 2000, 1); + temp1 = CLAMP(sp46, arg4, arg3); + Math_SmoothScaleMaxMinS(&arg1->unk_08.x, temp1, 6, 2000, 1); temp2 = sp46 - arg1->unk_08.x; - temp1 = (temp2 < arg7) ? arg7 : ((temp2 > arg6) ? arg6 : temp2); + temp1 = CLAMP(temp2, arg7, arg6); Math_SmoothScaleMaxMinS(&arg1->unk_0E.x, temp1, 6, 2000, 1); } #else @@ -3849,7 +3840,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD func_80093D18(globalCtx->state.gfxCtx); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, alpha); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, alpha); gDPPipeSync(gfxCtx->polyOpa.p++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); @@ -3869,7 +3860,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD func_80093D84(globalCtx->state.gfxCtx); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, alpha); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, @@ -4004,13 +3995,13 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar Color_RGB8 color1; Color_RGB8 color2; - color1.r = 0xC8; - color1.g = 0xA0; - color1.b = 0x78; + color1.r = 200; + color1.g = 160; + color1.b = 120; - color2.r = 0x82; - color2.g = 0x5A; - color2.b = 0x32; + color2.r = 130; + color2.g = 90; + color2.b = 50; func_80028B74(globalCtx, arg1, arg2, arg3, &color1, &color2); } @@ -4053,7 +4044,7 @@ void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { if (colBody->acHitItem == NULL) { actor->unk_116 = 0x00; } else if (freezeFlag && (colBody->acHitItem->toucher.flags & 0x10060000)) { - actor->freeze = colBody->acHitItem->toucher.damage; + actor->freezeTimer = colBody->acHitItem->toucher.damage; actor->unk_116 = 0x00; } else if (colBody->acHitItem->toucher.flags & 0x0800) { actor->unk_116 = 0x01; @@ -4069,7 +4060,7 @@ void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { actor->unk_116 = 0x20; } else if ((colBody->acHitItem->toucher.flags << 0xC) < 0) { if (freezeFlag) { - actor->freeze = colBody->acHitItem->toucher.damage; + actor->freezeTimer = colBody->acHitItem->toucher.damage; } actor->unk_116 = 0x40; } else { @@ -4089,7 +4080,7 @@ void func_8003573C(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag) { if (curColBody->acHitItem == NULL) { flag = 0x00; } else if (freezeFlag && (curColBody->acHitItem->toucher.flags & 0x10060000)) { - actor->freeze = curColBody->acHitItem->toucher.damage; + actor->freezeTimer = curColBody->acHitItem->toucher.damage; flag = 0x00; } else if (curColBody->acHitItem->toucher.flags & 0x0800) { flag = 0x01; @@ -4105,7 +4096,7 @@ void func_8003573C(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag) { flag = 0x20; } else if (curColBody->acHitItem->toucher.flags & 0x80000) { if (freezeFlag) { - actor->freeze = curColBody->acHitItem->toucher.damage; + actor->freezeTimer = curColBody->acHitItem->toucher.damage; } flag = 0x40; } else { diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 510340516b..029bee22eb 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3366,7 +3366,7 @@ void func_80059EC8(Camera* camera) { Gameplay_ChangeCameraStatus(camera->globalCtx, camera->unk_162, 7); if ((camera->unk_162 == 0) && (camera->unk_168 != 0)) { - player->actor.freeze = 0; + player->actor.freezeTimer = 0; player->stateFlags1 &= ~0x20000000; if (player->action != 0) { @@ -3518,7 +3518,7 @@ s32 Camera_ChangeMode(Camera* camera, s16 mode, u8 arg2) { if (camera->status == 7) { switch (phi_v0) { case 1: - func_80078884(NA_SE_PL_WALK_GROUND); + func_80078884(NA_SE_PL_WALK_GROUND - SFX_FLAG); break; case 2: if (1 == camera->globalCtx->roomCtx.curRoom.unk_03) { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index c8729cb329..8afb26877a 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1243,38 +1243,38 @@ void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { D_8015D8A0.position.z = (s32)v->z; D_8015D8A0.uDiv = 5; D_8015D8A0.vDiv = 5; - D_8015D8A0.colorStart[0].r = 0x0A; - D_8015D8A0.colorStart[0].g = 0x0A; - D_8015D8A0.colorStart[0].b = 0xC8; - D_8015D8A0.colorStart[0].a = 0xFF; - D_8015D8A0.colorStart[1].r = 0x00; - D_8015D8A0.colorStart[1].g = 0x00; - D_8015D8A0.colorStart[1].b = 0x80; - D_8015D8A0.colorStart[1].a = 0xFF; - D_8015D8A0.colorStart[2].r = 0x00; - D_8015D8A0.colorStart[2].g = 0x00; - D_8015D8A0.colorStart[2].b = 0x80; - D_8015D8A0.colorStart[2].a = 0xFF; - D_8015D8A0.colorStart[3].r = 0x00; - D_8015D8A0.colorStart[3].g = 0x00; - D_8015D8A0.colorStart[3].b = 0x80; - D_8015D8A0.colorStart[3].a = 0xFF; - D_8015D8A0.colorEnd[0].r = 0x00; - D_8015D8A0.colorEnd[0].g = 0x00; - D_8015D8A0.colorEnd[0].b = 0x20; - D_8015D8A0.colorEnd[0].a = 0x00; - D_8015D8A0.colorEnd[1].r = 0x00; - D_8015D8A0.colorEnd[1].g = 0x00; - D_8015D8A0.colorEnd[1].b = 0x20; - D_8015D8A0.colorEnd[1].a = 0x00; - D_8015D8A0.colorEnd[2].r = 0x00; - D_8015D8A0.colorEnd[2].g = 0x00; - D_8015D8A0.colorEnd[2].b = 0x40; - D_8015D8A0.colorEnd[2].a = 0x00; - D_8015D8A0.colorEnd[3].r = 0x00; - D_8015D8A0.colorEnd[3].g = 0x00; - D_8015D8A0.colorEnd[3].b = 0x40; - D_8015D8A0.colorEnd[3].a = 0x00; + D_8015D8A0.colorStart[0].r = 10; + D_8015D8A0.colorStart[0].g = 10; + D_8015D8A0.colorStart[0].b = 200; + D_8015D8A0.colorStart[0].a = 255; + D_8015D8A0.colorStart[1].r = 0; + D_8015D8A0.colorStart[1].g = 0; + D_8015D8A0.colorStart[1].b = 128; + D_8015D8A0.colorStart[1].a = 255; + D_8015D8A0.colorStart[2].r = 0; + D_8015D8A0.colorStart[2].g = 0; + D_8015D8A0.colorStart[2].b = 128; + D_8015D8A0.colorStart[2].a = 255; + D_8015D8A0.colorStart[3].r = 0; + D_8015D8A0.colorStart[3].g = 0; + D_8015D8A0.colorStart[3].b = 128; + D_8015D8A0.colorStart[3].a = 255; + D_8015D8A0.colorEnd[0].r = 0; + D_8015D8A0.colorEnd[0].g = 0; + D_8015D8A0.colorEnd[0].b = 32; + D_8015D8A0.colorEnd[0].a = 0; + D_8015D8A0.colorEnd[1].r = 0; + D_8015D8A0.colorEnd[1].g = 0; + D_8015D8A0.colorEnd[1].b = 32; + D_8015D8A0.colorEnd[1].a = 0; + D_8015D8A0.colorEnd[2].r = 0; + D_8015D8A0.colorEnd[2].g = 0; + D_8015D8A0.colorEnd[2].b = 64; + D_8015D8A0.colorEnd[2].a = 0; + D_8015D8A0.colorEnd[3].r = 0; + D_8015D8A0.colorEnd[3].g = 0; + D_8015D8A0.colorEnd[3].b = 64; + D_8015D8A0.colorEnd[3].a = 0; D_8015D8A0.timer = 0; D_8015D8A0.duration = 16; D_8015D8A0.speed = 8.0f; @@ -1299,38 +1299,38 @@ void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { D_8015DD68.position.z = (s32)v->z; D_8015DD68.uDiv = 5; D_8015DD68.vDiv = 5; - D_8015DD68.colorStart[0].r = 0x0A; - D_8015DD68.colorStart[0].g = 0xC8; - D_8015DD68.colorStart[0].b = 0x0A; - D_8015DD68.colorStart[0].a = 0xFF; - D_8015DD68.colorStart[1].r = 0x00; - D_8015DD68.colorStart[1].g = 0x80; - D_8015DD68.colorStart[1].b = 0x00; - D_8015DD68.colorStart[1].a = 0xFF; - D_8015DD68.colorStart[2].r = 0x00; - D_8015DD68.colorStart[2].g = 0x80; - D_8015DD68.colorStart[2].b = 0x00; - D_8015DD68.colorStart[2].a = 0xFF; - D_8015DD68.colorStart[3].r = 0x00; - D_8015DD68.colorStart[3].g = 0x80; - D_8015DD68.colorStart[3].b = 0x00; - D_8015DD68.colorStart[3].a = 0xFF; - D_8015DD68.colorEnd[0].r = 0x00; - D_8015DD68.colorEnd[0].g = 0x20; - D_8015DD68.colorEnd[0].b = 0x00; - D_8015DD68.colorEnd[0].a = 0x00; - D_8015DD68.colorEnd[1].r = 0x00; - D_8015DD68.colorEnd[1].g = 0x20; - D_8015DD68.colorEnd[1].b = 0x00; - D_8015DD68.colorEnd[1].a = 0x00; - D_8015DD68.colorEnd[2].r = 0x00; - D_8015DD68.colorEnd[2].g = 0x40; - D_8015DD68.colorEnd[2].b = 0x00; - D_8015DD68.colorEnd[2].a = 0x00; - D_8015DD68.colorEnd[3].r = 0x00; - D_8015DD68.colorEnd[3].g = 0x40; - D_8015DD68.colorEnd[3].b = 0x00; - D_8015DD68.colorEnd[3].a = 0x00; + D_8015DD68.colorStart[0].r = 10; + D_8015DD68.colorStart[0].g = 200; + D_8015DD68.colorStart[0].b = 10; + D_8015DD68.colorStart[0].a = 255; + D_8015DD68.colorStart[1].r = 0; + D_8015DD68.colorStart[1].g = 128; + D_8015DD68.colorStart[1].b = 0; + D_8015DD68.colorStart[1].a = 255; + D_8015DD68.colorStart[2].r = 0; + D_8015DD68.colorStart[2].g = 128; + D_8015DD68.colorStart[2].b = 0; + D_8015DD68.colorStart[2].a = 255; + D_8015DD68.colorStart[3].r = 0; + D_8015DD68.colorStart[3].g = 128; + D_8015DD68.colorStart[3].b = 0; + D_8015DD68.colorStart[3].a = 255; + D_8015DD68.colorEnd[0].r = 0; + D_8015DD68.colorEnd[0].g = 32; + D_8015DD68.colorEnd[0].b = 0; + D_8015DD68.colorEnd[0].a = 0; + D_8015DD68.colorEnd[1].r = 0; + D_8015DD68.colorEnd[1].g = 32; + D_8015DD68.colorEnd[1].b = 0; + D_8015DD68.colorEnd[1].a = 0; + D_8015DD68.colorEnd[2].r = 0; + D_8015DD68.colorEnd[2].g = 64; + D_8015DD68.colorEnd[2].b = 0; + D_8015DD68.colorEnd[2].a = 0; + D_8015DD68.colorEnd[3].r = 0; + D_8015DD68.colorEnd[3].g = 64; + D_8015DD68.colorEnd[3].b = 0; + D_8015DD68.colorEnd[3].a = 0; D_8015DD68.timer = 0; D_8015DD68.duration = 16; D_8015DD68.speed = 8.0f; @@ -1408,14 +1408,14 @@ s32 func_8005E4F8(Collider* left, ColliderBody* rightBody) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if (rightBody->flags == 1) { - Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0, - &D_801333E8); - } else if (2 == rightBody->flags) { - Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0, - &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &left->actor->projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } else if (rightBody->flags == 2) { + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &left->actor->projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } else if (rightBody->flags == 3) { - Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0, - &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &left->actor->projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } } @@ -2949,38 +2949,38 @@ void func_80062A28(GlobalContext* globalCtx, Vec3f* v) { D_8015CF10.position.z = (s32)v->z; D_8015CF10.uDiv = 5; D_8015CF10.vDiv = 5; - D_8015CF10.colorStart[0].r = 0x80; - D_8015CF10.colorStart[0].g = 0x00; - D_8015CF10.colorStart[0].b = 0x40; - D_8015CF10.colorStart[0].a = 0xFF; - D_8015CF10.colorStart[1].r = 0x80; - D_8015CF10.colorStart[1].g = 0x00; - D_8015CF10.colorStart[1].b = 0x40; - D_8015CF10.colorStart[1].a = 0xFF; - D_8015CF10.colorStart[2].r = 0xFF; - D_8015CF10.colorStart[2].g = 0x80; - D_8015CF10.colorStart[2].b = 0x00; - D_8015CF10.colorStart[2].a = 0xFF; - D_8015CF10.colorStart[3].r = 0xFF; - D_8015CF10.colorStart[3].g = 0x80; - D_8015CF10.colorStart[3].b = 0x00; - D_8015CF10.colorStart[3].a = 0xFF; - D_8015CF10.colorEnd[0].r = 0x40; - D_8015CF10.colorEnd[0].g = 0x00; - D_8015CF10.colorEnd[0].b = 0x20; - D_8015CF10.colorEnd[0].a = 0x00; - D_8015CF10.colorEnd[1].r = 0x40; - D_8015CF10.colorEnd[1].g = 0x00; - D_8015CF10.colorEnd[1].b = 0x20; - D_8015CF10.colorEnd[1].a = 0x00; - D_8015CF10.colorEnd[2].r = 0x80; - D_8015CF10.colorEnd[2].g = 0x00; - D_8015CF10.colorEnd[2].b = 0x40; - D_8015CF10.colorEnd[2].a = 0x00; - D_8015CF10.colorEnd[3].r = 0x80; - D_8015CF10.colorEnd[3].g = 0x00; - D_8015CF10.colorEnd[3].b = 0x40; - D_8015CF10.colorEnd[3].a = 0x00; + D_8015CF10.colorStart[0].r = 128; + D_8015CF10.colorStart[0].g = 0; + D_8015CF10.colorStart[0].b = 64; + D_8015CF10.colorStart[0].a = 255; + D_8015CF10.colorStart[1].r = 128; + D_8015CF10.colorStart[1].g = 0; + D_8015CF10.colorStart[1].b = 64; + D_8015CF10.colorStart[1].a = 255; + D_8015CF10.colorStart[2].r = 255; + D_8015CF10.colorStart[2].g = 128; + D_8015CF10.colorStart[2].b = 0; + D_8015CF10.colorStart[2].a = 255; + D_8015CF10.colorStart[3].r = 255; + D_8015CF10.colorStart[3].g = 128; + D_8015CF10.colorStart[3].b = 0; + D_8015CF10.colorStart[3].a = 255; + D_8015CF10.colorEnd[0].r = 64; + D_8015CF10.colorEnd[0].g = 0; + D_8015CF10.colorEnd[0].b = 32; + D_8015CF10.colorEnd[0].a = 0; + D_8015CF10.colorEnd[1].r = 64; + D_8015CF10.colorEnd[1].g = 0; + D_8015CF10.colorEnd[1].b = 32; + D_8015CF10.colorEnd[1].a = 0; + D_8015CF10.colorEnd[2].r = 128; + D_8015CF10.colorEnd[2].g = 0; + D_8015CF10.colorEnd[2].b = 64; + D_8015CF10.colorEnd[2].a = 0; + D_8015CF10.colorEnd[3].r = 128; + D_8015CF10.colorEnd[3].g = 0; + D_8015CF10.colorEnd[3].b = 64; + D_8015CF10.colorEnd[3].a = 0; D_8015CF10.timer = 0; D_8015CF10.duration = 16; D_8015CF10.speed = 8.0f; @@ -3004,38 +3004,38 @@ void func_80062B80(GlobalContext* globalCtx, Vec3f* v) { D_8015D3D8.position.z = (s32)v->z; D_8015D3D8.uDiv = 5; D_8015D3D8.vDiv = 5; - D_8015D3D8.colorStart[0].r = 0xFF; - D_8015D3D8.colorStart[0].g = 0xFF; - D_8015D3D8.colorStart[0].b = 0xFF; - D_8015D3D8.colorStart[0].a = 0xFF; - D_8015D3D8.colorStart[1].r = 0x64; - D_8015D3D8.colorStart[1].g = 0x64; - D_8015D3D8.colorStart[1].b = 0x64; - D_8015D3D8.colorStart[1].a = 0x64; - D_8015D3D8.colorStart[2].r = 0x64; - D_8015D3D8.colorStart[2].g = 0x64; - D_8015D3D8.colorStart[2].b = 0x64; - D_8015D3D8.colorStart[2].a = 0x64; - D_8015D3D8.colorStart[3].r = 0x64; - D_8015D3D8.colorStart[3].g = 0x64; - D_8015D3D8.colorStart[3].b = 0x64; - D_8015D3D8.colorStart[3].a = 0x64; - D_8015D3D8.colorEnd[0].r = 0x32; - D_8015D3D8.colorEnd[0].g = 0x32; - D_8015D3D8.colorEnd[0].b = 0x32; - D_8015D3D8.colorEnd[0].a = 0x32; - D_8015D3D8.colorEnd[1].r = 0x32; - D_8015D3D8.colorEnd[1].g = 0x32; - D_8015D3D8.colorEnd[1].b = 0x32; - D_8015D3D8.colorEnd[1].a = 0x32; - D_8015D3D8.colorEnd[2].r = 0x32; - D_8015D3D8.colorEnd[2].g = 0x32; - D_8015D3D8.colorEnd[2].b = 0x32; - D_8015D3D8.colorEnd[2].a = 0x32; - D_8015D3D8.colorEnd[3].r = 0x00; - D_8015D3D8.colorEnd[3].g = 0x00; - D_8015D3D8.colorEnd[3].b = 0x00; - D_8015D3D8.colorEnd[3].a = 0x00; + D_8015D3D8.colorStart[0].r = 255; + D_8015D3D8.colorStart[0].g = 255; + D_8015D3D8.colorStart[0].b = 255; + D_8015D3D8.colorStart[0].a = 255; + D_8015D3D8.colorStart[1].r = 100; + D_8015D3D8.colorStart[1].g = 100; + D_8015D3D8.colorStart[1].b = 100; + D_8015D3D8.colorStart[1].a = 100; + D_8015D3D8.colorStart[2].r = 100; + D_8015D3D8.colorStart[2].g = 100; + D_8015D3D8.colorStart[2].b = 100; + D_8015D3D8.colorStart[2].a = 100; + D_8015D3D8.colorStart[3].r = 100; + D_8015D3D8.colorStart[3].g = 100; + D_8015D3D8.colorStart[3].b = 100; + D_8015D3D8.colorStart[3].a = 100; + D_8015D3D8.colorEnd[0].r = 50; + D_8015D3D8.colorEnd[0].g = 50; + D_8015D3D8.colorEnd[0].b = 50; + D_8015D3D8.colorEnd[0].a = 50; + D_8015D3D8.colorEnd[1].r = 50; + D_8015D3D8.colorEnd[1].g = 50; + D_8015D3D8.colorEnd[1].b = 50; + D_8015D3D8.colorEnd[1].a = 50; + D_8015D3D8.colorEnd[2].r = 50; + D_8015D3D8.colorEnd[2].g = 50; + D_8015D3D8.colorEnd[2].b = 50; + D_8015D3D8.colorEnd[2].a = 50; + D_8015D3D8.colorEnd[3].r = 0; + D_8015D3D8.colorEnd[3].g = 0; + D_8015D3D8.colorEnd[3].b = 0; + D_8015D3D8.colorEnd[3].a = 0; D_8015D3D8.timer = 0; D_8015D3D8.duration = 16; D_8015D3D8.speed = 8.0f; diff --git a/src/code/z_construct.c b/src/code/z_construct.c index e4159a5836..42f2789771 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -171,16 +171,16 @@ void func_801109B0(GlobalContext* globalCtx) { interfaceCtx->unk_23C = 0; R_ITEM_BTN_X(0) = 160; - R_B_BTN_COLOR(0) = 0xFF; - R_B_BTN_COLOR(1) = 0x1E; - R_B_BTN_COLOR(2) = 0x1E; + R_B_BTN_COLOR(0) = 255; + R_B_BTN_COLOR(1) = 30; + R_B_BTN_COLOR(2) = 30; R_ITEM_ICON_X(0) = 160; R_ITEM_AMMO_X(0) = 162; R_A_BTN_X = 186; R_A_ICON_X = 186; - R_A_BTN_COLOR(0) = 0x00; - R_A_BTN_COLOR(1) = 0xC8; - R_A_BTN_COLOR(2) = 0x32; + R_A_BTN_COLOR(0) = 0; + R_A_BTN_COLOR(1) = 200; + R_A_BTN_COLOR(2) = 50; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_construct/func_801109B0.s") @@ -290,7 +290,7 @@ void func_80111070(void) { YREG(94) = 3; YREG(95) = 1; R_MAGIC_FILL_COLOR(0) = 0; - R_MAGIC_FILL_COLOR(1) = 0xC8; + R_MAGIC_FILL_COLOR(1) = 200; R_MAGIC_FILL_COLOR(2) = 0; ZREG(9) = 0x8C; ZREG(10) = 0xC8; @@ -321,8 +321,8 @@ void func_80111070(void) { ZREG(36) = 0; ZREG(37) = 0; ZREG(38) = 0; - R_C_BTN_COLOR(0) = 0xFF; - R_C_BTN_COLOR(1) = 0xA0; + R_C_BTN_COLOR(0) = 255; + R_C_BTN_COLOR(1) = 160; R_C_BTN_COLOR(2) = 0; ZREG(46) = 1; ZREG(47) = 1; @@ -548,8 +548,8 @@ void func_80111070(void) { R_COMPASS_OFFSET_X = 0x6E; R_COMPASS_OFFSET_Y = -0x2E4; R_MINIMAP_COLOR(0) = 0; - R_MINIMAP_COLOR(1) = 0xFF; - R_MINIMAP_COLOR(2) = 0xFF; + R_MINIMAP_COLOR(1) = 255; + R_MINIMAP_COLOR(2) = 255; } VREG(21) = 0; diff --git a/src/code/z_debug.c b/src/code/z_debug.c index a595de5a68..658f641442 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -20,8 +20,8 @@ PrintTextBuffer D_8015FA98[0x16]; s16 D_8011E0B0 = 0; // PrintTextBuffer index Color_RGBA8 printTextColors[] = { - { 0xFF, 0xFF, 0x20, 0xC0 }, { 0xFF, 0x96, 0x80, 0xC0 }, { 0x80, 0x60, 0x00, 0x40 }, { 0xC0, 0x80, 0x10, 0x80 }, - { 0xFF, 0xC0, 0x20, 0x80 }, { 0xE6, 0xE6, 0xDC, 0x40 }, { 0x80, 0x96, 0xFF, 0x80 }, { 0x80, 0xFF, 0x20, 0x80 }, + { 255, 255, 32, 192 }, { 255, 150, 128, 192 }, { 128, 96, 0, 64 }, { 192, 128, 16, 128 }, + { 255, 192, 32, 128 }, { 230, 230, 220, 64 }, { 128, 150, 255, 128 }, { 128, 255, 32, 128 }, }; InputCombo inputCombos[REG_GROUPS] = { @@ -201,16 +201,16 @@ void func_80063C04(GfxPrint* gfxPrint) { name[0] = 'R'; name[1] = regChar[gGameInfo->regGroup]; // r_group type char name[2] = '\0'; - GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80); + GfxPrint_SetColor(gfxPrint, 0, 128, 128, 128); for (i = 0; i != REG_PER_PAGE; i++) { if (i == gGameInfo->regCur) { - GfxPrint_SetColor(gfxPrint, 0, 0xff, 0xff, 0xff); + GfxPrint_SetColor(gfxPrint, 0, 255, 255, 255); } GfxPrint_SetPos(gfxPrint, 3, i + 5); GfxPrint_Printf(gfxPrint, "%s%02d%6d", &name, page + i, gGameInfo->data[i + regGroup]); if (i == gGameInfo->regCur) { - GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80); + GfxPrint_SetColor(gfxPrint, 0, 128, 128, 128); } } } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index df0f8c227c..1e03b4e610 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -137,7 +137,7 @@ u32 func_8006472C(GlobalContext* globalCtx, CutsceneContext* csCtx, f32 target) void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { Interface_ChangeAlpha(1); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); @@ -148,7 +148,7 @@ void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_800647C0(GlobalContext* globalCtx, CutsceneContext* csCtx) { func_80068C3C(globalCtx, csCtx); Interface_ChangeAlpha(1); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); @@ -296,15 +296,15 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* gSaveContext.eventChkInf[6] |= 0x0200; break; case 22: - D_801614B0.r = 0xFF; - D_801614B0.g = 0xFF; - D_801614B0.b = 0xFF; - D_801614B0.a = 0xFF; + D_801614B0.r = 255; + D_801614B0.g = 255; + D_801614B0.b = 255; + D_801614B0.a = 255; break; case 23: - D_801614B0.r = 0xFF; - D_801614B0.g = 0xB4; - D_801614B0.b = 0x64; + D_801614B0.r = 255; + D_801614B0.g = 180; + D_801614B0.b = 100; D_801614B0.a = 255.0f * temp; break; case 24: @@ -358,7 +358,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* if (sp3F != 0) { globalCtx->envCtx.unk_E6 = 1; } - func_800788CC(0x20C0); + func_800788CC(NA_SE_EV_SAND_STORM - SFX_FLAG); break; case 33: gSaveContext.unk_1422 = 1; @@ -1440,11 +1440,11 @@ void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx, if (D_8011E1C0 != cmd->base) { D_8011E1C0 = cmd->base; if ((cmd->type == 3) && CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) { - func_8010B680(globalCtx, cmd->textId1, 0); + func_8010B680(globalCtx, cmd->textId1, NULL); } else if ((cmd->type == 4) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { - func_8010B680(globalCtx, cmd->textId1, 0); + func_8010B680(globalCtx, cmd->textId1, NULL); } else { - func_8010B680(globalCtx, cmd->base, 0); + func_8010B680(globalCtx, cmd->base, NULL); } return; } @@ -1964,8 +1964,8 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (gSaveContext.cutsceneTrigger == 0) { Interface_ChangeAlpha(1); - func_800B3840(0x20); - func_800B38A4(0x20); + ShrinkWindow_SetVal(0x20); + ShrinkWindow_SetCurrentVal(0x20); csCtx->state++; } @@ -2018,10 +2018,10 @@ void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) { } } -#ifdef NON_MATCHING -// regalloc differences void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) { - osSyncPrintf("\ngame_info.mode=[%d] restart_flag", gSaveContext.respawnFlag); + s32 temp; // inline temp needed to match regalloc + + osSyncPrintf("\ngame_info.mode=[%d] restart_flag", temp = gSaveContext.respawnFlag); if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) { if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(0xAC)) { @@ -2040,21 +2040,18 @@ void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) { gSaveContext.cutsceneIndex = 0xFFF0; } else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) && LINK_IS_ADULT && !Flags_GetEventChkInf(0xC4) && - (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_TOKINOMA)) { + (gEntranceTable[temp = gSaveContext.entranceIndex].scene == SCENE_TOKINOMA)) { Flags_SetEventChkInf(0xC4); gSaveContext.entranceIndex = 0x0053; gSaveContext.cutsceneIndex = 0xFFF8; } else if (!Flags_GetEventChkInf(0xC7) && - (gEntranceTable[gSaveContext.entranceIndex].scene == SCENE_GANON_DEMO)) { + (gEntranceTable[temp = gSaveContext.entranceIndex].scene == SCENE_GANON_DEMO)) { Flags_SetEventChkInf(0xC7); gSaveContext.entranceIndex = 0x0517; gSaveContext.cutsceneIndex = 0xFFF0; } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_HandleConditionalTriggers.s") -#endif void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) { if (SEGMENT_NUMBER(segment) != 0) { diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index bad6871ab9..e6d9b5232d 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -139,14 +139,14 @@ void EffectBlure_Init1(void* thisx, void* initParamsx) { this->addAngleChange = 0; this->addAngle = 0; this->drawMode = 0; - this->altPrimColor.r = 0x00; - this->altPrimColor.g = 0x00; - this->altPrimColor.b = 0x00; - this->altPrimColor.a = 0x00; - this->altEnvColor.r = 0x00; - this->altEnvColor.g = 0x00; - this->altEnvColor.b = 0x00; - this->altEnvColor.a = 0x00; + this->altPrimColor.r = 0; + this->altPrimColor.g = 0; + this->altPrimColor.b = 0; + this->altPrimColor.a = 0; + this->altEnvColor.r = 0; + this->altEnvColor.g = 0; + this->altEnvColor.b = 0; + this->altEnvColor.a = 0; this->mode4Param = 1.0f; } } @@ -372,14 +372,14 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 sp30 = sp30; // Optimized out but seems necessary to match stack usage if (this->flags & 0x10) { - color1->a = 0xFF; - color1->b = 0xFF; - color1->g = 0xFF; - color1->r = 0xFF; - color2->r = 0xFF; - color2->g = 0xFF; - color2->b = 0xFF; - color2->a = 0xFF; + color1->a = 255; + color1->b = 255; + color1->g = 255; + color1->r = 255; + color2->r = 255; + color2->g = 255; + color2->b = 255; + color2->a = 255; } else { color1->r = func_80027E84(this->p1StartColor.r, this->p1EndColor.r, ratio); color1->g = func_80027E84(this->p1StartColor.g, this->p1EndColor.g, ratio); diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 05e60bdcd7..885e94b143 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -18,7 +18,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a gDPPipeSync(displayListHead++); if (color == NULL) { - gDPSetFogColor(displayListHead++, 0xFF, 0x00, 0x00, 0x00); + gDPSetFogColor(displayListHead++, 255, 0, 0, 0); } else { gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); } @@ -88,7 +88,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a gDPPipeSync(displayListHead++); if (color == NULL) { - gDPSetFogColor(displayListHead++, 0xFF, 0x00, 0x00, 0x00); + gDPSetFogColor(displayListHead++, 255, 0, 0, 0); } else { gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); } diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 8c99bb3800..03754d7c40 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -89,7 +89,7 @@ void EffectSs_Reset(EffectSs* effectSs) { effectSs->draw = NULL; effectSs->update = NULL; effectSs->unk_38 = 0; - effectSs->unk_3C = 0; + effectSs->unk_3C = NULL; for (i = 0; i < ARRAY_COUNT(effectSs->regs); i++) { effectSs->regs[i] = 0; diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index ee55590391..f06dc4a031 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,5 +1,7 @@ #include #include +#include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" +#include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" // Draw utility for some G effects #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s") @@ -160,17 +162,46 @@ // EffectSsFhgFlash Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s") +void EffectSsFhgFlash_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, u8 arg5) { + EffectSsFhgFlashInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.unk_24 = arg4; + initParams.unk_26 = arg5; + initParams.unk_2C = 0; + + EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); +} + +void EffectSsFhgFlash_Spawn2(GlobalContext* globalCtx, Actor* arg1, Vec3f* pos, s16 arg3, u8 arg4) { + EffectSsFhgFlashInitParams initParams; + + initParams.unk_28 = arg1; + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.unk_24 = arg3; + initParams.unk_26 = arg4; + initParams.unk_2C = 1; + EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); +} // EffectSsKFire Spawn Functions #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s") -// EffectSsSolderSrchBall Spawn Functions +void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, + s16* linkDetected) { + EffectSsSolderSrchBallInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.unk_24 = arg4; + initParams.linkDetected = linkDetected; + + EffectSs_Spawn(globalCtx, EFFECT_SS_SOLDER_SRCH_BALL, 128, &initParams); +} // EffectSsKakera Spawn Functions diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 309b3d32e4..a7b7fba35a 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,38 +1,6 @@ #include #include -typedef enum { - /* 0x00 */ A_OBJ_BLOCK_SMALL, - /* 0x01 */ A_OBJ_BLOCK_LARGE, - /* 0x02 */ A_OBJ_BLOCK_HUGE, - /* 0x03 */ A_OBJ_BLOCK_SMALL_ROT, - /* 0x04 */ A_OBJ_BLOCK_LARGE_ROT, - /* 0x05 */ A_OBJ_CUBE_SMALL, - /* 0x06 */ A_OBJ_UNKNOWN_6, - /* 0x07 */ A_OBJ_GRASS_CLUMP, - /* 0x08 */ A_OBJ_TREE_STUMP, - /* 0x09 */ A_OBJ_SIGNPOST_OBLONG, - /* 0x0A */ A_OBJ_SIGNPOST_ARROW, - /* 0x0B */ A_OBJ_KNOB -} AObjType; - -struct EnAObj; - -typedef void (*EnAObjActionFunc)(struct EnAObj*, GlobalContext*); - -typedef struct EnAObj { - /* 0x000 */ DynaPolyActor dyna; - /* 0x164 */ EnAObjActionFunc actionFunc; - /* 0x168 */ s32 unk_168; - /* 0x16C */ s16 textId; - /* 0x16E */ s16 unk_16E; - /* 0x170 */ s16 unk_170; - /* 0x172 */ s16 unk_172; - /* 0x174 */ s16 unk_174; - /* 0x178 */ f32 unk_178; - /* 0x17C */ ColliderCylinder collider; -} EnAObj; // size = 0x1C8 - #define FLAGS 0x00000010 #define THIS ((EnAObj*)thisx) @@ -317,7 +285,7 @@ void func_8001D608(EnAObj* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxMinF(&this->dyna.actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); if (this->dyna.actor.speedXZ != 0.0f) { - Audio_PlayActorSound2(&this->dyna.actor, 0x200A); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } this->dyna.unk_154 = 0.0f; @@ -363,7 +331,7 @@ void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { } if (thisx->params == A_OBJ_KNOB) { - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 1, 0x3C, 0x3C, 0x3C, 0x32); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 1, 60, 60, 60, 50); } gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 7e9606d402..728cb11b99 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,52 +1,6 @@ #include #include -typedef enum { - /* 0x00 */ ITEM00_RUPEE_GREEN, - /* 0x01 */ ITEM00_RUPEE_BLUE, - /* 0x02 */ ITEM00_RUPEE_RED, - /* 0x03 */ ITEM00_HEART, - /* 0x04 */ ITEM00_BOMBS_A, - /* 0x05 */ ITEM00_ARROWS_SINGLE, - /* 0x06 */ ITEM00_HEART_PIECE, - /* 0x07 */ ITEM00_HEART_CONTAINER, - /* 0x08 */ ITEM00_ARROWS_SMALL, - /* 0x09 */ ITEM00_ARROWS_MEDIUM, - /* 0x0A */ ITEM00_ARROWS_LARGE, - /* 0x0B */ ITEM00_BOMBS_B, - /* 0x0C */ ITEM00_NUTS, - /* 0x0D */ ITEM00_STICK, - /* 0x0E */ ITEM00_MAGIC_LARGE, - /* 0x0F */ ITEM00_MAGIC_SMALL, - /* 0x10 */ ITEM00_SEEDS, - /* 0x11 */ ITEM00_SMALL_KEY, - /* 0x12 */ ITEM00_FLEXIBLE, - /* 0x13 */ ITEM00_RUPEE_ORANGE, - /* 0x14 */ ITEM00_RUPEE_PURPLE, - /* 0x15 */ ITEM00_SHIELD_DEKU, - /* 0x16 */ ITEM00_SHIELD_HYLIAN, - /* 0x17 */ ITEM00_TUNIC_ZORA, - /* 0x18 */ ITEM00_TUNIC_GORON, - /* 0x19 */ ITEM00_BOMBS_SPECIAL -} Item00Type; - -struct EnItem00; - -typedef void (*EnItem00ActionFunc)(struct EnItem00*, GlobalContext*); - -typedef struct EnItem00 { - /* 0x000 */ Actor actor; - /* 0x14C */ EnItem00ActionFunc actionFunc; - /* 0x150 */ s16 collectibleFlag; - /* 0x152 */ s16 unk_152; - /* 0x154 */ s16 unk_154; - /* 0x156 */ s16 unk_156; - /* 0x158 */ s16 unk_158; - /* 0x15A */ s16 unk_15A; - /* 0x15C */ f32 unk_15C; - /* 0x160 */ ColliderCylinder collider; -} EnItem00; // size = 0x1AC - #define FLAGS 0x00000000 #define THIS ((EnItem00*)thisx) @@ -915,7 +869,7 @@ s16 func_8001F404(s16 dropId) { // External functions used by other actors to drop collectibles, which usually results in spawning an En_Item00 actor. -Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { +EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { s32 pad[2]; EnItem00* spawnedActor = NULL; s16 param4000 = params & 0x4000; @@ -955,10 +909,10 @@ Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 param } } - return (Actor*)spawnedActor; + return spawnedActor; } -Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { +EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { EnItem00* spawnedActor = NULL; s32 pad; s16 param4000 = params & 0x4000; @@ -987,7 +941,7 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 para } } - return (Actor*)spawnedActor; + return spawnedActor; } void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params) { diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 5a91cfd6ca..1b7aa46176 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -5,10 +5,10 @@ Gfx D_8012AFB0[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_FILL), gsDPSetColorImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, 0x0F000000), - gsDPSetFillColor(RGBA8(0x42, 0x11, 0x42, 0x11)), + gsDPSetFillColor((GPACK_RGBA5551(65, 65, 65, 1) << 16) | GPACK_RGBA5551(65, 65, 65, 1)), gsDPFillRectangle(0, 0, 319, 239), gsDPPipeSync(), - gsDPSetFillColor(RGBA8(0x42, 0x3F, 0x42, 0x3F)), + gsDPSetFillColor((GPACK_RGBA5551(65, 65, 255, 1) << 16) | GPACK_RGBA5551(65, 65, 255, 1)), gsDPFillRectangle(20, 20, 300, 220), gsDPPipeSync(), gsSPEndDisplayList(), diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index 8eb5786383..dfcf7e54a7 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -304,18 +304,18 @@ void TransitionCircle_Start(TransitionCircle* this) { } if (this->typeColor == 0) { - this->color.rgba = RGBA8(0x00, 0x00, 0x00, 0xFF); + this->color.rgba = RGBA8(0, 0, 0, 255); } else if (this->typeColor == 1) { - this->color.rgba = RGBA8(0xA0, 0xA0, 0xA0, 0xFF); + this->color.rgba = RGBA8(160, 160, 160, 255); } else if (this->typeColor == 2) { // yes, really. - this->color.r = 0x64; - this->color.g = 0x64; - this->color.b = 0x64; - this->color.a = 0xFF; + this->color.r = 100; + this->color.g = 100; + this->color.b = 100; + this->color.a = 255; } else { this->step = 0x28; - this->color.rgba = this->effect == 1 ? RGBA8(0x00, 0x00, 0x00, 0xFF) : RGBA8(0xA0, 0xA0, 0xA0, 0xFF); + this->color.rgba = this->effect == 1 ? RGBA8(0, 0, 0, 255) : RGBA8(160, 160, 160, 255); } if (this->unk_14 != 0) { this->texY = 0; diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index c0cacc18ce..93b3a95118 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -215,7 +215,7 @@ void TransitionWipe_Draw(TransitionWipe* this, Gfx** gfxP) { gDPPipeSync(gfx++); tex = Gfx_BranchTexScroll(&gfx, this->texX, this->texY, 0, 0); gSPSegment(gfx++, 8, tex); - gDPSetPrimColor(gfx++, 0, 0x80, this->color.r, this->color.g, this->color.b, 0xFF); + gDPSetPrimColor(gfx++, 0, 0x80, this->color.r, this->color.g, this->color.b, 255); gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION); gSPPerspNormalize(gfx++, this->normal); gSPMatrix(gfx++, &this->lookAt, G_MTX_MUL | G_MTX_PROJECTION); diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 8ceeb6334b..0baf2654b3 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -54,7 +54,7 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) { if (pauseCtx->state != 0 || pauseCtx->flag != 0) { if (pauseCtx->state == 1) { - if (func_800B38FC() == 0) { + if (ShrinkWindow_GetCurrentVal() == 0) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_MENU_MODE = 1; diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 3d6e5739ef..4e8fcacc92 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -77,8 +77,8 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) { if (pauseCtx->state == 1) { WREG(2) = -0x1860; R_UPDATE_RATE = 2; - if (func_800B3898()) { - func_800B3840(0); + if (ShrinkWindow_GetVal()) { + ShrinkWindow_SetVal(0); } func_800F64E0(1); } diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 63c328ce6f..883c7a5492 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -25,26 +25,26 @@ void Health_InitData(GlobalContext* globalCtx) { interfaceCtx->unk_22A = interfaceCtx->unk_1FE = 0; interfaceCtx->unk_22C = interfaceCtx->unk_200 = 0; - interfaceCtx->unk_20E[0] = 0xFF; - interfaceCtx->unk_20E[2] = 0x46; - interfaceCtx->unk_20E[4] = 0x32; - interfaceCtx->unk_21A[0] = 0x32; - interfaceCtx->unk_21A[2] = 0x28; - interfaceCtx->unk_21A[4] = 0x3C; + interfaceCtx->unk_20E[0] = 255; + interfaceCtx->unk_20E[2] = 70; + interfaceCtx->unk_20E[4] = 50; + interfaceCtx->unk_21A[0] = 50; + interfaceCtx->unk_21A[2] = 40; + interfaceCtx->unk_21A[4] = 60; - interfaceCtx->unk_20E[1] = 0xFF; - interfaceCtx->unk_20E[3] = 0x46; - interfaceCtx->unk_20E[5] = 0x32; - interfaceCtx->unk_21A[1] = 0x32; - interfaceCtx->unk_21A[3] = 0x28; - interfaceCtx->unk_21A[5] = 0x3C; + interfaceCtx->unk_20E[1] = 255; + interfaceCtx->unk_20E[3] = 70; + interfaceCtx->unk_20E[5] = 50; + interfaceCtx->unk_21A[1] = 50; + interfaceCtx->unk_21A[3] = 40; + interfaceCtx->unk_21A[5] = 60; - D_8015FDD0[0] = D_8015FDD0[3] = 0xFF; - D_8015FDD0[1] = D_8015FDD0[4] = 0xFF; - D_8015FDD0[2] = D_8015FDD0[5] = 0xFF; - D_8015FDE0[0] = D_8015FDE0[3] = 0xC8; - D_8015FDE0[1] = D_8015FDE0[4] = 0x00; - D_8015FDE0[2] = D_8015FDE0[5] = 0x00; + D_8015FDD0[0] = D_8015FDD0[3] = 255; + D_8015FDD0[1] = D_8015FDD0[4] = 255; + D_8015FDD0[2] = D_8015FDD0[5] = 255; + D_8015FDE0[0] = D_8015FDE0[3] = 200; + D_8015FDE0[1] = D_8015FDE0[4] = 0; + D_8015FDE0[2] = D_8015FDE0[5] = 0; } #ifdef NON_MATCHING @@ -70,13 +70,13 @@ void Health_UpdateData(GlobalContext* globalCtx) { } } - interfaceCtx->unk_20E[0] = 0xFF; - interfaceCtx->unk_20E[2] = 0x46; - interfaceCtx->unk_20E[4] = 0x32; + interfaceCtx->unk_20E[0] = 255; + interfaceCtx->unk_20E[2] = 70; + interfaceCtx->unk_20E[4] = 50; - interfaceCtx->unk_21A[0] = 0x32; - interfaceCtx->unk_21A[2] = 0x28; - interfaceCtx->unk_21A[4] = 0x3C; + interfaceCtx->unk_21A[0] = 50; + interfaceCtx->unk_21A[2] = 40; + interfaceCtx->unk_21A[4] = 60; interfaceCtx->unk_20E[1] = D_8011FF10[0]; interfaceCtx->unk_20E[3] = D_8011FF10[1]; @@ -104,15 +104,15 @@ void Health_UpdateData(GlobalContext* globalCtx) { temp2 *= temp_f0; interfaceCtx->unk_208[1] = (u8)(temp2 + 0x28); temp3 *= temp_f0; - interfaceCtx->unk_208[2] = (u8)(temp2 + 0x3C); + interfaceCtx->unk_208[2] = (u8)(temp3 + 0x3C); D_8015FDD0[0] = 0xFF; D_8015FDD0[1] = 0xFF; D_8015FDD0[2] = 0xFF; - D_8015FDE0[0] = 0xC8; - D_8015FDE0[1] = 0x00; - D_8015FDE0[2] = 0x00; + D_8015FDE0[0] = 200; + D_8015FDE0[1] = 0; + D_8015FDE0[2] = 0; D_8015FDD0[3] = D_8011FF60[0]; D_8015FDD0[4] = D_8011FF60[1]; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 1bca397c57..7abfb6a253 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -117,7 +117,7 @@ void Lights_Free(z_Light* light) { void func_8007A614(GlobalContext* globalCtx, LightingContext* lightCtx) { Lights_ClearHead(globalCtx, lightCtx); - Lights_SetAmbientColor(lightCtx, 0x50, 0x50, 0x50); + Lights_SetAmbientColor(lightCtx, 80, 80, 80); func_8007A698(lightCtx, 0, 0, 0, 0x3e4, 0x3200); bzero(&sLightsList, sizeof(sLightsList)); } diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 690553acf0..17d2ef1f00 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -329,7 +329,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { gSPMatrix(gfxCtx->overlay.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 255); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); tempX = player->actor.posRot.pos.x; @@ -344,7 +344,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 585), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xFF, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 200, 255, 0, 255); gSPDisplayList(gfxCtx->overlay.p++, D_0400C820); tempX = sPlayerInitialPosX; @@ -358,7 +358,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 603), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0xFF, 0xC8, 0x00, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0xFF, 200, 0, 0, 255); gSPDisplayList(gfxCtx->overlay.p++, D_0400C820); } @@ -395,7 +395,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { 0, TEXEL0, 0, PRIMITIVE, 0); if (gSaveContext.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0xFF, 0xFF, interfaceCtx->minimapAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha); gDPLoadTextureBlock_4b(gfxCtx->overlay.p++, interfaceCtx->mapSegment, G_IM_FMT_I, 96, 85, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 510731fc66..52836d8ec6 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -108,8 +108,8 @@ void MapMark_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); gDPSetTextureLUT(gfxCtx->overlay.p++, G_TT_NONE); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->minimapAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, interfaceCtx->minimapAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->minimapAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, interfaceCtx->minimapAlpha); markPoint = &mapMarkData->points[0]; for (i = 0; i < mapMarkData->count; i++) { diff --git a/src/code/z_moji.c b/src/code/z_moji.c index d6966544fd..d7366ceb93 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -1,10 +1,10 @@ #include #include -u32 sFontColorRed = 0xFF; -u32 sFontColorGreen = 0xFF; -u32 sFontColorBlue = 0xFF; -u32 sFontColorAlpha = 0xFF; +u32 sFontColorRed = 255; +u32 sFontColorGreen = 255; +u32 sFontColorBlue = 255; +u32 sFontColorAlpha = 255; s32 D_80120120 = 0; s32 D_80120124 = 0; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 4caee3394d..3715d01803 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -123,9 +123,9 @@ u16 sCUpTimer = 0; s16 gSpoilingItems[] = { ITEM_ODD_MUSHROOM, ITEM_FROG, ITEM_EYEDROPS }; s16 gSpoilingItemReverts[] = { ITEM_COJIRO, ITEM_PRESCRIPTION, ITEM_PRESCRIPTION }; -s16 sMagicBorderR = 0xFF; -s16 sMagicBorderG = 0xFF; -s16 sMagicBorderB = 0xFF; +s16 sMagicBorderR = 255; +s16 sMagicBorderG = 255; +s16 sMagicBorderB = 255; s16 sExtraItemBases[] = { ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOW, @@ -159,51 +159,51 @@ void func_80082644(GlobalContext* globalCtx, s16 alpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; if (gSaveContext.buttonStatus[0] == BTN_DISABLED) { - if (interfaceCtx->bAlpha != 0x46) { - interfaceCtx->bAlpha = 0x46; + if (interfaceCtx->bAlpha != 70) { + interfaceCtx->bAlpha = 70; } } else { - if (interfaceCtx->bAlpha != 0xFF) { + if (interfaceCtx->bAlpha != 255) { interfaceCtx->bAlpha = alpha; } } if (gSaveContext.buttonStatus[1] == BTN_DISABLED) { - if (interfaceCtx->cLeftAlpha != 0x46) { - interfaceCtx->cLeftAlpha = 0x46; + if (interfaceCtx->cLeftAlpha != 70) { + interfaceCtx->cLeftAlpha = 70; } } else { - if (interfaceCtx->cLeftAlpha != 0xFF) { + if (interfaceCtx->cLeftAlpha != 255) { interfaceCtx->cLeftAlpha = alpha; } } if (gSaveContext.buttonStatus[2] == BTN_DISABLED) { - if (interfaceCtx->cDownAlpha != 0x46) { - interfaceCtx->cDownAlpha = 0x46; + if (interfaceCtx->cDownAlpha != 70) { + interfaceCtx->cDownAlpha = 70; } } else { - if (interfaceCtx->cDownAlpha != 0xFF) { + if (interfaceCtx->cDownAlpha != 255) { interfaceCtx->cDownAlpha = alpha; } } if (gSaveContext.buttonStatus[3] == BTN_DISABLED) { - if (interfaceCtx->cRightAlpha != 0x46) { - interfaceCtx->cRightAlpha = 0x46; + if (interfaceCtx->cRightAlpha != 70) { + interfaceCtx->cRightAlpha = 70; } } else { - if (interfaceCtx->cRightAlpha != 0xFF) { + if (interfaceCtx->cRightAlpha != 255) { interfaceCtx->cRightAlpha = alpha; } } if (gSaveContext.buttonStatus[4] == BTN_DISABLED) { - if (interfaceCtx->aAlpha != 0x46) { - interfaceCtx->aAlpha = 0x46; + if (interfaceCtx->aAlpha != 70) { + interfaceCtx->aAlpha = 70; } } else { - if (interfaceCtx->aAlpha != 0xFF) { + if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = alpha; } } @@ -242,7 +242,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 alpha; - alpha = 0xFF - maxAlpha; + alpha = 255 - maxAlpha; switch (gSaveContext.unk_13E8) { case 1: @@ -251,7 +251,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { osSyncPrintf("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); if (gSaveContext.unk_13E8 == 8) { - if (interfaceCtx->bAlpha != 0xFF) { + if (interfaceCtx->bAlpha != 255) { interfaceCtx->bAlpha = alpha; } } else { @@ -306,7 +306,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->minimapAlpha = maxAlpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } @@ -344,7 +344,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->minimapAlpha = maxAlpha; } - if (interfaceCtx->aAlpha != 0xFF) { + if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = alpha; } @@ -356,15 +356,15 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->minimapAlpha = maxAlpha; } - if (interfaceCtx->aAlpha != 0xFF) { + if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = alpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha; } @@ -372,15 +372,15 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { case 6: func_8008277C(globalCtx, maxAlpha, alpha); - if (interfaceCtx->aAlpha != 0xFF) { + if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = alpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha; } @@ -405,14 +405,14 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { case SCENE_SPOT18: case SCENE_SPOT20: case SCENE_GANON_TOU: - if (interfaceCtx->minimapAlpha < 0xAA) { + if (interfaceCtx->minimapAlpha < 170) { interfaceCtx->minimapAlpha = alpha; } else { - interfaceCtx->minimapAlpha = 0xAA; + interfaceCtx->minimapAlpha = 170; } break; default: - if (interfaceCtx->minimapAlpha != 0xFF) { + if (interfaceCtx->minimapAlpha != 255) { interfaceCtx->minimapAlpha = alpha; } break; @@ -425,11 +425,11 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { func_80082644(globalCtx, alpha); - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha; } @@ -459,11 +459,11 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->minimapAlpha = maxAlpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha; } @@ -497,7 +497,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->minimapAlpha = maxAlpha; } - if (interfaceCtx->bAlpha != 0xFF) { + if (interfaceCtx->bAlpha != 255) { interfaceCtx->bAlpha = alpha; } @@ -531,21 +531,21 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->magicAlpha = maxAlpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } break; case 12: - if (interfaceCtx->aAlpha != 0xFF) { + if (interfaceCtx->aAlpha != 255) { interfaceCtx->aAlpha = alpha; } - if (interfaceCtx->bAlpha != 0xFF) { + if (interfaceCtx->bAlpha != 255) { interfaceCtx->bAlpha = alpha; } - if (interfaceCtx->minimapAlpha != 0xFF) { + if (interfaceCtx->minimapAlpha != 255) { interfaceCtx->minimapAlpha = alpha; } @@ -581,11 +581,11 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { interfaceCtx->aAlpha = maxAlpha; } - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha; } @@ -593,7 +593,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { } if ((globalCtx->roomCtx.curRoom.unk_03 == 1) && (interfaceCtx->minimapAlpha >= 0xFF)) { - interfaceCtx->minimapAlpha = 0xFF; + interfaceCtx->minimapAlpha = 255; } } @@ -2422,7 +2422,8 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { gSaveContext.magic += 4; if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) { - Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); } // Translates to: "Storage MAGIC_NOW=%d (%d)" @@ -2442,14 +2443,14 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { if (gSaveContext.magic <= 0) { gSaveContext.magic = 0; gSaveContext.unk_13F0 = 3; - sMagicBorderB = 0xFF; - sMagicBorderG = 0xFF; - sMagicBorderR = 0xFF; + sMagicBorderB = 255; + sMagicBorderG = 255; + sMagicBorderR = 255; } else if (gSaveContext.magic == gSaveContext.unk_13F8) { gSaveContext.unk_13F0 = 3; - sMagicBorderB = 0xFF; - sMagicBorderG = 0xFF; - sMagicBorderR = 0xFF; + sMagicBorderB = 255; + sMagicBorderG = 255; + sMagicBorderR = 255; } case 3: case 4: @@ -2487,9 +2488,9 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { } break; case 5: - sMagicBorderB = 0xFF; - sMagicBorderG = 0xFF; - sMagicBorderR = 0xFF; + sMagicBorderB = 255; + sMagicBorderG = 255; + sMagicBorderR = 255; gSaveContext.unk_13F0 = 0; break; case 7: @@ -2505,7 +2506,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); gSaveContext.unk_13F0 = 0; - sMagicBorderR = sMagicBorderG = sMagicBorderB = 0xFF; + sMagicBorderR = sMagicBorderG = sMagicBorderB = 255; break; } @@ -2550,7 +2551,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { break; case 10: gSaveContext.magic += 4; - Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); if (gSaveContext.magic >= gSaveContext.unk_13F8) { gSaveContext.magic = gSaveContext.unk_13F8; gSaveContext.unk_13F0 = gSaveContext.unk_13F2; @@ -2596,7 +2597,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB, interfaceCtx->magicAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x64, 0x32, 0x32, 0xFF); + gDPSetEnvColor(gfxCtx->overlay.p++, 100, 50, 50, 255); gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); @@ -2621,11 +2622,11 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 255); if (gSaveContext.unk_13F0 == 4) { // Yellow part of the bar being used when casting a spell - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFA, 0xFA, 0x00, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 250, 250, 0, interfaceCtx->magicAlpha); gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -2743,7 +2744,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2), interfaceCtx->bAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 255); gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2); @@ -2774,13 +2775,13 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { // Start Button Texture, Color & Label gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0x78, 0x78, interfaceCtx->startAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha); gSPTextureRectangle(gfxCtx->overlay.p++, sStartButtonLeftPos[gSaveContext.language] << 2, 68, (sStartButtonLeftPos[gSaveContext.language] + 22) << 2, 156, G_TX_RENDERTILE, 0, 0, 1462, 1462); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->startAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->startAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); @@ -2816,7 +2817,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { cUpAlpha = 0; } else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) || (player->stateFlags2 & 0x00040000)) { - cUpAlpha = 0x46; + cUpAlpha = 70; } else { cUpAlpha = interfaceCtx->healthAlpha; } @@ -2826,8 +2827,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { gSPTextureRectangle(gfxCtx->overlay.p++, R_C_UP_BTN_X << 2, R_C_UP_BTN_Y << 2, (R_C_UP_BTN_X + 16) << 2, (R_C_UP_BTN_Y + 16) << 2, G_TX_RENDERTILE, 0, 0, 2048, 2048); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, cUpAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, cUpAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); @@ -2940,11 +2941,11 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { ((item == ITEM_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_STICKS))) || ((item == ITEM_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_NUTS))) || ((item == ITEM_BOMBCHU) && (ammo == 50)) || ((item == ITEM_BEAN) && (ammo == 15))) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0xFF, 0x00, alpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 255, 0, alpha); } if (ammo == 0) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0x64, 0x64, alpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 100, 100, 100, alpha); } for (i = 0; ammo >= 10; i++) { @@ -3107,7 +3108,7 @@ s16 sDigitWidth[] = { 9, 9, 8, 9, 9 }; // unused, most likely colors s16 D_80125B1C[][3] = { - { 0x00, 0x96, 0x00 }, { 0x64, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF }, { 0x00, 0x00, 0x00 }, { 0xFF, 0xFF, 0xFF }, + { 0, 150, 0 }, { 100, 255, 0 }, { 255, 255, 255 }, { 0, 0, 0 }, { 255, 255, 255 }, }; s16 sRupeeDigitsFirst[] = { 1, 0, 0 }; @@ -3157,8 +3158,8 @@ void Interface_Draw(GlobalContext* globalCtx) { func_80094520(globalCtx->state.gfxCtx); // Rupee Icon - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xFF, 0x64, interfaceCtx->magicAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x50, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 200, 255, 100, interfaceCtx->magicAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 80, 0, 255); gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); switch (globalCtx->sceneNum) { @@ -3179,14 +3180,14 @@ void Interface_Draw(GlobalContext* globalCtx) { if (gSaveContext.dungeonKeys[gSaveContext.mapIndex] >= 0) { // Small Key Icon gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xE6, 0xFF, interfaceCtx->magicAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x14, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 200, 230, 255, interfaceCtx->magicAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 20, 255); gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); // Small Key Counter gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); @@ -3223,11 +3224,11 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0xFF, 0x00, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha); } else if (gSaveContext.rupees != 0) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha); } else { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0x64, 0x64, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha); } gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, @@ -3270,7 +3271,7 @@ void Interface_Draw(GlobalContext* globalCtx) { Interface_DrawItemButtons(globalCtx); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); if (interfaceCtx->unk_1FA == 0) { @@ -3292,7 +3293,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (u32)interfaceCtx->do_actionSegment + 0x180); @@ -3318,7 +3319,7 @@ void Interface_Draw(GlobalContext* globalCtx) { // C-Left Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[1] < 0xF0) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cLeftAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cLeftAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), 1); gDPPipeSync(gfxCtx->overlay.p++); @@ -3331,7 +3332,7 @@ void Interface_Draw(GlobalContext* globalCtx) { // C-Down Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[2] < 0xF0) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cDownAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cDownAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), 2); gDPPipeSync(gfxCtx->overlay.p++); @@ -3344,7 +3345,7 @@ void Interface_Draw(GlobalContext* globalCtx) { // C-Right Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[3] < 0xF0) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cRightAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cRightAlpha); gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), 3); gDPPipeSync(gfxCtx->overlay.p++); @@ -3366,8 +3367,8 @@ void Interface_Draw(GlobalContext* globalCtx) { gSPSetGeometryMode(gfxCtx->overlay.p++, G_CULL_BACK); gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->aAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0); Matrix_Translate(0.0f, 0.0f, WREG(46 + gSaveContext.language) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY); @@ -3401,7 +3402,7 @@ void Interface_Draw(GlobalContext* globalCtx) { if (pauseCtx->unk_24E < 0xBF) { // Normal Equip (icon goes from the inventory slot to the C button when equipping it) - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, pauseCtx->unk_258); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, pauseCtx->unk_258); gSPVertex(gfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, gItemIcons[pauseCtx->unk_24E]); @@ -3474,9 +3475,9 @@ void Interface_Draw(GlobalContext* globalCtx) { for (phi_s3 = 1; phi_s3 < 7; phi_s3++) { // Carrot Color (based on availability) if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x00, 0x96, 0xFF, interfaceCtx->aAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0, 150, 255, interfaceCtx->aAlpha); } else { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->aAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); } gSPTextureRectangle(gfxCtx->overlay.p++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2, @@ -3487,7 +3488,7 @@ void Interface_Draw(GlobalContext* globalCtx) { } } else { // Score for the Horseback Archery - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha); // Target Icon gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_02002600); @@ -3828,7 +3829,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer2State = 5; gSaveContext.cutsceneIndex = 0; D_8015FFE6 = 40; - func_8010B680(globalCtx, 0x71B0, 0); + func_8010B680(globalCtx, 0x71B0, NULL); func_8002DF54(globalCtx, 0, 8); } else { gSaveContext.timer2State = 6; @@ -3854,7 +3855,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer2Value++; if (gSaveContext.eventInf[1] & 1) { if (gSaveContext.timer2Value == 240) { - func_8010B680(globalCtx, 0x6083, 0); + func_8010B680(globalCtx, 0x6083, NULL); gSaveContext.timer2State = 0; gSaveContext.eventInf[1] &= ~1; } @@ -3904,8 +3905,8 @@ void Interface_Draw(GlobalContext* globalCtx) { // Clock Icon gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); - gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0); gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timerX[sp274], gSaveContext.timerY[sp274] + 2, 16, 16, 1024, 1024); @@ -3915,15 +3916,15 @@ void Interface_Draw(GlobalContext* globalCtx) { if (gSaveContext.timer1State != 0) { if ((gSaveContext.timer1Value < 10) && (gSaveContext.timer1State < 11)) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255); } else { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255); } } else { if ((gSaveContext.timer2Value < 10) && (gSaveContext.timer2State < 6)) { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255); } else { - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 0, 255); } } @@ -3944,7 +3945,7 @@ void Interface_Draw(GlobalContext* globalCtx) { if (interfaceCtx->unk_244 != 0) { gDPPipeSync(gfxCtx->overlay.p++); gSPDisplayList(gfxCtx->overlay.p++, sSetupDL_80125A60); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x00, 0x00, 0x00, interfaceCtx->unk_244); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0, 0, 0, interfaceCtx->unk_244); gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } @@ -4008,7 +4009,7 @@ void Interface_Update(GlobalContext* globalCtx) { case 11: case 12: case 13: - alpha = 0xFF - (gSaveContext.unk_13EC << 5); + alpha = 255 - (gSaveContext.unk_13EC << 5); if (alpha < 0) { alpha = 0; } @@ -4021,7 +4022,7 @@ void Interface_Update(GlobalContext* globalCtx) { } break; case 50: - alpha = 0xFF - (gSaveContext.unk_13EC << 5); + alpha = 255 - (gSaveContext.unk_13EC << 5); if (alpha < 0) { alpha = 0; } @@ -4034,11 +4035,11 @@ void Interface_Update(GlobalContext* globalCtx) { osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", alpha, alpha1); func_80082644(globalCtx, alpha1); - if (interfaceCtx->healthAlpha != 0xFF) { + if (interfaceCtx->healthAlpha != 255) { interfaceCtx->healthAlpha = alpha1; } - if (interfaceCtx->magicAlpha != 0xFF) { + if (interfaceCtx->magicAlpha != 255) { interfaceCtx->magicAlpha = alpha1; } @@ -4063,14 +4064,14 @@ void Interface_Update(GlobalContext* globalCtx) { case SCENE_SPOT18: case SCENE_SPOT20: case SCENE_GANON_TOU: - if (interfaceCtx->minimapAlpha < 0xAA) { + if (interfaceCtx->minimapAlpha < 170) { interfaceCtx->minimapAlpha = alpha1; } else { - interfaceCtx->minimapAlpha = 0xAA; + interfaceCtx->minimapAlpha = 170; } break; default: - if (interfaceCtx->minimapAlpha != 0xFF) { + if (interfaceCtx->minimapAlpha != 255) { interfaceCtx->minimapAlpha = alpha1; } break; diff --git a/src/code/z_play.c b/src/code/z_play.c index 6082a593e6..6092806044 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -172,7 +172,7 @@ void Gameplay_Destroy(GlobalContext* globalCtx) { globalCtx->transitionMode = 0; } - func_800B3968(); + ShrinkWindow_Destroy(); TransitionFade_Destroy(&globalCtx->transitionFade); VisMono_Destroy(&D_80161498); @@ -323,7 +323,7 @@ void Gameplay_Init(GlobalContext* globalCtx) { gSaveContext.dogIsLost = true; if (Inventory_ReplaceItem(globalCtx, ITEM_WEIRD_EGG, ITEM_CHICKEN) || Inventory_ReplaceItem(globalCtx, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO)) { - func_8010B680(globalCtx, 0x3066, 0); + func_8010B680(globalCtx, 0x3066, NULL); } gSaveContext.nextDayTime = 0xFFFE; } else { @@ -360,13 +360,13 @@ void Gameplay_Init(GlobalContext* globalCtx) { globalCtx->fadeTransition = 6; } - func_800B3908(); + ShrinkWindow_Init(); TransitionFade_Init(&globalCtx->transitionFade); TransitionFade_SetType(&globalCtx->transitionFade, 3); - TransitionFade_SetColor(&globalCtx->transitionFade, RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + TransitionFade_SetColor(&globalCtx->transitionFade, RGBA8(160, 160, 160, 255)); TransitionFade_Start(&globalCtx->transitionFade); VisMono_Init(&D_80161498); - D_801614B0.a = 0x00; + D_801614B0.a = 0; Flags_UnsetAllEnv(globalCtx); osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetSize(&globalCtx->state.tha)); @@ -404,8 +404,8 @@ void Gameplay_Init(GlobalContext* globalCtx) { Interface_SetSceneRestrictions(globalCtx); func_800758AC(globalCtx); - gSaveContext.seqIndex = globalCtx->soundCtx.musicSeq; - gSaveContext.nightSeqIndex = globalCtx->soundCtx.nighttimeSFX; + gSaveContext.seqIndex = globalCtx->soundCtx.seqIndex; + gSaveContext.nightSeqIndex = globalCtx->soundCtx.nightSeqIndex; func_8002DF18(globalCtx, PLAYER); func_800A390C(globalCtx, &globalCtx->animationCtx); gSaveContext.respawnFlag = 0; @@ -542,32 +542,27 @@ void Gameplay_Update(GlobalContext* globalCtx) { (globalCtx->transitionCtx.transitionType == 7) || (globalCtx->transitionCtx.transitionType == 13) || (globalCtx->transitionCtx.transitionType == 17)) { - globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, - RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, RGBA8(160, 160, 160, 255)); if (globalCtx->transitionCtx.setEnvColor != NULL) { globalCtx->transitionCtx.setEnvColor(&globalCtx->transitionCtx.data, - RGBA8(0xA0, 0xA0, 0xA0, 0xFF)); + RGBA8(160, 160, 160, 255)); } } else if (globalCtx->transitionCtx.transitionType == 18) { - globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, - RGBA8(0x8C, 0x8C, 0x64, 0xFF)); + globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, RGBA8(140, 140, 100, 255)); if (globalCtx->transitionCtx.setEnvColor != NULL) { globalCtx->transitionCtx.setEnvColor(&globalCtx->transitionCtx.data, - RGBA8(0x8C, 0x8C, 0x64, 0xFF)); + RGBA8(140, 140, 100, 255)); } } else if (globalCtx->transitionCtx.transitionType == 19) { - globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, - RGBA8(0x46, 0x64, 0x6E, 0xFF)); + globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, RGBA8(70, 100, 110, 255)); if (globalCtx->transitionCtx.setEnvColor != NULL) { globalCtx->transitionCtx.setEnvColor(&globalCtx->transitionCtx.data, - RGBA8(0x46, 0x64, 0x6E, 0xFF)); + RGBA8(70, 100, 110, 255)); } } else { - globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, - RGBA8(0x00, 0x00, 0x00, 0x00)); + globalCtx->transitionCtx.setColor(&globalCtx->transitionCtx.data, RGBA8(0, 0, 0, 0)); if (globalCtx->transitionCtx.setEnvColor != NULL) { - globalCtx->transitionCtx.setEnvColor(&globalCtx->transitionCtx.data, - RGBA8(0x00, 0x00, 0x00, 0x00)); + globalCtx->transitionCtx.setEnvColor(&globalCtx->transitionCtx.data, RGBA8(0, 0, 0, 0)); } } @@ -714,7 +709,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { break; case 13: - Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); if (globalCtx->sceneLoadFlag == -0x14) { if (globalCtx->envCtx.unk_E7 < 0x6E) { gTrnsnUnkState = 0; @@ -747,7 +743,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { break; case 15: - Audio_PlaySoundGeneral(0x20C0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); if (globalCtx->sceneLoadFlag == -0x14) { if (globalCtx->envCtx.unk_E7 <= 0) { gTrnsnUnkState = 0; @@ -996,7 +993,7 @@ void Gameplay_Update(GlobalContext* globalCtx) { LOG_NUM("1", 1, "../z_play.c", 3777); } - func_800B39B8(R_UPDATE_RATE); + ShrinkWindow_Update(R_UPDATE_RATE); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3783); @@ -1147,7 +1144,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { TransitionFade_Draw(&globalCtx->transitionFade, &gfxP); - if (D_801614B0.a > 0x00) { + if (D_801614B0.a > 0) { D_80161498.primColor.rgba = D_801614B0.rgba; VisMono_Draw(&D_80161498, &gfxP); } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 71721b63c7..fab2d296b7 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -245,7 +245,7 @@ void func_8008EEAC(GlobalContext* globalCtx, Actor* arg1) { func_8005A444(Gameplay_GetCamera(globalCtx, 0), 2); } -s32 func_8008EF40(GlobalContext* globalCtx) { +s32 func_8008EF30(GlobalContext* globalCtx) { Player* player = PLAYER; return player->stateFlags1 & 0x800000; } @@ -389,7 +389,7 @@ s32 func_8008F2F8(GlobalContext* globalCtx) { if (temp_a3->unk_0 != 0 && !(gSaveContext.unk_13C6 & temp_a3->unk_0) && ((phi_v1 == 0 && player->currentTunic != 1) || ((phi_v1 == 1 || phi_v1 == 3) && player->currentBoots == 1 && player->currentTunic != 2))) { - func_8010B680(globalCtx, temp_a3->unk_2, 0); + func_8010B680(globalCtx, temp_a3->unk_2, NULL); gSaveContext.unk_13C6 |= temp_a3->unk_0; } } diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 286c6328ff..c897083e5a 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -35,8 +35,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); func_800940B0(gfxCtx); - gDPSetFillColor(gfxCtx->polyOpa.p++, - (GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1)); + gDPSetFillColor(gfxCtx->polyOpa.p++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1)); gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100); Graph_CloseDisps(dispRefs, gfxCtx, "../z_prenmi.c", 112); diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 511cf84479..63c2d93820 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -744,7 +744,7 @@ Gfx sFillSetupDL[] = { G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2), gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), - gsDPSetBlendColor(0x00, 0x00, 0x00, 0x08), + gsDPSetBlendColor(0, 0, 0, 8), gsSPClipRatio(FRUSTRATIO_2), gsSPEndDisplayList(), }; @@ -752,7 +752,7 @@ Gfx sFillSetupDL[] = { // unused? Gfx D_80127030[] = { gsDPPipeSync(), - gsDPSetFillColor((GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)), + gsDPSetFillColor((GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)), gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), gsDPSetDepthSource(G_ZS_PIXEL), gsDPPipeSync(), @@ -764,7 +764,7 @@ Gfx D_80127060[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_FILL), gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), - gsDPSetFillColor((GPACK_RGBA5551(0x00, 0x00, 0x00, 1) << 16) | GPACK_RGBA5551(0x00, 0x00, 0x00, 1)), + gsDPSetFillColor((GPACK_RGBA5551(0, 0, 0, 1) << 16) | GPACK_RGBA5551(0, 0, 0, 1)), gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), gsDPPipeSync(), gsSPEndDisplayList(), @@ -1471,7 +1471,7 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gDPSetDepthImage(gfxCtx->overlay.p++, gZBuffer); if ((R_PAUSE_MENU_MODE < 2) && (gTrnsnUnkState < 2)) { - ret = func_800B38FC(); + ret = ShrinkWindow_GetCurrentVal(); if (HREG(80) == 16) { if (HREG(95) != 16) { @@ -1517,7 +1517,7 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); gDPSetFillColor(gfxCtx->polyOpa.p++, - (GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)); + (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)); gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); gDPPipeSync(gfxCtx->polyOpa.p++); diff --git a/src/code/z_room.c b/src/code/z_room.c index dbde895fbe..487e96964a 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -513,20 +513,12 @@ void func_80096FD4(GlobalContext* globalCtx, Room* room) { #ifdef NON_MATCHING // regalloc differences u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { - RomFile* roomList; - TransitionActorEntry* transitionActor; - s32 i, j; - s8 frontRoom; - s8 backRoom; - u32 roomSize; - u32 maxRoomSize; - u32 frontRoomSize; - u32 backRoomSize; - u32 cumulRoomSize; u8 nextRoomNum; + u32 maxRoomSize = 0; + RomFile* roomList = globalCtx->roomList; + u32 roomSize; + s32 i; - maxRoomSize = 0; - roomList = globalCtx->roomList; for (i = 0; i < globalCtx->nbRooms; i++) { roomSize = roomList[i].vromEnd - roomList[i].vromStart; osSyncPrintf("ROOM%d size=%d\n", i, roomSize); @@ -536,17 +528,19 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { } if (globalCtx->nbTransitionActors != 0) { - j = 0; - roomList = globalCtx->roomList; - transitionActor = &globalCtx->transitionActorList[0]; + s32 j = 0; + RomFile* roomList = globalCtx->roomList; + TransitionActorEntry* transitionActor = &globalCtx->transitionActorList[0]; + LOG_NUM("game_play->room_rom_address.num", globalCtx->nbRooms, "../z_room.c", 912); for (j = 0; j < globalCtx->nbTransitionActors; j++) { - frontRoom = transitionActor->frontRoom; - backRoom = transitionActor->backRoom; - frontRoomSize = (frontRoom < 0) ? 0 : roomList[frontRoom].vromEnd - roomList[frontRoom].vromStart; - backRoomSize = (backRoom < 0) ? 0 : roomList[backRoom].vromEnd - roomList[backRoom].vromStart; - cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; + s8 frontRoom = transitionActor->frontRoom; + s8 backRoom = transitionActor->backRoom; + u32 frontRoomSize = (frontRoom < 0) ? 0 : roomList[frontRoom].vromEnd - roomList[frontRoom].vromStart; + u32 backRoomSize = (backRoom < 0) ? 0 : roomList[backRoom].vromEnd - roomList[backRoom].vromStart; + u32 cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; + osSyncPrintf("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", j, cumulRoomSize, frontRoom, frontRoomSize, backRoom, backRoomSize); if (maxRoomSize < cumulRoomSize) { diff --git a/src/code/z_sample.c b/src/code/z_sample.c index bd6cbd5552..6bd1e95203 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -36,7 +36,7 @@ void Sample_Draw(SampleContext* this) { gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_1CYCLE); gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gfxCtx->polyOpa.p++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0xFF, 0xFF, 0x00, 0x00); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 255, 255, 0, 0); Graph_CloseDisps(dispRefs, gfxCtx, "../z_sample.c", 111); } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 74859ffe43..6fdb658cb4 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -441,8 +441,8 @@ void func_80099134(GlobalContext* globalCtx, SceneCmd* cmd) { // Scene Command 0x15: Sound Settings void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) { - globalCtx->soundCtx.musicSeq = cmd->soundSettings.musicSeq; - globalCtx->soundCtx.nighttimeSFX = cmd->soundSettings.nighttimeSFX; + globalCtx->soundCtx.seqIndex = cmd->soundSettings.seqIndex; + globalCtx->soundCtx.nightSeqIndex = cmd->soundSettings.nightSeqIndex; if (gSaveContext.seqIndex == 0xFF) { Audio_SetBGM(cmd->soundSettings.bgmId | 0xF0000000); diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index f97e900e7d..9d2ed095d0 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -918,8 +918,8 @@ Gfx sDefaultDisplayList[] = { gsSPSegment(0x0C, gEmptyDL), gsSPSegment(0x0D, gEmptyDL), gsDPPipeSync(), - gsDPSetPrimColor(0, 0, 0x80, 0x80, 0x80, 0x80), - gsDPSetEnvColor(0x80, 0x80, 0x80, 0x80), + gsDPSetPrimColor(0, 0, 128, 128, 128, 128), + gsDPSetEnvColor(128, 128, 128, 128), gsSPEndDisplayList(), }; @@ -975,7 +975,7 @@ void func_800995DC(GlobalContext* globalCtx) { 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); { s32 pad; } // Necessary to match stack usage @@ -999,7 +999,7 @@ void func_80099760(GlobalContext* globalCtx) { (gameplayFrames * 2) % 128, 64, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); } @@ -1033,18 +1033,18 @@ void func_80099878(GlobalContext* globalCtx) { { s32 pad2[2]; } // Necessary to match stack usage gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, displayListHead); gDPPipeSync(displayListHead++); - gDPSetEnvColor(displayListHead++, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0]); + gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead); gDPPipeSync(displayListHead++); - gDPSetEnvColor(displayListHead++, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[1]); + gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); @@ -1066,14 +1066,14 @@ void func_80099BD8(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x08, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, 0xFF - (u8)(185.0f * temp), 0xFF - (u8)(145.0f * temp), - 0xFF - (u8)(105.0f * temp), 0xFF); + gDPSetPrimColor(displayListHead++, 0, 0, 255 - (u8)(185.0f * temp), 255 - (u8)(145.0f * temp), + 255 - (u8)(105.0f * temp), 255); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyXlu.p++, 0x09, displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x09, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, 0x4C + (u8)(6.0f * temp), 0x4C + (u8)(34.0f * temp), - 0x4C + (u8)(74.0f * temp), 0xFF); + gDPSetPrimColor(displayListHead++, 0, 0, 76 + (u8)(6.0f * temp), 76 + (u8)(34.0f * temp), 76 + (u8)(74.0f * temp), + 255); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, displayListHead); @@ -1084,16 +1084,16 @@ void func_80099BD8(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x0B, displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x0B, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, 0x59 + (u8)(166.0f * temp), 0x59 + (u8)(166.0f * temp), - 0x59 + (u8)(166.0f * temp), 0xFF); + gDPSetPrimColor(displayListHead++, 0, 0, 89 + (u8)(166.0f * temp), 89 + (u8)(166.0f * temp), + 89 + (u8)(166.0f * temp), 255); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, 0xFF + (u8)(179.0f * temp), 0xFF + (u8)(179.0f * temp), - 0xFF + (u8)(179.0f * temp), 0xFF); + gDPSetPrimColor(displayListHead++, 0, 0, 255 + (u8)(179.0f * temp), 255 + (u8)(179.0f * temp), + 255 + (u8)(179.0f * temp), 255); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); gSPEndDisplayList(displayListHead++); @@ -1144,10 +1144,10 @@ void func_8009A45C(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); } @@ -1166,7 +1166,7 @@ void func_8009A798(GlobalContext* globalCtx) { Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, @@ -1176,10 +1176,10 @@ void func_8009A798(GlobalContext* globalCtx) { (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); } @@ -1202,10 +1202,10 @@ void func_8009A9DC(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); } @@ -1223,10 +1223,10 @@ void func_8009AB98(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); } @@ -1247,10 +1247,10 @@ void func_8009ACA8(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); } @@ -1277,10 +1277,10 @@ void func_8009AE30(GlobalContext* globalCtx) { } gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); } @@ -1335,11 +1335,11 @@ void func_8009B0FC(GlobalContext* globalCtx) { } else if (spB0 < 1) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); + 0, 0, 0, 255)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + 0, 0, 0, 160)); } if (spB0 == 2) { @@ -1349,35 +1349,35 @@ void func_8009B0FC(GlobalContext* globalCtx) { } else if (spB0 < 2) { gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); + 0, 0, 0, 255)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + 0, 0, 0, 160)); } if (spB0 != 0) { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + 0, 0, 0, 160)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xB4)); + 0, 0, 0, 180)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, - 32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); + 32, 32, 0, 0, 0, 160 + (s32)((spAC / 200.0f) * 95.0f))); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f))); + 0, 0, 0, 185 + (s32)((spAC / 200.0f) * 70.0f))); } gSPSegment(gfxCtx->polyXlu.p++, 0x0C, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, - 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80)); + 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 128)); gSPSegment(gfxCtx->polyXlu.p++, 0x0D, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, - gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80)); + gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 128)); { s32 pad[2]; } // Necessary to match stack usage @@ -1398,10 +1398,10 @@ void func_8009B86C(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, globalCtx->unk_11D30[0]); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, globalCtx->unk_11D30[0]); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x91); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 145); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); } @@ -1419,7 +1419,7 @@ void func_8009B9BC(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); } @@ -1444,10 +1444,10 @@ void func_8009BAA4(GlobalContext* globalCtx) { } gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); } @@ -1482,14 +1482,14 @@ void func_8009BC44(GlobalContext* globalCtx) { (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); sp83 = (sp83 >> 1) + 192; gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, sp83, sp83, sp83, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, sp83, sp83, sp83, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); } @@ -1539,14 +1539,14 @@ void func_8009C0AC(GlobalContext* globalCtx) { (gameplayFrames * 30) % 2048, 16, 512)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); sp7B = (sp7B >> 1) + 192; gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, sp7B, sp7B, sp7B, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, sp7B, sp7B, sp7B, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); @@ -1583,10 +1583,10 @@ void func_8009C3EC(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); } @@ -1614,10 +1614,10 @@ void func_8009C608(GlobalContext* globalCtx) { 1023 - (gameplayFrames * 3) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); } @@ -1641,10 +1641,10 @@ void func_8009C8B8(GlobalContext* globalCtx) { Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); } @@ -1664,10 +1664,10 @@ void func_8009CAC0(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); } @@ -1697,10 +1697,10 @@ void func_8009CC00(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); } @@ -1737,14 +1737,14 @@ void func_8009CF84(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, - (gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF, + (gameplayFrames * 1) % 128, 32, 32, 255, 255, 255, globalCtx->unk_11D30[0] + 127)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); } @@ -1769,10 +1769,10 @@ void func_8009D0E8(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); } @@ -1791,10 +1791,10 @@ void func_8009D31C(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); } @@ -1821,10 +1821,10 @@ void func_8009D438(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A350[var])); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); } @@ -1846,10 +1846,10 @@ void func_8009D5B4(GlobalContext* globalCtx) { 1023 - (gameplayFrames * 6) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); } @@ -1879,10 +1879,10 @@ void func_8009D758(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); } @@ -1924,10 +1924,10 @@ void func_8009DA30(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, displayListHead); @@ -1944,7 +1944,7 @@ void func_8009DA30(GlobalContext* globalCtx) { } } - gDPSetPrimColor(displayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0]); + gDPSetPrimColor(displayListHead++, 0, 0, 255, 255, 255, globalCtx->unk_11D30[0]); gSPDisplayList(displayListHead++, &D_03012B20); gSPEndDisplayList(displayListHead); } @@ -1966,10 +1966,10 @@ void func_8009DD5C(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); } @@ -1995,10 +1995,10 @@ void func_8009DE78(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); } @@ -2029,10 +2029,10 @@ void func_8009E0B8(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); if (gSaveContext.sceneSetupIndex == 4) { spA3 = 255 - (u8)globalCtx->unk_11D30[0]; @@ -2044,13 +2044,13 @@ void func_8009E0B8(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, displayListHead); gDPPipeSync(displayListHead++); - gDPSetEnvColor(displayListHead++, 0x80, 0x80, 0x80, spA3); + gDPSetEnvColor(displayListHead++, 128, 128, 128, spA3); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyXlu.p++, 0x0B, displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, displayListHead); gDPPipeSync(displayListHead++); - gDPSetEnvColor(displayListHead++, 0x80, 0x80, 0x80, spA0 * 0.1f); + gDPSetEnvColor(displayListHead++, 128, 128, 128, spA0 * 0.1f); gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, @@ -2076,13 +2076,13 @@ void func_8009E54C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32, - 32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + 32, 0, 0, 0, globalCtx->unk_11D30[0] + 168)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, - 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 168)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0xFF, 0xFF, 0xFF, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 255, 255, 255, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); } @@ -2108,7 +2108,7 @@ void func_8009E730(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A378[gSaveContext.nightFlag])); @@ -2137,10 +2137,10 @@ void func_8009E8C0(GlobalContext* globalCtx) { (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); } @@ -2175,10 +2175,10 @@ void func_8009EAD8(GlobalContext* globalCtx) { (gameplayFrames * 1) % 64, 16, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); } @@ -2203,10 +2203,10 @@ void func_8009EE44(GlobalContext* globalCtx) { gameplayFrames % 128, gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); if ((globalCtx->unk_11D30[0] == 0) && (INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO)) { if (globalCtx->unk_11D30[1] == 50) { @@ -2233,10 +2233,10 @@ void func_8009F074(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); } @@ -2275,10 +2275,10 @@ void func_8009F270(GlobalContext* globalCtx) { 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); } @@ -2301,10 +2301,10 @@ void func_8009F40C(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); } @@ -2335,16 +2335,16 @@ void func_8009F5D4(GlobalContext* globalCtx) { } } - gDPSetPrimColor(displayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0]); + gDPSetPrimColor(displayListHead++, 0, 0, 255, 255, 255, globalCtx->unk_11D30[0]); gSPDisplayList(displayListHead++, &D_0300AA48); gSPEndDisplayList(displayListHead); } gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); } @@ -2372,10 +2372,10 @@ void func_8009F7D4(GlobalContext* globalCtx) { 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, sp6F, sp6E, 0xFF, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, sp6F, sp6E, 255, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); } @@ -2397,10 +2397,10 @@ void func_8009F9D0(GlobalContext* globalCtx) { gameplayFrames % 128, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A388[gSaveContext.nightFlag])); @@ -2423,10 +2423,10 @@ void func_8009FB74(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.nightFlag])); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); } @@ -2450,10 +2450,10 @@ void func_8009FC90(GlobalContext* globalCtx) { 127 - (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x40); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 64); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x40); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 64); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); } @@ -2489,10 +2489,10 @@ void func_8009FE58(GlobalContext* globalCtx) { } gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); if (func_800C0D28(globalCtx) != 1) { D_8012A39C += 1820; @@ -2567,10 +2567,10 @@ void func_800A0334(GlobalContext* globalCtx) { 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); } @@ -2601,10 +2601,10 @@ void func_800A059C(GlobalContext* globalCtx) { Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, 128); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 128, 128, 128, 128); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); } diff --git a/src/code/z_view.c b/src/code/z_view.c index fc0cc3c719..b0566e7a41 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -138,7 +138,7 @@ void func_800AA550(View* view) { gfxCtx = view->gfxCtx; - varY = func_800B38FC(); + varY = ShrinkWindow_GetCurrentVal(); varX = -1; // The following is optimized to varX = 0 but affects codegen @@ -351,8 +351,8 @@ s32 func_800AAA9C(View* view) { } func_800ABE74(view->eye.x, view->eye.y, view->eye.z); - guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, - view->up.x, view->up.y, view->up.z); + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x, + view->up.y, view->up.z); view->viewing = *viewing; @@ -500,8 +500,8 @@ s32 func_800AB560(View* view) { } func_800ABE74(view->eye.x, view->eye.y, view->eye.z); - guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, - view->up.x, view->up.y, view->up.z); + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x, + view->up.y, view->up.z); view->viewing = *viewing; @@ -527,17 +527,23 @@ s32 func_800AB944(View* view) { } #ifdef NON_MATCHING -// saved register usage is wrong, relatively minor reorderings, regalloc +// regalloc differences s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { - GraphicsContext* gfxCtx = view->gfxCtx; Gfx* gfx = *gfxp; + GraphicsContext* gfxCtx = view->gfxCtx; + s32 width; + s32 height; + Vp* vp; + Mtx* projection; + Mtx* viewing; - arg1 = (view->flags & arg1) | arg1 >> 4; + arg1 = (arg1 & view->flags) | (arg1 >> 4); if (arg1 & 2) { - Vp* vp = Graph_Alloc(view->gfxCtx, sizeof(Vp)); + vp = Graph_Alloc(view->gfxCtx, sizeof(Vp)); LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 910); View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; gDPPipeSync(gfx++); @@ -547,7 +553,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { } if (arg1 & 8) { - Mtx* projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); view->projectionPtr = projection; @@ -558,9 +564,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else if (arg1 & 6) { - s32 width; - s32 height; - Mtx* projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 932); view->projectionPtr = projection; @@ -577,7 +581,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { } if (arg1 & 1) { - Mtx* viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); + viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948); view->viewingPtr = viewing; diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index b544132857..112f64c00d 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -12,14 +12,14 @@ void VisMono_Init(VisMono* this) { bzero(this, sizeof(VisMono)); this->unk_00 = 0; this->setScissor = false; - this->primColor.r = 0xFF; - this->primColor.g = 0xFF; - this->primColor.b = 0xFF; - this->primColor.a = 0xFF; - this->envColor.r = 0x00; - this->envColor.g = 0x00; - this->envColor.b = 0x00; - this->envColor.a = 0x00; + this->primColor.r = 255; + this->primColor.g = 255; + this->primColor.b = 255; + this->primColor.a = 255; + this->envColor.r = 0; + this->envColor.g = 0; + this->envColor.b = 0; + this->envColor.a = 0; } void VisMono_Destroy(VisMono* this) { diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index d4077d9239..b961271d15 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -21,7 +21,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb gSPSegment(gfxCtx->polyOpa.p++, 8, skyboxCtx->staticSegments[1]); gSPSegment(gfxCtx->polyOpa.p++, 9, skyboxCtx->staticSegments[2]); - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0x00, 0x00, alpha); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0, 0, 0, alpha); gSPTexture(gfxCtx->polyOpa.p++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON) sSkyboxDrawMatrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); diff --git a/src/libultra_code/osMempakAddrCRC.c b/src/libultra_code/__osContAddressCrc.c similarity index 95% rename from src/libultra_code/osMempakAddrCRC.c rename to src/libultra_code/__osContAddressCrc.c index cf4eb8c4d2..64b7749bde 100644 --- a/src/libultra_code/osMempakAddrCRC.c +++ b/src/libultra_code/__osContAddressCrc.c @@ -5,7 +5,7 @@ // Valid addr up to 0x7FF // It's the address of a block of 0x20 bytes in the mempak // So that means the whole mempak has a 16-bit address space -u8 osMempakAddrCRC(u16 addr) { +u8 __osContAddressCrc(u16 addr) { u32 addr32 = addr; u32 ret = 0; u32 bit; @@ -34,7 +34,7 @@ u8 osMempakAddrCRC(u16 addr) { return ret & 0x1f; } -u8 osMempakDataCRC(u8* data) { +u8 __osContDataCrc(u8* data) { s32 ret; u32 bit; u32 byte; diff --git a/src/libultra_code/osReadMempak.c b/src/libultra_code/__osContRamRead.c similarity index 84% rename from src/libultra_code/osReadMempak.c rename to src/libultra_code/__osContRamRead.c index 6640db0b63..be6d3e2894 100644 --- a/src/libultra_code/osReadMempak.c +++ b/src/libultra_code/__osContRamRead.c @@ -4,7 +4,9 @@ #define BLOCKSIZE 32 -s32 osReadMempak(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data) { +s32 __osPfsLastChannel = -1; + +s32 __osContRamRead(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data) { s32 ret; s32 i; u8* bufptr; @@ -31,15 +33,15 @@ s32 osReadMempak(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data) { } else { bufptr += channel; } - ((__OSContRamHeader*)bufptr)->hi = addr >> 3; // send byte 1 - ((__OSContRamHeader*)bufptr)->lo = (s8)(osMempakAddrCRC(addr) | (addr << 5)); // send byte 2 + ((__OSContRamHeader*)bufptr)->hi = addr >> 3; // send byte 1 + ((__OSContRamHeader*)bufptr)->lo = (s8)(__osContAddressCrc(addr) | (addr << 5)); // send byte 2 __osSiRawStartDma(OS_WRITE, &pifMempakBuf); osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK); __osSiRawStartDma(OS_READ, &pifMempakBuf); osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK); ret = (((__OSContRamHeader*)bufptr)->rxsize & 0xC0) >> 4; if (!ret) { - if (((__OSContRamHeader*)bufptr)->datacrc != osMempakDataCRC(bufptr + 6)) { + if (((__OSContRamHeader*)bufptr)->datacrc != __osContDataCrc(bufptr + 6)) { ret = __osPfsGetStatus(ctrlrqueue, channel); if (ret) { break; diff --git a/src/libultra_code/__osContRamWrite.c b/src/libultra_code/__osContRamWrite.c new file mode 100644 index 0000000000..d26ca579ef --- /dev/null +++ b/src/libultra_code/__osContRamWrite.c @@ -0,0 +1,68 @@ +#include +#include +#include + +s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 force) { + s32 ret = 0; + s32 i; + u8* ptr; + s32 retry = 2; + u8 crc; + + if ((force != PFS_FORCE) && (address < PFS_LABEL_AREA) && (address != 0)) { + return 0; + } + + __osSiGetAccess(); + + do { + ptr = (u8*)(&pifMempakBuf); + + if (__osContLastPoll != CONT_CMD_WRITE_MEMPACK || __osPfsLastChannel != channel) { + __osContLastPoll = CONT_CMD_WRITE_MEMPACK; + __osPfsLastChannel = channel; + + // clang-format off + for (i = 0; i < channel; i++) { *ptr++ = 0; } + // clang-format on + + pifMempakBuf.status = 1; + + ((__OSContRamHeader*)ptr)->unk_00 = 0xff; + ((__OSContRamHeader*)ptr)->txsize = 35; + ((__OSContRamHeader*)ptr)->rxsize = 1; + ((__OSContRamHeader*)ptr)->poll = CONT_CMD_WRITE_MEMPACK; + ((__OSContRamHeader*)ptr)->datacrc = 0xff; + + ptr[sizeof(__OSContRamHeader)] = CONT_CMD_END; + } else { + ptr += channel; + } + ((__OSContRamHeader*)ptr)->hi = address >> 3; + ((__OSContRamHeader*)ptr)->lo = ((address << 5) | __osContAddressCrc(address)); + + bcopy(buffer, ((__OSContRamHeader*)ptr)->data, BLOCKSIZE); + + ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf); + crc = __osContDataCrc(buffer); + osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK); + + ret = __osSiRawStartDma(OS_READ, &pifMempakBuf); + osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK); + + ret = ((((__OSContRamHeader*)ptr)->rxsize & 0xC0) >> 4); + if (!ret) { + if (crc != ((__OSContRamHeader*)ptr)->datacrc) { + if ((ret = __osPfsGetStatus(mq, channel))) { + break; + } else { + ret = PFS_ERR_CONTRFAIL; + } + } + } else { + ret = PFS_ERR_NOPACK; + } + } while ((ret == PFS_ERR_CONTRFAIL) && (retry-- >= 0)); + __osSiRelAccess(); + return ret; +} diff --git a/src/libultra_code/__osPfsSelectBank.c b/src/libultra_code/__osPfsSelectBank.c new file mode 100644 index 0000000000..6e7acc82f9 --- /dev/null +++ b/src/libultra_code/__osPfsSelectBank.c @@ -0,0 +1,18 @@ +#include +#include + +s32 __osPfsSelectBank(OSPfs* pfs, u8 bank) { + u8 temp[BLOCKSIZE]; + s32 i; + s32 ret = 0; + + for (i = 0; i < BLOCKSIZE; i++) { + temp[i] = bank; + } + + ret = __osContRamWrite(pfs->queue, pfs->channel, 0x8000 / BLOCKSIZE, temp, 0); + if (ret == 0) { + pfs->activebank = bank; + } + return ret; +} diff --git a/src/libultra_code/contpfs.c b/src/libultra_code/contpfs.c new file mode 100644 index 0000000000..3087b7adc2 --- /dev/null +++ b/src/libultra_code/contpfs.c @@ -0,0 +1,315 @@ +#include +#include + +extern __OSInode __osPfsInodeCache; // bss +s32 __osPfsInodeCacheChannel = -1; +u8 __osPfsInodeCacheBank = 250; + +u16 __osSumcalc(u8* ptr, s32 length) { + s32 i; + u32 sum = 0; + u8* temp; + + temp = ptr; + for (i = 0; i < length; i++) { + sum += *temp++; + } + return sum & 0xFFFF; +} + +s32 __osIdCheckSum(u16* ptr, u16* checkSum, u16* idSum) { + + u16 data = 0; + u32 i; + + *checkSum = *idSum = 0; + for (i = 0; i < ((sizeof(__OSPackId) - sizeof(u32)) / sizeof(u8)); i += 2) { + data = *((u16*)((u32)ptr + i)); + *checkSum += data; + *idSum += ~data; + } + return 0; +} + +s32 __osRepairPackId(OSPfs* pfs, __OSPackId* badid, __OSPackId* newid) { + s32 ret = 0; + u8 temp[BLOCKSIZE]; + u8 comp[BLOCKSIZE]; + u8 mask = 0; + s32 i, j = 0; + u16 index[4]; + + newid->repaired = 0xFFFFFFFF; + newid->random = osGetCount(); + newid->serialMid = badid->serialMid; + newid->serialLow = badid->serialLow; + + if ((pfs->activebank != 0) && ((ret = __osPfsSelectBank(pfs, 0)) != 0)) { + return ret; + } + + do { + if ((ret = __osPfsSelectBank(pfs, j)) != 0) { + return ret; + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, temp)) != 0) { + return ret; + } + temp[0] = j | 0x80; + for (i = 1; i < BLOCKSIZE; i++) { + temp[i] = ~temp[i]; + } + + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, 0, temp, 0)) != 0) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, comp)) != 0) { + return (ret); + } + for (i = 0; i < BLOCKSIZE; i++) { + if (comp[i] != temp[i]) { + break; + } + } + if (i != BLOCKSIZE) { + break; + } + + if (j > 0) { + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, temp)) != 0) { + return ret; + } + if (temp[0] != 0x80) { + break; + } + } + + j++; + } while (j < PFS_MAX_BANKS); + + if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + + mask = (j > 0) ? 1 : 0; + newid->deviceid = (badid->deviceid & 0xFFFE) | mask; + newid->banks = j; + newid->version = badid->version; + __osIdCheckSum(newid, &newid->checksum, &newid->invertedChecksum); + + index[0] = PFS_ID_0AREA; + index[1] = PFS_ID_1AREA; + index[2] = PFS_ID_2AREA; + index[3] = PFS_ID_3AREA; + for (i = 0; i < 4; i++) { + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, index[i], newid, PFS_FORCE)) != 0) { + return ret; + } + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) { + return ret; + } + for (i = 0; i < BLOCKSIZE; i++) { + if (temp[i] != *(u8*)((s32)newid + i)) { + return PFS_ERR_DEVICE; + } + } + return 0; +} + +s32 __osCheckPackId(OSPfs* pfs, __OSPackId* temp) { + + u16 index[4]; + s32 ret = 0; + u16 sum; + u16 idSum; + s32 i; + s32 j; + + if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + + index[0] = PFS_ID_0AREA; + index[1] = PFS_ID_1AREA; + index[2] = PFS_ID_2AREA; + index[3] = PFS_ID_3AREA; + for (i = 1; i < 4; i++) { + if ((ret = __osContRamRead(pfs->queue, pfs->channel, index[i], temp)) != 0) { + return ret; + } + __osIdCheckSum(temp, &sum, &idSum); + if ((temp->checksum == sum) && (temp->invertedChecksum == idSum)) { + break; + } + } + if (i == 4) { + return PFS_ERR_ID_FATAL; + } + + for (j = 0; j < 4; j++) { + if (j != i) { + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, index[j], temp, PFS_FORCE)) != 0) { + return ret; + } + } + } + return 0; +} + +#ifdef NON_MATCHING +// regalloc differences, probably the same issue as osPfsInitPak +s32 __osGetId(OSPfs* pfs) { + + u16 sum, isum; + u8 temp[BLOCKSIZE]; + __OSPackId newid; + s32 ret; + __OSPackId* id; + + if (pfs->activebank != 0) { + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) { + return ret; + } + __osIdCheckSum((u16*)temp, &sum, &isum); + id = (__OSPackId*)temp; + if ((id->checksum != sum) || (id->invertedChecksum != isum)) { + if ((ret = __osCheckPackId(pfs, id)) == PFS_ERR_ID_FATAL) { + ret = __osRepairPackId(pfs, id, &newid); + if (ret) { + return ret; + } + id = &newid; + } else if (ret != 0) { + return ret; + } + } + + if ((id->deviceid & 0x01) == 0) { + ret = __osRepairPackId(pfs, id, &newid); + if (ret) { + return ret; + } + id = &newid; + if ((id->deviceid & 0x01) == 0) { + return PFS_ERR_DEVICE; + } + } + + bcopy(id, pfs->id, BLOCKSIZE); + + pfs->version = id->version; + + pfs->banks = id->banks; + pfs->inodeStartPage = 1 + DEF_DIR_PAGES + (2 * pfs->banks); + pfs->dir_size = DEF_DIR_PAGES * PFS_ONE_PAGE; + pfs->inode_table = 1 * PFS_ONE_PAGE; + pfs->minode_table = (1 + pfs->banks) * PFS_ONE_PAGE; + pfs->dir_table = pfs->minode_table + (pfs->banks * PFS_ONE_PAGE); + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_LABEL_AREA, pfs->label)) != 0) { + return ret; + } + + return 0; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/contpfs/__osGetId.s") +#endif + +s32 __osCheckId(OSPfs* pfs) { + u8 temp[BLOCKSIZE]; + s32 ret; + + if (pfs->activebank != 0) { + ret = __osPfsSelectBank(pfs, 0); + if (ret == PFS_ERR_NEW_PACK) { + ret = __osPfsSelectBank(pfs, 0); + } + if (ret != 0) { + return ret; + } + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) { + if (ret != PFS_ERR_NEW_PACK) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) { + return ret; + } + } + + if (bcmp(pfs->id, temp, BLOCKSIZE) != 0) { + return PFS_ERR_NEW_PACK; + } + + return 0; +} + +s32 __osPfsRWInode(OSPfs* pfs, __OSInode* inode, u8 flag, u8 bank) { + u8 sum; + s32 j; + s32 ret; + s32 offset; + u8* addr; + + if (flag == PFS_READ && bank == __osPfsInodeCacheBank && (pfs->channel == __osPfsInodeCacheChannel)) { + bcopy(&__osPfsInodeCache, inode, sizeof(__OSInode)); + return 0; + } + + if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + + offset = ((bank > 0) ? 1 : pfs->inodeStartPage); + + if (flag == PFS_WRITE) { + inode->inodePage[0].inode_t.page = + __osSumcalc(inode->inodePage + offset, (PFS_INODE_SIZE_PER_PAGE - offset) * 2); + } + + for (j = 0; j < PFS_ONE_PAGE; j++) { + addr = (u8*)(((u8*)inode) + (j * BLOCKSIZE)); + if (flag == PFS_WRITE) { + ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + (bank * PFS_ONE_PAGE) + j, addr, 0); + ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->minode_table + (bank * PFS_ONE_PAGE) + j, addr, 0); + } else { + ret = __osContRamRead(pfs->queue, pfs->channel, pfs->inode_table + (bank * PFS_ONE_PAGE) + j, addr); + } + if (ret) { + return ret; + } + } + + if (flag == PFS_READ) { + sum = __osSumcalc((u8*)(inode->inodePage + offset), (PFS_INODE_SIZE_PER_PAGE - offset) * 2); + if (sum != inode->inodePage[0].inode_t.page) { + for (j = 0; j < PFS_ONE_PAGE; j++) { + addr = (u8*)(((u8*)inode) + (j * BLOCKSIZE)); + ret = __osContRamRead(pfs->queue, pfs->channel, pfs->minode_table + (bank * PFS_ONE_PAGE) + j, addr); + } + sum = __osSumcalc(inode->inodePage + offset, (PFS_INODE_SIZE_PER_PAGE - offset) * 2); + if (sum != inode->inodePage[0].inode_t.page) { + return PFS_ERR_INCONSISTENT; + } + for (j = 0; j < PFS_ONE_PAGE; j++) { + addr = (u8*)(((u8*)inode) + (j * BLOCKSIZE)); + ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + (bank * PFS_ONE_PAGE) + j, addr, 0); + } + } + } + __osPfsInodeCacheBank = bank; + bcopy(inode, &__osPfsInodeCache, sizeof(__OSInode)); + __osPfsInodeCacheChannel = pfs->channel; + return 0; +} diff --git a/src/libultra_code/code_801031F0.c b/src/libultra_code/contquery.c similarity index 94% rename from src/libultra_code/code_801031F0.c rename to src/libultra_code/contquery.c index 12bb4668f5..6f6def55bb 100644 --- a/src/libultra_code/code_801031F0.c +++ b/src/libultra_code/contquery.c @@ -1,15 +1,12 @@ #include "libultra_internal.h" #include -s32 osAfterPreNMI(void) { - return __osSpSetPc(0); -} - /** * osContStartQuery: * Starts to read the values for SI device status and type which are connected to the controller port and joyport * connector. **/ + s32 osContStartQuery(OSMesgQueue* mq) { s32 ret; ret = 0; diff --git a/src/libultra_code/cosf.c b/src/libultra_code/cosf.c index 06b11e988f..75dce4efdd 100644 --- a/src/libultra_code/cosf.c +++ b/src/libultra_code/cosf.c @@ -1,3 +1,64 @@ -#include "libultra_internal.h" +#include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/cosf/cosf.s") +static const du P[] = { + { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, + { 0xBF29f6FF, 0xEEA56814 }, { 0x3EC5DBDF, 0x0E314BFE }, +}; + +static const du rpi = { 0x3FD45F30, 0x6DC9C883 }; + +static const du pihi = { 0x400921FB, 0x50000000 }; + +static const du pilo = { 0x3E6110B4, 0x611A6263 }; + +static const fu zero = { 0x00000000 }; + +f32 cosf(f32 x) { + f32 absx; + f64 dx; + f64 xSq; + f64 polyApprox; + f64 dn; + s32 n; + f64 result; + s32 ix, xpt; + + ix = *(s32*)&x; + xpt = (ix >> 22); + xpt &= 0x1FF; + + if (xpt < 0x136) { + + absx = ULTRA_ABS(x); + + dx = absx; + + dn = dx * rpi.d + 0.5; + n = ROUND(dn); + dn = n; + + dn -= 0.5; + + dx -= dn * pihi.d; + dx -= dn * pilo.d; + + xSq = SQ(dx); + + polyApprox = ((P[4].d * xSq + P[3].d) * xSq + P[2].d) * xSq + P[1].d; + + result = dx + (dx * xSq) * polyApprox; + + if (!(n & 1)) { + return (f32)result; + } + + return -(f32)result; + } + + if (x != x) { + return __libm_qnan_f; + } + + return zero.f; +} diff --git a/src/libultra_code/guLookAt.c b/src/libultra_code/guLookAt.c index e331aee8c9..0c95c7f5ee 100644 --- a/src/libultra_code/guLookAt.c +++ b/src/libultra_code/guLookAt.c @@ -1,6 +1,62 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/guLookAt/guLookAtF.s") +void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) { + f32 length; + f32 xLook, yLook, zLook; + f32 xRight, yRight, zRight; -#pragma GLOBAL_ASM("asm/non_matchings/code/guLookAt/guLookAt.s") + guMtxIdentF(mf); + + xLook = xAt - xEye; + yLook = yAt - yEye; + zLook = zAt - zEye; + length = -1.0 / sqrtf(SQ(xLook) + SQ(yLook) + SQ(zLook)); + xLook *= length; + yLook *= length; + zLook *= length; + + xRight = yUp * zLook - zUp * yLook; + yRight = zUp * xLook - xUp * zLook; + zRight = xUp * yLook - yUp * xLook; + length = 1.0 / sqrtf(SQ(xRight) + SQ(yRight) + SQ(zRight)); + xRight *= length; + yRight *= length; + zRight *= length; + + xUp = yLook * zRight - zLook * yRight; + yUp = zLook * xRight - xLook * zRight; + zUp = xLook * yRight - yLook * xRight; + length = 1.0 / sqrtf(SQ(xUp) + SQ(yUp) + SQ(zUp)); + xUp *= length; + yUp *= length; + zUp *= length; + + mf[0][0] = xRight; + mf[1][0] = yRight; + mf[2][0] = zRight; + mf[3][0] = -(xEye * xRight + yEye * yRight + zEye * zRight); + + mf[0][1] = xUp; + mf[1][1] = yUp; + mf[2][1] = zUp; + mf[3][1] = -(xEye * xUp + yEye * yUp + zEye * zUp); + + mf[0][2] = xLook; + mf[1][2] = yLook; + mf[2][2] = zLook; + mf[3][2] = -(xEye * xLook + yEye * yLook + zEye * zLook); + + mf[0][3] = 0; + mf[1][3] = 0; + mf[2][3] = 0; + mf[3][3] = 1; +} + +void guLookAt(Mtx* m, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) { + f32 mf[4][4]; + + guLookAtF(mf, xEye, yEye, zEye, xAt, yAt, zAt, xUp, yUp, zUp); + + guMtxF2L(mf, m); +} diff --git a/src/libultra_code/osAfterPreNMI.c b/src/libultra_code/osAfterPreNMI.c new file mode 100644 index 0000000000..19ccdb6f69 --- /dev/null +++ b/src/libultra_code/osAfterPreNMI.c @@ -0,0 +1,6 @@ +#include +#include + +s32 osAfterPreNMI(void) { + return __osSpSetPc(0); +} diff --git a/src/libultra_code/osPfsDeleteFile.c b/src/libultra_code/osPfsDeleteFile.c new file mode 100644 index 0000000000..e44a5633ce --- /dev/null +++ b/src/libultra_code/osPfsDeleteFile.c @@ -0,0 +1,70 @@ +#include +#include + +s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name) { + + s32 file_no; + s32 ret; + __OSInode inode; + __OSDir dir; + __OSInodeUnit last_page; + u8 startpage; + u8 bank; + + if ((company_code == 0) || (game_code == 0)) { + return PFS_ERR_INVALID; + } + if ((ret = osPfsFindFile(pfs, company_code, game_code, game_name, ext_name, &file_no)) != 0) { + return ret; + } + if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir)) != 0) { + return ret; + } + startpage = dir.start_page.inode_t.page; + for (bank = dir.start_page.inode_t.bank; bank < pfs->banks;) { + if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { + return ret; + } + if ((ret = __osPfsReleasePages(pfs, &inode, startpage, bank, &last_page)) != 0) { + return ret; + } + if ((ret = __osPfsRWInode(pfs, &inode, PFS_WRITE, bank)) != 0) { + return ret; + } + if (last_page.ipage == PFS_EOF) { + break; + } + bank = last_page.inode_t.bank; + startpage = last_page.inode_t.page; + } + + if (bank >= pfs->banks) { + return PFS_ERR_INCONSISTENT; + } + bzero(&dir, sizeof(__OSDir)); + + ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, 0); + return ret; +} + +s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage) { + __OSInodeUnit next; + __OSInodeUnit prev; + s32 ret = 0; + + next.ipage = (u16)((bank << 8) + initialPage); + + do { + prev = next; + next = inode->inodePage[next.inode_t.page]; + inode->inodePage[prev.inode_t.page].ipage = PFS_PAGE_NOT_USED; + } while (next.ipage >= pfs->inodeStartPage && next.inode_t.bank == bank); + + *finalPage = next; + + return ret; +} diff --git a/src/libultra_code/osPfsFindFile.c b/src/libultra_code/osPfsFindFile.c new file mode 100644 index 0000000000..4320aca4b3 --- /dev/null +++ b/src/libultra_code/osPfsFindFile.c @@ -0,0 +1,53 @@ +#include +#include + +s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo) { + s32 j; + s32 i; + __OSDir dir; + s32 ret = 0; + s32 err; + + if (!(pfs->status & PFS_INITIALIZED)) { + return PFS_ERR_INVALID; + } + + if ((ret = __osCheckId(pfs)) != 0) { + return ret; + } + + for (j = 0; j < pfs->dir_size; j++) { + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + j, &dir)) != 0) { + return ret; + } + if ((ret = __osPfsGetStatus(pfs->queue, pfs->channel)) != 0) { + return ret; + } + + if ((dir.company_code == companyCode) && (dir.game_code == gameCode)) { + err = 0; + if (gameName != 0) { + for (i = 0; i < PFS_FILE_NAME_LEN; i++) { + if (dir.game_name[i] != gameName[i]) { + err = 1; + break; + } + } + } + if ((extName != 0) && (err == 0)) { + for (i = 0; i < PFS_FILE_EXT_LEN; i++) { + if (dir.ext_name[i] != extName[i]) { + err = 1; + break; + } + } + } + if (err == 0) { + *fileNo = j; + return ret; + } + } + } + *fileNo = -1; + return PFS_ERR_INVALID; +} diff --git a/src/libultra_code/osPfsFreeBlocks.c b/src/libultra_code/osPfsFreeBlocks.c new file mode 100644 index 0000000000..912af74157 --- /dev/null +++ b/src/libultra_code/osPfsFreeBlocks.c @@ -0,0 +1,36 @@ +#include +#include +#include + +s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes) { + s32 j; + s32 pages = 0; + __OSInode inode; + s32 ret = 0; + u8 bank; + s32 offset; + + if (!(pfs->status & PFS_INITIALIZED)) { + return (PFS_ERR_INVALID); + } + + if ((ret = __osCheckId(pfs)) != 0) { + return ret; + } + + for (bank = PFS_ID_BANK_256K; bank < pfs->banks; bank++) { + if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { + return ret; + } + + offset = ((bank > PFS_ID_BANK_256K) ? 1 : pfs->inodeStartPage); + for (j = offset; j < PFS_INODE_SIZE_PER_PAGE; j++) { + if (inode.inodePage[j].ipage == PFS_PAGE_NOT_USED) { + pages++; + } + } + } + + *leftoverBytes = pages * PFS_ONE_PAGE * BLOCKSIZE; + return 0; +} diff --git a/src/libultra_code/osRumblePak.c b/src/libultra_code/osRumblePak.c index 6be487e457..d71a066abe 100644 --- a/src/libultra_code/osRumblePak.c +++ b/src/libultra_code/osRumblePak.c @@ -54,7 +54,7 @@ void osSetUpMempakWrite(s32 channel, OSPifRam* buf) { mempakwr.rxsize = 1; mempakwr.poll = 3; // write mempak mempakwr.hi = 0x600 >> 3; - mempakwr.lo = (u8)(osMempakAddrCRC(0x600) | (0x600 << 5)); + mempakwr.lo = (u8)(__osContAddressCrc(0x600) | (0x600 << 5)); if (channel != 0) { for (i = 0; i < channel; ++i) { *bufptr++ = 0; @@ -74,14 +74,14 @@ s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel) { pfs->activebank = 0xFF; pfs->status = 0; - ret = func_80104C80(pfs, 0xFE); + ret = __osPfsSelectBank(pfs, 0xFE); if (ret == 2) { - ret = func_80104C80(pfs, MOTOR_ID); + ret = __osPfsSelectBank(pfs, MOTOR_ID); } if (ret != 0) { return ret; } - ret = osReadMempak(ctrlrqueue, channel, BANK_ADDR, sp24); + ret = __osContRamRead(ctrlrqueue, channel, BANK_ADDR, sp24); ret = ret; if (ret == 2) { ret = 4; // "Controller pack communication error" @@ -92,14 +92,14 @@ s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel) { if (sp24[BLOCKSIZE - 1] == 0xFE) { return 0xB; } - ret = func_80104C80(pfs, MOTOR_ID); + ret = __osPfsSelectBank(pfs, MOTOR_ID); if (ret == 2) { ret = 4; // "Controller pack communication error" } if (ret != 0) { return ret; } - ret = osReadMempak(ctrlrqueue, channel, BANK_ADDR, sp24); + ret = __osContRamRead(ctrlrqueue, channel, BANK_ADDR, sp24); if (ret == 2) { ret = 4; // "Controller pack communication error" } diff --git a/src/libultra_code/pfsallocatefile.c b/src/libultra_code/pfsallocatefile.c new file mode 100644 index 0000000000..3cdc592187 --- /dev/null +++ b/src/libultra_code/pfsallocatefile.c @@ -0,0 +1,137 @@ +#include +#include +#include + +s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 fileSize, s32* fileNo) { + s32 startPage, decleared, prevPage; + s32 oldPrevPage = 0; + s32 ret = 0; + s32 fileSizeInPages; + __OSInode inode, backup_inode; + __OSDir dir; + u8 bank; + u8 prevBank = 0; + s32 firsttime = 0; + s32 bytes; + __OSInodeUnit fpage; + + if ((companyCode == 0) || (gameCode == 0)) { + return PFS_ERR_INVALID; + } + + fileSizeInPages = (fileSize + PFS_PAGE_SIZE - 1) / PFS_PAGE_SIZE; + + if (((ret = osPfsFindFile(pfs, companyCode, gameCode, gameName, extName, fileNo)) != 0) && + (ret != PFS_ERR_INVALID)) { + return ret; + } + if (*fileNo != -1) { + return PFS_ERR_EXIST; + } + + ret = osPfsFreeBlocks(pfs, &bytes); + if (fileSize > bytes) { + return PFS_DATA_FULL; + } + + if (fileSizeInPages == 0) { + return (PFS_ERR_INVALID); + } + + if (((ret = osPfsFindFile(pfs, 0, 0, 0, 0, fileNo)) != 0) && (ret != PFS_ERR_INVALID)) { + return ret; + } + if (*fileNo == -1) { + return PFS_DIR_FULL; + } + + for (bank = PFS_ID_BANK_256K; bank < pfs->banks; bank++) { + if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) { + return ret; + } + ret = __osPfsDeclearPage(pfs, &inode, fileSizeInPages, &startPage, bank, &decleared, &prevPage); + if (ret) { + return ret; + } + if (startPage != -1) { /* There is free space */ + if (firsttime == 0) { + fpage.inode_t.page = (u8)startPage; + fpage.inode_t.bank = bank; + } else { /* Writing previous bank inode */ + backup_inode.inodePage[oldPrevPage].inode_t.bank = bank; + backup_inode.inodePage[oldPrevPage].inode_t.page = (u8)startPage; + if ((ret = __osPfsRWInode(pfs, &backup_inode, PFS_WRITE, prevBank)) != 0) { + return ret; + } + } + if (fileSizeInPages > decleared) { + bcopy(&inode, &backup_inode, sizeof(__OSInode)); + oldPrevPage = prevPage; + prevBank = bank; + fileSizeInPages -= decleared; + firsttime++; + } else { + fileSizeInPages = 0; + if ((ret = __osPfsRWInode(pfs, &inode, PFS_WRITE, bank)) != 0) { + return ret; + } + break; + } + } + } + if ((fileSizeInPages > 0) || (startPage == -1)) { + return PFS_ERR_INCONSISTENT; + } + + dir.start_page = fpage; + dir.company_code = companyCode; + dir.game_code = gameCode; + dir.data_sum = 0; + + bcopy(gameName, dir.game_name, PFS_FILE_NAME_LEN); + bcopy(extName, dir.ext_name, PFS_FILE_EXT_LEN); + + ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + *fileNo, &dir, 0); + return ret; +} + +s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, + s32* finalPage) { + s32 j; + s32 spage, prevPage; + s32 ret = 0; + s32 offset; + + offset = ((bank > PFS_ID_BANK_256K) ? 1 : pfs->inodeStartPage); + for (j = offset; j < PFS_INODE_SIZE_PER_PAGE; j++) { + if (inode->inodePage[j].ipage == PFS_PAGE_NOT_USED) { + break; + } + } + if (j == PFS_INODE_SIZE_PER_PAGE) { + *startPage = -1; + return ret; + } + + spage = j; + *decleared = 1; + prevPage = j; + j++; + while ((fileSizeInPages > *decleared) && (j < PFS_INODE_SIZE_PER_PAGE)) { + if (inode->inodePage[j].ipage == PFS_PAGE_NOT_USED) { + inode->inodePage[prevPage].inode_t.bank = (u8)bank; + inode->inodePage[prevPage].inode_t.page = (u8)j; + prevPage = j; + (*decleared)++; + } + j++; + } + *startPage = spage; + if ((j == (PFS_INODE_SIZE_PER_PAGE)) && (fileSizeInPages > *decleared)) { + *finalPage = prevPage; + } else { + inode->inodePage[prevPage].ipage = PFS_EOF; + *finalPage = 0; + } + return ret; +} diff --git a/src/libultra_code/pfschecker.c b/src/libultra_code/pfschecker.c new file mode 100644 index 0000000000..abfcf41857 --- /dev/null +++ b/src/libultra_code/pfschecker.c @@ -0,0 +1,203 @@ +#include +#include +#include + +#define CHECK_IPAGE(p) \ + (((p).ipage >= pfs->inodeStartPage) && ((p).inode_t.bank < pfs->banks) && ((p).inode_t.page >= 0x01) && \ + ((p).inode_t.page < 0x80)) + +s32 osPfsChecker(OSPfs* pfs) { + s32 j; + s32 ret; + __OSInodeUnit next; + __OSInode checkedInode; + __OSInode tempInode; + __OSDir tempDir; + __OSInodeUnit nextNodeInFile[16]; + + __OSInodeCache cache; + + s32 fixed = 0; + u8 bank, prevBank = 254; + s32 cc, cl; + s32 offset; + + ret = __osCheckId(pfs); + + if (ret == PFS_ERR_NEW_PACK) { + ret = __osGetId(pfs); + } + + if (ret) { + return ret; + } + + if ((ret = func_80105788(pfs, &cache)) != 0) { + return ret; + } + + for (j = 0; j < pfs->dir_size; j++) { + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + j, &tempDir)) != 0) { + return ret; + } + + if ((tempDir.company_code != 0) || (tempDir.game_code != 0)) { + if ((tempDir.company_code == 0) || (tempDir.game_code == 0)) { + cc = -1; + } else { + next = tempDir.start_page; + + cl = cc = 0; + bank = 255; + + while (CHECK_IPAGE(next)) { + if (bank != next.inode_t.bank) { + bank = next.inode_t.bank; + if (prevBank != bank) { + ret = __osPfsRWInode(pfs, &tempInode, PFS_READ, bank); + prevBank = bank; + } + + if ((ret != 0) && (ret != PFS_ERR_INCONSISTENT)) { + return ret; + } + } + + if ((cc = func_80105A60(pfs, next, &cache) - cl) != 0) { + break; + } + cl = 1; + + next = tempInode.inodePage[next.inode_t.page]; + } + } + + if ((cc != 0) || (next.ipage != PFS_EOF)) { + bzero(&tempDir, sizeof(__OSDir)); + if (pfs->activebank != 0) { + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + } + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + j, &tempDir, 0)) != 0) { + return ret; + } + + fixed++; + } + } + } + for (j = 0; j < pfs->dir_size; j++) { + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + j, &tempDir)) != 0) { + return ret; + } + + if ((tempDir.company_code != 0) && (tempDir.game_code != 0) && + (tempDir.start_page.ipage >= (u16)pfs->inodeStartPage)) { // cast required + nextNodeInFile[j].ipage = tempDir.start_page.ipage; + } else { + nextNodeInFile[j].ipage = 0; + } + } + + for (bank = 0; bank < pfs->banks; bank++) { + ret = __osPfsRWInode(pfs, &tempInode, PFS_READ, bank); + if ((ret != 0) && (ret != PFS_ERR_INCONSISTENT)) { + return (ret); + } + offset = ((bank > PFS_ID_BANK_256K) ? 1 : pfs->inodeStartPage); + for (j = 0; j < offset; j++) { + checkedInode.inodePage[j].ipage = tempInode.inodePage[j].ipage; + } + for (; j < PFS_INODE_SIZE_PER_PAGE; j++) { + checkedInode.inodePage[j].ipage = PFS_PAGE_NOT_USED; + } + + for (j = 0; j < pfs->dir_size; j++) { + while (nextNodeInFile[j].inode_t.bank == bank && + nextNodeInFile[j].ipage >= (u16)pfs->inodeStartPage) { // cast required + u8 val; + val = nextNodeInFile[j].inode_t.page; + nextNodeInFile[j] = checkedInode.inodePage[val] = tempInode.inodePage[val]; + } + } + if ((ret = __osPfsRWInode(pfs, &checkedInode, PFS_WRITE, bank)) != 0) { + return ret; + } + } + + if (fixed != 0) { + pfs->status |= PFS_CORRUPTED; + } else { + pfs->status &= ~PFS_CORRUPTED; + } + return 0; +} + +// Original name: corrupted_init (probably needs better name) +s32 func_80105788(OSPfs* pfs, __OSInodeCache* cache) { + s32 i; + s32 n; + s32 offset; + u8 bank; + __OSInodeUnit tpage; + __OSInode tempInode; + s32 ret; + + for (i = 0; i < PFS_INODE_DIST_MAP; i++) { + cache->map[i] = 0; + } + cache->bank = 255; + + for (bank = PFS_ID_BANK_256K; bank < pfs->banks; bank++) { + offset = ((bank > PFS_ID_BANK_256K) ? 1 : pfs->inodeStartPage); + ret = __osPfsRWInode(pfs, &tempInode, PFS_READ, bank); + if ((ret != 0) && (ret != PFS_ERR_INCONSISTENT)) { + return ret; + } + + for (i = offset; i < PFS_INODE_SIZE_PER_PAGE; i++) { + tpage = tempInode.inodePage[i]; + if ((tpage.ipage >= pfs->inodeStartPage) && (tpage.inode_t.bank != bank)) { + n = ((tpage.inode_t.page & 0x7F) / PFS_SECTOR_SIZE) + + PFS_SECTOR_PER_BANK * (tpage.inode_t.bank % PFS_BANK_LAPPED_BY); + cache->map[n] |= (1 << (bank % PFS_BANK_LAPPED_BY)); + } + } + } + return 0; +} + +// original name: corrupted (probably needs a better name) +s32 func_80105A60(OSPfs* pfs, __OSInodeUnit fpage, __OSInodeCache* cache) { + s32 j; + s32 n; + s32 hit = 0; + u8 bank; + s32 offset; + s32 ret = 0; + + n = (fpage.inode_t.page / PFS_SECTOR_SIZE) + PFS_SECTOR_PER_BANK * (fpage.inode_t.bank % PFS_BANK_LAPPED_BY); + + for (bank = PFS_ID_BANK_256K; bank < pfs->banks; bank++) { + offset = ((bank > PFS_ID_BANK_256K) ? 1 : pfs->inodeStartPage); + if ((bank == fpage.inode_t.bank) || (cache->map[n] & (1 << (bank % PFS_BANK_LAPPED_BY))) != 0) { + if (bank != cache->bank) { + ret = __osPfsRWInode(pfs, &(cache->inode), PFS_READ, bank); + if ((ret) && (ret != PFS_ERR_INCONSISTENT)) { + return ret; + } + cache->bank = bank; + } + for (j = offset; ((hit < 2) && (j < PFS_INODE_SIZE_PER_PAGE)); j++) { + if (cache->inode.inodePage[j].ipage == fpage.ipage) { + hit++; + } + } + if (hit >= 2) { + return 2; + } + } + } + return hit; +} diff --git a/src/libultra_code/pfsinitpak.c b/src/libultra_code/pfsinitpak.c new file mode 100644 index 0000000000..2ce03b79d6 --- /dev/null +++ b/src/libultra_code/pfsinitpak.c @@ -0,0 +1,113 @@ +#include +#include + +#ifdef NON_MATCHING +// regalloc differences, probably the same issue as __osGetId +s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) { + s32 ret = 0; + u16 sum; + u16 isum; + u8 temp[BLOCKSIZE]; + __OSPackId* id; + __OSPackId newid; + + __osSiGetAccess(); + + ret = __osPfsGetStatus(queue, channel); + + __osSiRelAccess(); + + if (ret != 0) { + return ret; + } + + pfs->queue = queue; + pfs->channel = channel; + pfs->status = 0; + + if ((ret = __osPfsCheckRamArea(pfs)) != 0) { + return ret; + } + + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_ID_0AREA, temp)) != 0) { + return (ret); + } + __osIdCheckSum((u16*)temp, &sum, &isum); + id = (__OSPackId*)temp; + if ((id->checksum != sum) || (id->invertedChecksum != isum)) { + if ((ret = __osCheckPackId(pfs, id)) != 0) { + pfs->status |= PFS_ID_BROKEN; + return ret; + } + } + + if ((id->deviceid & 0x01) == 0) { + ret = __osRepairPackId(pfs, id, &newid); + if (ret) { + if (ret == PFS_ERR_ID_FATAL) { + pfs->status |= PFS_ID_BROKEN; + } + return ret; + } + id = &newid; + if ((id->deviceid & 0x01) == 0) { + return PFS_ERR_DEVICE; + } + } + + bcopy(id, pfs->id, BLOCKSIZE); + + pfs->version = (s32)id->version; + pfs->banks = id->banks; + pfs->inodeStartPage = 1 + DEF_DIR_PAGES + (2 * pfs->banks); + pfs->dir_size = DEF_DIR_PAGES * PFS_ONE_PAGE; + pfs->inode_table = 1 * PFS_ONE_PAGE; + pfs->minode_table = (1 + pfs->banks) * PFS_ONE_PAGE; + pfs->dir_table = pfs->minode_table + (pfs->banks * PFS_ONE_PAGE); + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, PFS_LABEL_AREA, (u8*)pfs->label)) != 0) { + return ret; + } + + ret = osPfsChecker(pfs); + pfs->status |= PFS_INITIALIZED; + return ret; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/pfsinitpak/osPfsInitPak.s") +#endif + +s32 __osPfsCheckRamArea(OSPfs* pfs) { + s32 i = 0; + s32 ret = 0; + u8 temp1[BLOCKSIZE]; + u8 temp2[BLOCKSIZE]; + u8 saveReg[BLOCKSIZE]; + + if ((ret = __osPfsSelectBank(pfs, PFS_ID_BANK_256K)) != 0) { + return ret; + } + + if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, saveReg)) != 0) { + return (ret); + } + for (i = 0; i < BLOCKSIZE; i++) { + temp1[i] = i; + } + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, 0, temp1, 0)) != 0) { + return ret; + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, 0, temp2)) != 0) { + return ret; + } + if (bcmp(temp1, temp2, BLOCKSIZE) != 0) { + return PFS_ERR_DEVICE; + } + ret = __osContRamWrite(pfs->queue, pfs->channel, 0, saveReg, 0); + + return ret; +} diff --git a/src/libultra_code/pfsreadwritefile.c b/src/libultra_code/pfsreadwritefile.c new file mode 100644 index 0000000000..7ef65736c5 --- /dev/null +++ b/src/libultra_code/pfsreadwritefile.c @@ -0,0 +1,140 @@ +#include +#include + +#define CHECK_IPAGE(p, pfs) \ + (((p).ipage >= (pfs).inodeStartPage) && ((p).inode_t.bank < (pfs).banks) && ((p).inode_t.page >= 0x01) && \ + ((p).inode_t.page < 0x80)) + +__OSInode __osPfsInodeCache; + +s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page) { + s32 ret; + + if (page->inode_t.bank != *bank) { + *bank = page->inode_t.bank; + if ((ret = __osPfsRWInode(pfs, inode, PFS_READ, *bank)) != 0) { + return ret; + } + } + *page = inode->inodePage[page->inode_t.page]; + + if (!CHECK_IPAGE(*page, *pfs)) { + if (page->ipage == PFS_EOF) { + return PFS_ERR_INVALID; + } + return PFS_ERR_INCONSISTENT; + } + return 0; +} + +s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8* data) { + s32 ret; + __OSDir dir; + __OSInode inode; + __OSInodeUnit curPage; + s32 curBlock; + s32 blockSize; + u8* buffer; + u8 bank; + u16 blockno; + + if ((fileNo >= pfs->dir_size) || (fileNo < 0)) { + return PFS_ERR_INVALID; + } + if ((size <= 0) || ((size % BLOCKSIZE) != 0)) { + return PFS_ERR_INVALID; + } + if ((offset < 0) || ((offset % BLOCKSIZE) != 0)) { + return PFS_ERR_INVALID; + } + if (!(pfs->status & PFS_INITIALIZED)) { + return PFS_ERR_INVALID; + } + + if (__osCheckId(pfs) == PFS_ERR_NEW_PACK) { + return PFS_ERR_NEW_PACK; + } + + if (pfs->activebank != 0) { + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + } + if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + fileNo, &dir)) != 0) { + return ret; + } + + if ((dir.company_code == 0) || (dir.game_code == 0)) { + return PFS_ERR_INVALID; + } + + if (!CHECK_IPAGE(dir.start_page, *pfs)) { + if (dir.start_page.ipage == PFS_EOF) { + return PFS_ERR_INVALID; + } + return PFS_ERR_INCONSISTENT; + } + + if ((flag == PFS_READ) && ((dir.status & PFS_WRITTEN) == 0)) { + return PFS_ERR_BAD_DATA; + } + + bank = 255; + + curBlock = offset / BLOCKSIZE; + curPage = dir.start_page; + + while (curBlock >= 8) { + if ((ret = __osPfsGetNextPage(pfs, &bank, &inode, &curPage)) != 0) { + return ret; + } + curBlock -= 8; + } + + blockSize = size / BLOCKSIZE; + buffer = data; + + while (blockSize > 0) { + if (curBlock == 8) { + if ((ret = __osPfsGetNextPage(pfs, &bank, &inode, &curPage)) != 0) { + return ret; + } + curBlock = 0; + } + + if (pfs->activebank != curPage.inode_t.bank) { + if ((ret = __osPfsSelectBank(pfs, curPage.inode_t.bank)) != 0) { + return ret; + } + } + + blockno = curPage.inode_t.page * PFS_ONE_PAGE + curBlock; + if (flag == PFS_READ) { + ret = __osContRamRead(pfs->queue, pfs->channel, blockno, buffer); + } else { + ret = __osContRamWrite(pfs->queue, pfs->channel, blockno, buffer, 0); + } + if (ret != 0) { + return ret; + } + + buffer += BLOCKSIZE; + curBlock++; + blockSize--; + } + + if (flag == PFS_WRITE && !(dir.status & PFS_WRITTEN)) { + dir.status |= PFS_WRITTEN; + if (pfs->activebank != 0) { + if ((ret = __osPfsSelectBank(pfs, 0)) != 0) { + return ret; + } + } + if ((ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + fileNo, &dir, 0)) != 0) { + return ret; + } + } + + ret = __osPfsGetStatus(pfs->queue, pfs->channel); + return ret; +} diff --git a/src/libultra_code/sinf.c b/src/libultra_code/sinf.c index ffd8bf5c10..d38e128ad9 100644 --- a/src/libultra_code/sinf.c +++ b/src/libultra_code/sinf.c @@ -1,3 +1,66 @@ -#include "libultra_internal.h" +#include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/sinf/sinf.s") +static const du P[] = { + { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, + { 0xBF29F6FF, 0xEEA56814 }, { 0x3EC5DBDF, 0x0E314BFE }, +}; + +static const du rpi = { 0x3FD45F30, 0x6DC9C883 }; + +static const du pihi = { 0x400921FB, 0x50000000 }; + +static const du pilo = { 0x3E6110B4, 0x611A6263 }; + +static const fu zero = { 0x00000000 }; + +f32 sinf(f32 x) { + f64 dx; + f64 xSq; + f64 polyApprox; + f64 dn; + s32 n; + f64 result; + s32 ix, xpt; + + ix = *(s32*)&x; + xpt = (ix >> 22); + xpt &= 0x1FF; + + if (xpt < 0xFF) { + dx = x; + + if (xpt >= 0xE6) { + xSq = SQ(dx); + polyApprox = ((P[4].d * xSq + P[3].d) * xSq + P[2].d) * xSq + P[1].d; + result = dx + (dx * xSq) * polyApprox; + return (f32)result; + } + return x; + } + + if (xpt < 0x136) { + dx = x; + dn = dx * rpi.d; + n = ROUND(dn); + dn = n; + + dx -= dn * pihi.d; + dx -= dn * pilo.d; + xSq = SQ(dx); + + polyApprox = ((P[4].d * xSq + P[3].d) * xSq + P[2].d) * xSq + P[1].d; + result = dx + (dx * xSq) * polyApprox; + + if (!(n & 1)) { + return (f32)result; + } + + return -(f32)result; + } + + if (x != x) { + return __libm_qnan_f; + } + return zero.f; +} diff --git a/src/libultra_code/sins.c b/src/libultra_code/sins.c index 00bb8c11f4..ee69849204 100644 --- a/src/libultra_code/sins.c +++ b/src/libultra_code/sins.c @@ -1,3 +1,21 @@ -#include "libultra_internal.h" +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/sins/sins.s") +#include "sintable.c" + +s16 sins(u16 x) { + s16 value; + + x >>= 4; + + if (x & 0x400) { + value = sintable[0x3FF - (x & 0x3FF)]; + } else { + value = sintable[x & 0x3FF]; + } + + if (x & 0x800) { + return -value; + } else { + return value; + } +} diff --git a/src/libultra_code/sintable.c b/src/libultra_code/sintable.c new file mode 100644 index 0000000000..705b609e3d --- /dev/null +++ b/src/libultra_code/sintable.c @@ -0,0 +1,78 @@ +#include + +static s16 sintable[0x400] = { + 0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E, + 0x02C0, 0x02F2, 0x0324, 0x0357, 0x0389, 0x03BB, 0x03EE, 0x0420, 0x0452, 0x0484, 0x04B7, 0x04E9, 0x051B, 0x054E, + 0x0580, 0x05B2, 0x05E4, 0x0617, 0x0649, 0x067B, 0x06AD, 0x06E0, 0x0712, 0x0744, 0x0776, 0x07A9, 0x07DB, 0x080D, + 0x083F, 0x0871, 0x08A4, 0x08D6, 0x0908, 0x093A, 0x096C, 0x099F, 0x09D1, 0x0A03, 0x0A35, 0x0A67, 0x0A99, 0x0ACB, + 0x0AFE, 0x0B30, 0x0B62, 0x0B94, 0x0BC6, 0x0BF8, 0x0C2A, 0x0C5C, 0x0C8E, 0x0CC0, 0x0CF2, 0x0D25, 0x0D57, 0x0D89, + 0x0DBB, 0x0DED, 0x0E1F, 0x0E51, 0x0E83, 0x0EB5, 0x0EE7, 0x0F19, 0x0F4B, 0x0F7C, 0x0FAE, 0x0FE0, 0x1012, 0x1044, + 0x1076, 0x10A8, 0x10DA, 0x110C, 0x113E, 0x116F, 0x11A1, 0x11D3, 0x1205, 0x1237, 0x1269, 0x129A, 0x12CC, 0x12FE, + 0x1330, 0x1361, 0x1393, 0x13C5, 0x13F6, 0x1428, 0x145A, 0x148C, 0x14BD, 0x14EF, 0x1520, 0x1552, 0x1584, 0x15B5, + 0x15E7, 0x1618, 0x164A, 0x167B, 0x16AD, 0x16DF, 0x1710, 0x1741, 0x1773, 0x17A4, 0x17D6, 0x1807, 0x1839, 0x186A, + 0x189B, 0x18CD, 0x18FE, 0x1930, 0x1961, 0x1992, 0x19C3, 0x19F5, 0x1A26, 0x1A57, 0x1A88, 0x1ABA, 0x1AEB, 0x1B1C, + 0x1B4D, 0x1B7E, 0x1BAF, 0x1BE1, 0x1C12, 0x1C43, 0x1C74, 0x1CA5, 0x1CD6, 0x1D07, 0x1D38, 0x1D69, 0x1D9A, 0x1DCB, + 0x1DFC, 0x1E2D, 0x1E5D, 0x1E8E, 0x1EBF, 0x1EF0, 0x1F21, 0x1F52, 0x1F82, 0x1FB3, 0x1FE4, 0x2015, 0x2045, 0x2076, + 0x20A7, 0x20D7, 0x2108, 0x2139, 0x2169, 0x219A, 0x21CA, 0x21FB, 0x222B, 0x225C, 0x228C, 0x22BD, 0x22ED, 0x231D, + 0x234E, 0x237E, 0x23AE, 0x23DF, 0x240F, 0x243F, 0x2470, 0x24A0, 0x24D0, 0x2500, 0x2530, 0x2560, 0x2591, 0x25C1, + 0x25F1, 0x2621, 0x2651, 0x2681, 0x26B1, 0x26E1, 0x2711, 0x2740, 0x2770, 0x27A0, 0x27D0, 0x2800, 0x2830, 0x285F, + 0x288F, 0x28BF, 0x28EE, 0x291E, 0x294E, 0x297D, 0x29AD, 0x29DD, 0x2A0C, 0x2A3C, 0x2A6B, 0x2A9B, 0x2ACA, 0x2AF9, + 0x2B29, 0x2B58, 0x2B87, 0x2BB7, 0x2BE6, 0x2C15, 0x2C44, 0x2C74, 0x2CA3, 0x2CD2, 0x2D01, 0x2D30, 0x2D5F, 0x2D8E, + 0x2DBD, 0x2DEC, 0x2E1B, 0x2E4A, 0x2E79, 0x2EA8, 0x2ED7, 0x2F06, 0x2F34, 0x2F63, 0x2F92, 0x2FC0, 0x2FEF, 0x301E, + 0x304C, 0x307B, 0x30A9, 0x30D8, 0x3107, 0x3135, 0x3163, 0x3192, 0x31C0, 0x31EF, 0x321D, 0x324B, 0x3279, 0x32A8, + 0x32D6, 0x3304, 0x3332, 0x3360, 0x338E, 0x33BC, 0x33EA, 0x3418, 0x3446, 0x3474, 0x34A2, 0x34D0, 0x34FE, 0x352B, + 0x3559, 0x3587, 0x35B5, 0x35E2, 0x3610, 0x363D, 0x366B, 0x3698, 0x36C6, 0x36F3, 0x3721, 0x374E, 0x377C, 0x37A9, + 0x37D6, 0x3803, 0x3831, 0x385E, 0x388B, 0x38B8, 0x38E5, 0x3912, 0x393F, 0x396C, 0x3999, 0x39C6, 0x39F3, 0x3A20, + 0x3A4D, 0x3A79, 0x3AA6, 0x3AD3, 0x3B00, 0x3B2C, 0x3B59, 0x3B85, 0x3BB2, 0x3BDE, 0x3C0B, 0x3C37, 0x3C64, 0x3C90, + 0x3CBC, 0x3CE9, 0x3D15, 0x3D41, 0x3D6D, 0x3D99, 0x3DC5, 0x3DF1, 0x3E1D, 0x3E49, 0x3E75, 0x3EA1, 0x3ECD, 0x3EF9, + 0x3F25, 0x3F50, 0x3F7C, 0x3FA8, 0x3FD3, 0x3FFF, 0x402B, 0x4056, 0x4082, 0x40AD, 0x40D8, 0x4104, 0x412F, 0x415A, + 0x4186, 0x41B1, 0x41DC, 0x4207, 0x4232, 0x425D, 0x4288, 0x42B3, 0x42DE, 0x4309, 0x4334, 0x435F, 0x4389, 0x43B4, + 0x43DF, 0x4409, 0x4434, 0x445F, 0x4489, 0x44B4, 0x44DE, 0x4508, 0x4533, 0x455D, 0x4587, 0x45B1, 0x45DC, 0x4606, + 0x4630, 0x465A, 0x4684, 0x46AE, 0x46D8, 0x4702, 0x472C, 0x4755, 0x477F, 0x47A9, 0x47D2, 0x47FC, 0x4826, 0x484F, + 0x4879, 0x48A2, 0x48CC, 0x48F5, 0x491E, 0x4948, 0x4971, 0x499A, 0x49C3, 0x49EC, 0x4A15, 0x4A3E, 0x4A67, 0x4A90, + 0x4AB9, 0x4AE2, 0x4B0B, 0x4B33, 0x4B5C, 0x4B85, 0x4BAD, 0x4BD6, 0x4BFE, 0x4C27, 0x4C4F, 0x4C78, 0x4CA0, 0x4CC8, + 0x4CF0, 0x4D19, 0x4D41, 0x4D69, 0x4D91, 0x4DB9, 0x4DE1, 0x4E09, 0x4E31, 0x4E58, 0x4E80, 0x4EA8, 0x4ED0, 0x4EF7, + 0x4F1F, 0x4F46, 0x4F6E, 0x4F95, 0x4FBD, 0x4FE4, 0x500B, 0x5032, 0x505A, 0x5081, 0x50A8, 0x50CF, 0x50F6, 0x511D, + 0x5144, 0x516B, 0x5191, 0x51B8, 0x51DF, 0x5205, 0x522C, 0x5253, 0x5279, 0x52A0, 0x52C6, 0x52EC, 0x5313, 0x5339, + 0x535F, 0x5385, 0x53AB, 0x53D1, 0x53F7, 0x541D, 0x5443, 0x5469, 0x548F, 0x54B5, 0x54DA, 0x5500, 0x5525, 0x554B, + 0x5571, 0x5596, 0x55BB, 0x55E1, 0x5606, 0x562B, 0x5650, 0x5675, 0x569B, 0x56C0, 0x56E5, 0x5709, 0x572E, 0x5753, + 0x5778, 0x579D, 0x57C1, 0x57E6, 0x580A, 0x582F, 0x5853, 0x5878, 0x589C, 0x58C0, 0x58E5, 0x5909, 0x592D, 0x5951, + 0x5975, 0x5999, 0x59BD, 0x59E1, 0x5A04, 0x5A28, 0x5A4C, 0x5A6F, 0x5A93, 0x5AB7, 0x5ADA, 0x5AFD, 0x5B21, 0x5B44, + 0x5B67, 0x5B8B, 0x5BAE, 0x5BD1, 0x5BF4, 0x5C17, 0x5C3A, 0x5C5D, 0x5C7F, 0x5CA2, 0x5CC5, 0x5CE7, 0x5D0A, 0x5D2D, + 0x5D4F, 0x5D71, 0x5D94, 0x5DB6, 0x5DD8, 0x5DFA, 0x5E1D, 0x5E3F, 0x5E61, 0x5E83, 0x5EA5, 0x5EC6, 0x5EE8, 0x5F0A, + 0x5F2C, 0x5F4D, 0x5F6F, 0x5F90, 0x5FB2, 0x5FD3, 0x5FF4, 0x6016, 0x6037, 0x6058, 0x6079, 0x609A, 0x60BB, 0x60DC, + 0x60FD, 0x611E, 0x613E, 0x615F, 0x6180, 0x61A0, 0x61C1, 0x61E1, 0x6202, 0x6222, 0x6242, 0x6263, 0x6283, 0x62A3, + 0x62C3, 0x62E3, 0x6303, 0x6323, 0x6342, 0x6362, 0x6382, 0x63A1, 0x63C1, 0x63E0, 0x6400, 0x641F, 0x643F, 0x645E, + 0x647D, 0x649C, 0x64BB, 0x64DA, 0x64F9, 0x6518, 0x6537, 0x6556, 0x6574, 0x6593, 0x65B2, 0x65D0, 0x65EF, 0x660D, + 0x662B, 0x664A, 0x6668, 0x6686, 0x66A4, 0x66C2, 0x66E0, 0x66FE, 0x671C, 0x673A, 0x6757, 0x6775, 0x6792, 0x67B0, + 0x67CD, 0x67EB, 0x6808, 0x6825, 0x6843, 0x6860, 0x687D, 0x689A, 0x68B7, 0x68D4, 0x68F1, 0x690D, 0x692A, 0x6947, + 0x6963, 0x6980, 0x699C, 0x69B9, 0x69D5, 0x69F1, 0x6A0E, 0x6A2A, 0x6A46, 0x6A62, 0x6A7E, 0x6A9A, 0x6AB5, 0x6AD1, + 0x6AED, 0x6B08, 0x6B24, 0x6B40, 0x6B5B, 0x6B76, 0x6B92, 0x6BAD, 0x6BC8, 0x6BE3, 0x6BFE, 0x6C19, 0x6C34, 0x6C4F, + 0x6C6A, 0x6C84, 0x6C9F, 0x6CBA, 0x6CD4, 0x6CEF, 0x6D09, 0x6D23, 0x6D3E, 0x6D58, 0x6D72, 0x6D8C, 0x6DA6, 0x6DC0, + 0x6DDA, 0x6DF3, 0x6E0D, 0x6E27, 0x6E40, 0x6E5A, 0x6E73, 0x6E8D, 0x6EA6, 0x6EBF, 0x6ED9, 0x6EF2, 0x6F0B, 0x6F24, + 0x6F3D, 0x6F55, 0x6F6E, 0x6F87, 0x6FA0, 0x6FB8, 0x6FD1, 0x6FE9, 0x7002, 0x701A, 0x7032, 0x704A, 0x7062, 0x707A, + 0x7092, 0x70AA, 0x70C2, 0x70DA, 0x70F2, 0x7109, 0x7121, 0x7138, 0x7150, 0x7167, 0x717E, 0x7196, 0x71AD, 0x71C4, + 0x71DB, 0x71F2, 0x7209, 0x7220, 0x7236, 0x724D, 0x7264, 0x727A, 0x7291, 0x72A7, 0x72BD, 0x72D4, 0x72EA, 0x7300, + 0x7316, 0x732C, 0x7342, 0x7358, 0x736E, 0x7383, 0x7399, 0x73AE, 0x73C4, 0x73D9, 0x73EF, 0x7404, 0x7419, 0x742E, + 0x7443, 0x7458, 0x746D, 0x7482, 0x7497, 0x74AC, 0x74C0, 0x74D5, 0x74EA, 0x74FE, 0x7512, 0x7527, 0x753B, 0x754F, + 0x7563, 0x7577, 0x758B, 0x759F, 0x75B3, 0x75C7, 0x75DA, 0x75EE, 0x7601, 0x7615, 0x7628, 0x763B, 0x764F, 0x7662, + 0x7675, 0x7688, 0x769B, 0x76AE, 0x76C1, 0x76D3, 0x76E6, 0x76F9, 0x770B, 0x771E, 0x7730, 0x7742, 0x7754, 0x7767, + 0x7779, 0x778B, 0x779D, 0x77AF, 0x77C0, 0x77D2, 0x77E4, 0x77F5, 0x7807, 0x7818, 0x782A, 0x783B, 0x784C, 0x785D, + 0x786E, 0x787F, 0x7890, 0x78A1, 0x78B2, 0x78C3, 0x78D3, 0x78E4, 0x78F4, 0x7905, 0x7915, 0x7925, 0x7936, 0x7946, + 0x7956, 0x7966, 0x7976, 0x7985, 0x7995, 0x79A5, 0x79B5, 0x79C4, 0x79D4, 0x79E3, 0x79F2, 0x7A02, 0x7A11, 0x7A20, + 0x7A2F, 0x7A3E, 0x7A4D, 0x7A5B, 0x7A6A, 0x7A79, 0x7A87, 0x7A96, 0x7AA4, 0x7AB3, 0x7AC1, 0x7ACF, 0x7ADD, 0x7AEB, + 0x7AF9, 0x7B07, 0x7B15, 0x7B23, 0x7B31, 0x7B3E, 0x7B4C, 0x7B59, 0x7B67, 0x7B74, 0x7B81, 0x7B8E, 0x7B9B, 0x7BA8, + 0x7BB5, 0x7BC2, 0x7BCF, 0x7BDC, 0x7BE8, 0x7BF5, 0x7C02, 0x7C0E, 0x7C1A, 0x7C27, 0x7C33, 0x7C3F, 0x7C4B, 0x7C57, + 0x7C63, 0x7C6F, 0x7C7A, 0x7C86, 0x7C92, 0x7C9D, 0x7CA9, 0x7CB4, 0x7CBF, 0x7CCB, 0x7CD6, 0x7CE1, 0x7CEC, 0x7CF7, + 0x7D02, 0x7D0C, 0x7D17, 0x7D22, 0x7D2C, 0x7D37, 0x7D41, 0x7D4B, 0x7D56, 0x7D60, 0x7D6A, 0x7D74, 0x7D7E, 0x7D88, + 0x7D91, 0x7D9B, 0x7DA5, 0x7DAE, 0x7DB8, 0x7DC1, 0x7DCB, 0x7DD4, 0x7DDD, 0x7DE6, 0x7DEF, 0x7DF8, 0x7E01, 0x7E0A, + 0x7E13, 0x7E1B, 0x7E24, 0x7E2C, 0x7E35, 0x7E3D, 0x7E45, 0x7E4D, 0x7E56, 0x7E5E, 0x7E66, 0x7E6D, 0x7E75, 0x7E7D, + 0x7E85, 0x7E8C, 0x7E94, 0x7E9B, 0x7EA3, 0x7EAA, 0x7EB1, 0x7EB8, 0x7EBF, 0x7EC6, 0x7ECD, 0x7ED4, 0x7EDB, 0x7EE1, + 0x7EE8, 0x7EEE, 0x7EF5, 0x7EFB, 0x7F01, 0x7F08, 0x7F0E, 0x7F14, 0x7F1A, 0x7F20, 0x7F25, 0x7F2B, 0x7F31, 0x7F36, + 0x7F3C, 0x7F41, 0x7F47, 0x7F4C, 0x7F51, 0x7F56, 0x7F5B, 0x7F60, 0x7F65, 0x7F6A, 0x7F6F, 0x7F74, 0x7F78, 0x7F7D, + 0x7F81, 0x7F85, 0x7F8A, 0x7F8E, 0x7F92, 0x7F96, 0x7F9A, 0x7F9E, 0x7FA2, 0x7FA6, 0x7FA9, 0x7FAD, 0x7FB0, 0x7FB4, + 0x7FB7, 0x7FBA, 0x7FBE, 0x7FC1, 0x7FC4, 0x7FC7, 0x7FCA, 0x7FCC, 0x7FCF, 0x7FD2, 0x7FD4, 0x7FD7, 0x7FD9, 0x7FDC, + 0x7FDE, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF3, 0x7FF5, + 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, + 0x7FFE, 0x7FFF, +}; diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index a2d98868c5..6a42782443 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -34,8 +34,8 @@ Vec3f sUnusedVec1 = { 0.0f, 0.5f, 0.0f }; Vec3f sUnusedVec2 = { 0.0f, 0.5f, 0.0f }; Color_RGB8 sUnusedColors[] = { - { 0xFF, 0xFF, 0x64 }, - { 0xFF, 0xFF, 0x32 }, + { 255, 255, 100 }, + { 255, 255, 50 }, }; Vec3f D_80865B70 = { 0.0f, 0.0f, 0.0f }; @@ -157,7 +157,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { return; } - func_8002F8F0(&player->actor, 0x100B); + func_8002F8F0(&player->actor, NA_SE_IT_HOOKSHOT_CHAIN - SFX_FLAG); ArmsHook_CheckForCancel(this); if (this->timer != 0) { @@ -279,8 +279,8 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { return; } func_80062D60(globalCtx, &this->actor.posRot.pos); - Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, - &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); return; } } diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 06b9c1ee8c..0b709b98cc 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -50,7 +50,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_158 = 1.0f; ArrowFire_SetupAction(&this->actor, ArrowFire_Charge); Actor_SetScale(this, 0.01f); - this->alpha = 0xA0; + this->alpha = 160; this->timer = 0; this->unk_15C = 0.0f; } @@ -77,14 +77,14 @@ void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE); + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG); // If arrow's attached is null, Link has fired the arrow if (arrow->actor.attachedA == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowFire_SetupAction(this, ArrowFire_Fly); - this->alpha = 0xFF; + this->alpha = 255; } } @@ -170,9 +170,9 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_FRAME); ArrowFire_SetupAction(this, ArrowFire_Hit); this->timer = 32; - this->alpha = 0xFF; + this->alpha = 255; } else if (arrow->timer < 34) { - if (this->alpha < 0x23) { + if (this->alpha < 35) { Actor_Kill(&this->actor); } else { this->alpha -= 0x19; @@ -218,7 +218,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw red effect over the screen when arrow hits if (this->unk_15C > 0) { gfxCtx->polyXlu.p = func_800937C0(gfxCtx->polyXlu.p); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0x00, 0x00, + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0, 0, (s32)(150.0f * this->unk_15C) & 0xFF); gDPSetAlphaDither(gfxCtx->polyXlu.p++, G_AD_DISABLE); gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); @@ -227,8 +227,8 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw fire on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xC8, 0x00, this->alpha); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 200, 0, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 166082a906..d1e8506b3f 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -51,7 +51,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_160 = 1.0f; ArrowIce_SetupAction(this, ArrowIce_Charge); Actor_SetScale(&this->actor, 0.01f); - this->alpha = 0x64; + this->alpha = 100; this->timer = 0; this->unk_164 = 0.0f; } @@ -78,14 +78,14 @@ void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE); + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG); // If arrow's attached is null, Link has fired the arrow if (arrow->actor.attachedA == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowIce_SetupAction(this, ArrowIce_Fly); - this->alpha = 0xFF; + this->alpha = 255; } } @@ -171,9 +171,9 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_ICE); ArrowIce_SetupAction(this, ArrowIce_Hit); this->timer = 32; - this->alpha = 0xFF; + this->alpha = 255; } else if (arrow->timer < 34) { - if (this->alpha < 0x23) { + if (this->alpha < 35) { Actor_Kill(&this->actor); } else { this->alpha -= 0x19; @@ -228,8 +228,8 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw ice on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xAA, 0xFF, 0xFF, this->alpha); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 170, 255, 255, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 255, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 67a3470419..c1c85ce2d5 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -51,7 +51,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_160 = 1.0f; ArrowLight_SetupAction(this, ArrowLight_Charge); Actor_SetScale(&this->actor, 0.01f); - this->alpha = 0x82; + this->alpha = 130; this->timer = 0; this->unk_164 = 0.0f; } @@ -78,14 +78,14 @@ void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { this->actor.posRot.pos = arrow->actor.posRot.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT); + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG); // If arrow's attached is null, Link has fired the arrow if (arrow->actor.attachedA == NULL) { this->unkPos = this->actor.posRot.pos; this->radius = 10; ArrowLight_SetupAction(this, ArrowLight_Fly); - this->alpha = 0xFF; + this->alpha = 255; } } @@ -171,9 +171,9 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_LIGHT); ArrowLight_SetupAction(this, ArrowLight_Hit); this->timer = 32; - this->alpha = 0xFF; + this->alpha = 255; } else if (arrow->timer < 34) { - if (this->alpha < 0x23) { + if (this->alpha < 35) { Actor_Kill(&this->actor); } else { this->alpha -= 0x19; @@ -228,8 +228,8 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { // Draw light on the arrow func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xAA, this->alpha); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0x00, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 170, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 0, 128); Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 7aed248ac6..02c0d6edf3 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -210,7 +210,7 @@ void func_8086C1A0(BgBdanObjects* this, GlobalContext* globalCtx) { func_800AA000(0.0f, 0x78, 0x14, 0xA); this->unk_16A = 0xB; } - func_8002F974(&this->dyna.actor, 0x208F); + func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); } } @@ -246,7 +246,7 @@ void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { this->dyna.actor.velocity.y)) { this->dyna.actor.posRot.rot.y = 0; this->unk_16A = 0x3C; - Audio_PlayActorSound2(&this->dyna.actor, 0x289F); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_U); this->dyna.actor.attachedB->posRot.pos.y = this->dyna.actor.posRot.pos.y + 140.0f; this->actionFunc = func_8086C5BC; func_800800F8(globalCtx, 0xC08, -0x63, this->dyna.actor.attachedB, 0); @@ -257,7 +257,7 @@ void func_8086C3D8(BgBdanObjects* this, GlobalContext* globalCtx) { player->actor.posRot.rot.y = player->actor.shape.rot.y; func_800AA000(0.0f, 0xFF, 0x1E, 0x96); } else { - func_8002F974(&this->dyna.actor, 0x2090); + func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); if (this->unk_16A != 0) { this->unk_16A -= 1; } @@ -335,7 +335,7 @@ void func_8086C7D0(BgBdanObjects* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); this->actionFunc = BgBdanObjects_DoNothing; } else { - func_8002F974(&this->dyna.actor, 0x208F); + func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); } } @@ -387,12 +387,12 @@ void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { Flags_UnsetSwitch(globalCtx, this->unk_168); this->actionFunc = func_8086C9A8; } - func_8002F948(this, 0x205E); + func_8002F948(this, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 75.0f, 0.5f)) { this->actionFunc = func_8086CABC; } - func_8002F948(this, 0x205E); + func_8002F948(this, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } globalCtx->colCtx.stat.colHeader->waterBoxes[7].unk_02 = this->dyna.actor.posRot.pos.y; } @@ -427,7 +427,7 @@ void func_8086CB8C(BgBdanObjects* this, GlobalContext* globalCtx) { this->actionFunc = BgBdanObjects_DoNothing; func_800C078C(globalCtx, 0, -1); } else { - func_8002F974(&this->dyna.actor, 0x2090); + func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 117238816e..6a84dadbc3 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -161,7 +161,8 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) { func_8003555C(globalCtx, &sp5C, &D_808718FC, &D_80871908); } func_8005AA1C(&globalCtx->cameras, 0, sp4C * 0.6f, 3); - Audio_PlaySoundGeneral(0x2027, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_PILLAR_SINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 361fd0a3a1..97962d4ccf 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -83,7 +83,7 @@ void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (this->unk_178 == 0) { - Audio_PlayActorSound2(thisx, 0x2067); + Audio_PlayActorSound2(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); thisx->posRot.pos.x -= 2.0f; Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1375.0f, 0.8f, 0.3f); if (thisx->posRot.pos.x < -89.0f) { @@ -105,7 +105,7 @@ void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (this->unk_178 == 0) { - Audio_PlayActorSound2(thisx, 0x2067); + Audio_PlayActorSound2(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); thisx->posRot.pos.x += 2.0f; Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1350.0f, 0.8f, 0.3f); if (thisx->posRot.pos.x > 90.0f) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 9ed4062b3a..5fbd61c80c 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -202,7 +202,7 @@ void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx) { if ((D_80880F30 == 0) && (func_8008E988(globalCtx) == 0)) { if (!Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x, 0.5f)) { - func_8002F974(&this->dyna.actor, 0x2058); + func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL) { D_80881018 |= 1; } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL_2) { @@ -232,7 +232,7 @@ void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx) { this->timer--; } - func_8002F974(&this->dyna.actor, 0x205B); + func_8002F974(&this->dyna.actor, NA_SE_EV_BURN_OUT - SFX_FLAG); for (i = 0; i < 2; i++) { f32 rand = Math_Rand_ZeroOne(); @@ -355,7 +355,7 @@ void func_808806BC(BgHakaTrap* this, GlobalContext* globalCtx) { } if (this->dyna.actor.velocity.y >= 0.01f) { - func_8002F974(&this->dyna.actor, 0x204D); + func_8002F974(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); } if (this->timer == 0) { @@ -425,7 +425,7 @@ void func_80880AE8(BgHakaTrap* this, GlobalContext* globalCtx) { this->dyna.actor.shape.rot.z += this->dyna.actor.posRot.rot.z; if (this->dyna.actor.posRot.rot.z >= 0x1801) { - func_8002F974(&this->dyna.actor, 0x2057); + func_8002F974(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); } func_808809E4(this, globalCtx, this->dyna.actor.posRot.rot.z); @@ -436,7 +436,7 @@ void func_80880C0C(BgHakaTrap* this, GlobalContext* globalCtx) { this->timer--; } - func_8002F974(&this->dyna.actor, 0x2057); + func_8002F974(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); if (this->timer == 0) { this->timer = 1; @@ -487,7 +487,7 @@ void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) { static Gfx* sDLists[5] = { 0x06007610, 0x06009860, 0x06007EF0, 0x06008A20, 0x060072C0, }; - static Color_RGBA8 D_8088103C = { 0 }; + static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 }; BgHakaTrap* this = THIS; s32 pad; Vec3f sp2C; @@ -512,6 +512,6 @@ void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) { sp2C.y = thisx->posRot.pos.y + 110.0f; func_800A6EF4(&globalCtx->mf_11D60, &sp2C, &this->unk_16C); - func_80078914(&this->unk_16C, 0x200D); + func_80078914(&this->unk_16C, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 088e6aab47..bdbd71149f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -186,7 +186,7 @@ void BgHidanFirewall_Update(Actor* thisx, GlobalContext* globalCtx) { BgHidanFirewall_ColliderFollowPlayer(this, globalCtx); CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider); CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); - func_8002F974(&this->actor, 0x2034); + func_8002F974(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG); } } @@ -201,8 +201,8 @@ void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) { gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x14); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80886D04[this->unk_150])); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 0xFF, 0xFF, 0x00, 0x96); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 255, 255, 0, 150); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, 255); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyXlu.p++, D_0600DA80); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index a92e026104..e76bc4ce21 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -112,7 +112,7 @@ void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); } else { - func_8002F974(thisx, 0x20b9); + func_8002F974(thisx, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } func_80886F24(this); } @@ -125,7 +125,7 @@ void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); } else { - func_8002F974(thisx, 0x20b9); + func_8002F974(thisx, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } else { func_80886FB4(this); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 2cea8c6e45..81a8e13b9f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -127,7 +127,7 @@ void func_80889C18(BgHidanKousi* this, GlobalContext* globalCtx) { BgHidanKousi_SetupAction(this, func_80889C90); } Actor_MoveForward(&this->dyna.actor); - func_8002F974(&this->dyna.actor, 0x2036); + func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } void func_80889C90(BgHidanKousi* this, GlobalContext* globalCtx) { @@ -138,7 +138,7 @@ void func_80889C90(BgHidanKousi* this, GlobalContext* globalCtx) { BgHidanKousi_SetupAction(this, func_80889D28); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->dyna.actor, 0x2036); + func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index 3467b3f876..a3340bbf7b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -78,7 +78,7 @@ void func_8088F514(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_16A == 0) { func_8088F47C(this); } else { - func_8002F974(&this->dyna.actor, 0x20b9); + func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } @@ -90,7 +90,7 @@ void func_8088F5A0(BgHidanSyoku* this, GlobalContext* globalCtx) { if (this->unk_16A == 0) { func_8088F47C(this); } else { - func_8002F974(&this->dyna.actor, 0x20b9); + func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index a3e9362935..236daba768 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -95,7 +95,7 @@ void func_80893438(BgJyaAmishutter* this) { func_808934B0(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->actor, 0x2036); + func_8002F974(&this->actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } @@ -118,7 +118,7 @@ void func_8089350C(BgJyaAmishutter* this) { func_808933BC(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->actor, 0x2036); + func_8002F974(&this->actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 2bb617796f..1a2bd0b210 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -99,7 +99,7 @@ void BgJyaLift_SetInitPosY(BgJyaLift* this) { void BgJyaLift_DelayMove(BgJyaLift* this, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F) || (this->moveDelay > 0)) { this->moveDelay++; - if (this->moveDelay >= 20) { + if (this->moveDelay >= 20) { func_800800F8(globalCtx, 0xD66, -0x63, &this->dyna.actor, 0); BgJyaLift_SetupMove(this); } @@ -124,7 +124,7 @@ void BgJyaLift_Move(BgJyaLift* this, GlobalContext* globalCtx) { BgJyaLift_SetFinalPosY(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_ELEVATOR_STOP); } else { - func_8002F974(&this->dyna.actor, 0x200C); + func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); } } @@ -142,8 +142,9 @@ void BgJyaLift_Update(Actor* thisx, GlobalContext* globalCtx) { } if ((this->dyna.unk_160 & 4) && ((this->unk_16B & 4) == 0)) { func_8005A77C(globalCtx2->cameraPtrs[0], 0x3F); - } else if (((this->dyna.unk_160) & 4) == 0 && ((this->unk_16B & 4)) && (globalCtx2->cameraPtrs[0]->setting == 0x3F)) { - func_8005A77C(globalCtx2->cameraPtrs[0], 3); + } else if (((this->dyna.unk_160) & 4) == 0 && ((this->unk_16B & 4)) && + (globalCtx2->cameraPtrs[0]->setting == 0x3F)) { + func_8005A77C(globalCtx2->cameraPtrs[0], 3); } this->unk_16B = this->dyna.unk_160; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 5ba66801c2..8aa385c689 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -55,7 +55,7 @@ void BgMenkuriKaiten_Update(Actor* thisx, GlobalContext* globalCtx) { BgMenkuriKaiten* this = THIS; if (!Flags_GetSwitch(globalCtx, this->actor.params) && func_80043590(&this->actor)) { - func_8002F974(&this->actor, 0x2024); + func_8002F974(&this->actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); this->actor.shape.rot.y += 0x80; } } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 4cdfa5eaac..0372a74e91 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -64,7 +64,7 @@ void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { } else { func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } - Audio_PlayActorSound2(thisx, 0x20CD); + Audio_PlayActorSound2(thisx, NA_SE_EV_WATER_CONVECTION - SFX_FLAG); thisx->shape.rot.y += 0x1C0; } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 89616c8795..12ea2707e8 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -58,7 +58,7 @@ void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) { } void BgSpot01Idohashira_PlayBreakSfx2(BgSpot01Idohashira* this, GlobalContext* globalCtx) { - Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 0x3C, NA_SE_EV_WOODBOX_BREAK); + Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 60, NA_SE_EV_WOODBOX_BREAK); } void func_808AAD3C(GlobalContext* globalCtx, Vec3f* vec, u32 arg2) { @@ -72,38 +72,38 @@ void func_808AAD3C(GlobalContext* globalCtx, Vec3f* vec, u32 arg2) { effect.gravity = -1.0f; effect.uDiv = arg2; effect.vDiv = arg2; - effect.colorStart[0].r = 0x00; - effect.colorStart[0].g = 0x00; - effect.colorStart[0].b = 0x00; - effect.colorStart[0].a = 0xFF; - effect.colorStart[1].r = 0x00; - effect.colorStart[1].g = 0x00; - effect.colorStart[1].b = 0x00; - effect.colorStart[1].a = 0xFF; - effect.colorStart[2].r = 0x00; - effect.colorStart[2].g = 0x00; - effect.colorStart[2].b = 0x00; - effect.colorStart[2].a = 0xFF; - effect.colorStart[3].r = 0x00; - effect.colorStart[3].g = 0x00; - effect.colorStart[3].b = 0x00; - effect.colorStart[3].a = 0xFF; - effect.colorEnd[0].r = 0x00; - effect.colorEnd[0].g = 0x00; - effect.colorEnd[0].b = 0x00; - effect.colorEnd[0].a = 0x00; - effect.colorEnd[1].r = 0x00; - effect.colorEnd[1].g = 0x00; - effect.colorEnd[1].b = 0x00; - effect.colorEnd[1].a = 0x00; - effect.colorEnd[2].r = 0x00; - effect.colorEnd[2].g = 0x00; - effect.colorEnd[2].b = 0x00; - effect.colorEnd[2].a = 0x00; - effect.colorEnd[3].r = 0x00; - effect.colorEnd[3].g = 0x00; - effect.colorEnd[3].b = 0x00; - effect.colorEnd[3].a = 0x00; + effect.colorStart[0].r = 0; + effect.colorStart[0].g = 0; + effect.colorStart[0].b = 0; + effect.colorStart[0].a = 255; + effect.colorStart[1].r = 0; + effect.colorStart[1].g = 0; + effect.colorStart[1].b = 0; + effect.colorStart[1].a = 255; + effect.colorStart[2].r = 0; + effect.colorStart[2].g = 0; + effect.colorStart[2].b = 0; + effect.colorStart[2].a = 255; + effect.colorStart[3].r = 0; + effect.colorStart[3].g = 0; + effect.colorStart[3].b = 0; + effect.colorStart[3].a = 255; + effect.colorEnd[0].r = 0; + effect.colorEnd[0].g = 0; + effect.colorEnd[0].b = 0; + effect.colorEnd[0].a = 0; + effect.colorEnd[1].r = 0; + effect.colorEnd[1].g = 0; + effect.colorEnd[1].b = 0; + effect.colorEnd[1].a = 0; + effect.colorEnd[2].r = 0; + effect.colorEnd[2].g = 0; + effect.colorEnd[2].b = 0; + effect.colorEnd[2].a = 0; + effect.colorEnd[3].r = 0; + effect.colorEnd[3].g = 0; + effect.colorEnd[3].b = 0; + effect.colorEnd[3].a = 0; effect.timer = 0; effect.duration = 32; @@ -323,6 +323,7 @@ void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) { } #ifdef NON_MATCHING +// regalloc differences void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[5]; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 50cd8b4d4e..3c61ec3dc2 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -123,7 +123,7 @@ void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { Quake_SetCountdown(var, 0xC); Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); } else { - func_8002F974(thisx, 0x2067); + func_8002F974(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index a0c9b5dd9e..3e49a633f4 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -111,9 +111,9 @@ void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { this->dyna.actor.initPosRot.pos.z - (Math_Coss(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); if (fabsf(temp_ret) < 0.0001f) { func_808B3714(this); - Audio_PlayActorSound2(&this->dyna.actor, 0x280E); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); } else { - func_8002F974(&this->dyna.actor, 0x2067); + func_8002F974(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 7561c7050b..e29637ec8b 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -70,10 +70,10 @@ void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx) { void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (!this->unk_17C) { - Audio_PlayActorSound2(thisx, 0x2067); + Audio_PlayActorSound2(thisx, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); thisx->posRot.pos.z -= 2.0f; if (thisx->posRot.pos.z < 2660.0f) { - Audio_PlayActorSound2(thisx, 0x280E); + Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); this->unk_17C = 0x1E; this->actionFunc = func_808B4A04; } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index fff9e01b7f..baf45c7019 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -51,7 +51,7 @@ void BgSpot16Doughnut_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.1f); this->fireFlag = 0; - this->envColorAlpha = 0xFF; + this->envColorAlpha = 255; params = this->actor.params; if (params == 1 || params == 2 || params == 3 || params == 4) { Actor_SetScale(&this->actor, sScales[this->actor.params] * 1.0e-4f); @@ -91,10 +91,10 @@ void BgSpot16Doughnut_Update(Actor* thisx, GlobalContext* globalCtx) { if (!(this->fireFlag & 1)) { this->actor.shape.rot.y -= 0x20; - if (this->envColorAlpha < 0xFF) { + if (this->envColorAlpha < 255) { this->envColorAlpha += 5; } else { - this->envColorAlpha = 0xFF; + this->envColorAlpha = 255; } } else if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[2] != NULL && globalCtx->csCtx.npcActions[2]->action == 2) { @@ -137,11 +137,11 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment( gfxCtx->polyXlu.p++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32)); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, this->envColorAlpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, this->envColorAlpha); gSPDisplayList(gfxCtx->polyXlu.p++, D_06000660); } else { - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0xFF, this->envColorAlpha); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255); gSPDisplayList(gfxCtx->polyXlu.p++, D_06000FC0); } Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238); @@ -158,8 +158,8 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0xFF, this->envColorAlpha); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255); gSPDisplayList(gfxCtx->polyXlu.p++, D_06000FC0); Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 61a01be35c..730fed87e5 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -67,10 +67,8 @@ BgSpot18ObjInitFunc D_808B910C[] = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(minVelocityY, 65526, ICHAIN_CONTINUE), - ICHAIN_F32(gravity, 65532, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(minVelocityY, 65526, ICHAIN_CONTINUE), ICHAIN_F32(gravity, 65532, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), }; @@ -263,10 +261,10 @@ void func_808B8F08(BgSpot18Obj* this, GlobalContext* globalCtx) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~0x10; Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F); - func_80078884(0x4802); - Audio_PlayActorSound2(&this->dyna.actor, 0x2835); + func_80078884(NA_SE_SY_CORRECT_CHIME); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } else { - func_8002F974(&this->dyna.actor, 0x200A); + func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/overlay.cfg b/src/overlays/actors/ovl_Bg_Toki_Swd/overlay.cfg index da9ab6bacf..b0a3ac22e4 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/overlay.cfg +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/overlay.cfg @@ -1,2 +1,5 @@ ovl_Bg_Toki_Swd +z_bg_toki_swd_cutscene_data_1.c +z_bg_toki_swd_cutscene_data_2.c +z_bg_toki_swd_cutscene_data_3.c z_bg_toki_swd.c \ No newline at end of file diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 3ed3a9a93f..abd9b8135b 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -21,7 +21,9 @@ void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx); extern Gfx D_06001BD0[]; -#include "z_bg_toki_swd_cutscene_data.c" EARLY +extern CutsceneData D_808BB2F0[]; +extern CutsceneData D_808BB7A0[]; +extern CutsceneData D_808BBD90[]; const ActorInit Bg_Toki_Swd_InitVars = { ACTOR_BG_TOKI_SWD, @@ -100,7 +102,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { globalCtx->csCtx.segment = D_808BB7A0; } Audio_SetBGM(NA_BGM_STOP); - Audio_SetBGM(NA_SE_PL_BOUND_DIRT); + Audio_SetBGM(0x53); gSaveContext.cutsceneTrigger = 1; this->actor.attachedA = NULL; BgTokiSwd_SetupAction(this, func_808BB0AC); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data.c deleted file mode 100644 index e997177c02..0000000000 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data.c +++ /dev/null @@ -1,276 +0,0 @@ -#include "z_bg_toki_swd.h" - -#include - -// clang-format off -static CutsceneData D_808BB2F0[] = { - CS_BEGIN_CUTSCENE(9, 425), - CS_PLAYER_ACTION_LIST(1), - CS_PLAYER_ACTION(0x000C, 0, 256, 0x0000, 0x0000, 0x0000, 0, 54, 52, 0, 54, 52, 0.0f, 0.0f, 0.0f), - CS_LIGHTING_LIST(1), - CS_LIGHTING(0x0002, 110, 111, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5), - CS_MISC_LIST(1), - CS_MISC(0x000A, 110, 111, 0x0000, 0x00000000, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000), - CS_TERMINATOR(TEMPLE_OF_TIME_AFTER_USE_MS, 230, 231), - CS_SCENE_TRANS_FX(0x0001, 210, 230), - CS_CAM_POS_LIST(0, 241), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x018C), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x019D), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x01AE), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x02A8), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x007A), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0064), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0074), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -42, 72, -39, 0x005F), - CS_CAM_POS_LIST(80, 406), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x2F73), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x6B2F), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x6169), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x0005), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 129, -34, 0x7961), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 173, -19, 0x742F), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -17, 217, -20, 0x2E64), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -24, 328, -12, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -27, 509, -2, 0x2F73), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -41, 813, 10, 0x6B2F), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -60, 1285, 38, 0x6D61), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -58, 1910, 91, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -53, 2526, 133, 0x0005), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -33, 3445, 193, 0x7961), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 0, 3960, 225, 0x742F), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4317, 245, 0x6565), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4316, 245, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4316, 245, 0x2F73), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, 7, 4316, 245, 0x6B2F), - CS_CAM_FOCUS_POINT_LIST(0, 270), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x2F73), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x6B2F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x6169), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x0005), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x7961), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x742F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x2E64), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -20, 85, -9, 0x0000), - CS_CAM_FOCUS_POINT_LIST(80, 425), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x2F73), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x6B2F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x6169), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -1, 112, 7, 0x0005), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x7961), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.0f, -1, 117, 7, 0x742F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.0f, -1, 117, 7, 0x2E64), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x2F73), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6B2F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6D61), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0005), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x7961), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x742F), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6565), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x2F73), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 20, 60.0f, -1, 117, 7, 0x6B2F), - CS_END(), - CS_PAD(), - CS_PAD(), - CS_PAD(), -}; - -static CutsceneData D_808BB7A0[] = { - CS_BEGIN_CUTSCENE(9, 368), - CS_CAM_POS_LIST(0, 126), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 101, -110, 0x616D), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x6964), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x00FB), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x0111), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -109, 0x012D), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 71, -110, 0x0033), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x00FB), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x00FB), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x2F68), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.0f, -1, 72, -110, 0x612F), - CS_CAM_POS_LIST(58, 339), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -9, 106, -3, 0xA1BC), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5F3), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5EB), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5A2), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xBAEE), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xC9B8), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xA5A4), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -83, 102, -42, 0xA5E1), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -116, 81, -19, 0xA5D0), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -118, 81, 54, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -106, 78, 116, 0xA5A6), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -27, 75, 226, 0xA5E5), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 121, 82, 312, 0xC0AE), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 296, 76, 374, 0xA5E5), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 565, 80, 257, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 614, 80, -1, 0xA5EB), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 594, 80, -145, 0xA5E1), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 475, 80, -380, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 323, 80, -513, 0xA5E1), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 192, 80, -574, 0xA5D0), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -45, 80, -604, 0x0020), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -142, 80, -589, 0xA5A6), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -228, 80, -562, 0xA5E5), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -376, 93, -477, 0xC0AE), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -584, 95, -183, 0xA5E5), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -613, 95, -34, 0x0020), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -595, 95, 161, 0xA5EB), - CS_CAM_FOCUS_POINT_LIST(0, 155), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.4f, -1, 111, 5, 0xA1BC), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 111, 5, 0xA5F3), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 111, 5, 0xA5EB), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 111, 5, 0xA5A2), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 111, 5, 0xBAEE), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 104, 8, 0xC9B8), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 104, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.0f, -1, 104, 8, 0xA5A4), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.0f, -1, 104, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.0f, -1, 104, 8, 0xA5E1), - CS_CAM_FOCUS_POINT_LIST(58, 368), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.000004f, 0, 120, 12, 0xA1BC), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, 0, 120, 12, 0xA5F3), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, 0, 120, 12, 0xA5EB), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 0, 120, 12, 0xA5A2), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xBAEE), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xC9B8), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xA5A4), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E1), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5D0), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5A6), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E5), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xC0AE), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E5), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5EB), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E1), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E1), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5D0), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5A6), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E5), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xC0AE), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E5), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0x0020), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -3, 95, 8, 0xA5EB), - CS_PLAYER_ACTION_LIST(1), - CS_PLAYER_ACTION(0x000C, 0, 180, 0x0000, 0x0000, 0x0000, 0, 28, -10, 0, -14, 9, 0.0f, -0.23333333f, 0.0f), - CS_LIGHTING_LIST(1), - CS_LIGHTING(0x0002, 90, 91, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0xFFFFFFF2, 0x00000024), - CS_MISC_LIST(1), - CS_MISC(0x000A, 90, 91, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000), - CS_SCENE_TRANS_FX(0x0001, 190, 210), - CS_TERMINATOR(TEMPLE_OF_TIME_AFTER_USE_MS, 210, 211), - CS_END(), - CS_PAD(), - CS_PAD(), - CS_PAD(), -}; - -static CutsceneData D_808BBD90[] = { - CS_BEGIN_CUTSCENE(11, 3000), - CS_UNK_DATA_LIST(0x00000021, 1), - CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000), - CS_PLAYER_ACTION_LIST(3), - CS_PLAYER_ACTION(0x0005, 0, 1, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 820, 0.0f, 0.0f, 1.4E-45f), - CS_PLAYER_ACTION(0x0002, 1, 16, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 720, 0.0f, 0.0f, 1.4E-45f), - CS_PLAYER_ACTION(0x0005, 16, 176, 0x0000, 0x8000, 0x0000, 0, 0, 720, 0, 0, 720, 0.0f, 0.0f, 1.4E-45f), - CS_NPC_ACTION_LIST(62, 3), - CS_NPC_ACTION(0x0004, 40, 70, 0x7D74, 0x0000, 0x0000, -1, 49, 719, 1, 47, 687, 0.06666667f, -0.06666667f, -0.06666667f), - CS_NPC_ACTION(0x0004, 70, 220, 0x8010, 0x0000, 0x0000, 1, 47, 687, 0, 134, 21, -0.006666667f, 0.58f, 0.006666667f), - CS_NPC_ACTION(0x0002, 220, 272, 0x8000, 0x0000, 0x0000, 0, 134, 21, 0, 101, 2, 0.0f, -0.63461536f, 0.0f), - CS_MISC_LIST(1), - CS_MISC(0x000C, 340, 341, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000), - CS_TEXT_LIST(6), - CS_TEXT_NONE(0, 50), - CS_TEXT_DISPLAY_TEXTBOX(0x70E6, 50, 60, 0x0000, 0x0000, 0x0000), - CS_TEXT_NONE(60, 250), - CS_TEXT_DISPLAY_TEXTBOX(0x70E7, 250, 260, 0x0000, 0x0000, 0x0000), - CS_TEXT_NONE(260, 290), - CS_TEXT_DISPLAY_TEXTBOX(0x70E8, 290, 320, 0x0000, 0x0000, 0x0000), - CS_CAM_POS_LIST(0, 251), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0222), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x00FA), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x2D70), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0085), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x01E6), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), - CS_CAM_POS_LIST(90, 331), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0222), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x00FA), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -154, 92, 236, 0x2D70), - CS_CAM_POS_LIST(220, 491), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 122, 39, 0x0222), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 122, 39, 0x00FA), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 102, 39, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 90, 39, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), - CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x2D70), - CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.000004f, -2, 81, 62, 0x0085), - CS_CAM_FOCUS_POINT_LIST(0, 280), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 43, 52, 716, 0x0222), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 43, 52, 716, 0x00FA), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 63, 86, 722, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x2D70), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 85, 721, 0x0085), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 85, 721, 0x01E6), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, 62, 85, 721, 0x0000), - CS_CAM_FOCUS_POINT_LIST(90, 360), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -105, 83, 366, 0x0222), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -104, 83, 364, 0x00FA), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -63, 83, 339, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -16, 99, 255, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -30, 111, 177, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -80, 112, 121, 0x2D70), - CS_CAM_FOCUS_POINT_LIST(220, 520), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 137, -55, 0x0222), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 137, -55, 0x00FA), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 117, -55, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 105, -55, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), - CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x2D70), - CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.000004f, 0, 98, -31, 0x0085), - CS_END(), - CS_PAD(), - CS_PAD(), - CS_PAD(), -}; -// clang-format on diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c new file mode 100644 index 0000000000..ef0733075d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -0,0 +1,79 @@ +#include "z_bg_toki_swd.h" +#include + +// clang-format off +CutsceneData D_808BB2F0[] = { + CS_BEGIN_CUTSCENE(9, 425), + CS_PLAYER_ACTION_LIST(1), + CS_PLAYER_ACTION(0x000C, 0, 256, 0x0000, 0x0000, 0x0000, 0, 54, 52, 0, 54, 52, 0.0f, 0.0f, 0.0f), + CS_LIGHTING_LIST(1), + CS_LIGHTING(0x0002, 110, 111, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5), + CS_MISC_LIST(1), + CS_MISC(0x000A, 110, 111, 0x0000, 0x00000000, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000), + CS_TERMINATOR(TEMPLE_OF_TIME_AFTER_USE_MS, 230, 231), + CS_SCENE_TRANS_FX(0x0001, 210, 230), + CS_CAM_POS_LIST(0, 241), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x018C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x019D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x01AE), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x02A8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x007A), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0064), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -42, 72, -39, 0x0074), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -42, 72, -39, 0x005F), + CS_CAM_POS_LIST(80, 406), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x2F73), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x6B2F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x6169), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 95, -19, 0x0005), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 129, -34, 0x7961), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 173, -19, 0x742F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -17, 217, -20, 0x2E64), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -24, 328, -12, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -27, 509, -2, 0x2F73), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -41, 813, 10, 0x6B2F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -60, 1285, 38, 0x6D61), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -58, 1910, 91, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -53, 2526, 133, 0x0005), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -33, 3445, 193, 0x7961), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 0, 3960, 225, 0x742F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4317, 245, 0x6565), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4316, 245, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 7, 4316, 245, 0x2F73), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, 7, 4316, 245, 0x6B2F), + CS_CAM_FOCUS_POINT_LIST(0, 270), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x2F73), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x6B2F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x6169), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x0005), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x7961), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x742F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -20, 85, -9, 0x2E64), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -20, 85, -9, 0x0000), + CS_CAM_FOCUS_POINT_LIST(80, 425), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x2F73), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x6B2F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x6169), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 112, 7, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -1, 112, 7, 0x0005), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x7961), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.0f, -1, 117, 7, 0x742F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.0f, -1, 117, 7, 0x2E64), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x2F73), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6B2F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6D61), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0005), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x7961), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x742F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x6565), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.0f, -1, 117, 7, 0x2F73), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 20, 60.0f, -1, 117, 7, 0x6B2F), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c new file mode 100644 index 0000000000..b3f580a846 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -0,0 +1,99 @@ +#include "z_bg_toki_swd.h" +#include + +// clang-format off +CutsceneData D_808BB7A0[] = { + CS_BEGIN_CUTSCENE(9, 368), + CS_CAM_POS_LIST(0, 126), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1, 101, -110, 0x616D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x6964), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x00FB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -110, 0x0111), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 101, -109, 0x012D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 71, -110, 0x0033), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x00FB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x00FB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.0f, -1, 72, -110, 0x2F68), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.0f, -1, 72, -110, 0x612F), + CS_CAM_POS_LIST(58, 339), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -9, 106, -3, 0xA1BC), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5F3), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5EB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 106, -3, 0xA5A2), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xBAEE), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xC9B8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0xA5A4), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -67, 108, -53, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -83, 102, -42, 0xA5E1), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -116, 81, -19, 0xA5D0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -118, 81, 54, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -106, 78, 116, 0xA5A6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -27, 75, 226, 0xA5E5), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 121, 82, 312, 0xC0AE), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 296, 76, 374, 0xA5E5), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 565, 80, 257, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 614, 80, -1, 0xA5EB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 594, 80, -145, 0xA5E1), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 475, 80, -380, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 323, 80, -513, 0xA5E1), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 192, 80, -574, 0xA5D0), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -45, 80, -604, 0x0020), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -142, 80, -589, 0xA5A6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -228, 80, -562, 0xA5E5), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -376, 93, -477, 0xC0AE), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -584, 95, -183, 0xA5E5), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -613, 95, -34, 0x0020), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -595, 95, 161, 0xA5EB), + CS_CAM_FOCUS_POINT_LIST(0, 155), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.4f, -1, 111, 5, 0xA1BC), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 111, 5, 0xA5F3), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 111, 5, 0xA5EB), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 111, 5, 0xA5A2), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 111, 5, 0xBAEE), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 40.0f, -1, 104, 8, 0xC9B8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 40.0f, -1, 104, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.0f, -1, 104, 8, 0xA5A4), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.0f, -1, 104, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.0f, -1, 104, 8, 0xA5E1), + CS_CAM_FOCUS_POINT_LIST(58, 368), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.000004f, 0, 120, 12, 0xA1BC), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, 0, 120, 12, 0xA5F3), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, 0, 120, 12, 0xA5EB), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 0, 120, 12, 0xA5A2), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xBAEE), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xC9B8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0xA5A4), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 5, 60.0f, -1, 95, 11, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E1), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5D0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5A6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E5), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xC0AE), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E5), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5EB), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0xA5E1), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, -3, 95, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E1), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5D0), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5A6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E5), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xC0AE), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0xA5E5), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 15, 60.0f, -3, 95, 8, 0x0020), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -3, 95, 8, 0xA5EB), + CS_PLAYER_ACTION_LIST(1), + CS_PLAYER_ACTION(0x000C, 0, 180, 0x0000, 0x0000, 0x0000, 0, 28, -10, 0, -14, 9, 0.0f, -0.23333333f, 0.0f), + CS_LIGHTING_LIST(1), + CS_LIGHTING(0x0002, 90, 91, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0xFFFFFFF2, 0x00000024), + CS_MISC_LIST(1), + CS_MISC(0x000A, 90, 91, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000), + CS_SCENE_TRANS_FX(0x0001, 190, 210), + CS_TERMINATOR(TEMPLE_OF_TIME_AFTER_USE_MS, 210, 211), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c new file mode 100644 index 0000000000..e837c82de8 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -0,0 +1,96 @@ +#include "z_bg_toki_swd.h" +#include + +// clang-format off +CutsceneData D_808BBD90[] = { + CS_BEGIN_CUTSCENE(11, 3000), + CS_UNK_DATA_LIST(0x00000021, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000), + CS_PLAYER_ACTION_LIST(3), + CS_PLAYER_ACTION(0x0005, 0, 1, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 820, 0.0f, 0.0f, 1.4E-45f), + CS_PLAYER_ACTION(0x0002, 1, 16, 0x0000, 0x8000, 0x0000, 0, 0, 820, 0, 0, 720, 0.0f, 0.0f, 1.4E-45f), + CS_PLAYER_ACTION(0x0005, 16, 176, 0x0000, 0x8000, 0x0000, 0, 0, 720, 0, 0, 720, 0.0f, 0.0f, 1.4E-45f), + CS_NPC_ACTION_LIST(62, 3), + CS_NPC_ACTION(0x0004, 40, 70, 0x7D74, 0x0000, 0x0000, -1, 49, 719, 1, 47, 687, 0.06666667f, -0.06666667f, -0.06666667f), + CS_NPC_ACTION(0x0004, 70, 220, 0x8010, 0x0000, 0x0000, 1, 47, 687, 0, 134, 21, -0.006666667f, 0.58f, 0.006666667f), + CS_NPC_ACTION(0x0002, 220, 272, 0x8000, 0x0000, 0x0000, 0, 134, 21, 0, 101, 2, 0.0f, -0.63461536f, 0.0f), + CS_MISC_LIST(1), + CS_MISC(0x000C, 340, 341, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000), + CS_TEXT_LIST(6), + CS_TEXT_NONE(0, 50), + CS_TEXT_DISPLAY_TEXTBOX(0x70E6, 50, 60, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(60, 250), + CS_TEXT_DISPLAY_TEXTBOX(0x70E7, 250, 260, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(260, 290), + CS_TEXT_DISPLAY_TEXTBOX(0x70E8, 290, 320, 0x0000, 0x0000, 0x0000), + CS_CAM_POS_LIST(0, 251), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0222), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x00FA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -59, 12, 690, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x2D70), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x0085), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -31, 24, 701, 0x01E6), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -31, 24, 701, 0x0000), + CS_CAM_POS_LIST(90, 331), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0222), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x00FA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -154, 92, 236, 0x0000), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -154, 92, 236, 0x2D70), + CS_CAM_POS_LIST(220, 491), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 122, 39, 0x0222), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 122, 39, 0x00FA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 102, 39, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 90, 39, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.000004f, -2, 81, 62, 0x2D70), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.000004f, -2, 81, 62, 0x0085), + CS_CAM_FOCUS_POINT_LIST(0, 280), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 43, 52, 716, 0x0222), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 43, 52, 716, 0x00FA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 43, 52, 716, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.0f, 63, 86, 722, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 86, 722, 0x2D70), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 85, 721, 0x0085), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 63, 85, 721, 0x01E6), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, 62, 85, 721, 0x0000), + CS_CAM_FOCUS_POINT_LIST(90, 360), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -105, 83, 366, 0x0222), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -104, 83, 364, 0x00FA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -63, 83, 339, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -16, 99, 255, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -30, 111, 177, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -80, 112, 121, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -80, 112, 121, 0x2D70), + CS_CAM_FOCUS_POINT_LIST(220, 520), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 137, -55, 0x0222), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 137, -55, 0x00FA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 117, -55, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 105, -55, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.000004f, 0, 98, -31, 0x2D70), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.000004f, 0, 98, -31, 0x0085), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index e2f12d3d66..925570980d 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -24,7 +24,7 @@ void func_808BC8B8(BgTreemouth* this, GlobalContext* globalCtx); void func_808BC9EC(BgTreemouth* this, GlobalContext* globalCtx); void func_808BCAF0(BgTreemouth* this, GlobalContext* globalCtx); -#include "z_bg_treemouth_cutscene_data.c" +#include "z_bg_treemouth_cutscene_data.c" EARLY const ActorInit Bg_Treemouth_InitVars = { ACTOR_BG_TREEMOUTH, @@ -39,8 +39,10 @@ const ActorInit Bg_Treemouth_InitVars = { }; static InitChainEntry sInitChain[] = { - ICHAIN_U8(unk_1F, 5, ICHAIN_CONTINUE), ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), + ICHAIN_U8(unk_1F, 5, ICHAIN_CONTINUE), + ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), }; @@ -223,7 +225,7 @@ void BgTreemouth_Update(Actor* thisx, GlobalContext* globalCtx) { void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - u16 alpha = 0x1F4; + u16 alpha = 500; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* dispRefs[4]; @@ -232,7 +234,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { if ((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) { if (gSaveContext.eventChkInf[0] & 0x80) { - alpha = 0x866; + alpha = 2150; } } else { // neeeded to match } @@ -241,7 +243,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { alpha = (globalCtx->unk_11D30[0] + 0x1F4); } - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, alpha * 0.1f); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, alpha * 0.1f); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_060009D0); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index bf958f75db..9389675535 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -1,93 +1,169 @@ #include "z_bg_treemouth.h" +#include +// clang-format off CutsceneData D_808BCE20[] = { - 0x0000000C, 0x00000BB8, 0x00000015, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, - 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, - 0x00020000, 0x002154B2, 0x00000000, 0x00000A36, 0x00000000, 0xFFFFFE3D, 0x00000AF8, 0x00000000, 0xFFFFFDD1, - 0x40BC1F08, 0x00000000, 0xC0BC1F08, 0x00040021, 0x002A5945, 0x00000000, 0x00000AF8, 0x00000000, 0xFFFFFDD1, - 0x00000B29, 0x00000000, 0xFFFFFDAE, 0x40AE38E4, 0x00000000, 0xC0AE38E4, 0x00000001, 0x00010000, 0x04430000, - 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E59A8, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E20B8, 0x00000000, - 0x423CCCC1, 0x0AC1002E, 0xFE9E0000, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E6430, 0xFF000000, 0x423CCCC1, - 0x0AC1002E, 0xFE9E0000, 0x00000001, 0x0001003C, 0x04F70000, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E20BA, - 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E44B8, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E8080, 0x00000000, - 0x423CCCC1, 0x0A910043, 0xFED22D9A, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3D005E, 0x00000000, 0x423CCCC1, - 0x0A24007F, 0xFF3DFFFF, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3D0000, 0x00000000, 0x423CCCC1, 0x0A24007F, - 0xFF3D5B80, 0xFF000000, 0x423CCCC1, 0x0A24007F, 0xFF3D7805, 0x00000002, 0x00010000, 0x04600000, 0x0000001E, - 0x423CCCC1, 0x0AE40017, 0xFE3B20BA, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B44B8, 0x000003E8, 0x423CCCC1, - 0x0AE30017, 0xFE3B8080, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B2D9A, 0xFF00001E, 0x423CCCC1, 0x0AE30017, - 0xFE3B005E, 0x00000002, 0x0001003C, 0x05140000, 0x0000001E, 0x423CCCC1, 0x0AE40017, 0xFE3B20BA, 0x0000001E, - 0x423CCCC1, 0x0AE30017, 0xFE3B44B8, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B8080, 0x0000001E, 0x423CCCC1, - 0x0AD90048, 0xFE862D9A, 0x0000001E, 0x423CCCC1, 0x0A71007F, 0xFEF5005E, 0x0000001E, 0x423CCCC1, 0x0A71007F, - 0xFEF5FFFF, 0x000003E8, 0x423CCCC1, 0x0A71007F, 0xFEF50000, 0x0000001E, 0x423CCCC1, 0x0A71007F, 0xFEF55B80, - 0xFF00001E, 0x423CCCC1, 0x0A71007F, 0xFEF57805, 0x00000013, 0x00000004, 0xFFFF0000, 0x0028FFFF, 0xFFFFFFFF, - 0x107D0028, 0x003C0000, 0xFFFFFFFF, 0xFFFF003C, 0x00A0FFFF, 0xFFFFFFFF, 0x101500A0, 0x00AA0000, 0xFFFFFFFF, - 0x00000003, 0x00000001, 0x000C00B4, 0x00C80000, 0x00000000, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, - 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0x00000000, 0x00000000, 0x0000002E, 0x00000001, 0x00010000, 0x0BB80000, - 0x00000000, 0x00000000, 0xFFFFFFD7, 0xFFFFFFE4, 0x00000000, 0xFFFFFFD7, 0xFFFFFFE4, 0x00000000, 0x00000000, - 0x00000000, 0x0000003E, 0x00000004, 0x00010000, 0x00010000, 0x00000000, 0x00000A6C, 0x0000002E, 0xFFFFFE16, - 0x00000A6C, 0x0000002E, 0xFFFFFE16, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00325479, 0x00000000, - 0x00000A6C, 0x0000002E, 0xFFFFFE16, 0x00000B4A, 0x0000002B, 0xFFFFFD9C, 0x4090FAC7, 0xBD7AC688, 0xC090FAC7, - 0x00040032, 0x0064505C, 0x00000000, 0x00000B4A, 0x0000002B, 0xFFFFFD9C, 0x00000C25, 0x00000079, 0xFFFFFD3F, - 0x408C28F6, 0x3FC7AE14, 0xC08C28F6, 0x00010064, 0x08240000, 0x00000000, 0x00000C25, 0x00000079, 0xFFFFFD3F, - 0x00000C25, 0x00000079, 0xFFFFFD3F, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x004C008C, - 0x008D0000, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, - 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040000, 0x00140000, 0x00000000, 0xFFFFFFA2, 0x00000000, - 0x00000027, 0xFFFFFFA2, 0x00000000, 0x00000027, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, + CS_BEGIN_CUTSCENE(12, 3000), + CS_UNK_DATA_LIST(0x00000015, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), + CS_PLAYER_ACTION_LIST(2), + CS_PLAYER_ACTION(0x0002, 0, 33, 0x54B2, 0x0000, 0x0000, 2614, 0, -451, 2808, 0, -559, 5.878787994384766f, 0.0f, -5.878787994384766f), + CS_PLAYER_ACTION(0x0004, 33, 42, 0x5945, 0x0000, 0x0000, 2808, 0, -559, 2857, 0, -594, 5.44444465637207f, 0.0f, -5.44444465637207f), + CS_CAM_POS_LIST(0, 1091), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x59A8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x20B8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x6430), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x0000), + CS_CAM_POS_LIST(60, 1271), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x20BA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x44B8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2753, 46, -354, 0x8080), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2705, 67, -302, 0x2D9A), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2596, 127, -195, 0x005E), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2596, 127, -195, 0xFFFF), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2596, 127, -195, 0x0000), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 47.199954986572266f, 2596, 127, -195, 0x5B80), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 47.199954986572266f, 2596, 127, -195, 0x7805), + CS_CAM_FOCUS_POINT_LIST(0, 1120), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2788, 23, -453, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2787, 23, -453, 0x44B8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 47.199954986572266f, 2787, 23, -453, 0x8080), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2787, 23, -453, 0x2D9A), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 47.199954986572266f, 2787, 23, -453, 0x005E), + CS_CAM_FOCUS_POINT_LIST(60, 1300), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2788, 23, -453, 0x20BA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2787, 23, -453, 0x44B8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2787, 23, -453, 0x8080), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2777, 72, -378, 0x2D9A), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2673, 127, -267, 0x005E), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2673, 127, -267, 0xFFFF), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 47.199954986572266f, 2673, 127, -267, 0x0000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 47.199954986572266f, 2673, 127, -267, 0x5B80), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 47.199954986572266f, 2673, 127, -267, 0x7805), + CS_TEXT_LIST(4), + CS_TEXT_NONE(0, 40), + CS_TEXT_DISPLAY_TEXTBOX(0x107D, 40, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT_NONE(60, 160), + CS_TEXT_DISPLAY_TEXTBOX(0x1015, 160, 170, 0x0000, 0xFFFF, 0xFFFF), + CS_MISC_LIST(1), + CS_MISC(0x000C, 180, 200, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(46, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -41, -28, 0, -41, -28, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(62, 4), + CS_NPC_ACTION(0x0001, 0, 1, 0x0000, 0x0000, 0x0000, 2668, 46, -490, 2668, 46, -490, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 1, 50, 0x5479, 0x0000, 0x0000, 2668, 46, -490, 2890, 43, -612, 4.530612468719482f, -0.06122449040412903f, -4.530612468719482f), + CS_NPC_ACTION(0x0004, 50, 100, 0x505C, 0x0000, 0x0000, 2890, 43, -612, 3109, 121, -705, 4.380000114440918f, 1.559999942779541f, -4.380000114440918f), + CS_NPC_ACTION(0x0001, 100, 2084, 0x0000, 0x0000, 0x0000, 3109, 121, -705, 3109, 121, -705, 0.0f, 0.0f, 0.0f), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x004C, 140, 141, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, 0xFFFFFFBA, 0x00000094), + CS_FADE_BGM_LIST(1), + CS_FADE_BGM(0x0004, 0, 20, 0x0000, 0x00000000, 0xFFFFFFA2, 0x00000000, 0x00000027, 0xFFFFFFA2, 0x00000000, 0x00000027), + CS_END(), }; + CutsceneData D_808BD2A0[] = { - 0x00000009, 0x00000BB8, 0x00000015, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, - 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, - 0x000C005A, 0x00AC0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0x00000012, 0x00000000, 0xFFFFFFE3, 0x00000012, - 0x00000000, 0x00000000, 0x00000000, 0x0000002E, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, - 0xFFFFFFE5, 0x0000001A, 0x00000000, 0xFFFFFFE5, 0x0000001A, 0x00000000, 0x00000000, 0x00000000, 0x00000001, - 0x00010000, 0x04430000, 0x00000000, 0x42700000, 0x0E9CFF73, 0xFDEE7065, 0x00000000, 0x4223FFED, 0x0E9CFF73, - 0xFDEE6167, 0x00000000, 0x4223FFED, 0x0E9CFF73, 0xFDEE6D5D, 0x00000000, 0x4223FFED, 0x0E9CFF73, 0xFDEEF348, - 0xFF000000, 0x4223FFED, 0x0E9CFF73, 0xFDEE9D94, 0x00000005, 0x0001003C, 0x047F0000, 0x00000000, 0x42700000, - 0xFFFC0005, 0x00317065, 0x00000000, 0x42700000, 0xFFFC0005, 0x00316167, 0x00000000, 0x42700000, 0xFFFC0005, - 0x00316D5D, 0x00000000, 0x42700000, 0xFFFC0005, 0x0031F348, 0xFF000000, 0x42700000, 0xFFFC0005, 0x00319D94, - 0x00000002, 0x00010000, 0x04600000, 0x0000001E, 0x4223FFED, 0x0EC1FFA7, 0xFDA37065, 0x0000001E, 0x4223FFED, - 0x0EC1FFA7, 0xFDA36167, 0x000003E8, 0x4223FFED, 0x0EC0FFA7, 0xFDA36D5D, 0x0000001E, 0x4223FFED, 0x0EC0FFA7, - 0xFDA3F348, 0xFF00001E, 0x4223FFED, 0x0EC0FFA7, 0xFDA49D94, 0x00000006, 0x0001003C, 0x049C0000, 0x0000001E, - 0x42700000, 0x00010023, 0xFFDC7065, 0x0000001E, 0x42700000, 0x00010023, 0xFFDC6167, 0x000003E8, 0x42700000, - 0x00010023, 0xFFDC6D5D, 0x0000001E, 0x42700000, 0x00010023, 0xFFDCF348, 0xFF00001E, 0x42700000, 0x00010023, - 0xFFDC9D94, 0x00000013, 0x00000002, 0xFFFF0000, 0x0014FFFF, 0xFFFFFFFF, 0x10160014, 0x00500000, 0xFFFFFFFF, - 0x00000056, 0x00000001, 0x004C0000, 0x00010000, 0x00000000, 0x00000000, 0xFFFFFFAC, 0x0000007E, 0x00000000, - 0xFFFFFFAC, 0x0000007E, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, + CS_BEGIN_CUTSCENE(9, 3000), + CS_UNK_DATA_LIST(0x00000015, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), + CS_MISC_LIST(1), + CS_MISC(0x000C, 90, 172, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0x00000012, 0x00000000, 0xFFFFFFE3, 0x00000012, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(46, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -27, 26, 0, -27, 26, 0.0f, 0.0f, 0.0f), + CS_CAM_POS_LIST(0, 1091), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 3740, -141, -530, 0x7065), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x6167), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x6D5D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0xF348), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x9D94), + CS_CAM_POS_PLAYER_LIST(60, 1151), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -4, 5, 49, 0x7065), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -4, 5, 49, 0x6167), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -4, 5, 49, 0x6D5D), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -4, 5, 49, 0xF348), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 60.0f, -4, 5, 49, 0x9D94), + CS_CAM_FOCUS_POINT_LIST(0, 1120), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3777, -89, -605, 0x7065), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3777, -89, -605, 0x6167), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 40.99992752075195f, 3776, -89, -605, 0x6D5D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3776, -89, -605, 0xF348), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.99992752075195f, 3776, -89, -604, 0x9D94), + CS_CAM_FOCUS_POINT_PLAYER_LIST(60, 1180), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 1, 35, -36, 0x7065), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 1, 35, -36, 0x6167), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 60.0f, 1, 35, -36, 0x6D5D), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 60.0f, 1, 35, -36, 0xF348), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 60.0f, 1, 35, -36, 0x9D94), + CS_TEXT_LIST(2), + CS_TEXT_NONE(0, 20), + CS_TEXT_DISPLAY_TEXTBOX(0x1016, 20, 80, 0x0000, 0xFFFF, 0xFFFF), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x004C, 0, 1, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFAC, 0x0000007E, 0x00000000, 0xFFFFFFAC, 0x0000007E), + CS_END(), }; + CutsceneData D_808BD520[] = { - 0x00000008, 0x00000BB8, 0x00000015, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, - 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000, 0x0000002E, 0x00000002, - 0x00010000, 0x00140000, 0x00000000, 0x0000002A, 0x00000000, 0x0000004D, 0x0000002A, 0x00000000, 0x0000004D, - 0x00000000, 0x00000000, 0x00000000, 0x00030014, 0x01650000, 0x00000000, 0x0000002A, 0x00000000, 0x0000004D, - 0x0000002A, 0x00000000, 0x0000004D, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x047F0000, - 0x00000000, 0x42700000, 0x0E9CFF73, 0xFDEE00EA, 0x00000000, 0x4223FFED, 0x0E9CFF73, 0xFDEE00FB, 0x00000000, - 0x4223FFED, 0x0E9CFF73, 0xFDEE010C, 0x00000000, 0x4223FFED, 0x0E9CFF73, 0xFDEE0198, 0x00000000, 0x4223FFED, - 0x0E9CFF73, 0xFDEE019A, 0x00000000, 0x4223FFED, 0x0E9CFF73, 0xFDEE01AB, 0xFF000000, 0x4223FFED, 0x0E9BFF73, - 0xFDEE01BC, 0x00000002, 0x00010000, 0x049C0000, 0x0000001E, 0x4223FFED, 0x0EC1FFA7, 0xFDA300EA, 0x0000001E, - 0x4223FFED, 0x0EC1FFA7, 0xFDA300FB, 0x0000001E, 0x4223FFED, 0x0EC1FFA7, 0xFDA3010C, 0x0000001E, 0x4223FFED, - 0x0EB3FF82, 0xFD930198, 0x000003E8, 0x4223FFED, 0x0EB3FF82, 0xFD93019A, 0x0000001E, 0x4223FFED, 0x0EB3FF82, - 0xFD9301AB, 0xFF00001E, 0x4223FFED, 0x0EB5FF8A, 0xFD9701BC, 0x00000013, 0x00000002, 0xFFFF0000, 0x0014FFFF, - 0xFFFFFFFF, 0x10170014, 0x003C0000, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x000C0064, 0x00960000, 0x00000000, - 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0x00000000, 0x00000000, - 0x00000057, 0x00000001, 0x004C005A, 0x005B0000, 0x00000000, 0xFFFFFFAC, 0x00000000, 0x00000034, 0xFFFFFFAC, - 0x00000000, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x003D0063, 0x00640000, - 0x00000000, 0xFFFFFFD0, 0x00000000, 0x00000041, 0xFFFFFFD0, 0x00000000, 0x00000041, 0x00000000, 0x00000000, - 0x00000000, 0xFFFFFFFF, 0x00000000, + CS_BEGIN_CUTSCENE(8, 3000), + CS_UNK_DATA_LIST(0x00000015, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(46, 2), + CS_NPC_ACTION(0x0001, 0, 20, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0003, 20, 357, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, 0.0f, 0.0f, 0.0f), + CS_CAM_POS_LIST(0, 1151), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 3740, -141, -530, 0x00EA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x00FB), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x010C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x0198), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x019A), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99992752075195f, 3740, -141, -530, 0x01AB), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.99992752075195f, 3739, -141, -530, 0x01BC), + CS_CAM_FOCUS_POINT_LIST(0, 1180), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3777, -89, -605, 0x00EA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3777, -89, -605, 0x00FB), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3777, -89, -605, 0x010C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3763, -126, -621, 0x0198), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 40.99992752075195f, 3763, -126, -621, 0x019A), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99992752075195f, 3763, -126, -621, 0x01AB), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.99992752075195f, 3765, -118, -617, 0x01BC), + CS_TEXT_LIST(2), + CS_TEXT_NONE(0, 20), + CS_TEXT_DISPLAY_TEXTBOX(0x1017, 20, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_MISC_LIST(1), + CS_MISC(0x000C, 100, 150, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0xFFFFFFF5, 0x00000010, 0x00000000, 0x00000000, 0x00000000), + CS_STOP_BGM_LIST(1), + CS_STOP_BGM(0x004C, 90, 91, 0x0000, 0x00000000, 0xFFFFFFAC, 0x00000000, 0x00000034, 0xFFFFFFAC, 0x00000000, 0x00000034), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x003D, 99, 100, 0x0000, 0x00000000, 0xFFFFFFD0, 0x00000000, 0x00000041, 0xFFFFFFD0, 0x00000000, 0x00000041), + CS_END(), }; + CutsceneData D_808BD790[] = { - 0x00000008, 0x00000BB8, 0x00000015, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, - 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000, 0x0000002E, 0x00000001, - 0x00010000, 0x00770000, 0x00000000, 0x0000002A, 0x00000000, 0x0000004D, 0x0000002A, 0x00000000, 0x0000004D, - 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04430000, 0x00000000, 0x4297331E, 0x0E840316, - 0xFB6D54EC, 0x00000000, 0x4297331E, 0x0E840316, 0xFB6D555C, 0x00000000, 0x4297331E, 0x0E840316, 0xFB6D55CC, - 0x00000000, 0x4297331E, 0x0E840316, 0xFB6D563C, 0xFF000000, 0x4297331E, 0x0E840316, 0xFB6D56AC, 0x00000002, - 0x00010000, 0x04600000, 0x0000001E, 0x4297331E, 0x0EB902CE, 0xFB5E54EC, 0x0000001E, 0x4297331E, 0x0EB902CE, - 0xFB5E555C, 0x000003E8, 0x4297331E, 0x0EB902CE, 0xFB5E55CC, 0x0000001E, 0x4297331E, 0x0EB902CE, 0xFB5E563C, - 0xFF00001E, 0x4297331E, 0x0EB902CE, 0xFB5E56AC, 0x00000013, 0x00000002, 0xFFFF0000, 0x0014FFFF, 0xFFFFFFFF, - 0x10180014, 0x003C0000, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x000C0050, 0x006E0000, 0x00000000, 0x00000000, - 0xFFFFFFEA, 0x00000006, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000057, - 0x00000001, 0x004C0046, 0x00470000, 0x00000000, 0xFFFFFFB7, 0x00000000, 0x00000044, 0xFFFFFFB7, 0x00000000, - 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x003D004F, 0x00500000, 0x00000000, - 0xFFFFFFE8, 0x00000000, 0x0000003A, 0xFFFFFFE8, 0x00000000, 0x0000003A, 0x00000000, 0x00000000, 0x00000000, - 0xFFFFFFFF, 0x00000000, + CS_BEGIN_CUTSCENE(8, 3000), + CS_UNK_DATA_LIST(0x00000015, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(46, 1), + CS_NPC_ACTION(0x0001, 0, 119, 0x0000, 0x0000, 0x0000, 42, 0, 77, 42, 0, 77, 0.0f, 0.0f, 0.0f), + CS_CAM_POS_LIST(0, 1091), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 75.59983825683594f, 3716, 790, -1171, 0x54EC), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 75.59983825683594f, 3716, 790, -1171, 0x555C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 75.59983825683594f, 3716, 790, -1171, 0x55CC), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 75.59983825683594f, 3716, 790, -1171, 0x563C), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 75.59983825683594f, 3716, 790, -1171, 0x56AC), + CS_CAM_FOCUS_POINT_LIST(0, 1120), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 75.59983825683594f, 3769, 718, -1186, 0x54EC), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 75.59983825683594f, 3769, 718, -1186, 0x555C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 75.59983825683594f, 3769, 718, -1186, 0x55CC), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 75.59983825683594f, 3769, 718, -1186, 0x563C), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 75.59983825683594f, 3769, 718, -1186, 0x56AC), + CS_TEXT_LIST(2), + CS_TEXT_NONE(0, 20), + CS_TEXT_DISPLAY_TEXTBOX(0x1018, 20, 60, 0x0000, 0xFFFF, 0xFFFF), + CS_MISC_LIST(1), + CS_MISC(0x000C, 80, 110, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0xFFFFFFEA, 0x00000006, 0x00000000, 0x00000000, 0x00000000), + CS_STOP_BGM_LIST(1), + CS_STOP_BGM(0x004C, 70, 71, 0x0000, 0x00000000, 0xFFFFFFB7, 0x00000000, 0x00000044, 0xFFFFFFB7, 0x00000000, 0x00000044), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x003D, 79, 80, 0x0000, 0x00000000, 0xFFFFFFE8, 0x00000000, 0x0000003A, 0xFFFFFFE8, 0x00000000, 0x0000003A), + CS_END(), }; +// clang-format on diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 8a2af914ce..0c7ecc44ea 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -58,7 +58,8 @@ void BgZg_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_808C0C50(BgZg* this) { - Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); } s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index f78358378d..7cdcd5f94e 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -83,7 +83,7 @@ void func_8097C8A8(DemoGo* this, GlobalContext* globalCtx) { if ((thisx->params == 0) || (thisx->params == 1)) { func_800A6E10(&globalCtx->mf_11D60, &thisx->posRot.pos, &sp20, &sp1C); - Audio_PlaySoundAtPosition(globalCtx, &sp20, 20, 0x28A0); + Audio_PlaySoundAtPosition(globalCtx, &sp20, 20, NA_SE_EV_OBJECT_FALL); } } diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 32888e063d..efcde8f5c8 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -1,5 +1,13 @@ +/* + * File: z_demo_sa.c + * Overlay: Demo_Sa + * Description: Saria (Cutscene) + */ + #include "z_demo_sa.h" +#include + #define FLAGS 0x00000010 #define THIS ((DemoSa*)thisx) @@ -9,7 +17,56 @@ void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx); void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_8098EBB8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC28(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC60(DemoSa* this, GlobalContext* globalCtx); +void func_8098EC94(DemoSa* this, GlobalContext* globalCtx); +void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx); +void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx); +void func_8098F118(DemoSa* this, GlobalContext* globalCtx); +void func_8098F16C(DemoSa* this, GlobalContext* globalCtx); +void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx); +void func_8098F714(DemoSa* this, GlobalContext* globalCtx); +void func_8098F734(DemoSa* this, GlobalContext* globalCtx); +void func_8098F77C(DemoSa* this, GlobalContext* globalCtx); +void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx); +void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC44(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC64(DemoSa* this, GlobalContext* globalCtx); +void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx); +void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx); +void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx); + +void func_8098FEA8(DemoSa* this, GlobalContext* globalCtx); +void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx); +void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx); + +UNK_PTR D_809900E0[] = { + 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48, +}; + +UNK_PTR D_809900F4[] = { + 0x06003588, 0x06004C48, 0x06003348, 0x06004448, 0x06004648, +}; + +u32 D_80990108 = 0; + +#include "z_demo_sa_cutscene_data.c" EARLY + +static DemoSaActionFunc sActionFuncs[] = { + func_8098EBB8, func_8098EBD8, func_8098EBF8, func_8098EC28, func_8098EC60, func_8098EC94, func_8098ECCC, + func_8098F0E8, func_8098F118, func_8098F16C, func_8098F3F0, func_8098F714, func_8098F734, func_8098F77C, + func_8098F7BC, func_8098F7FC, func_8098FC44, func_8098FC64, func_8098FC9C, func_8098FCD4, func_8098FD0C, +}; + +static DemoSaDrawFunc sDrawFuncs[] = { + func_8098FEA8, + func_8098FEB4, + func_8098F1C0, +}; + const ActorInit Demo_Sa_InitVars = { ACTOR_DEMO_SA, ACTORTYPE_NPC, @@ -21,155 +78,747 @@ const ActorInit Demo_Sa_InitVars = { (ActorFunc)DemoSa_Update, (ActorFunc)DemoSa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E508.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E51C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E554.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E5C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E630.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E654.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E6EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E86C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E8C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E944.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E960.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E9EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EBF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EC94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EDB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EE28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EEFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F0E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F118.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F16C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F3F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F50C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F5D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F654.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F734.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F77C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F7FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F8F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F984.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F998.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FA84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FAE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FB68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FC9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FCD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FD0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FE74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Draw.s") +void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +extern AnimationHeader D_06001334; +extern AnimationHeader D_060021D8; +extern Gfx D_06007B80[]; +extern SkeletonHeader D_0600B1A0; +extern AnimationHeader D_0600DF80; +extern AnimationHeader D_0600E500; +extern AnimationHeader D_0600F580; +extern AnimationHeader D_0600FCE0; +extern AnimationHeader D_0600FFD4; +extern AnimationHeader D_0601113C; +extern AnimationHeader D_060135EC; +extern AnimationHeader D_06013CD8; +extern AnimationHeader D_060140BC; + +void func_8098E480(DemoSa* this) { + s32 pad[2]; + s16* unk_190 = &this->unk_190; + s16* unk_192 = &this->unk_192; + + if (DECR(*unk_192) == 0) { + *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_190 = *unk_192; + if (*unk_190 >= 3) { + *unk_190 = 0; + } +} + +void func_8098E508(DemoSa* this, s16 arg1) { + this->unk_190 = arg1; +} + +void func_8098E51C(DemoSa* this, s16 arg1) { + this->unk_194 = arg1; +} + +void func_8098E530(DemoSa* this) { + this->action = 7; + this->drawConfig = 0; + this->alpha = 0; + this->unk_1A8 = 0; + this->actor.shape.unk_14 = 0; + this->unk_1A0 = 0.0f; +} + +void func_8098E554(DemoSa* this, GlobalContext* globalCtx) { + u32* something = &D_80990108; + + if (globalCtx->csCtx.state == 0) { + if (*something != 0) { + if (this->actor.params == 2) { + func_8098E530(this); + } + *something = 0; + } + } else if (*something == 0) { + *something = 1; + } +} + +void func_8098E5C8(DemoSa* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 DemoSa_FrameUpdateMatrix(DemoSa* this) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* DemoSa_GetNpcAction(GlobalContext* globalCtx, s32 idx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[idx]; + } + return NULL; +} + +s32 func_8098E654(DemoSa* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, arg3); + + if ((npcAction != NULL) && (npcAction->action == arg2)) { + return 1; + } + return 0; +} + +s32 func_8098E6A0(DemoSa* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, arg3); + + if ((npcAction != NULL) && (npcAction->action != arg2)) { + return 1; + } + return 0; +} + +void func_8098E6EC(DemoSa* this, GlobalContext* globalCtx, s32 actionIdx) { + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, actionIdx); + + if (npcAction != NULL) { + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void func_8098E76C(DemoSa* this, AnimationHeader* animationHeader, u8 arg2, f32 transitionRate, s32 arg4) { + s32 pad[2]; + f32 frameCount = SkelAnime_GetFrameCount(&animationHeader->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + fc = 0.0f; + unk0 = frameCount; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animationHeader, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +void func_8098E7FC(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_060021D8, NULL, NULL, 0); + this->actor.shape.unk_08 = -10000.0f; + func_8098E508(this, 1); + func_8098E51C(this, 0); +} + +void func_8098E86C(DemoSa* this, GlobalContext* globalCtx) { + Vec3f* posRot = &this->actor.posRot.pos; + f32 posX = posRot->x; + f32 posY = posRot->y; + f32 posZ = posRot->z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +void func_8098E8C8(DemoSa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.posRot.pos.x; + f32 posY = player->actor.posRot.pos.y + 80.0f; + f32 posZ = player->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + 0xB); + Item_Give(globalCtx, ITEM_MEDALLION_FOREST); +} + +void func_8098E944(DemoSa* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += (250.0f / 3.0f); +} + +void func_8098E960(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player; + + if ((gSaveContext.chamberCutsceneNum == 0) && (gSaveContext.sceneSetupIndex < 4)) { + player = PLAYER; + this->action = 1; + globalCtx->csCtx.segment = D_8099010C; + gSaveContext.cutsceneTrigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_FOREST); + player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + } +} + +void func_8098E9EC(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[4]; + if ((npcAction != NULL) && (npcAction->action == 2)) { + this->action = 2; + this->drawConfig = 1; + func_8098E86C(this, globalCtx); + } + } +} + +void func_8098EA3C(DemoSa* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} + +void func_8098EA68(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[4]; + if ((npcAction != NULL) && (npcAction->action == 3)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600DF80.genericHeader, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600DF80.genericHeader), 2, -4.0f); + this->action = 4; + } + } +} + +void func_8098EB00(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600E500, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600E500.genericHeader), 0, 0.0f); + this->action = 5; + } +} + +void func_8098EB6C(DemoSa* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction; + + if (globalCtx->csCtx.state != 0) { + npcAction = globalCtx->csCtx.npcActions[6]; + if ((npcAction != NULL) && (npcAction->action == 2)) { + this->action = 6; + func_8098E8C8(this, globalCtx); + } + } +} + +void func_8098EBB8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E960(this, globalCtx); +} + +void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E9EC(this, globalCtx); +} + +void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx) { + func_8098E944(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EA3C(this); +} + +void func_8098EC28(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EA68(this, globalCtx); +} + +void func_8098EC60(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + func_8098EB00(this, DemoSa_FrameUpdateMatrix(this)); +} + +void func_8098EC94(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EB6C(this, globalCtx); +} + +void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); +} + +void func_8098ECF4(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = SkelAnime_GetFrameCount(&D_06001334.genericHeader); + + SkelAnime_InitSV(globalCtx, skelAnime, &D_0600B1A0, NULL, NULL, NULL, 0); + SkelAnime_ChangeAnim(skelAnime, &D_06001334, 1.0f, 0.0f, frameCount, 2, 0.0f); + this->action = 7; + this->actor.shape.unk_14 = 0; + func_8098E508(this, 2); + func_8098E51C(this, 2); +} + +void func_8098EDB0(DemoSa* this) { + f32 animCurrentFrame = this->skelAnime.animCurrentFrame; + + if ((this->skelAnime.mode == 2) && (animCurrentFrame >= 32.0f)) { + func_8098E508(this, 1); + func_8098E51C(this, 0); + } +} + +void func_8098EE08(void) { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +void func_8098EE28(DemoSa* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + (kREG(23) + 25.0f) + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 4); +} + +void func_8098EEA8(DemoSa* this, GlobalContext* globalCtx) { + if (func_8098E654(this, globalCtx, 4, 4)) { + this->action = 8; + this->drawConfig = 2; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + this->unk_1A0 = 0.0f; + func_8098EE08(); + } +} + +void func_8098EEFC(DemoSa* this, GlobalContext* globalCtx) { + s32 alpha = 255; + f32* unk_1A0 = &this->unk_1A0; + + if (func_8098E654(this, globalCtx, 4, 4)) { + *unk_1A0 += 1.0f; + if ((kREG(5) + 10.0f) <= *unk_1A0) { + this->action = 9; + this->drawConfig = 1; + *unk_1A0 = kREG(5) + 10.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; + return; + } + } else { + *unk_1A0 -= 1.0f; + if (*unk_1A0 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_1A0 = 0.0f; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / (kREG(5) + 10.0f)) * 255.0f; +} + +void func_8098F050(DemoSa* this, GlobalContext* globalCtx) { + if (func_8098E6A0(this, globalCtx, 4, 4)) { + this->action = 8; + this->drawConfig = 2; + this->unk_1A0 = kREG(5) + 10.0f; + this->alpha = 255; + if (this->unk_1A8 == 0) { + func_8098EE28(this, globalCtx); + this->unk_1A8 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx) { + func_8098EEA8(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F118(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098EEFC(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F16C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098EDB0(this); + func_8098F050(this, globalCtx); + func_8098E554(this, globalCtx); +} + +void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + UNK_PTR sp78 = D_809900E0[unk_190]; + s16 unk_194 = this->unk_194; + s32 pad2; + UNK_PTR sp6C = D_809900F4[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 296); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, D_80116280); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + NULL, NULL, NULL, gfxCtx->polyXlu.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 325); +} + +void func_8098F390(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_060021D8, NULL, NULL, 0); + this->action = 10; + this->drawConfig = 1; +} + +void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); +} + +void func_8098F420(DemoSa* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0600FFD4, NULL, NULL, 0); + this->action = 11; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_8098F480(DemoSa* this) { + s32 alpha = 255; + f32* unk_1A0 = &this->unk_1A0; + f32 temp_f0; + + *unk_1A0 += 1.0f; + temp_f0 = kREG(17) + 10.0f; + + if (temp_f0 <= *unk_1A0) { + this->actor.shape.unk_14 = this->alpha = alpha; + } else { + this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / temp_f0) * 255.0f; + } +} + +void func_8098F50C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E6EC(this, globalCtx, 4); + this->action = 12; + this->drawConfig = 2; +} + +void func_8098F544(DemoSa* this) { + if (this->unk_1A0 >= kREG(17) + 10.0f) { + this->action = 13; + this->drawConfig = 1; + } +} + +void func_8098F590(DemoSa* this) { + func_8098E76C(this, &D_0600F580, 2, -8.0f, 0); + this->action = 14; +} + +void func_8098F5D0(DemoSa* this) { + func_8098E76C(this, &D_0600FCE0, 2, 0.0f, 0); + this->action = 15; +} + +void func_8098F610(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + func_8098E76C(this, &D_0600FFD4, 0, 0.0f, 0); + this->action = 13; + } +} + +void func_8098F654(DemoSa* this, GlobalContext* globalCtx) { + s32 unk_1AC; + s32 action; + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, 4); + + if (npcAction != NULL) { + action = npcAction->action; + unk_1AC = this->unk_1AC; + if (action != unk_1AC) { + switch (action) { + case 7: + func_8098F50C(this, globalCtx); + break; + case 8: + func_8098F590(this); + break; + case 9: + func_8098F5D0(this); + break; + default: + osSyncPrintf("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_1AC = action; + } + } +} + +void func_8098F714(DemoSa* this, GlobalContext* globalCtx) { + func_8098F654(this, globalCtx); +} + +void func_8098F734(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F480(this); + func_8098F544(this); +} + +void func_8098F77C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F654(this, globalCtx); +} + +void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F654(this, globalCtx); +} + +void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx) { + s32 sp1C; + + func_8098E5C8(this, globalCtx); + sp1C = DemoSa_FrameUpdateMatrix(this); + func_8098E480(this); + func_8098F610(this, sp1C); +} + +void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) { + Vec3f* thisPos = &this->actor.posRot.pos; + + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0601113C, NULL, NULL, 0); + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, + 0, 0, 0, 3); + this->action = 16; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; + func_8098E508(this, 4); + func_8098E51C(this, 2); +} + +void func_8098F8F8(DemoSa* this) { + s32 alpha = 255; + f32* unk_1A0 = &this->unk_1A0; + f32 temp_f0; + + *unk_1A0 += 1.0f; + temp_f0 = kREG(17) + 10.0f; + + if (temp_f0 <= *unk_1A0) { + this->actor.shape.unk_14 = this->alpha = alpha; + } else { + this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / temp_f0) * 255.0f; + } +} + +void func_8098F984(DemoSa* this) { + this->action = 16; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_8098F998(DemoSa* this, GlobalContext* globalCtx) { + if (this->unk_1AC == 4) { + func_8098E6EC(this, globalCtx, 1); + this->action = 17; + this->drawConfig = 2; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0; + } else { + func_8098E76C(this, &D_0601113C, 0, 0.0f, 0); + this->action = 18; + this->drawConfig = 1; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0xFF; + } + func_8098E508(this, 4); +} + +void func_8098FA2C(DemoSa* this) { + if (this->unk_1A0 >= kREG(17) + 10.0f) { + this->action = 18; + this->drawConfig = 1; + this->unk_1B0 = 0; + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_8098FA84(DemoSa* this) { + func_8098E76C(this, &D_060140BC, 0, 0.0f, 0); + this->action = 19; + this->drawConfig = 1; + this->unk_1B0 = 1; + this->actor.shape.unk_14 = 0xFF; + func_8098E508(this, 2); +} + +void func_8098FAE0(DemoSa* this) { + func_8098E76C(this, &D_060135EC, 2, -8.0f, 0); + this->action = 20; + this->drawConfig = 1; + this->unk_1B0 = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_8098FB34(DemoSa* this, s32 arg1) { + if (arg1 != 0) { + func_8098E76C(this, &D_06013CD8, 0, 0, 0); + } +} + +void func_8098FB68(DemoSa* this, GlobalContext* globalCtx) { + s32 unk_1AC; + s32 action; + CsCmdActorAction* npcAction = DemoSa_GetNpcAction(globalCtx, 1); + + if (npcAction != NULL) { + action = npcAction->action; + unk_1AC = this->unk_1AC; + if (action != unk_1AC) { + switch (action) { + case 4: + func_8098F984(this); + break; + case 12: + func_8098F998(this, globalCtx); + break; + case 13: + func_8098FA84(this); + break; + case 14: + func_8098FAE0(this); + break; + default: + osSyncPrintf("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_1AC = action; + } + } +} + +void func_8098FC44(DemoSa* this, GlobalContext* globalCtx) { + func_8098FB68(this, globalCtx); +} + +void func_8098FC64(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098F8F8(this); + func_8098FA2C(this); +} + +void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098FB68(this, globalCtx); +} + +void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + DemoSa_FrameUpdateMatrix(this); + func_8098FB68(this, globalCtx); +} + +void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) { + func_8098E5C8(this, globalCtx); + func_8098FB34(this, DemoSa_FrameUpdateMatrix(this)); + func_8098FB68(this, globalCtx); +} + +void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + if (this->action < 0 || this->action >= 21 || sActionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void DemoSa_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + + switch (this->actor.params) { + case 2: + func_8098ECF4(this, globalCtx); + break; + case 3: + func_8098F390(this, globalCtx); + break; + case 4: + func_8098F420(this, globalCtx); + break; + case 5: + func_8098F83C(this, globalCtx); + break; + default: + func_8098E7FC(this, globalCtx); + } +} + +s32 DemoSa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + DemoSa* this = THIS; + + if ((limbIndex == 15) && (this->unk_1B0 != 0)) { + *dList = &D_06007B80; + } + return 0; +} + +void func_8098FEA8(DemoSa* this, GlobalContext* globalCtx) { +} + +void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + UNK_PTR sp70 = D_809900E0[unk_190]; + s32 pad2; + s16 unk_194 = this->unk_194; + UNK_PTR sp64 = D_809900F4[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(&dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa.c", 602); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + DemoSa_OverrideLimbDraw, NULL, &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_sa.c", 626); +} + +void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoSa* this = THIS; + + if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h index 51eb75c114..ac98e7c130 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h @@ -6,9 +6,22 @@ struct DemoSa; +typedef void (*DemoSaActionFunc)(struct DemoSa*, GlobalContext*); +typedef void (*DemoSaDrawFunc)(struct DemoSa*, GlobalContext*); + typedef struct DemoSa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x68]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 unk_190; + /* 0x0192 */ s16 unk_192; + /* 0x0194 */ s16 unk_194; + /* 0x0198 */ s32 action; + /* 0x019C */ s32 drawConfig; + /* 0x01A0 */ f32 unk_1A0; + /* 0x01A4 */ s32 alpha; + /* 0x01A8 */ s32 unk_1A8; + /* 0x01AC */ s32 unk_1AC; + /* 0x01B0 */ s32 unk_1B0; } DemoSa; // size = 0x01B4 extern const ActorInit Demo_Sa_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c new file mode 100644 index 0000000000..bc256a2228 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c @@ -0,0 +1,184 @@ +#include "z_demo_sa.h" +#include + +// clang-format off +static CutsceneData D_8099010C[] = { + CS_BEGIN_CUTSCENE(29, 3001), + CS_UNK_DATA_LIST(0x00000020, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(31, 5), + CS_NPC_ACTION(0x0001, 0, 612, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 612, 613, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 613, 684, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 216, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 684, 732, 0x0000, 0x0000, 0x0000, 0, 216, 0, 0, 82, 0, 0.0f, -2.7916667461395264f, 0.0f), + CS_NPC_ACTION(0x0003, 732, 2912, 0x0000, 0x0000, 0x0000, 0, 82, 0, 0, 82, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION_LIST(3), + CS_PLAYER_ACTION(0x000D, 0, 261, 0x0000, 0x0000, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION(0x0005, 261, 600, 0x0000, 0x9555, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION(0x0013, 600, 1243, 0x0000, 0x1555, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(43, 3), + CS_NPC_ACTION(0x0001, 0, 165, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 165, 466, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0003, 466, 3001, 0x0000, 0x0000, 0x0000, -98, 6, -169, -98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_SCENE_TRANS_FX(0x0001, 590, 607), + CS_SCENE_TRANS_FX(0x0005, 617, 647), + CS_SCENE_TRANS_FX(0x0001, 875, 905), + CS_NPC_ACTION_LIST(49, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, -98, 0, 98, -98, 0, 98, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(62, 1), + CS_NPC_ACTION(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, -35, 97, -60, -35, 97, -60, 0.0f, 0.0f, 0.0f), + CS_TERMINATOR(KOKIRI_FOREST_AFTER_FOREST_BLUE_WARP, 974, 1050), + CS_TEXT_LIST(10), + CS_TEXT_NONE(0, 303), + CS_TEXT_DISPLAY_TEXTBOX(0x106A, 303, 323, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(323, 344), + CS_TEXT_DISPLAY_TEXTBOX(0x108F, 344, 394, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(394, 415), + CS_TEXT_DISPLAY_TEXTBOX(0x1090, 415, 465, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(465, 871), + CS_TEXT_DISPLAY_TEXTBOX(0x003E, 871, 875, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(875, 936), + CS_TEXT_DISPLAY_TEXTBOX(0x106B, 936, 946, 0x0000, 0x0000, 0x0000), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x0044, 686, 687, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC5, 0x00000057, 0x00000000, 0xFFFFFFC5, 0x00000057), + CS_FADE_BGM_LIST(1), + CS_FADE_BGM(0x0004, 550, 600, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000066, 0x00000000, 0xFFFFFFC4, 0x00000066), + CS_CAM_POS_LIST(0, 1241), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 170.19839477539062f, 159, 2758, 43, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 170.19839477539062f, 159, 2758, 43, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 170.19839477539062f, 159, 2409, 43, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 170.19839477539062f, 159, 202, 43, 0x0073), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 158, 222, 42, 0x0061), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 158, 149, 42, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 158, 111, 42, 0x006D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 158, 111, 42, 0x0065), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 158, 111, 42, 0x0061), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.39994430541992f, 158, 111, 42, 0x0061), + CS_CAM_POS_LIST(190, 391), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -91, 18, -158, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -90, 17, -157, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -90, 31, -157, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -90, 37, -157, 0x0073), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -90, 37, -157, 0x0061), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 40.99993133544922f, -90, 37, -157, 0x006F), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 40.99993133544922f, -90, 37, -157, 0x006D), + CS_CAM_POS_LIST(263, 1354), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 24.399864196777344f, 7, 97, 127, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 24.399864196777344f, 7, 97, 127, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 24.399864196777344f, 7, 97, 127, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 24.399864196777344f, 7, 97, 127, 0x0073), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 24.399864196777344f, 7, 97, 127, 0x0061), + CS_CAM_POS_LIST(333, 1424), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, -279, 103, 68, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, -279, 103, 68, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, -279, 103, 68, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, -279, 103, 68, 0x0073), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.39994430541992f, -279, 103, 68, 0x0061), + CS_CAM_POS_LIST(403, 1494), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -52, 35, -83, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -52, 35, -83, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -52, 35, -83, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -52, 35, -83, 0x0073), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.39994812011719f, -52, 35, -83, 0x0061), + CS_CAM_POS_LIST(473, 1716), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -65, 61, -111, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -65, 61, -111, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994812011719f, -51, 74, -86, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, 0, 136, 11, 0x0073), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, 386, 514, 736, 0x0061), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 80.39976501464844f, 579, 156, 1099, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 80.39976501464844f, 579, 156, 1099, 0x006D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 50.5999641418457f, 579, 156, 1099, 0x0065), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 50.5999641418457f, 579, 156, 1099, 0x0061), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 50.5999641418457f, 579, 156, 1099, 0x0061), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 50.5999641418457f, 579, 156, 1099, 0x0072), + CS_CAM_POS_LIST(609, 951), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 13, 854, 2, 0x0072), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 853, 5, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -3, 853, 5, 0x002F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 853, -6, 0x0073), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -2, 852, -17, 0x0061), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, -17, 0x006F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 16, 852, -6, 0x006D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, 5, 0x0065), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -3, 851, 5, 0x0061), + CS_CAM_POS_PLAYER_LIST(685, 1866), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x0072), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x006F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 68, -26, 0x002F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x0073), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x0061), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x006F), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x006D), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x0065), + CS_CAM_FOCUS_POINT_LIST(0, 1270), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 170.19839477539062f, 154, 2596, 41, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 170.19839477539062f, 154, 2596, 41, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 170.19839477539062f, 154, 2248, 41, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 170.19839477539062f, 154, 42, 41, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.20000076293945f, 82, 94, 23, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.99996566772461f, 33, 79, 0, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 30, 62, -14, 0x006D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.39994430541992f, 30, 62, -14, 0x0065), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 30, 62, -14, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.39994430541992f, 31, 62, -14, 0x0061), + CS_CAM_FOCUS_POINT_LIST(190, 420), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 40.99993133544922f, 13, 42, 20, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99993133544922f, 12, 47, 18, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99993133544922f, 11, 50, 20, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99993133544922f, 11, 53, 20, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99993133544922f, 11, 53, 20, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.99993133544922f, 11, 53, 20, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 40.99993133544922f, 11, 53, 20, 0x006D), + CS_CAM_FOCUS_POINT_LIST(263, 1383), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 24.399864196777344f, -42, 17, -150, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 24.399864196777344f, -42, 17, -150, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 24.399864196777344f, -42, 17, -150, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 24.399864196777344f, -42, 17, -150, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 24.399864196777344f, -42, 17, -150, 0x0061), + CS_CAM_FOCUS_POINT_LIST(333, 1453), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x01, 30, 45.19994354248047f, -26, 13, -85, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, -26, 13, -85, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.39994430541992f, -26, 13, -85, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, -26, 13, -85, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.39994430541992f, -26, 13, -85, 0x0061), + CS_CAM_FOCUS_POINT_LIST(403, 1523), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 30.79989242553711f, -226, 10, -419, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 30.999893188476562f, -226, 10, -419, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 35.599910736083984f, -226, 10, -419, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 40.39992904663086f, -226, 10, -418, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.39994812011719f, -226, 10, -418, 0x0061), + CS_CAM_FOCUS_POINT_LIST(473, 1745), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994812011719f, -218, -88, -396, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994812011719f, -218, -88, -396, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994812011719f, -204, -75, -370, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 65.39999389648438f, -149, -10, -269, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 70.79991149902344f, 287, 239, 551, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 80.39976501464844f, 570, 493, 1083, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 50.39996337890625f, 578, 492, 1097, 0x006D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.5999641418457f, 578, 492, 1097, 0x0065), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 50.5999641418457f, 578, 491, 1097, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 27, 50.5999641418457f, 578, 491, 1097, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 50.5999641418457f, 578, 491, 1097, 0x0072), + CS_CAM_FOCUS_POINT_LIST(609, 1000), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.0f, 3, 6, -6, 0x0072), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.0f, 3, 6, -6, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.99996566772461f, 3, 6, -6, 0x002F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 20.599849700927734f, 3, 6, -6, 0x0073), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 51, 10.799838066101074f, 3, 6, -6, 0x0061), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x006F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x006D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.199838638305664f, 3, 6, -6, 0x0065), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 50, 10.999837875366211f, 3, 6, -6, 0x0061), + CS_CAM_FOCUS_POINT_PLAYER_LIST(685, 1895), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 100, 5, 0x0072), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 101, 6, 0x006F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 1, 99, 41, 0x002F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x0073), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x0061), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 68.59994506835938f, 0, 42, 16, 0x006F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x006D), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x0065), + CS_END(), +}; +// clang-format on diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index d58e88a42d..83e4dff704 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -8,7 +8,9 @@ struct DoorWarp1; typedef struct DoorWarp1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA0]; + /* 0x014C */ char unk_14C[0x5C]; + /* 0x01A8 */ f32 alpha; + /* 0x01AC */ char unk_1AC[0x40]; /* 0x01EC */ s32 unk_1EC; } DoorWarp1; // size = 0x01F0 diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index c202ef79c3..a6dbf29fb3 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -212,8 +212,8 @@ void func_809B0994(EnAni* this, GlobalContext* globalCtx) { AnimationHeader* objSegChangeAnime = &D_060070F0; if (globalCtx->csCtx.npcActions[0]->action == 4) { - SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 1.0f, 0.0f, - (f32)SkelAnime_GetFrameCount(objSegFrameCount), 2, -4.0f); + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 1.0f, 0.0f, SkelAnime_GetFrameCount(objSegFrameCount), + 2, -4.0f); this->unk_2AA += 1; this->actor.shape.shadowDrawFunc = ActorShadow_DrawFunc_Circle; } diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 3fbdef583b..b678e36531 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -17,7 +17,7 @@ void EnBdfire_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bdfire_InitVars = { - ACTOR_PLAYER, + 0, ACTORTYPE_ENEMY, FLAGS, OBJECT_KINGDODONGO, diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 1c5907cac8..2927bc6784 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -15,7 +15,11 @@ void EnBlkobj_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx); void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_809C2148(EnBlkobj* this, GlobalContext* globalCtx); +void func_809C21A0(EnBlkobj* this, GlobalContext* globalCtx); +void func_809C2218(EnBlkobj* this, GlobalContext* globalCtx); +void func_809C22F4(EnBlkobj* this, GlobalContext* globalCtx); + const ActorInit En_Blkobj_InitVars = { ACTOR_EN_BLKOBJ, ACTORTYPE_PROP, @@ -27,23 +31,152 @@ const ActorInit En_Blkobj_InitVars = { (ActorFunc)EnBlkobj_Update, (ActorFunc)EnBlkobj_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2060.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 800, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Destroy.s") +Gfx D_809C2590[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsSPEndDisplayList(), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2148.s") +Gfx D_809C25A0[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2), + gsSPEndDisplayList(), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C21A0.s") +extern Gfx D_060014E0[]; +extern Gfx D_060053D0[]; +extern UNK_TYPE D_06007564; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2218.s") +void func_809C2060(EnBlkobj* this, EnBlkobjActionFunc actionFunc) { + this->actionFunc = actionFunc; + this->unk_166 = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C22F4.s") +void EnBlkobj_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnBlkobj* this = THIS; + s32 localC = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Update.s") + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyInfo_SetActorMove(&this->dyna, 0); + if (Flags_GetClear(globalCtx, this->dyna.actor.room)) { + this->unk_164 = 0xFF; + func_809C2060(this, func_809C22F4); + } else { + DynaPolyInfo_Alloc(&D_06007564, &localC); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC); + func_809C2060(this, func_809C2148); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s") +void EnBlkobj_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnBlkobj* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void func_809C2148(EnBlkobj* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->dyna.actor.xzDistFromLink < 120.0f) { + func_809C2060(this, func_809C21A0); + } + player->stateFlags2 |= 0x4000000; +} + +void func_809C21A0(EnBlkobj* this, GlobalContext* globalCtx) { + if (!(this->dyna.actor.flags & 0x40)) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_TORCH2, this->dyna.actor.posRot.pos.x, + this->dyna.actor.posRot.pos.y, this->dyna.actor.posRot.pos.z, 0, this->dyna.actor.yawTowardsLink, 0, + 0); + func_809C2060(this, func_809C2218); + } +} + +void func_809C2218(EnBlkobj* this, GlobalContext* globalCtx) { + s32 temp; + + if (this->unk_166 == 0) { + if (Actor_Find(&globalCtx->actorCtx, ACTOR_EN_TORCH2, ACTORTYPE_BOSS) == NULL) { + Flags_SetClear(globalCtx, this->dyna.actor.room); + this->unk_166 += 1; + } + } else { + if ((this->unk_166++ < 0x65) ^ 1) { + temp = (this->unk_166 - 0x64) >> 2; + if (temp > 5) { + temp = 5; + } + this->unk_164 += temp; + if (this->unk_164 > 0xFF) { + this->unk_164 = 0xFF; + func_809C2060(this, func_809C22F4); + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } + } + } +} + +void func_809C22F4(EnBlkobj* this, GlobalContext* globalCtx) { +} + +void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx) { + EnBlkobj* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void func_809C2324(GlobalContext* globalCtx, Gfx* dList, s32 alpha) { + Gfx* segment; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 322); + + if (alpha == 255) { + segment = D_809C2590; + } else { + segment = D_809C25A0; + } + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, segment); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, alpha); + gSPDisplayList(gfxCtx->polyXlu.p++, dList); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 330); +} + +void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnBlkobj* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 temp_a3; + u32 gameplayFrames; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 349); + func_80093D84(globalCtx->state.gfxCtx); + + gameplayFrames = globalCtx->gameplayFrames % 128; + + gSPSegment(gfxCtx->polyXlu.p++, 0x0D, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32)); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (this->unk_164 != 0) { + func_809C2324(globalCtx, D_060014E0, this->unk_164); + } + temp_a3 = 0xFF - this->unk_164; + if (temp_a3 != 0) { + func_809C2324(globalCtx, D_060053D0, temp_a3); + } + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 375); +} diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h index 8af8482823..df3a7a4819 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h @@ -6,9 +6,13 @@ struct EnBlkobj; +typedef void (*EnBlkobjActionFunc)(struct EnBlkobj*, GlobalContext*); + typedef struct EnBlkobj { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ s16 unk_164; + /* 0x0166 */ s16 unk_166; + /* 0x0168 */ EnBlkobjActionFunc actionFunc; } EnBlkobj; // size = 0x016C extern const ActorInit En_Blkobj_InitVars; diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index e04d536b09..e1ce985bca 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -54,25 +54,25 @@ void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); - trail.p1StartColor.r = 0xFF; - trail.p1StartColor.g = 0xFF; - trail.p1StartColor.b = 0x64; - trail.p1StartColor.a = 0xFF; + trail.p1StartColor.r = 255; + trail.p1StartColor.g = 255; + trail.p1StartColor.b = 100; + trail.p1StartColor.a = 255; - trail.p2StartColor.r = 0xFF; - trail.p2StartColor.g = 0xFF; - trail.p2StartColor.b = 0x64; - trail.p2StartColor.a = 0x40; + trail.p2StartColor.r = 255; + trail.p2StartColor.g = 255; + trail.p2StartColor.b = 100; + trail.p2StartColor.a = 64; - trail.p1EndColor.r = 0xFF; - trail.p1EndColor.g = 0xFF; - trail.p1EndColor.b = 0x64; - trail.p1EndColor.a = 0x00; + trail.p1EndColor.r = 255; + trail.p1EndColor.g = 255; + trail.p1EndColor.b = 100; + trail.p1EndColor.a = 0; - trail.p2EndColor.r = 0xFF; - trail.p2EndColor.g = 0xFF; - trail.p2EndColor.b = 0x64; - trail.p2EndColor.a = 0x00; + trail.p2EndColor.r = 255; + trail.p2EndColor.g = 255; + trail.p2EndColor.b = 100; + trail.p2EndColor.a = 0; trail.elemDuration = 8; trail.unkFlag = 0; @@ -139,7 +139,7 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { // Set xyz speed, move forward, and play the boomerang sound func_8002D9A4(&this->actor, 12.0f); Actor_MoveForward(&this->actor); - func_8002F974(this, 0x1010); + func_8002F974(this, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG); // If the boomerang collides with EnItem00 or a Skulltula token, set grabbed pointer to pick it up collided = (this->collider.base.atFlags & 0x2); diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index c025fa487d..d167ecf116 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -343,10 +343,10 @@ void func_809DFE98(Actor* thisx, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { if (this->skelAnime.animCurrentSeg == &D_06004348) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06004E98, 1.0f, 0.0f, - (f32)SkelAnime_GetFrameCount(&D_06004E98.genericHeader), 2, 1.0f); + SkelAnime_GetFrameCount(&D_06004E98.genericHeader), 2, 1.0f); } else { SkelAnime_ChangeAnim(&this->skelAnime, &D_06004348, 1.0f, 0.0f, - (f32)SkelAnime_GetFrameCount(&D_06004348.genericHeader), 0, 1.0f); + SkelAnime_GetFrameCount(&D_06004348.genericHeader), 0, 1.0f); } } this->actionFunc(this, globalCtx); 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 c4f5925147..34c41e498d 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -450,7 +450,7 @@ void EnDog_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDog* this = THIS; - Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } }; + Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } }; GraphicsContext* gfxCtx; Gfx* dispRefs[4]; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 988002a5c4..c7d90827a8 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -1,4 +1,11 @@ +/* + * File: z_en_fhg_fire.c + * Overlay: ovl_En_Fhg_Fire + * Description: Phantom Ganon's Lighting Attack + */ + #include "z_en_fhg_fire.h" +#include "../ovl_En_fHG/z_en_fhg.h" #define FLAGS 0x00000030 @@ -9,9 +16,26 @@ void EnFhgFire_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnFhgFire_Update(Actor* thisx, GlobalContext* globalCtx); void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A0FA90(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A0FC48(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A0FD8C(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A10220(EnFhgFire* this, GlobalContext* globalCtx); +void func_80A10F18(EnFhgFire* this, GlobalContext* globalCtx); + +extern ColliderCylinderInit D_80A11790; +extern Vec3f D_80A117BC; +extern Vec3f D_80A117C8; +extern Vec3f D_80A117D4; + +extern Gfx D_0600FAA0[]; +extern Gfx D_0600FCF8[]; +extern Gfx D_060105E0[]; +extern Gfx D_06012160[]; + const ActorInit En_Fhg_Fire_InitVars = { - ACTOR_PLAYER, + 0, ACTORTYPE_BOSS, FLAGS, OBJECT_FHG, @@ -21,27 +45,488 @@ const ActorInit En_Fhg_Fire_InitVars = { (ActorFunc)EnFhgFire_Update, (ActorFunc)EnFhgFire_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F260.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s") +void EnFhgFire_SetupAction(EnFhgFire* this, EnFhgFireActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s") +void EnFhgFire_Init(Actor* thisx, GlobalContext* globalCtx) { + f32 tempf0; + EnFhgFire* this = THIS; + Player* player = PLAYER; + f32 tempf1; + f32 tempf2; + f32 tempf3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0F6F8.s") + ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); + if ((thisx->params == 0x23) || (thisx->params == 0x24) || (thisx->params == 0x32)) { + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, thisx, &D_80A11790); + } + this->unk_160 = 200.0f; + Actor_SetScale(thisx, 0.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FA90.s") + if (thisx->params == 0x01) { + EnFhgFire_SetupAction(this, func_80A0F6F8); + Audio_PlayActorSound2(thisx, NA_SE_EN_FANTOM_THUNDER); + } else if (thisx->params >= 0x64) { + EnFhgFire_SetupAction(this, func_80A0FA90); + thisx->shape.rot = thisx->posRot.rot; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s") + if (thisx->params == 0x23) { + thisx->draw = NULL; + EnFhgFire_SetupAction(this, func_80A0FC48); + thisx->speedXZ = 30.0f; + Audio_PlayActorSound2(thisx, NA_SE_EN_FANTOM_SPARK); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s") + if (thisx->params == 0x24) { + EnFhgFire_SetupAction(this, func_80A0FD8C); + this->unk_160 = 255.0f; + this->unk_150.x = 0x20; + this->unk_150.y = 0x32; + this->unk_1FE = 0x0A; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10008.s") + tempf2 = thisx->posRot.rot.x; + this->unk_18C = tempf2 / 100.0f; + tempf1 = tempf2 * 0.13f; + + this->collider.dim.radius = tempf1; + this->collider.dim.height = tempf1; + this->collider.dim.yShift = 0; + return; + } + + if (thisx->params == 0x26) { + // "light spear" + osSyncPrintf("yari hikari ct 1\n"); + EnFhgFire_SetupAction(this, func_80A10008); + osSyncPrintf("yari hikari ct 2\n"); + this->unk_150.x = thisx->posRot.rot.x; + this->fireMode = thisx->posRot.rot.y; + return; + } + + switch (thisx->params) { + case 0x27: + case 0x28: + case 0x29: + Actor_SetScale(thisx, 7.0f); + EnFhgFire_SetupAction(this, func_80A10F18); + if (thisx->params == 0x29) { + this->unk_150.x = 0x01B8; + thisx->scale.z = 1.0f; + } else { + this->unk_150.x = 0x4C; + Audio_PlayActorSound2(thisx, NA_SE_EV_FANTOM_WARP_S); + Audio_PlayActorSound2(thisx, NA_SE_EV_FANTOM_WARP_S2); + } + return; + } + + if (thisx->params == 0x32) { + thisx->speedXZ = (thisx->posRot.rot.x == 0) ? 8.0f : 3.0f; + EnFhgFire_SetupAction(this, func_80A10220); + + this->unk_150.x = 0x46; + this->unk_150.y = 0x02; + + tempf1 = player->actor.posRot.pos.x - thisx->posRot.pos.x; + tempf2 = player->actor.posRot.pos.y + 30.0f - thisx->posRot.pos.y; + tempf3 = player->actor.posRot.pos.z - thisx->posRot.pos.z; + thisx->posRot.rot.y = Math_atan2f(tempf1, tempf3) * 10430.378f; // 65536/(2*M_PI) + tempf0 = sqrtf(SQ(tempf1) + SQ(tempf3)); + thisx->posRot.rot.x = Math_atan2f(tempf2, tempf0) * 10430.378f; // 65536/(2*M_PI) + this->collider.dim.radius = 40; + this->collider.dim.height = 50; + this->collider.dim.yShift = -25; + this->light = Lights_Insert(globalCtx, &globalCtx->lightCtx, (void*)(&this->unk_1A0)); + Lights_InitType0PositionalLight(&this->unk_1A0, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, + 0xFF, 0xFF, 0xFF, 0xFF); + } +} + +void EnFhgFire_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnFhgFire* this = THIS; + + if ((thisx->params == 0x23) || (thisx->params == 0x24) || (thisx->params == 0x32)) { + Collider_DestroyCylinder(globalCtx, &this->collider); + } + + if (thisx->params == 0x32) { + Lights_Remove(globalCtx, &globalCtx->lightCtx, this->light); + } +} + +void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { + Camera* camera; + s32 pad; + Vec3f randVec; + Vec3f tmpVec; + s16 i; + s16 randY; + s16* tmp; + + tmp = &this->unk_156; + camera = Gameplay_GetCamera(globalCtx, 0); + + switch (this->fireMode) { + case 0x00: + this->fireMode = 0x0A; + this->unk_150.x = 0x07; + break; + + case 0x0A: + this->actor.shape.rot.y = func_8005A948(camera) + ((*tmp & 0xFF) << 0x0F); + Math_SmoothScaleMaxF(&this->scale, 1.0f, 1.0f, 0.2f); + + if (this->unk_150.x == 0) { + this->fireMode = 0x0B; + this->actor.shape.rot.z += 0x8000; + this->unk_150.x = 0x25; + this->actor.posRot.pos.y -= 200.0f; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 500, + 0, 0, 0x24); + + tmpVec = D_80A117BC; + + for (i = 0; i < 35; i++) { + randVec.x = Math_Rand_CenteredFloat(30.f); + randVec.y = Math_Rand_ZeroFloat(5.0f) + 3.0f; + randVec.z = Math_Rand_CenteredFloat(30.f); + tmpVec.y = -0.2f; + EffectSsFhgFlash_Spawn(globalCtx, &this->actor.posRot.pos, &randVec, &tmpVec, + (s16)(Math_Rand_ZeroOne() * 100.0f) + 240, 0); + } + + func_80033E88(&this->actor, globalCtx, 4, 10); + } + + break; + + case 0x0B: + this->actor.shape.rot.y = func_8005A948(camera) + ((*tmp & 0xFF) << 0x0F); + + Math_SmoothScaleMaxF(&this->scale, 0.0f, 1.0f, 0.2f); + if (this->unk_150.x == 0x1E) { + randY = (Math_Rand_ZeroOne() < 0.5f) ? 0x1000 : 0; + + for (i = 0; i < 8; i++) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + (i * 8192) + randY, 0x4000, i + 0x64); + } + + for (i = 0; i < 8; i++) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + (i * 8192) + randY, 0, 0x23); + } + } + + if (this->unk_150.x == 0) { + Actor_Kill(&this->actor); + } + } + + Actor_SetScale(&this->actor, this->scale); +} + +void func_80A0FA90(EnFhgFire* this, GlobalContext* globalCtx) { + osSyncPrintf("FF MOVE 1\n"); + this->actor.shape.rot.x += (s16)(Math_Rand_ZeroOne() * 4000.0f) + 0x4000; + + switch (this->fireMode) { + case 0: + this->fireMode = 1; + this->unk_150.x = (s16)(Math_Rand_ZeroOne() * 7.0f) + 0x07; + case 1: + Math_SmoothScaleMaxF(&this->scale, 1.7f, 1.0f, 0.34f); + + if (this->unk_150.x == 0) { + this->fireMode = 0x02; + this->unk_150.x = 0x0A; + this->actor.posRot.pos.z += Math_Sins(this->actor.shape.rot.y) * -200.0f * this->scale; + this->actor.posRot.pos.x += Math_Coss(this->actor.shape.rot.y) * 200.0f * this->scale; + this->actor.shape.rot.y += 0x8000; + } + break; + case 2: + Math_SmoothDownscaleMaxF(&this->scale, 1.0f, 0.34f); + if (this->unk_150.x == 0) { + Actor_Kill(&this->actor); + } + break; + } + + Actor_SetScale(&this->actor, this->scale); + if (this->actor.scale.x > 1.0f) { + this->actor.scale.x = 1.0f; + } + + osSyncPrintf("FF MOVE 2\n"); +} + +void func_80A0FC48(EnFhgFire* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Vec3f pos; + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags = this->collider.base.atFlags & ~2; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER); + } + + if (Math_Rand_ZeroOne() < 0.5f) { + pos = this->actor.posRot.pos; + pos.y -= 20.0f; + EffectSsFhgFlash_Spawn2(globalCtx, &this->actor, &pos, 0xC8, 0); + } + + Actor_MoveForward(&this->actor); + Collider_CylinderUpdate(&this->actor, &this->collider); + if (player->invincibilityTimer == 0) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + func_8002E4B4(globalCtx, &this->actor, 50.0f, 50.0f, 100.0f, 1); + if (this->actor.bgCheckFlags & 8) { + Actor_Kill(&this->actor); + } +} + +void func_80A0FD8C(EnFhgFire* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + + globalCtx->envCtx.unk_E1 = 0x01; + this->actor.shape.rot.y += 0x1000; + + if (this->unk_150.y == 0x31) { + globalCtx->envCtx.unk_BF = 1; + globalCtx->envCtx.unk_D6 = 0xFF; + } + if (this->unk_150.y == 0x1F) { + globalCtx->envCtx.unk_BF = 0x00; + globalCtx->envCtx.unk_D6 = 0x14; + } + if (this->unk_150.y >= 0x30) { + globalCtx->envCtx.unk_E2[2] = 0xFF; + globalCtx->envCtx.unk_E2[1] = 0xFF; + globalCtx->envCtx.unk_E2[0] = 0xFF; + + if (((this->unk_150.x & 0xFF) % 2) != 0) { + globalCtx->envCtx.unk_E2[3] = 0x46; + } else { + globalCtx->envCtx.unk_E2[3] = 0x00; + } + } else { + globalCtx->envCtx.unk_E2[3] = 0x00; + } + + if (this->unk_150.x < 0x15) { + Math_SmoothDownscaleMaxF(&this->unk_160, 1.0f, 45.0f); + Math_SmoothDownscaleMaxF(&this->scale, 1.0f, 0.5f); + } else { + Math_SmoothScaleMaxF(&this->scale, this->unk_18C, 0.5f, 3.0f); + } + + Actor_SetScale(&this->actor, this->scale); + if (3.0f < this->unk_18C) { + Collider_CylinderUpdate(&this->actor, &this->collider); + if (player->invincibilityTimer == 0) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, (Collider*)&this->collider); + } + } + + if (this->unk_150.x == 0) { + Actor_Kill(&this->actor); + globalCtx->envCtx.unk_E1 = 0; + } + if (this->unk_1FE != 0) { + this->unk_1FE--; + this->unk_1FC = 1; + Math_SmoothScaleMaxF(&this->unk_200, 40.0f, 0.3f, 10.0f); + } else { + Math_SmoothDownscaleMaxF(&this->unk_200, 1.0f, 5.0f); + if (this->unk_200 == 0.0f) { + this->unk_1FC = 0; + } + } + + // Related to scene draw config 30, only used in BossGanon_Update and + // loaded in z_kankyo + D_8015FCF0 = this->unk_1FC; + D_8015FCF8 = this->actor.posRot.pos; + D_8015FD06 = this->unk_200; + D_8015FD08 = 10.0f; + D_8015FD0C = 0; +} + +void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { + EnfHG* horse; + s16 i; + Vec3f sp6C; + Vec3f tmp; + Vec3f sp54; + + osSyncPrintf("yari hikari 1\n"); + horse = (EnfHG*)this->actor.attachedA; + if ((this->unk_156 % 2) != 0) { + Actor_SetScale(&this->actor, 6.0f); + } else { + Actor_SetScale(&this->actor, 5.25f); + } + + this->actor.posRot.pos = horse->unk_200; + this->actor.shape.rot.z += (s16)(Math_Rand_ZeroOne() * 20000.0f) + 0x4000; + + osSyncPrintf("yari hikari 2\n"); + if (this->fireMode == 0) { + tmp = D_80A117C8; + sp54 = D_80A117D4; + osSyncPrintf("FLASH !!\n"); + + for (i = 0; i < 2; i++) { + sp6C.x = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.x; + sp6C.y = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.y; + sp6C.z = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.z; + sp54.y = -0.08f; + + EffectSsFhgFlash_Spawn(globalCtx, &sp6C, &tmp, &sp54, (s16)(Math_Rand_ZeroOne() * 80.0f) + 150, 0); + } + } + + if (this->unk_150.x == 0) { + Actor_Kill(&this->actor); + } +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10F18.s") +void func_80A10F18(EnFhgFire* this, GlobalContext* globalCtx) { + EnfHG* horse = (EnfHG*)this->actor.attachedA; + f32 phi_f0; + s32 tmp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Update.s") + this->unk_174 = (this->unk_174 + (25.0f * this->unk_184)); + this->unk_178 = (this->unk_178 - (40.0f * this->unk_184)); + this->unk_17C = (this->unk_17C + (5.0f * this->unk_184)); + this->unk_180 = (this->unk_180 - (30.0f * this->unk_184)); + if (this->actor.params == 0x29) { + if (this->unk_150.x >= 0x47) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FANTOM_WARP_L - SFX_FLAG); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FANTOM_WARP_L2 - SFX_FLAG); + } + + if (this->unk_150.x == 0x46) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FANTOM_WARP_S); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FANTOM_WARP_S2); + } + } + + if (this->unk_150.x >= 0x33) { + phi_f0 = 1.0f; + if (this->actor.params >= 0x28) { + phi_f0 = -1.0f; + } + + Math_SmoothScaleMaxF(&this->unk_184, phi_f0, 1.0f, 0.04f); + Math_SmoothScaleMaxF(&this->unk_188, 255.0f, 1.0f, 10.2f); + } else { + if (this->unk_150.x < 0x1A) { + Math_SmoothDownscaleMaxF(&this->unk_184, 1.0f, 0.04f); + Math_SmoothDownscaleMaxF(&this->unk_188, 1.0f, 10.2f); + } + } + + osSyncPrintf("EFC 1\n"); + if ((this->unk_150.x == 0) || ((this->actor.params == 0x27) && (horse->unk_14F != 0))) { + Actor_Kill(&this->actor); + } + osSyncPrintf("EFC 2\n"); +} + +void EnFhgFire_Update(Actor* thisx, GlobalContext* globalCtx) { + EnFhgFire* this = THIS; + + this->unk_156++; + + DECR(this->unk_150.x); + DECR(this->unk_150.y); + + this->actionFunc(this, globalCtx); +} + +// Unsolved regalloc +#ifdef NON_EQUIVALENT +void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnFhgFire* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_en_fhg_fire.c", 1723); + if (thisx->params == 0x24) { + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s32)this->unk_160 & 0xFF); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 165, 255, 75, 0); + gDPPipeSync(gfxCtx->polyXlu.p++); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0600FCF8)); + } else if ((thisx->params == 0x26) || (thisx->params == 0x32)) { + osSyncPrintf("yari hikari draw 1\n"); + func_800D1FD4(&globalCtx->mf_11DA0); + func_80093D84(globalCtx->state.gfxCtx); + + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, (s32)this->unk_160 & 0xFF); + + if (this->fireMode > 0) { + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 255, 255, 0); + } else { + gDPSetEnvColor(gfxCtx->polyXlu.p++, 165, 255, 75, 0); + } + + gDPPipeSync(gfxCtx->polyXlu.p++); + + Matrix_RotateZ(((f32)thisx->shape.rot.z / 32768.0f) * M_PI, 1); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1801), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(gfxCtx->polyXlu.p++, D_06012160); + } else if ((thisx->params == 0x27) || (thisx->params == 0x28) || (thisx->params == 0x29)) { + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, ((u32)this->unk_188 & 0xFF)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 90, 50, 95, (s32)(this->unk_188 * 0.5f)); + gDPPipeSync(gfxCtx->polyXlu.p++); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (s16)this->unk_174, (s16)this->unk_178, 0x40, 0x40, 1, + (s16)this->unk_17C, (s16)this->unk_180, 0x40, 0x40)); + + gSPDisplayList(gfxCtx->polyXlu.p++, D_0600FAA0); + } else { + osSyncPrintf("FF DRAW 1\n"); + Matrix_Translate(0.0f, -100.0f, 0.0f, 1); + func_80093D84(globalCtx->state.gfxCtx); + + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s32)this->unk_160 & 0xFF); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 30, 0, 255); + gDPPipeSync(gfxCtx->polyXlu.p++); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, D_060105E0); + osSyncPrintf("FF DRAW 2\n"); + } + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1900); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s") +#endif diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h index f14652d7f6..df4568bbb6 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h @@ -6,9 +6,37 @@ struct EnFhgFire; +typedef void (*EnFhgFireActionFunc)(struct EnFhgFire*, GlobalContext *globalCtx); + typedef struct EnFhgFire { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xB8]; + /* 0x014C */ EnFhgFireActionFunc actionFunc; + /* 0x0150 */ Vec3s unk_150; // rotation + /* 0x0156 */ s16 unk_156; + /* 0x0158 */ s16 fireMode; + /* 0x015a */ s16 unk_15A; + /* 0x015C */ s16 unk_15C; + /* 0x015E */ char unk_15E[0x02]; + /* 0x0160 */ f32 unk_160; + /* 0x0164 */ char unk_164[0x08]; + /* 0x016C */ f32 scale; + /* 0x0170 */ char unk_170[0x04]; + /* 0x0174 */ f32 unk_174; + /* 0x0178 */ f32 unk_178; + /* 0x017C */ f32 unk_17C; + /* 0x0180 */ f32 unk_180; + /* 0x0184 */ f32 unk_184; + /* 0x0188 */ f32 unk_188; + /* 0x018C */ f32 unk_18C; + /* 0x0190 */ char unk_190[0x0C]; + /* 0x019C */ z_Light* light; + /* 0x01A0 */ LightInfoPositional unk_1A0; + /* 0x01AE */ char padding_1AE[2]; + /* 0x01B0 */ ColliderCylinder collider; + /* 0x01FC */ u8 unk_1FC; + /* 0x01FD */ char unk_1FD; + /* 0x01FE */ s16 unk_1FE; + /* 0x0200 */ f32 unk_200; } EnFhgFire; // size = 0x0204 extern const ActorInit En_Fhg_Fire_InitVars; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 87d633843c..e4bce5c726 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -96,10 +96,10 @@ static Vec3f sDustPos = { }; static Color_RGBA8 sMergeColor = { - 0x00, - 0xFF, - 0x00, - 0x00, + 0, + 255, + 0, + 0, }; // display lists @@ -925,7 +925,7 @@ void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx) { } } } - func_8002F974(&this->actor, 0x3133); + func_8002F974(&this->actor, NA_SE_EN_FLOORMASTER_RESTORE - SFX_FLAG); } void EnFloormas_SmWait(EnFloormas* this, GlobalContext* globalCtx) { @@ -1053,7 +1053,7 @@ void EnFloormas_Update(Actor* thisx, GlobalContext* globalCtx) { } if (this->actionFunc != EnFloormas_GrabLink) { if (this->actionFunc != EnFloormas_Split && this->actionFunc != EnFloormas_TakeDamage && - this->actor.freeze == 0) { + this->actor.freezeTimer == 0) { CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index d75156c715..0dc5b7e350 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -222,7 +222,7 @@ void EnFu_WaitAdult(EnFu* this, GlobalContext* globalCtx) { func_80A1D94C(this, globalCtx, 0x508E, func_80A1DBA0); } else if (player->stateFlags2 & 0x1000000) { this->actor.textId = 0x5035; - func_8010B680(globalCtx, this->actor.textId, 0); + func_8010B680(globalCtx, this->actor.textId, NULL); this->actionFunc = EnFu_TeachSong; this->behaviorFlags |= FU_WAIT; } else if (func_8002F194(&this->actor, globalCtx) != 0) { diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 5ce1da8ada..9d9bc86c53 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -69,7 +69,7 @@ Gfx* func_80A280BC(GraphicsContext* gfxCtx, BossGanon* dorf) { do { if (1) {} } while (0); - gDPSetEnvColor(displayListHead++, 0x19, 0x14, 0x00, dorf->organFadeTimer); + gDPSetEnvColor(displayListHead++, 25, 20, 0, dorf->organFadeTimer); gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); return displayList; @@ -86,7 +86,7 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) { do { if (1) {} } while (0); - gDPSetEnvColor(displayListHead++, 0x00, 0x00, 0x00, dorf->organFadeTimer); + gDPSetEnvColor(displayListHead++, 0, 0, 0, dorf->organFadeTimer); gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); return displayList; diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 1b12786318..2f5db00f38 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -1,4 +1,11 @@ +/* + * File: z_en_heishi1.c + * Overlay: ovl_En_Heishi1 + * Description: Courtyard Guards + */ + #include "z_en_heishi1.h" +#include #define FLAGS 0x00000010 @@ -9,9 +16,24 @@ void EnHeishi1_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx); void EnHeishi1_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnHeishi1_SetupWait(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_SetupWalk(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_SetupMoveToLink(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_SetupTurnTowardLink(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_SetupKick(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_SetupWaitNight(EnHeishi1* this, GlobalContext* globalCtx); + +void EnHeishi1_Wait(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_Walk(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_MoveToLink(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_TurnTowardLink(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_Kick(EnHeishi1* this, GlobalContext* globalCtx); +void EnHeishi1_WaitNight(EnHeishi1* this, GlobalContext* globalCtx); + +s32 sPlayerIsCaught = false; + const ActorInit En_Heishi1_InitVars = { - ACTOR_PLAYER, + 0, ACTORTYPE_NPC, FLAGS, OBJECT_SD, @@ -21,37 +43,469 @@ const ActorInit En_Heishi1_InitVars = { (ActorFunc)EnHeishi1_Update, (ActorFunc)EnHeishi1_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Destroy.s") +f32 sAnimParamsInit[][8] = { + { 1.0f, -10.0f, 3.0f, 0.5f, 1000.0f, 200.0f, 0.3f, 1000.0f }, + { 3.0f, -3.0f, 6.0f, 0.8f, 2000.0f, 400.0f, 0.5f, 2000.0f }, + { 1.0f, -10.0f, 3.0f, 0.5f, 1000.0f, 200.0f, 0.3f, 1000.0f }, + { 3.0f, -3.0f, 6.0f, 0.8f, 2000.0f, 400.0f, 0.5f, 2000.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s") +s16 sBaseHeadTimers[] = { 20, 10, 20, 10, 13, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s") +Vec3f sRupeePositions[] = { + { 0.0f, 0.0f, 90.0f }, { -55.0f, 0.0f, 90.0f }, { -55.0f, 0.0f, 30.0f }, { -55.0f, 0.0f, -30.0f }, + { 0.0f, 0.0f, -30.0f }, { 55.0f, 0.0f, -30.0f }, { 55.0f, 0.0f, 30.0f }, { 55.0f, 0.0f, 90.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s") +s32 sCamDataIdxs[] = { + 7, 7, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 4, 4, 5, 6, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51B54.s") +s16 sWaypoints[] = { 0, 4, 1, 5, 2, 6, 3, 7 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s") +extern AnimationHeader D_06005880; +extern AnimationHeader D_06005C30; +extern SkeletonHeader D_0600BAC8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51D18.s") +void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnHeishi1* this = THIS; + Vec3f rupeePos; + s32 i; + u16 time; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s") + Actor_SetScale(&this->actor, 0.01f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_0600BAC8, &D_06005C30, this->limbDrawTable, + this->transitionDrawTable, 17); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51FEC.s") + this->type = (this->actor.params >> 8) & 0xFF; + this->path = this->actor.params & 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s") + for (i = 0; i < ARRAY_COUNT(sAnimParamsInit[0]); i++) { + this->animParams[i] = sAnimParamsInit[this->type][i]; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5212C.s") + // "type" + osSyncPrintf(VT_FGCOL(GREEN) " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->type); + // "path data" + osSyncPrintf(VT_FGCOL(YELLOW) " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->path); + osSyncPrintf(VT_FGCOL(PURPLE) " anime_frame_speed ☆☆☆☆☆☆ %f\n" VT_RST, this->animSpeed); + // "interpolation frame" + osSyncPrintf(VT_FGCOL(PURPLE) " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" VT_RST, this->transitionRate); + // "targeted movement speed value between points" + osSyncPrintf(VT_FGCOL(PURPLE) " point間の移動スピード目標値 ☆ %f\n" VT_RST, this->moveSpeedTarget); + // "maximum movement speed value between points" + osSyncPrintf(VT_FGCOL(PURPLE) " point間の移動スピード最大 ☆☆ %f\n" VT_RST, this->moveSpeedMax); + // "(body) targeted turning angle speed value" + osSyncPrintf(VT_FGCOL(PURPLE) " (体)反転アングルスピード目標値 %f\n" VT_RST, this->bodyTurnSpeedTarget); + // "(body) maximum turning angle speed" + osSyncPrintf(VT_FGCOL(PURPLE) " (体)反転アングルスピード最大☆ %f\n" VT_RST, this->bodyTurnSpeedMax); + // "(head) targeted turning angle speed value" + osSyncPrintf(VT_FGCOL(PURPLE) " (頭)反転アングルスピード加算値 %f\n" VT_RST, this->headTurnSpeedScale); + // "(head) maximum turning angle speed" + osSyncPrintf(VT_FGCOL(PURPLE) " (頭)反転アングルスピード最大☆ %f\n" VT_RST, this->headTurnSpeedMax); + // "current time" + // clang-format off + time = gSaveContext.dayTime; osSyncPrintf(VT_FGCOL(GREEN) " 今時間 %d\n" VT_RST, time); + // clang-format on + // "check time" + osSyncPrintf(VT_FGCOL(YELLOW) " チェック時間 %d\n" VT_RST, 0xBAAA); + osSyncPrintf("\n\n"); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s") + if (this->path == 3) { + for (i = 0; i < ARRAY_COUNT(sRupeePositions); i++) { + rupeePos = sRupeePositions[i]; + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_RUPPY, rupeePos.x, + rupeePos.y, rupeePos.z, 0, 0, 0, 3); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52290.s") + if (this->type != 5) { + if (((gSaveContext.dayTime < 0xB888) || (!gSaveContext.nightFlag)) && !(gSaveContext.eventChkInf[8] & 1)) { + this->actionFunc = EnHeishi1_SetupWalk; + } else { + Actor_Kill(&this->actor); + } + } else { + if ((gSaveContext.dayTime >= 0xB889) || (gSaveContext.nightFlag) || (gSaveContext.eventChkInf[8] & 1)) { + this->actionFunc = EnHeishi1_SetupWaitNight; + } else { + Actor_Kill(&this->actor); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Update.s") +void EnHeishi1_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5263C.s") +void EnHeishi1_SetupWalk(EnHeishi1* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005880.genericHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi1/EnHeishi1_Draw.s") + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005880, this->animSpeed, 0.0f, (s16)frameCount, 0, + this->transitionRate); + this->bodyTurnSpeed = 0.0f; + this->moveSpeed = 0.0f; + this->headDirection = Math_Rand_ZeroFloat(1.99f); + this->actionFunc = EnHeishi1_Walk; +} + +void EnHeishi1_Walk(EnHeishi1* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* pointPos; + f32 pathDiffX; + f32 pathDiffZ; + s16 randOffset; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (func_800A56C8(&this->skelAnime, 1.0f) || func_800A56C8(&this->skelAnime, 17.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KNIGHT_WALK); + } + + if (!sPlayerIsCaught) { + path = &globalCtx->setupPathList[this->path]; + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos += this->waypoint; + + Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, pointPos->x, 1.0f, this->moveSpeed); + Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, pointPos->z, 1.0f, this->moveSpeed); + + Math_SmoothScaleMaxF(&this->moveSpeed, this->moveSpeedTarget, 1.0f, this->moveSpeedMax); + + pathDiffX = pointPos->x - this->actor.posRot.pos.x; + pathDiffZ = pointPos->z - this->actor.posRot.pos.z; + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, (Math_atan2f(pathDiffX, pathDiffZ) * 10430.378f), 3, + this->bodyTurnSpeed, 0); + + Math_SmoothScaleMaxF(&this->bodyTurnSpeed, this->bodyTurnSpeedTarget, 1.0f, this->bodyTurnSpeedMax); + + if (this->headTimer == 0) { + this->headDirection++; + this->headAngleTarget = 0x2000; + // if headDirection is odd, face 45 degrees left + if ((this->headDirection & 1) != 0) { + this->headAngleTarget *= -1; + } + randOffset = Math_Rand_ZeroFloat(30.0f); + this->headTimer = sBaseHeadTimers[this->type] + randOffset; + } + + Math_SmoothScaleMaxF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); + + if ((this->path == BREG(1)) && (BREG(0) != 0)) { + osSyncPrintf(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); + osSyncPrintf(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); + osSyncPrintf(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); + osSyncPrintf(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); + osSyncPrintf(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); + osSyncPrintf("\n\n"); + } + + // when 20 units away from a middle waypoint, decide whether or not to skip it + if ((fabsf(pathDiffX) < 20.0f) && (fabsf(pathDiffZ) < 20.0f)) { + if (this->waypointTimer == 0) { + if (this->type >= 2) { + if ((this->waypoint >= 4) && (Math_Rand_ZeroFloat(1.99f) > 1.0f)) { + if (this->waypoint == 7) { + this->waypoint = 0; + } + if (this->waypoint >= 4) { + this->waypoint -= 3; + } + this->waypointTimer = 5; + return; + } + } + this->actionFunc = EnHeishi1_SetupWait; + } + } + } +} + +void EnHeishi1_SetupMoveToLink(EnHeishi1* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005880.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005880, 3.0f, 0.0f, (s16)frameCount, 0, -3.0f); + this->bodyTurnSpeed = 0.0f; + this->moveSpeed = 0.0f; + func_8010B680(globalCtx, 0x702D, &this->actor); + Interface_SetDoAction(globalCtx, 0x12); + this->actionFunc = EnHeishi1_MoveToLink; +} + +void EnHeishi1_MoveToLink(EnHeishi1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 1.0f, this->moveSpeed); + Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 1.0f, this->moveSpeed); + Math_SmoothScaleMaxF(&this->moveSpeed, 6.0f, 1.0f, 0.4f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); + Math_SmoothScaleMaxF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); + Math_SmoothDownscaleMaxF(&this->headAngle, 0.5f, 2000.0f); + + if (this->actor.xzDistFromLink < 70.0f) { + this->actionFunc = EnHeishi1_SetupTurnTowardLink; + } +} + +void EnHeishi1_SetupWait(EnHeishi1* this, GlobalContext* globalCtx) { + s16 rand; + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, this->animSpeed, 0.0f, (s16)frameCount, 0, + this->transitionRate); + this->headBehaviorDecided = false; + this->headDirection = Math_Rand_ZeroFloat(1.99f); + rand = Math_Rand_ZeroFloat(50.0f); + this->waitTimer = rand + 50; + this->actionFunc = EnHeishi1_Wait; +} + +void EnHeishi1_Wait(EnHeishi1* this, GlobalContext* globalCtx) { + s16 randOffset; + s32 i; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (!sPlayerIsCaught) { + switch (this->headBehaviorDecided) { + case false: + this->headDirection++; + // if headDirection is odd, face 52 degrees left + this->headAngleTarget = (this->headDirection & 1) ? 0x2500 : -0x2500; + randOffset = Math_Rand_ZeroFloat(30.0f); + this->headTimer = sBaseHeadTimers[this->type] + randOffset; + this->headBehaviorDecided = true; + break; + case true: + if (this->headTimer == 0) { + if (this->waitTimer == 0) { + if ((this->type == 0) || (this->type == 1)) { + this->waypoint++; + if (this->waypoint >= 4) { + this->waypoint = 0; + } + } else { + // waypoints are defined with corners as 0-3 and middle points as 4-7 + // to choose the next waypoint, the order "04152637" is hardcoded in an array + for (i = 0; i < ARRAY_COUNT(sWaypoints); i++) { + if (this->waypoint == sWaypoints[i]) { + i++; + if (i >= ARRAY_COUNT(sWaypoints)) { + i = 0; + } + this->waypoint = sWaypoints[i]; + break; + } + } + this->waypointTimer = 5; + } + this->actionFunc = EnHeishi1_SetupWalk; + } else { + this->headBehaviorDecided = false; + } + } + break; + } + Math_SmoothScaleMaxF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, + this->headTurnSpeedMax + this->headTurnSpeedMax); + + if ((this->path == BREG(1)) && (BREG(0) != 0)) { + osSyncPrintf(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); + osSyncPrintf(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); + osSyncPrintf(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); + osSyncPrintf(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); + osSyncPrintf("\n\n"); + } + } +} + +void EnHeishi1_SetupTurnTowardLink(EnHeishi1* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->kickTimer = 30; + this->actionFunc = EnHeishi1_TurnTowardLink; +} + +void EnHeishi1_TurnTowardLink(EnHeishi1* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->type != 5) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 3, this->bodyTurnSpeed, 0); + Math_SmoothScaleMaxF(&this->bodyTurnSpeed, 3000.0f, 1.0f, 300.0f); + Math_SmoothDownscaleMaxF(&this->headAngle, 0.5f, 2000.0f); + } + + if (this->kickTimer == 0) { + this->actionFunc = EnHeishi1_SetupKick; + } +} + +void EnHeishi1_SetupKick(EnHeishi1* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->actionFunc = EnHeishi1_Kick; +} + +void EnHeishi1_Kick(EnHeishi1* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (!this->loadStarted) { + // if dialog state is 5 and textbox has been advanced, kick player out + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx))) { + func_80106CCC(globalCtx); + if (!this->loadStarted) { + gSaveContext.eventChkInf[4] |= 0x4000; + globalCtx->nextEntranceIndex = 0x4FA; + globalCtx->sceneLoadFlag = 0x14; + this->loadStarted = true; + sPlayerIsCaught = false; + globalCtx->fadeTransition = 0x2E; + gSaveContext.nextTransition = 0x2E; + } + } + } +} + +void EnHeishi1_SetupWaitNight(EnHeishi1* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->actionFunc = EnHeishi1_WaitNight; +} + +void EnHeishi1_WaitNight(EnHeishi1* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->actor.xzDistFromLink < 100.0f) { + func_8010B680(globalCtx, 0x702D, &this->actor); + func_80078884(NA_SE_SY_FOUND); + // "Discovered!" + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); + func_8002DF54(globalCtx, &this->actor, 1); + this->actionFunc = EnHeishi1_SetupKick; + } +} + +void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx) { + EnHeishi1* this = THIS; + s16 path; + u8 i; + s32 pad; + Player* player = PLAYER; + s32 pad2; + Camera* activeCam; + + this->activeTimer++; + + for (i = 0; i < ARRAY_COUNT(this->timers); i++) { + if (this->timers[i] != 0) { + this->timers[i]--; + } + } + + if (this->waypointTimer != 0) { + this->waypointTimer--; + } + + activeCam = ACTIVE_CAM; + + if (player->actor.freezeTimer == 0) { + + this->actionFunc(this, globalCtx); + + this->actor.uncullZoneForward = 550.0f; + this->actor.uncullZoneScale = 350.0f; + this->actor.uncullZoneDownward = 700.0f; + + if (this->type != 5) { + path = this->path * 2; + if ((sCamDataIdxs[path] == activeCam->unk_148) || (sCamDataIdxs[path + 1] == activeCam->unk_148)) { + if (!sPlayerIsCaught) { + if ((this->actionFunc == EnHeishi1_Walk) || (this->actionFunc == EnHeishi1_Wait)) { + Vec3f searchBallVel; + Vec3f searchBallAccel = { 0.0f, 0.0f, 0.0f }; + Vec3f searchBallMult = { 0.0f, 0.0f, 20.0f }; + Vec3f searchBallPos; + + searchBallPos.x = this->actor.posRot.pos.x; + searchBallPos.y = this->actor.posRot.pos.y + 60.0f; + searchBallPos.z = this->actor.posRot.pos.z; + + Matrix_Push(); + Matrix_RotateY(((this->actor.shape.rot.y + this->headAngle) / 32768.0f) * M_PI, 0); + searchBallMult.z = 30.0f; + Matrix_MultVec3f(&searchBallMult, &searchBallVel); + Matrix_Pull(); + + EffectSsSolderSrchBall_Spawn(globalCtx, &searchBallPos, &searchBallVel, &searchBallAccel, 2, + &this->linkDetected); + + if (this->actor.xzDistFromLink < 60.0f) { + this->linkDetected = true; + } else if (this->actor.xzDistFromLink < 70.0f) { + // this case probably exists to detect link making a jump sound + // from slightly further away than the previous 60 unit check + if (player->actor.velocity.y > -4.0f) { + this->linkDetected = true; + } + } + + if (this->linkDetected) { + // ! @bug This appears to be a check to make sure that link is standing on the ground + // before getting caught. However this is an issue for two reasons: + // 1: When doing a backflip or falling from the upper path, links y velocity will reach + // less than -4.0 before even touching the ground. + // 2: There is one frame when landing from a sidehop where you can sidehop again without + // letting y velocity reach -4.0 or less. This enables the player to do frame perfect + // sidehops onto the next screen and prevent getting caught. + if (!(player->actor.velocity.y > -3.9f)) { + this->linkDetected = false; + // this 60 unit height check is so the player doesnt get caught when on the upper path + if (fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < 60.0f) { + func_80078884(NA_SE_SY_FOUND); + // "Discovered!" + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); + func_8002DF54(globalCtx, &this->actor, 1); + sPlayerIsCaught = true; + this->actionFunc = EnHeishi1_SetupMoveToLink; + } + } + } + } + } + } + } + } +} + +s32 EnHeishi1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + EnHeishi1* this = THIS; + + // turn the guards head to match the direction he is looking + if (limbIndex == 16) { + rot->x += (s16)this->headAngle; + } + + return 0; +} + +void EnHeishi1_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnHeishi1* this = THIS; + Vec3f matrixScale = { 0.3f, 0.3f, 0.3f }; + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHeishi1_OverrideLimbDraw, NULL, + &this->actor); + func_80033C30(&this->actor.posRot.pos, &matrixScale, 0xFF, globalCtx); + + if ((this->path == BREG(1)) && (BREG(0) != 0)) { + DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y + 100.0f, this->actor.posRot.pos.z, + 17000, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, 1.0f, 1.0f, 255, 0, 0, + 255, 4, globalCtx->state.gfxCtx); + } +} diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h index 823c3114df..71e3778fef 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h @@ -6,9 +6,50 @@ struct EnHeishi1; +typedef void (*EnHeishi1ActionFunc)(struct EnHeishi1*, GlobalContext*); + typedef struct EnHeishi1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x160]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[17]; + /* 0x01F6 */ Vec3s transitionDrawTable[17]; + /* 0x025C */ EnHeishi1ActionFunc actionFunc; + /* 0x0260 */ s16 activeTimer; + /* 0x0262 */ s16 headDirection; + /* 0x0264 */ s16 headBehaviorDecided; + /* 0x0266 */ s16 linkDetected; + /* 0x0268 */ s16 loadStarted; + /* 0x026A */ s16 type; + /* 0x026C */ s16 path; + /* 0x026E */ s16 unused1; + /* 0x0270 */ s16 waypointTimer; + /* 0x0272 */ s16 unused2; + /* 0x0274 */ f32 moveSpeed; + /* 0x0278 */ f32 bodyTurnSpeed; + /* 0x027C */ f32 headAngle; + /* 0x0280 */ f32 headAngleTarget; + union { + struct { + /* 0x0284 */ f32 animSpeed; + /* 0x0288 */ f32 transitionRate; + /* 0x028C */ f32 moveSpeedTarget; + /* 0x0290 */ f32 moveSpeedMax; + /* 0x0294 */ f32 bodyTurnSpeedTarget; + /* 0x0298 */ f32 bodyTurnSpeedMax; + /* 0x029C */ f32 headTurnSpeedScale; + /* 0x02A0 */ f32 headTurnSpeedMax; + }; + f32 animParams[8]; + }; + union { + struct { + /* 0x02A4 */ s16 headTimer; + /* 0x02A6 */ s16 waitTimer; + /* 0x02A8 */ s16 kickTimer; + }; + s16 timers[3]; + }; + /* 0x02AA */ s16 waypoint; } EnHeishi1; // size = 0x02AC extern const ActorInit En_Heishi1_InitVars; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index a1c6c9a8c7..c65c8cd875 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -153,6 +153,7 @@ void EnHeishi2_Init(Actor* thisx, GlobalContext* globalCtx) { void EnHeishi2_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnHeishi2* this = THIS; + if ((this->collider.dim.radius != 0) || (this->collider.dim.height != 0)) { Collider_DestroyCylinder(globalCtx, &this->collider); } @@ -165,8 +166,9 @@ void func_80A531D8(EnHeishi2* this, GlobalContext* globalCtx) { } void func_80A531E4(EnHeishi2* this, GlobalContext* globalCtx) { - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, - (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->actionFunc = func_80A53278; } @@ -262,14 +264,14 @@ void func_80A53538(EnHeishi2* this, GlobalContext* globalCtx) { } void func_80A535BC(EnHeishi2* this, GlobalContext* globalCtx) { - f32 frames = SkelAnime_GetFrameCount(&D_06005500.genericHeader); - this->unk_2EC = frames; - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frames, 2, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + + this->unk_2EC = frameCount; + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frameCount, 2, -10.0f); this->actionFunc = func_80A53638; } void func_80A53638(EnHeishi2* this, GlobalContext* globalCtx) { - Actor* thisx; f32 frameCount; BgSpot15Saku* actor; @@ -299,8 +301,9 @@ void func_80A53638(EnHeishi2* this, GlobalContext* globalCtx) { } void func_80A5372C(EnHeishi2* this, GlobalContext* globalCtx) { - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, - (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->unk_2F2[0] = 200; this->cameraId = Gameplay_CreateSubCamera(globalCtx); Gameplay_ChangeCameraStatus(globalCtx, 0, 1); @@ -319,6 +322,7 @@ void func_80A5372C(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A53850(EnHeishi2* this, GlobalContext* globalCtx) { BgSpot15Saku* gate; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); gate = (BgSpot15Saku*)this->attachedGate; @@ -334,6 +338,7 @@ void func_80A53850(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A53908(EnHeishi2* this, GlobalContext* globalCtx) { f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->actionFunc = func_80A5399C; } @@ -426,6 +431,7 @@ void func_80A53C0C(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A53C90(EnHeishi2* this, GlobalContext* globalCtx) { f32 frameCount = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + this->unk_2EC = frameCount; SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frameCount, 2, -10.0f); this->actionFunc = func_80A53D0C; @@ -462,8 +468,9 @@ void func_80A53D0C(EnHeishi2* this, GlobalContext* globalCtx) { } void func_80A53DF8(EnHeishi2* this, GlobalContext* globalCtx) { - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, - (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->unk_2F2[0] = 200; this->cameraId = Gameplay_CreateSubCamera(globalCtx); Gameplay_ChangeCameraStatus(globalCtx, 0, 1); @@ -486,6 +493,7 @@ void func_80A53DF8(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A53F30(EnHeishi2* this, GlobalContext* globalCtx) { BgGateShutter* gate; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); gate = (BgGateShutter*)this->attachedGate; @@ -586,6 +594,7 @@ void func_80A5427C(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A54320(EnHeishi2* this, GlobalContext* globalCtx) { f32 frameCount = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + this->unk_2EC = frameCount; SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frameCount, 2, -10.0f); this->audioFlag = 0; @@ -627,23 +636,21 @@ void func_80A543A0(EnHeishi2* this, GlobalContext* globalCtx) { } } void func_80A544AC(EnHeishi2* this, GlobalContext* globalCtx) { - Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, -0x17D4, 5, (s16)(s32)(f32)this->unk_2E4, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, -6100, 5, this->unk_2E4, 0); Math_SmoothScaleMaxF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); this->actor.posRot.rot.z = this->actor.shape.rot.z; if (this->actor.shape.rot.z < -6000) { - func_8010B680(globalCtx, 0x708F, 0); + func_8010B680(globalCtx, 0x708F, NULL); this->actor.flags |= 0x10000; this->actionFunc = func_80A5455C; this->unk_2E4 = 0.0f; } } -#ifdef NON_MATCHING -// regalloc differences void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; Vec3f pos; - s32 rotY; + f32 rotY; EnBom* bomb; if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { @@ -665,9 +672,6 @@ void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) { this->actionFunc = func_80A546DC; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s") -#endif void func_80A546DC(EnHeishi2* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, 200, 5, this->unk_2E4, 0); @@ -725,7 +729,7 @@ void func_80A5475C(EnHeishi2* this, GlobalContext* globalCtx) { if (this->unk_300 == 4) { this->unk_309 = 1; - func_80078884(0x4807); + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); this->actionFunc = func_80A540C0; } return; @@ -742,6 +746,7 @@ void func_80A5475C(EnHeishi2* this, GlobalContext* globalCtx) { void func_80A54954(EnHeishi2* this, GlobalContext* globalCtx) { f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->actionFunc = func_80A549E8; } @@ -798,6 +803,7 @@ void EnHeishi2_Update(Actor* thisx, GlobalContext* globalCtx) { s32 EnHeishi2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { EnHeishi2* this = THIS; + switch (this->initParams) { case 1: break; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index bb93d38ee5..9acd6f230a 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -78,12 +78,14 @@ void EnHeishi3_Init(Actor* thisx, GlobalContext* globalCtx) { void EnHeishi3_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnHeishi3* this = THIS; + Collider_DestroyCylinder(globalCtx, &this->collider); } void EnHeishi3_SetupGuardType(EnHeishi3* this, GlobalContext* globalCtx) { - f32 frames = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)(f32)frames, 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); if (this->unk_278 == 0) { this->actionFunc = EnHeishi3_StandSentinelInGrounds; } else { @@ -157,8 +159,9 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, GlobalContext* globalCtx) } void EnHeishi3_CatchStart(EnHeishi3* this, GlobalContext* globalCtx) { - f32 frames = SkelAnime_GetFrameCount(&D_06005880.genericHeader); - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005880, 1.0f, 0.0f, (s16)(f32)frames, 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005880.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005880, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->caughtTimer = 20; this->actionFunc = func_80A55BD4; this->actor.speedXZ = 2.5f; @@ -179,8 +182,9 @@ void func_80A55BD4(EnHeishi3* this, GlobalContext* globalCtx) { } void EnHeishi3_ResetAnimationToIdle(EnHeishi3* this, GlobalContext* globalCtx) { - f32 frames = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); - SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)(f32)frames, 0, -10.0f); + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); this->actionFunc = func_80A55D00; } @@ -200,6 +204,7 @@ void func_80A55D00(EnHeishi3* this, GlobalContext* globalCtx) { void EnHeishi3_Update(Actor* thisx, GlobalContext* globalCtx) { EnHeishi3* this = THIS; s32 pad; + Actor_SetHeight(&this->actor, 60.0f); this->unk_274 += 1; if (this->caughtTimer != 0) { @@ -216,6 +221,7 @@ void EnHeishi3_Update(Actor* thisx, GlobalContext* globalCtx) { s32 EnHeishi3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { EnHeishi3* this = THIS; + if (limbIndex == 9) { rot->x += this->unk_26E; } @@ -230,6 +236,7 @@ s32 EnHeishi3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL void EnHeishi3_Draw(Actor* thisx, GlobalContext* globalCtx) { EnHeishi3* this = THIS; + func_80093D18(globalCtx->state.gfxCtx); SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHeishi3_OverrideLimbDraw, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 0377549f3b..2cea6c8558 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -514,7 +514,7 @@ void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetHeight(&this->actor, this->skelAnime.animCurrentFrame); } else if (this->actionFunc == EnHintnuts_Burrow) { Actor_SetHeight(&this->actor, 20.0f - ((this->skelAnime.animCurrentFrame * 20.0f) / - (f32)SkelAnime_GetFrameCount(&D_060024CC.genericHeader))); + SkelAnime_GetFrameCount(&D_060024CC.genericHeader))); } else { Actor_SetHeight(&this->actor, 20.0f); } diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 37d3634880..37d0211cb3 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -138,7 +138,8 @@ void func_80A686A8(EnHorseGanon* this, GlobalContext* globalCtx) { void func_80A68870(EnHorseGanon* this) { if (this->skin.skelAnime.animCurrentFrame > D_80A692B8[this->soundCount]) { if (D_80A692B8[this->soundCount] != 0 || !(this->skin.skelAnime.animCurrentFrame > D_80A692B8[1])) { - Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); this->soundCount += 1; if (this->soundCount >= 2) { 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 4ff73aaef1..134567adc3 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -338,7 +338,7 @@ void func_80AA0F44(EnMa1* this, GlobalContext* globalCtx) { player->stateFlags2 |= 0x2000000; player->unk_6A8 = &this->actor; this->actor.textId = 0x2061; - func_8010B680(globalCtx, this->actor.textId, 0); + func_8010B680(globalCtx, this->actor.textId, NULL); this->unk_1E8.unk_00 = 1; this->actor.flags |= 0x10000; this->actionFunc = func_80AA106C; 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 a59b33ea52..fbe67d63a1 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -9,7 +9,12 @@ void EnMd_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnMd_Update(Actor* thisx, GlobalContext* globalCtx); void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AAB874(EnMd* this, GlobalContext* globalCtx); +void func_80AAB8F8(EnMd* this, GlobalContext* globalCtx); +void func_80AAB948(EnMd* this, GlobalContext* globalCtx); +void func_80AABC10(EnMd* this, GlobalContext* globalCtx); +void func_80AABD0C(EnMd* this, GlobalContext* globalCtx); + const ActorInit En_Md_InitVars = { ACTOR_EN_MD, ACTORTYPE_NPC, @@ -21,79 +26,799 @@ const ActorInit En_Md_InitVars = { (ActorFunc)EnMd_Update, (ActorFunc)EnMd_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA250.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA274.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 36, 46, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA308.s") +static CollisionCheckInfoInit2 sColChkInfoInit = { + 0x00, 0x0000, 0x0000, 0x0000, 0xFF, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA39C.s") +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 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA474.s") +extern AnimationHeader D_060002C8; +extern SkeletonHeader D_06007FB8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA508.s") +void func_80AAA250(EnMd* this) { + f32 initialFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA5A4.s") + initialFrame = this->skelAnime.initialFrame; + this->skelAnime.initialFrame = this->skelAnime.animFrameCount; + this->skelAnime.animCurrentFrame = this->skelAnime.animFrameCount; + this->skelAnime.animFrameCount = initialFrame; + this->skelAnime.animPlaybackSpeed = -1.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA638.s") +void func_80AAA274(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 2); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 3); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA6D4.s") +void func_80AAA308(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 4); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 5); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA768.s") +void func_80AAA39C(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 2); + func_80AAA250(this); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 7); + this->unk_20A++; + } else { + break; + } + case 2: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 8); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA7FC.s") +void func_80AAA474(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 7); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA890.s") +void func_80AAA508(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 2); + func_80AAA250(this); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA92C.s") +void func_80AAA5A4(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 9); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 6); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAA93C.s") +void func_80AAA638(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 9); + func_80AAA250(this); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAA24.s") +void func_80AAA6D4(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 11); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 6); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAC78.s") +void func_80AAA768(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 12); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 3); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s") +void func_80AAA7FC(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 13); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 6); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAADE0.s") +void func_80AAA890(EnMd* this) { + switch (this->unk_20A) { + case 0: + func_80034EC0(&this->skelAnime, sAnimations, 7); + func_80AAA250(this); + this->unk_20A++; + case 1: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount)) { + func_80034EC0(&this->skelAnime, sAnimations, 10); + this->unk_20A++; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE14.s") +void func_80AAA92C(EnMd* this, u8 arg1) { + this->unk_20B = arg1; + this->unk_20A = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAE94.s") +void func_80AAA93C(EnMd* this) { + switch (this->unk_20B) { + case 1: + func_80AAA274(this); + break; + case 2: + func_80AAA308(this); + break; + case 3: + func_80AAA39C(this); + break; + case 4: + func_80AAA474(this); + break; + case 5: + func_80AAA508(this); + break; + case 6: + func_80AAA5A4(this); + break; + case 7: + func_80AAA638(this); + break; + case 8: + func_80AAA6D4(this); + break; + case 9: + func_80AAA768(this); + break; + case 10: + func_80AAA7FC(this); + break; + case 11: + func_80AAA890(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAAF04.s") +void func_80AAAA24(EnMd* this) { + if (this->unk_1E0.unk_00 != 0) { + switch (this->actor.textId) { + case 0x102F: + if ((this->unk_208 == 0) && (this->unk_20B != 1)) { + func_80AAA92C(this, 1); + } + if ((this->unk_208 == 2) && (this->unk_20B != 2)) { + func_80AAA92C(this, 2); + } + if ((this->unk_208 == 5) && (this->unk_20B != 8)) { + func_80AAA92C(this, 8); + } + if ((this->unk_208 == 11) && (this->unk_20B != 9)) { + func_80AAA92C(this, 9); + } + break; + case 0x1033: + if ((this->unk_208 == 0) && (this->unk_20B != 1)) { + func_80AAA92C(this, 1); + } + if ((this->unk_208 == 1) && (this->unk_20B != 2)) { + func_80AAA92C(this, 2); + } + if ((this->unk_208 == 5) && (this->unk_20B != 10)) { + func_80AAA92C(this, 10); + } + if ((this->unk_208 == 7) && (this->unk_20B != 9)) { + func_80AAA92C(this, 9); + } + break; + case 0x1030: + case 0x1034: + case 0x1045: + if ((this->unk_208 == 0) && (this->unk_20B != 1)) { + func_80AAA92C(this, 1); + } + break; + case 0x1046: + if ((this->unk_208 == 0) && (this->unk_20B != 6)) { + func_80AAA92C(this, 6); + } + break; + } + } else if (this->skelAnime.animCurrentSeg != &D_060002C8) { + func_80034EC0(&this->skelAnime, sAnimations, 10); + func_80AAA92C(this, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB03C.s") + func_80AAA93C(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB0E0.s") +s16 func_80AAAC78(EnMd* this, GlobalContext* globalCtx) { + s16 dialogState = func_8010BDBC(&globalCtx->msgCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB158.s") + if ((this->unk_209 == 10) || (this->unk_209 == 5) || (this->unk_209 == 2) || (this->unk_209 == 1)) { + if (this->unk_209 != dialogState) { + this->unk_208++; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s") + this->unk_209 = dialogState; + return dialogState; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB4DC.s") +u16 EnMd_GetTextKokiriForest(GlobalContext* globalCtx, EnMd* this) { + u16 reactionText = Text_GetFaceReaction(globalCtx, 0x11); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB5A4.s") + if (reactionText != 0) { + return reactionText; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s") + this->unk_208 = 0; + this->unk_209 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s") + if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) { + return 0x1045; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB874.s") + if (gSaveContext.eventChkInf[0] & 0x10) { + return 0x1034; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB8F8.s") + if ((CUR_EQUIP_VALUE(EQUIP_SHIELD) == 1) && (CUR_EQUIP_VALUE(EQUIP_SWORD) == 1)) { + return 0x1033; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB948.s") + if (gSaveContext.infTable[0] & 0x1000) { + return 0x1030; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABC10.s") + return 0x102F; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABD0C.s") +u16 EnMd_GetTextKokiriHome(GlobalContext* globalCtx, EnMd* this) { + this->unk_208 = 0; + this->unk_209 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s") + if (gSaveContext.eventChkInf[4] & 1) { + return 0x1028; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AABEF0.s") + return 0x1046; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAC104.s") +u16 EnMd_GetTextLostWoods(GlobalContext* globalCtx, EnMd* this) { + this->unk_208 = 0; + this->unk_209 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s") + if (gSaveContext.eventChkInf[4] & 0x100) { + if (gSaveContext.infTable[1] & 0x200) { + return 0x1071; + } + return 0x1070; + } + + if (gSaveContext.eventChkInf[0] & 0x400) { + return 0x1068; + } + + if (gSaveContext.infTable[1] & 0x20) { + return 0x1061; + } + + return 0x1060; +} + +u16 EnMd_GetText(GlobalContext* globalCtx, EnMd* this) { + switch (globalCtx->sceneNum) { + case SCENE_SPOT04: + return EnMd_GetTextKokiriForest(globalCtx, this); + case SCENE_KOKIRI_HOME4: + return EnMd_GetTextKokiriHome(globalCtx, this); + case SCENE_SPOT10: + return EnMd_GetTextLostWoods(globalCtx, this); + default: + return 0; + } +} + +s16 func_80AAAF04(GlobalContext* globalCtx, EnMd* this) { + switch (func_80AAAC78(this, globalCtx)) { + case 0: + case 1: + case 3: + case 4: + case 6: + case 7: + case 8: + case 9: + return 1; + case 2: + switch (this->actor.textId) { + case 0x1028: + gSaveContext.eventChkInf[0] |= 0x8000; + break; + case 0x102F: + gSaveContext.eventChkInf[0] |= 4; + gSaveContext.infTable[0] |= 0x1000; + break; + case 0x1060: + gSaveContext.infTable[1] |= 0x20; + break; + case 0x1070: + gSaveContext.infTable[1] |= 0x200; + break; + case 0x1033: + case 0x1067: + return 2; + } + return 0; + case 5: + if (func_80106BC8(globalCtx) != 0) { + return 2; + } + default: + return 1; + } +} + +u8 EnMd_ShouldSpawn(EnMd* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_SPOT04) { + if (!(gSaveContext.eventChkInf[1] & 0x1000) && !(gSaveContext.eventChkInf[4] & 1)) { + return 1; + } + } + + if (globalCtx->sceneNum == SCENE_KOKIRI_HOME4) { + if (((gSaveContext.eventChkInf[1] & 0x1000) != 0) || ((gSaveContext.eventChkInf[4] & 1) != 0)) { + if (LINK_IS_CHILD) { + return 1; + } + } + } + + if (globalCtx->sceneNum == SCENE_SPOT10) { + return 1; + } + + return 0; +} + +void EnMd_UpdateEyes(EnMd* this) { + if (DECR(this->blinkTimer) == 0) { + this->eyeIdx++; + if (this->eyeIdx > 2) { + this->blinkTimer = Math_Rand_S16Offset(30, 30); + this->eyeIdx = 0; + } + } +} + +void func_80AAB158(EnMd* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 absYawDiff; + s16 temp; + s16 temp2; + s16 yawDiff; + + if (this->actor.xzDistFromLink < 170.0f) { + yawDiff = (f32)this->actor.yawTowardsLink - this->actor.shape.rot.y; + absYawDiff = ABS(yawDiff); + + temp = (absYawDiff <= func_800347E8(2)) ? 2 : 1; + temp2 = 1; + } else { + temp = 1; + temp2 = 0; + } + + if (this->unk_1E0.unk_00 != 0) { + temp = 4; + } + + if (this->actionFunc == func_80AABD0C) { + temp = 1; + temp2 = 0; + } + if (this->actionFunc == func_80AAB8F8) { + temp = 4; + temp2 = 1; + } + + if ((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) { + this->unk_1E0.unk_18 = globalCtx->view.eye; + this->unk_1E0.unk_14 = 40.0f; + temp = 2; + } else { + this->unk_1E0.unk_18 = player->actor.posRot.pos; + this->unk_1E0.unk_14 = (gSaveContext.linkAge > 0) ? 0.0f : -18.0f; + } + + func_80034A14(&this->actor, &this->unk_1E0, 2, temp); + if (this->actionFunc != func_80AABC10) { + if (temp2) { + func_800343CC(globalCtx, &this->actor, &this->unk_1E0.unk_00, this->collider.dim.radius + 30.0f, + EnMd_GetText, func_80AAAF04); + } + } +} + +u8 EnMd_FollowPath(EnMd* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* pointPos; + f32 pathDiffX; + f32 pathDiffZ; + + if ((this->actor.params & 0xFF00) == 0xFF00) { + return 0; + } + + path = &globalCtx->setupPathList[(this->actor.params & 0xFF00) >> 8]; + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos += this->waypoint; + + pathDiffX = pointPos->x - this->actor.posRot.pos.x; + pathDiffZ = pointPos->z - this->actor.posRot.pos.z; + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(pathDiffX, pathDiffZ) * (65536.0f / (2 * M_PI)), 4, + 4000, 1); + + if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 100.0f) { + this->waypoint++; + if (this->waypoint >= path->count) { + this->waypoint = 0; + } + return 1; + } + return 0; +} + +u8 EnMd_SetMovedPos(EnMd* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* lastPointPos; + + if ((this->actor.params & 0xFF00) == 0xFF00) { + return 0; + } + + path = &globalCtx->setupPathList[(this->actor.params & 0xFF00) >> 8]; + lastPointPos = SEGMENTED_TO_VIRTUAL(path->points); + lastPointPos += path->count - 1; + + this->actor.posRot.pos.x = lastPointPos->x; + this->actor.posRot.pos.y = lastPointPos->y; + this->actor.posRot.pos.z = lastPointPos->z; + + return 1; +} + +void func_80AAB5A4(EnMd* this, GlobalContext* globalCtx) { + f32 temp; + + if (globalCtx->sceneNum != SCENE_KOKIRI_HOME4) { + temp = (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !(gSaveContext.eventChkInf[1] & 0x1000) && + (globalCtx->sceneNum == SCENE_SPOT04)) + ? 100.0f + : 400.0f; + this->alpha = func_80034DD4(this, globalCtx, this->alpha, temp); + this->actor.shape.unk_14 = this->alpha; + } else { + this->alpha = 255; + this->actor.shape.unk_14 = this->alpha; + } +} + +void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) { + EnMd* this = THIS; + s32 pad; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007FB8, NULL, this->limbDrawTable, this->transitionDrawTable, + 17); + + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + func_80061EFC(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + if (!EnMd_ShouldSpawn(&this->actor, globalCtx)) { + Actor_Kill(&this->actor); + return; + } + + func_80034EC0(&this->skelAnime, sAnimations, 0); + Actor_SetScale(&this->actor, 0.01f); + this->actor.unk_1F = 6; + this->alpha = 255; + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3); + + if (((globalCtx->sceneNum == SCENE_SPOT04) && !(gSaveContext.eventChkInf[0] & 0x10)) || + ((globalCtx->sceneNum == SCENE_SPOT04) && (gSaveContext.eventChkInf[0] & 0x10) && + CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) || + ((globalCtx->sceneNum == SCENE_SPOT10) && !(gSaveContext.eventChkInf[0] & 0x400))) { + this->actor.initPosRot.pos = this->actor.posRot.pos; + this->actionFunc = func_80AAB948; + return; + } + + if (globalCtx->sceneNum != SCENE_KOKIRI_HOME4) { + EnMd_SetMovedPos(&this->actor, globalCtx); + } + + this->actionFunc = func_80AAB874; +} + +void EnMd_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnMd* this = THIS; + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void func_80AAB874(EnMd* this, GlobalContext* globalCtx) { + if (this->skelAnime.animCurrentSeg == &D_060002C8) { + func_80034F54(globalCtx, &this->unk_214, &this->unk_236, 17); + } else if ((this->unk_1E0.unk_00 == 0) && (this->unk_20B != 7)) { + func_80AAA92C(this, 7); + } + + func_80AAAA24(this); +} + +void func_80AAB8F8(EnMd* this, GlobalContext* globalCtx) { + if (this->skelAnime.animCurrentSeg == &D_060002C8) { + func_80034F54(globalCtx, &this->unk_214, &this->unk_236, 17); + } + func_80AAA93C(this); +} + +void func_80AAB948(EnMd* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 temp; + Actor* actorToBlock = &PLAYER->actor; + s16 yaw; + + func_80AAAA24(this); + + if (this->unk_1E0.unk_00 == 0) { + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + this->actor.shape.rot.y = this->actor.yawTowardsLink; + + yaw = Math_Vec3f_Yaw(&this->actor.initPosRot.pos, &actorToBlock->posRot.pos); + + this->actor.posRot.pos.x = this->actor.initPosRot.pos.x; + this->actor.posRot.pos.x += 60.0f * Math_Sins(yaw); + + this->actor.posRot.pos.z = this->actor.initPosRot.pos.z; + this->actor.posRot.pos.z += 60.0f * Math_Coss(yaw); + + temp = fabsf((f32)this->actor.yawTowardsLink - yaw) * 0.001f * 3.0f; + this->skelAnime.animPlaybackSpeed = CLAMP(temp, 1.0f, 3.0f); + } + + if (this->unk_1E0.unk_00 == 2) { + if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !(gSaveContext.eventChkInf[1] & 0x1000) && + (globalCtx->sceneNum == SCENE_SPOT04)) { + globalCtx->msgCtx.msgMode = 0x37; + } + + if (globalCtx->sceneNum == SCENE_SPOT04) { + gSaveContext.eventChkInf[0] |= 0x10; + } + if (globalCtx->sceneNum == SCENE_SPOT10) { + gSaveContext.eventChkInf[0] |= 0x400; + } + + func_80AAA92C(this, 3); + func_80AAA93C(this); + this->waypoint = 1; + this->unk_1E0.unk_00 = 0; + this->actionFunc = func_80AABD0C; + this->actor.speedXZ = 1.5f; + return; + } + + if (this->skelAnime.animCurrentSeg == &D_060002C8) { + func_80034F54(globalCtx, &this->unk_214, &this->unk_236, 17); + } + + if ((this->unk_1E0.unk_00 == 0) && (globalCtx->sceneNum == SCENE_SPOT10)) { + if (player->stateFlags2 & 0x1000000) { + player->stateFlags2 |= 0x2000000; + player->unk_6A8 = &this->actor; + func_8010BD58(globalCtx, 0x22); + this->actionFunc = func_80AABC10; + return; + } + + if (this->actor.xzDistFromLink < (30.0f + this->collider.dim.radius)) { + player->stateFlags2 |= 0x800000; + } + } +} + +void func_80AABC10(EnMd* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (globalCtx->msgCtx.unk_E3EE >= 4) { + this->actionFunc = func_80AAB948; + 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); + this->actor.textId = 0x1067; + func_8002F2CC(&this->actor, globalCtx, this->collider.dim.radius + 30.0f); + + this->actionFunc = func_80AAB948; + globalCtx->msgCtx.unk_E3EE = 4; + } else { + player->stateFlags2 |= 0x800000; + } +} + +void func_80AABD0C(EnMd* this, GlobalContext* globalCtx) { + func_80034F54(globalCtx, &this->unk_214, &this->unk_236, 17); + func_80AAA93C(this); + + if (!(EnMd_FollowPath(this, globalCtx)) || (this->waypoint != 0)) { + this->actor.shape.rot = this->actor.posRot.rot; + return; + } + + if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && !(gSaveContext.eventChkInf[1] & 0x1000) && + (globalCtx->sceneNum == SCENE_SPOT04)) { + func_80106CCC(globalCtx); + gSaveContext.eventChkInf[1] |= 0x1000; + Actor_Kill(&this->actor); + return; + } + + func_80AAA92C(this, 11); + + this->skelAnime.animPlaybackSpeed = 0.0f; + this->actor.speedXZ = 0.0f; + this->actor.initPosRot.pos = this->actor.posRot.pos; + this->actionFunc = func_80AAB8F8; +} + +void EnMd_Update(Actor* thisx, GlobalContext* globalCtx) { + EnMd* this = THIS; + s32 pad; + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + EnMd_UpdateEyes(this); + func_80AAB5A4(this, globalCtx); + Actor_MoveForward(&this->actor); + func_80AAB158(this, globalCtx); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + this->actionFunc(this, globalCtx); +} + +s32 EnMd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + EnMd* this = THIS; + Vec3s vec; + + if (limbIndex == 16) { + Matrix_Translate(1200.0f, 0.0f, 0.0f, MTXMODE_APPLY); + vec = this->unk_1E0.unk_08; + Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_Translate(-1200.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } + if (limbIndex == 9) { + vec = this->unk_1E0.unk_0E; + Matrix_RotateX((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); + } + + if (((limbIndex == 9) || (limbIndex == 10)) || (limbIndex == 13)) { + rot->y += Math_Sins(this->unk_214[limbIndex]) * 200.0f; + rot->z += Math_Coss(this->unk_236[limbIndex]) * 200.0f; + } + + return 0; +} + +void EnMd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + s32 pad; + Vec3f vec = { 400.0f, 0.0f, 0.0f }; + + if (limbIndex == 16) { + Matrix_MultVec3f(&vec, &thisx->posRot2.pos); + } +} + +void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) { + static UNK_PTR sEyesSegments[] = { + 0x06004FF0, + 0x06005930, + 0x06005D30, + }; + EnMd* this = THIS; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_md.c", 1280); + if (this->alpha == 255) { + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + func_80034BA0(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); + } else if (this->alpha != 0) { + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx])); + func_80034CC4(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); + } + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_md.c", 1317); +} diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h index 5cc6b6719b..08973c3d19 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.h +++ b/src/overlays/actors/ovl_En_Md/z_en_md.h @@ -6,9 +6,26 @@ struct EnMd; +typedef void (*EnMdActionFunc)(struct EnMd*, GlobalContext*); + typedef struct EnMd { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1D8]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnMdActionFunc 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 blinkTimer; + /* 0x020E */ s16 eyeIdx; + /* 0x0210 */ s16 alpha; + /* 0x0212 */ s16 waypoint; + /* 0x0214 */ s16 unk_214[17]; + /* 0x0236 */ s16 unk_236[17]; + /* 0x0258 */ Vec3s limbDrawTable[17]; + /* 0x02BE */ Vec3s transitionDrawTable[17]; } EnMd; // size = 0x0324 extern const ActorInit En_Md_InitVars; diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index 0fbd4a75d2..26a076b63d 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -77,7 +77,8 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) { thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : ((thisx->speedXZ > 2.5f) ? 2.5f : thisx->speedXZ); Math_SmoothScaleMaxMinF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); if (thisx->speedXZ != 0.0f) { - Audio_PlaySoundGeneral(0x200A, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_ROCK_SLIDE - SFX_FLAG, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); } this->dyna.unk_154 = 0.0f; this->dyna.unk_150 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index e01b283731..95af9a2fe4 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1227,7 +1227,8 @@ void func_80AED4FC(EnRu1* this) { func_80AED520(EnRu1* this, GlobalContext* globalCtx) { Player* player = PLAYER; - Audio_PlaySoundGeneral(0x883, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LIFT); } @@ -2366,7 +2367,7 @@ void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, @@ -2391,7 +2392,7 @@ void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2A8); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->unk_2A8); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c index c44d2ff975..c6870e407e 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c @@ -1,5 +1,4 @@ #include "z_en_ru1.h" - #include // clang-format off @@ -109,10 +108,10 @@ CutsceneData D_80AF0880[] = { CS_PLAY_BGM_LIST(1), CS_PLAY_BGM(0x0052, 74, 75, 0x0000, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x0000004E, 0xFFFFFFF1, 0x00000000, 0x0000004E), CS_END(), - CS_PAD(), - CS_PAD(), }; +u32 D_80AF10A0 = 0; + CutsceneData D_80AF10A4[] = { CS_BEGIN_CUTSCENE(14, 1299), CS_PLAYER_ACTION_LIST(3), @@ -198,10 +197,10 @@ CutsceneData D_80AF10A4[] = { CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 30.306555f, -1426, -857, -3190, 0x00E8), CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 30.306555f, -1426, -857, -3190, 0x00EA), CS_END(), - CS_PAD(), - CS_PAD(), }; +u32 D_80AF1724 = 0; + CutsceneData D_80AF1728[] = { CS_BEGIN_CUTSCENE(7, 1160), CS_MISC_LIST(1), @@ -236,6 +235,5 @@ CutsceneData D_80AF1728[] = { CS_TEXT_NONE(0, 35), CS_TEXT_DISPLAY_TEXTBOX(0x404F, 35, 70, 0x0000, 0xFFFF, 0xFFFF), CS_END(), - CS_PAD(), }; // clang-format on diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 7d21e7209a..323750c31b 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -145,7 +145,7 @@ s32 func_80AF26A0(EnRu2* this) { void func_80AF26AC(EnRu2* this) { this->action = 7; this->drawConfig = 0; - this->unk_2B4 = 0; + this->alpha = 0; this->unk_2B8 = 0; this->actor.shape.unk_14 = 0; this->unk_2B0 = 0.0f; @@ -399,7 +399,7 @@ void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { if (func_80AF27D0(this, globalCtx, 4, 3)) { this->action = 8; this->drawConfig = 2; - this->unk_2B4 = 0; + this->alpha = 0; this->actor.shape.unk_14 = 0; this->unk_2B0 = 0.0f; func_80AF2E64(); @@ -408,7 +408,7 @@ void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { f32* unk_2B0 = &this->unk_2B0; - s32 something; + s32 alpha; if (func_80AF27D0(this, globalCtx, 4, 3)) { *unk_2B0 += 1.0f; @@ -416,7 +416,7 @@ void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { this->action = 9; this->drawConfig = 1; *unk_2B0 = kREG(5) + 10.0f; - this->unk_2B4 = 0xFF; + this->alpha = 255; this->actor.shape.unk_14 = 0xFF; return; } @@ -426,14 +426,14 @@ void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { this->action = 7; this->drawConfig = 0; *unk_2B0 = 0.0f; - this->unk_2B4 = 0; + this->alpha = 0; this->actor.shape.unk_14 = 0; return; } } - something = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; - this->unk_2B4 = something; - this->actor.shape.unk_14 = something; + alpha = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; } void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { @@ -441,7 +441,7 @@ void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { this->action = 8; this->drawConfig = 2; this->unk_2B0 = kREG(5) + 10.0f; - this->unk_2B4 = 0xFF; + this->alpha = 255; if (this->unk_2B8 == 0) { func_80AF2E84(this, globalCtx); this->unk_2B8 = 1; @@ -484,7 +484,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, @@ -509,11 +509,11 @@ void func_80AF33E0(EnRu2* this) { temp_f0 = kREG(17) + 10.0f; if (temp_f0 <= *unk_2B0) { - this->unk_2B4 = 0xFF; + this->alpha = 255; this->actor.shape.unk_14 = 0xFF; } else { temp_f18 = (*unk_2B0 / temp_f0) * 255.0f; - this->unk_2B4 = temp_f18; + this->alpha = temp_f18; this->actor.shape.unk_14 = temp_f18; } } @@ -656,7 +656,7 @@ void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { func_80AF37AC(); } else if (*unk_2C4 > kREG(4) + 50.0f) { this->actor.textId = 0x403E; - func_8010B680(globalCtx, this->actor.textId, 0); + func_8010B680(globalCtx, this->actor.textId, NULL); this->action = 17; } } @@ -810,7 +810,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); - gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 510b679b8b..82d0bee9bc 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -19,7 +19,7 @@ typedef struct EnRu2 { /* 0x02A8 */ s32 action; /* 0x02AC */ s32 drawConfig; /* 0x02B0 */ f32 unk_2B0; - /* 0x02B4 */ u32 unk_2B4; + /* 0x02B4 */ u32 alpha; /* 0x02B8 */ s32 unk_2B8; /* 0x02BC */ s32 unk_2BC; /* 0x02C0 */ u16 unk_2C0; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c index 39888924f8..5f17537404 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c @@ -1,9 +1,8 @@ #include "z_en_ru2.h" - #include +// clang-format off static CutsceneData D_80AF411C[] = { - // clang-format off CS_BEGIN_CUTSCENE(35, 3338), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), @@ -221,6 +220,5 @@ static CutsceneData D_80AF411C[] = { CS_FADE_BGM_LIST(1), CS_FADE_BGM(0x0004, 800, 850, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030), CS_END(), - CS_PAD(), - // clang-format on }; +// clang-format on diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 7e7f22c957..fb4dfa9704 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -137,10 +137,10 @@ void EnSb_SetupWaitOpen(EnSb* this) { } void EnSb_SetupLunge(EnSb* this) { - f32 frames = SkelAnime_GetFrameCount(&D_06000124.genericHeader); + f32 frameCount = SkelAnime_GetFrameCount(&D_06000124.genericHeader); f32 playbackSpeed = this->actor.waterY > 0.0f ? 1.0f : 0.0f; - SkelAnime_ChangeAnim(&this->skelAnime, &D_06000124, playbackSpeed, 0.0f, frames, 2, 0); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000124, playbackSpeed, 0.0f, frameCount, 2, 0); this->behavior = SHELLBLADE_LUNGE; this->actionFunc = EnSb_Lunge; Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHELL_MOUTH); diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 1ce48b8ee6..3d556dfcdc 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -1,3 +1,9 @@ +/* + * File: z_en_si.c + * Overlay: En_Si + * Description: + */ + #include "z_en_si.h" #define FLAGS 0x00000201 @@ -8,12 +14,22 @@ void EnSi_Init(Actor* thisx, GlobalContext* globalCtx); void EnSi_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnSi_Update(Actor* thisx, GlobalContext* globalCtx); void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx); + s32 func_80AFB748(EnSi* this, GlobalContext* globalCtx); void func_80AFB768(EnSi* this, GlobalContext* globalCtx); void func_80AFB89C(EnSi* this, GlobalContext* globalCtx); void func_80AFB950(EnSi* this, GlobalContext* globalCtx); -/* +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x3D, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000090, 0x00, 0x00 }, 0x00, 0x05, 0x01 }, + { 20, 18, 2, { 0, 0, 0 } }, +}; + +static CollisionCheckInfoInit2 D_80AFBADC = { + 0x00, 0x0000, 0x0000, 0x0000, 0xFF, +}; + const ActorInit En_Si_InitVars = { ACTOR_EN_SI, ACTORTYPE_ITEMACTION, @@ -25,19 +41,108 @@ const ActorInit En_Si_InitVars = { (ActorFunc)EnSi_Update, (ActorFunc)EnSi_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s") +void EnSi_Init(Actor* thisx, GlobalContext* globalCtx) { + EnSi* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB748.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + func_80061EFC(&this->actor.colChkInfo, NULL, &D_80AFBADC); + Actor_SetScale(&this->actor, 0.025f); + this->unk_19C = 0; + this->actionFunc = func_80AFB768; + this->actor.shape.unk_08 = 42.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s") +void EnSi_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnSi* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB89C.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB950.s") +s32 func_80AFB748(EnSi* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 0x2) { + this->collider.base.acFlags &= ~0x2; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s") +void func_80AFB768(EnSi* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s") + if ((this->actor.flags & 0x2000) == 0x2000) { + this->actionFunc = func_80AFB89C; + } else { + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); + Actor_SetScale(&this->actor, this->actor.scale.x); + this->actor.shape.rot.y += 0x400; + + if (func_8008E988(globalCtx) == 0) { + func_80AFB748(this, globalCtx); + + if (this->collider.base.maskB & 0x1) { + this->collider.base.maskB &= ~0x1; + Item_Give(globalCtx, ITEM_SKULL_TOKEN); + player->actor.freezeTimer = 10; + func_8010B680(globalCtx, 0xB4, 0); + func_800F5C64(0x39); + this->actionFunc = func_80AFB950; + } else { + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + } + } +} + +void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.25f, 0.4f, 1.0f, 0.0f); + Actor_SetScale(&this->actor, this->actor.scale.x); + this->actor.shape.rot.y += 0x400; + + if ((this->actor.flags & 0x2000) != 0x2000) { + Item_Give(globalCtx, ITEM_SKULL_TOKEN); + player->actor.freezeTimer = 10; + func_8010B680(globalCtx, 0xB4, 0); + func_800F5C64(0x39); + this->actionFunc = func_80AFB950; + } +} + +void func_80AFB950(EnSi* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 temp; + s16 params; + + if (func_8010BDBC(&globalCtx->msgCtx) != 2) { + player->actor.freezeTimer = 10; + } else { + params = this->actor.params; + temp = (params & 0x1F00) >> 8; + gSaveContext.gsFlags[temp >> 2] |= (params & 0xFF) << D_8012724C[temp & 3]; + + Actor_Kill(&this->actor); + } +} + +void EnSi_Update(Actor* thisx, GlobalContext* globalCtx) { + EnSi* this = THIS; + + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + this->actionFunc(this, globalCtx); + Actor_SetHeight(&this->actor, 16.0f); +} + +void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnSi* this = THIS; + + if (this->actionFunc != func_80AFB950) { + func_8002ED80(&this->actor, globalCtx, 0); + func_8002EBCC(&this->actor, globalCtx, 0); + func_800694A0(globalCtx, 0x74); + } +} diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index 6116f26aa4..3273c906b8 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -11,7 +11,8 @@ typedef void (*EnSiActionFunc)(struct EnSi*, GlobalContext*); typedef struct EnSi { /* 0x0000 */ Actor actor; /* 0x014C */ EnSiActionFunc actionFunc; - /* 0x0150 */ char unk_150[0x50]; + /* 0x0150 */ ColliderCylinder collider; + /* 0x019C */ u8 unk_19C; } EnSi; // size = 0x01A0 extern const ActorInit En_Si_InitVars; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index cff40b3036..75b804ebef 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -133,12 +133,12 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { if (gfxSetup == 0) { gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BC90); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 60, 20, 0); gfxSetup = 1; } alpha = eff->timeLeft * (255.f / eff->timeTotal); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xAA, 0x82, 0x5A, alpha); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 170, 130, 90, alpha); gDPPipeSync(gfxCtx->polyXlu.p++); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); @@ -661,7 +661,7 @@ void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { if (func_800A56C8(&this->skelAnim, this->skelAnim.animFrameCount) != 0) { if (this->currentReward < 0) { /* "Nope, nothing here!" */ - func_8010B680(globalCtx, 0x501A, 0); + func_8010B680(globalCtx, 0x501A, NULL); } else { func_80106CCC(globalCtx); } diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index a7dbe4c3d3..2de31e469d 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -210,7 +210,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { if (this->collider.base.at == &player->actor) { EnTuboTrap_SpawnFragments(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); - Audio_PlaySoundAtPosition(globalCtx, &player->actor.posRot.pos, 40, 0x83E); + Audio_PlaySoundAtPosition(globalCtx, &player->actor.posRot.pos, 40, NA_SE_PL_BODY_HIT); EnTuboTrap_DropCollectible(this, globalCtx); Actor_Kill(&this->actor); return; @@ -271,7 +271,7 @@ void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx) { f32 dy = this->originPos.y - this->actor.posRot.pos.y; f32 dz = this->originPos.z - this->actor.posRot.pos.z; - Audio_PlayActorSound2(&this->actor, 0x3037); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_TUBOOCK_FLY - SFX_FLAG); if (240.0f < sqrtf(SQ(dx) + SQ(dy) + SQ(dz))) { Math_SmoothScaleMaxF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 8f48376c2a..337dcf3b33 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -17,7 +17,7 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Vb_Ball_InitVars = { - ACTOR_PLAYER, + 0, ACTORTYPE_BOSS, FLAGS, OBJECT_FD, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 5d2f05b924..bc871a32ed 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -141,7 +141,7 @@ void EnWallmas_SetupDrop(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; AnimationHeader* objSegChangeAnime = &D_0600299C; - SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 0.0f, 20.0f, (f32)SkelAnime_GetFrameCount(&D_0600299C), 2, + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 0.0f, 20.0f, SkelAnime_GetFrameCount(&D_0600299C), 2, 0.0f); this->unk_2c4 = player->actor.posRot.pos.y; @@ -188,8 +188,8 @@ void EnWallmas_SetupReturnToCeiling(EnWallmas* this) { this->timer = 0; this->actor.speedXZ = 0.0f; - SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 3.0f, 0.0f, - (f32)SkelAnime_GetFrameCount(objSegFrameCount), 2, -3.0f); + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 3.0f, 0.0f, SkelAnime_GetFrameCount(objSegFrameCount), 2, + -3.0f); this->actionFunc = EnWallmas_ReturnToCeiling; } @@ -539,7 +539,7 @@ void EnWallmas_Update(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); if ((this->actionFunc != EnWallmas_TakeDamage) && (this->actor.bgCheckFlags & 1) != 0 && - (this->actor.freeze == 0)) { + (this->actor.freezeTimer == 0)) { CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); } } @@ -569,7 +569,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { // clang-format on func_80094044(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0x00, 0x00, 0x00, 0xFF); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, 255); func_80038A28(this->actor.floorPoly, this->actor.posRot.pos.x, this->actor.groundY, this->actor.posRot.pos.z, &mf); Matrix_Mult(&mf, MTXMODE_NEW); diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index ccc8818535..9db3499921 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -24,7 +24,7 @@ void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx); void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx); void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx); -#include "z_en_zl1_cutscene_data.c" +#include "z_en_zl1_cutscene_data.c" EARLY const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, @@ -183,7 +183,7 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { globalCtx->envCtx.unk_E1 = 1; func_800C04D8(globalCtx, this->unk_1E8, &vec1, &vec2); func_800C0704(globalCtx, this->unk_1E8, 30.0f); - func_800B3840(0x20); + ShrinkWindow_SetVal(0x20); Interface_ChangeAlpha(2); player->actor.posRot.pos = playerPos; player->actor.speedXZ = 0.0f; @@ -229,7 +229,7 @@ void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { animationHeader = &D_06011348; sp3C = 1; this->actor.textId = 0x702E; - func_8010B680(globalCtx, this->actor.textId, 0); + func_8010B680(globalCtx, this->actor.textId, NULL); this->unk_1E2 += 1; break; } @@ -420,9 +420,9 @@ void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, 0, 0.0f); func_8002DF54(globalCtx, &this->actor, 1); - func_8002F7DC(&player->actor, 0x6836); + func_8002F7DC(&player->actor, NA_SE_VO_LI_SURPRISE_KID); this->actor.textId = 0x7039; - func_8010B680(globalCtx, this->actor.textId, 0); + func_8010B680(globalCtx, this->actor.textId, NULL); this->unk_1E2 = 0; this->actionFunc = func_80B4BF2C; } diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index 8af79752a7..1b7e1be53a 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -1,158 +1,292 @@ #include "z_en_zl1.h" +#include +// clang-format off CutsceneData D_80B4C5D0[] = { - 0x0000001C, 0x00000BB8, 0x0000000A, 0x00000003, 0x00050190, 0x04BB0000, 0xC0000000, 0xFFFFFE5A, 0x00000054, - 0x00000001, 0xFFFFFE5A, 0x00000054, 0x00000001, 0x0F6484E4, 0x00000000, 0x00000001, 0x000104BB, 0x04D90000, - 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, - 0x00000001, 0x002904D9, 0x051F0000, 0xC0000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0xFFFFFE1D, 0x00000054, - 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x00000012, 0x00000001, 0x00070492, 0x05247477, 0x00000000, - 0xFFFFFE1B, 0x00000054, 0x00000000, 0xFFFFFE2B, 0x00000055, 0xFFFFFFC9, 0x3DE07038, 0x3BE07038, 0xBDE07038, - 0x00000049, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, - 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000003, 0x000904C4, 0x051E8000, - 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000096, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x000A051E, 0x05A90000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000405A9, 0x05B10000, 0x00000000, 0xFFFFFC86, 0x0000005A, - 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, - 0x000C05B4, 0x05B50000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x0002014A, 0x02FB0000, 0x00000000, 0xFFFFFB1E, - 0x00000096, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, - 0x00000001, 0x000100C8, 0x00E700E7, 0x0000002D, 0x00000001, 0x000500E6, 0x010F010F, 0x0000002D, 0x00000001, - 0x0001035C, 0x03660366, 0x0000002D, 0x00000001, 0x0005036B, 0x03840384, 0x00000001, 0x00010000, 0x014B0000, - 0x00000000, 0x42733334, 0xFE410080, 0x00012031, 0x00000000, 0x42733334, 0xFE410080, 0x00013533, 0x00000000, - 0x42733334, 0xFE410080, 0x00013833, 0x00000000, 0x42733334, 0xFE410080, 0x00012C20, 0x00000000, 0x42733334, - 0xFE780091, 0x00012032, 0x00000000, 0x42733334, 0xFEC200A8, 0x00013533, 0x00000000, 0x42733334, 0xFF2200C6, - 0x00013639, 0x00000000, 0x42733334, 0xFF6E00DD, 0x0001392C, 0x00000000, 0x42733334, 0xFF7C00DE, 0x00012032, - 0x00000000, 0x42733334, 0xFFBE010B, 0x00013632, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013639, 0x00000000, - 0x42733334, 0xFFBE010B, 0x0001392C, 0x00000000, 0x42733334, 0xFFBE010B, 0x00012031, 0x00000000, 0x42733334, - 0xFFBE010B, 0x00013533, 0xFF000000, 0x42733334, 0xFFBE010B, 0x00013336, 0x00000001, 0x000100E6, 0x065F0000, - 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182031, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, - 0x42700000, 0xFB3C01BD, 0x00183833, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182C20, 0x00000000, 0x42700000, - 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, - 0x00183639, 0x00000000, 0x42700000, 0xFB3C01BD, 0x0018392C, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, - 0x00000000, 0x42700000, 0xFB3C0103, 0x00183632, 0x00000000, 0x42700000, 0xFB3C00BD, 0x00183639, 0x00000000, - 0x42700000, 0xFB9100C6, 0x0051392C, 0x00000000, 0x42700000, 0xFB940077, 0x00542031, 0x00000000, 0x42726667, - 0xFB510089, 0x00243533, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, - 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163231, - 0x00000000, 0x42726667, 0xFB3E007F, 0x00163232, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016392C, 0x00000000, - 0x42726667, 0xFB3E007F, 0x00162034, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163331, 0x00000000, 0x42726667, - 0xFB3E007F, 0x00163434, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016312C, 0x00000000, 0x42726667, 0xFB3E007F, - 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, - 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016200A, 0x00000000, - 0x42726667, 0xFB3E007F, 0x00163136, 0xFF000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000001, 0x0001032A, - 0x04110000, 0x00000000, 0x42726668, 0xFB3E007F, 0x00162031, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163533, - 0x00000000, 0x42726668, 0xFB3E007F, 0x00163833, 0x00000000, 0x42726668, 0xFB3E0058, 0x00152C20, 0x00000000, - 0x42726668, 0xFB48FFCC, 0x00172032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3533, 0x00000000, 0x42726668, - 0xFB4FFF8E, 0x001A3639, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A392C, 0x00000000, 0x42726668, 0xFB4FFF8E, - 0x001A2032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3632, 0xFF000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, - 0x00000001, 0x00010366, 0x04ED0000, 0x00000000, 0x42A08C84, 0xFFC500A0, 0x01402031, 0x00000000, 0x42704C78, - 0xFFC500A0, 0x01403533, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403833, 0x00000000, 0x42704C78, 0xFFC500A0, - 0x01402C20, 0x00000000, 0x42704C78, 0xFF8D0094, 0x00F92032, 0x00000000, 0x42704C78, 0xFF42007E, 0x00C03533, - 0x00000000, 0x42704C78, 0xFEE20069, 0x00873639, 0x00000000, 0x42704C78, 0xFE9B006C, 0x0057392C, 0x00000000, - 0x42704C78, 0xFE760068, 0x00352032, 0x00000000, 0x42704C78, 0xFE760068, 0x00353632, 0x00000000, 0x42704C78, - 0xFE760068, 0x00353639, 0x00000000, 0x42704C78, 0xFE760068, 0x0035392C, 0x00000000, 0x42704C78, 0xFE760068, - 0x00352031, 0xFF000000, 0x42704C78, 0xFE760068, 0x00353533, 0x00000001, 0x00010488, 0x05790000, 0x00000000, - 0x42700000, 0xFE3500AF, 0x00502031, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, - 0xFE3500AF, 0x00503833, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502C20, 0x00000000, 0x42700000, 0xFE3500AF, - 0x00502032, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503639, - 0x00000000, 0x42700000, 0xFE3500AF, 0x0050392C, 0xFF000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000001, - 0x000104EC, 0x05830000, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002031, 0x00000000, 0x4234CCBE, 0xFE330085, - 0x00003533, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003833, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002C20, - 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002032, 0xFF000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000001, - 0x00010528, 0x05FB0000, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2031, 0x00000000, 0x412FFF56, 0xFE18007C, - 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3833, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2C20, - 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2032, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, - 0x412FFF56, 0xFE18007C, 0xFFFA3639, 0xFF000000, 0x412FFF56, 0xFE18007C, 0xFFFA392C, 0x00000002, 0x00010000, - 0x01680000, 0x0000001E, 0x42726667, 0xFE06006E, 0x00012031, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013533, - 0x0000001E, 0x42733334, 0xFE06006E, 0x00013833, 0x0000001E, 0x42733334, 0xFE06006E, 0x00012C20, 0x00000019, - 0x42733334, 0xFE3D007F, 0x00012032, 0x00000019, 0x42733334, 0xFE840095, 0x00013533, 0x00000014, 0x42733334, - 0xFEDD00B1, 0x00013639, 0x00000014, 0x42733334, 0xFF2000D2, 0x0001392C, 0x00000014, 0x42733334, 0xFF2B00E6, - 0x00012032, 0x00000014, 0x42733334, 0xFF710123, 0x00013632, 0x00000014, 0x42733334, 0xFF790134, 0x00013639, - 0x00000014, 0x42733334, 0xFF81013F, 0x0001392C, 0x00000014, 0x42733334, 0xFF880146, 0x00012031, 0x00000014, - 0x42733334, 0xFF880146, 0x00013533, 0xFF00001E, 0x42733334, 0xFF880146, 0x00013336, 0x00000002, 0x000100E6, - 0x06AE0000, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052031, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, - 0x0000001E, 0x42700000, 0xFB22019D, 0x00053833, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052C20, 0x0000001E, - 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, - 0xFB22019D, 0x00053639, 0x0000001E, 0x42700000, 0xFB22019D, 0x0005392C, 0x0000001E, 0x42700000, 0xFB22019D, - 0x00052032, 0x0000001E, 0x42700000, 0xFB2300E3, 0x00053632, 0x0000001E, 0x42700000, 0xFB23009E, 0x00053639, - 0x0000001E, 0x42700000, 0xFB6400B2, 0x0032392C, 0x00000050, 0x42700000, 0xFB660083, 0x00332031, 0x00000050, - 0x42726667, 0xFB280092, 0x00063533, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3336, 0x0000001E, 0x42726667, - 0xFB1B0099, 0xFFFD332C, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD2032, 0x0000001E, 0x42726667, 0xFB1B0099, - 0xFFFD3231, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3232, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE392C, - 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE2034, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3331, 0x00000050, - 0x42726667, 0xFB1C0098, 0xFFFE3434, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE312C, 0x00000050, 0x42726667, - 0xFB1D0097, 0xFFFF2032, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0x00000050, 0x42726667, 0xFB1D0097, - 0xFFFF3336, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF332C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF200A, - 0x0000001E, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0xFF000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000002, - 0x0001032A, 0x042E0000, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF2031, 0x0000001E, 0x42726668, 0xFB1D0097, - 0xFFFF3533, 0x00000014, 0x42726668, 0xFB1E0096, 0x00003833, 0x0000000A, 0x42726668, 0xFB27007D, 0x00052C20, - 0x0000000A, 0x42726668, 0xFB36FFF3, 0x000A2032, 0x0000000A, 0x42726668, 0xFB3EFFB7, 0x001A3533, 0x0000001E, - 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A392C, 0x0000001E, 0x42726668, - 0xFB3EFFB7, 0x001A2032, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3632, 0xFF00001E, 0x42726668, 0xFB3EFFB7, - 0x001A3639, 0x00000002, 0x00010366, 0x050A0000, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F12031, 0x0000001E, - 0x42704C78, 0xFFD300F0, 0x00F13533, 0x0000001E, 0x42704C78, 0xFFC800DB, 0x00E03833, 0x0000001E, 0x42704C78, - 0xFFAB00B7, 0x00D42C20, 0x0000001E, 0x42704C78, 0xFF340086, 0x00B72032, 0x0000001E, 0x42704C78, 0xFEE80074, - 0x007D3533, 0x0000001E, 0x42704C78, 0xFE880068, 0x00453639, 0x0000001E, 0x42704C78, 0xFE48006B, 0x000D392C, - 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72032, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73632, 0x0000001E, - 0x42704C78, 0xFE2D006E, 0xFFE73639, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE7392C, 0x0000001E, 0x42704C78, - 0xFE2D006E, 0xFFE72031, 0xFF00001E, 0x42704C78, 0xFE2D006E, 0xFFE73533, 0x00000002, 0x00010488, 0x05960000, - 0x0000001E, 0x42700000, 0xFE38008A, 0x00102031, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, - 0x42700000, 0xFE38008A, 0x00103833, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102C20, 0x0000001E, 0x42700000, - 0xFE38008A, 0x00102032, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, - 0x00103639, 0x0000001E, 0x42700000, 0xFE38008A, 0x0010392C, 0xFF00001E, 0x42700000, 0xFE38008A, 0x00102032, - 0x00000002, 0x000104EC, 0x05A00000, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002031, 0x0000001E, 0x4234CCBE, - 0xFDE90085, 0x00003533, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003833, 0x0000001E, 0x4234CCBE, 0xFDE90085, - 0x00002C20, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002032, 0xFF00001E, 0x4234CCBE, 0xFDE90085, 0x00003533, - 0x00000002, 0x00010528, 0x06180000, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2031, 0x0000001E, 0x412FFF56, - 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3833, 0x0000001E, 0x412FFF56, 0xFABB007C, - 0xFFFA2C20, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2032, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, - 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3639, 0xFF00001E, 0x412FFF56, 0xFABB007C, 0xFFFA392C, 0x00000013, - 0x0000000A, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70350032, 0x00BE0000, 0xFFFFFFFF, 0xFFFF00BE, 0x012CFFFF, - 0xFFFFFFFF, 0x7036012C, 0x03200000, 0xFFFFFFFF, 0xFFFF0320, 0x03CAFFFF, 0xFFFFFFFF, 0x703703CA, 0x047E0000, - 0xFFFF7038, 0xFFFF047E, 0x04A6FFFF, 0xFFFFFFFF, 0x700504A6, 0x04B00000, 0xFFFF700B, 0xFFFF04B0, 0x053CFFFF, - 0xFFFFFFFF, 0x7009053C, 0x058C0000, 0xFFFFFFFF, 0x00000056, 0x00000001, 0x004E00E6, 0x00E70000, 0x00000000, - 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000056, 0x00000001, 0x002A0366, 0x03670000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, - 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000001, 0x0001006E, 0x006F0000, - 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001, 0x00000000, 0x00000000, - 0x00000000, 0xFFFFFFFF, 0x00000000, 0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, - 0x0000002D, 0xC3F20000, 0x42F40000, 0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, - 0x43080000, 0xC2900000, 0xC3C98000, 0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, - 0xC3D90000, 0x42F20000, 0x00000000, 0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, - 0xC2140000, 0x00000014, 0xC3E30000, 0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, - 0xC3FA8000, 0x42F40000, 0x00000000, 0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, - 0x00000000, 0xC3D18000, 0x42FA0000, 0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, - 0x42E60000, 0x41600000, 0x00000014, 0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, - 0x00000028, 0xC4034000, 0x42FC0000, 0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, - 0x42F00000, 0xC0E00000, 0xC3FE8000, 0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, - 0xC3F20000, 0x42F00000, 0x41200000, 0x0000002D, + CS_BEGIN_CUTSCENE(28, 3000), + CS_PLAYER_ACTION_LIST(3), + CS_PLAYER_ACTION(0x0005, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, 1.1266861702801002e-29f, 0.0f, 1.401298464324817e-45f), + CS_PLAYER_ACTION(0x0001, 1211, 1241, 0x0000, 0xC000, 0x0000, -422, 84, 1, -483, 84, 0, 1.1266861702801002e-29f, 0.0f, 1.401298464324817e-45f), + CS_PLAYER_ACTION(0x0029, 1241, 1311, 0x0000, 0xC000, 0x0000, -483, 84, 0, -483, 84, 0, 1.1266861702801002e-29f, 0.0f, 1.401298464324817e-45f), + CS_NPC_ACTION_LIST(18, 1), + CS_NPC_ACTION(0x0007, 1170, 1316, 0x7477, 0x0000, 0x0000, -485, 84, 0, -469, 85, -55, 0.10958904027938843f, 0.006849315017461777f, -0.10958904027938843f), + CS_UNK_DATA_LIST(0x00000049, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(16, 3), + CS_NPC_ACTION(0x0009, 1220, 1310, 0x8000, 0x0000, 0x0000, -890, 90, 150, -890, 90, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x000A, 1310, 1449, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 1449, 1457, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, 0.0f, 0.0f, 0.0f), + CS_MISC_LIST(1), + CS_MISC(0x000C, 1460, 1461, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(29, 1), + CS_NPC_ACTION(0x0002, 330, 763, 0x0000, 0x0000, 0x0000, -1250, 150, 0, -1250, 150, 0, 0.0f, 0.0f, 0.0f), + CS_SCENE_TRANS_FX(0x0001, 200, 231), + CS_SCENE_TRANS_FX(0x0005, 230, 271), + CS_SCENE_TRANS_FX(0x0001, 860, 870), + CS_SCENE_TRANS_FX(0x0005, 875, 900), + CS_CAM_POS_LIST(0, 331), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -447, 128, 1, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -447, 128, 1, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -447, 128, 1, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -447, 128, 1, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -392, 145, 1, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -318, 168, 1, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -222, 198, 1, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -146, 221, 1, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -132, 222, 1, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x3632), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x3533), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.80000305175781f, -66, 267, 1, 0x3336), + CS_CAM_POS_LIST(230, 1631), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 445, 24, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 259, 24, 0x3632), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1220, 189, 24, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1135, 198, 81, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -1132, 119, 84, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1199, 137, 36, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3336), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x332C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3231), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3232), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x2034), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3331), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3434), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x312C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3136), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3336), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x332C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x200A), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3136), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.60000228881836f, -1218, 127, 22, 0x3336), + CS_CAM_POS_LIST(810, 1041), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1218, 127, 22, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1218, 127, 22, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1218, 127, 22, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1218, 88, 21, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1208, -52, 23, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x3632), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.600006103515625f, -1201, -114, 26, 0x3639), + CS_CAM_POS_LIST(870, 1261), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 80.27444458007812f, -59, 160, 320, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -59, 160, 320, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -59, 160, 320, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -59, 160, 320, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -115, 148, 249, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -190, 126, 192, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -286, 105, 135, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -357, 108, 87, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x3632), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x392C), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x2031), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.074676513671875f, -394, 104, 53, 0x3533), + CS_CAM_POS_LIST(1160, 1401), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x3639), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -459, 175, 80, 0x392C), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -459, 175, 80, 0x2032), + CS_CAM_POS_LIST(1260, 1411), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x2032), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.19994354248047f, -461, 133, 0, 0x3533), + CS_CAM_POS_LIST(1320, 1531), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x2031), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x3833), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x2C20), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x2032), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x3533), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x3639), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 10.999837875366211f, -488, 124, -6, 0x392C), + CS_CAM_FOCUS_POINT_LIST(0, 360), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -506, 110, 1, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -506, 110, 1, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -506, 110, 1, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.80000305175781f, -506, 110, 1, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.80000305175781f, -451, 127, 1, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 25, 60.80000305175781f, -380, 149, 1, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -291, 177, 1, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -224, 210, 1, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -213, 230, 1, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -143, 291, 1, 0x3632), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -135, 308, 1, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -127, 319, 1, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -120, 326, 1, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.80000305175781f, -120, 326, 1, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.80000305175781f, -120, 326, 1, 0x3336), + CS_CAM_FOCUS_POINT_LIST(230, 1710), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1246, 413, 5, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1245, 227, 5, 0x3632), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1245, 158, 5, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -1180, 178, 50, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.0f, -1178, 131, 51, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1240, 146, 6, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1253, 153, -3, 0x3336), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1253, 153, -3, 0x332C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1253, 153, -3, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1253, 153, -3, 0x3231), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1253, 153, -3, 0x3232), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1252, 152, -2, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1252, 152, -2, 0x2034), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1252, 152, -2, 0x3331), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1252, 152, -2, 0x3434), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1252, 152, -2, 0x312C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x3136), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x3336), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x332C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x200A), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.60000228881836f, -1251, 151, -1, 0x3136), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 80, 60.60000228881836f, -1251, 151, -1, 0x3336), + CS_CAM_FOCUS_POINT_LIST(810, 1070), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1251, 151, -1, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1251, 151, -1, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 60.600006103515625f, -1250, 150, 0, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.600006103515625f, -1241, 125, 5, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.600006103515625f, -1226, -13, 10, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 60.600006103515625f, -1218, -73, 26, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1218, -73, 26, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1218, -73, 26, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1218, -73, 26, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.600006103515625f, -1218, -73, 26, 0x3632), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.600006103515625f, -1218, -73, 26, 0x3639), + CS_CAM_FOCUS_POINT_LIST(870, 1290), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -45, 240, 241, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -45, 240, 241, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -56, 219, 224, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -85, 183, 212, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -204, 134, 183, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -280, 116, 125, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -376, 104, 69, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -440, 107, 13, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x3632), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.074676513671875f, -467, 110, -25, 0x3533), + CS_CAM_FOCUS_POINT_LIST(1160, 1430), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.0f, -456, 138, 16, 0x392C), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.0f, -456, 138, 16, 0x2032), + CS_CAM_FOCUS_POINT_LIST(1260, 1440), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.19994354248047f, -535, 133, 0, 0x3533), + CS_CAM_FOCUS_POINT_LIST(1320, 1560), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x2031), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x3833), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x2C20), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x2032), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x3533), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x3639), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 10.999837875366211f, -1349, 124, -6, 0x392C), + CS_TEXT_LIST(10), + CS_TEXT_NONE(0, 50), + CS_TEXT_DISPLAY_TEXTBOX(0x7035, 50, 190, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT_NONE(190, 300), + CS_TEXT_DISPLAY_TEXTBOX(0x7036, 300, 800, 0x0000, 0xFFFF, 0xFFFF), + CS_TEXT_NONE(800, 970), + CS_TEXT_DISPLAY_TEXTBOX(0x7037, 970, 1150, 0x0000, 0xFFFF, 0x7038), + CS_TEXT_NONE(1150, 1190), + CS_TEXT_DISPLAY_TEXTBOX(0x7005, 1190, 1200, 0x0000, 0xFFFF, 0x700B), + CS_TEXT_NONE(1200, 1340), + CS_TEXT_DISPLAY_TEXTBOX(0x7009, 1340, 1420, 0x0000, 0xFFFF, 0xFFFF), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x004E, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x002A, 870, 871, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD), + CS_STOP_BGM_LIST(1), + CS_STOP_BGM(0x0001, 110, 111, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001), + CS_END(), }; -CutsceneData D_80B4D72C[] = { +// clang-format on + +u32 D_80B4D5C0[] = { + 0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, 0x0000002D, 0xC3F20000, 0x42F40000, + 0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, 0x43080000, 0xC2900000, 0xC3C98000, + 0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D90000, 0x42F20000, 0x00000000, + 0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, 0xC2140000, 0x00000014, 0xC3E30000, + 0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, 0xC3FA8000, 0x42F40000, 0x00000000, + 0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, 0x00000000, 0xC3D18000, 0x42FA0000, + 0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, 0x42E60000, 0x41600000, 0x00000014, + 0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, 0x00000028, 0xC4034000, 0x42FC0000, + 0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, 0x42F00000, 0xC0E00000, 0xC3FE8000, + 0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, 0xC3F20000, 0x42F00000, 0x41200000, + 0x0000002D, +}; +u32 D_80B4D72C[] = { 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0xFF000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0xFF00001E, 0x42A19989, 0xFE3C0079, 0xFFEB0000, }; -CutsceneData D_80B4D7AC[] = { +u32 D_80B4D7AC[] = { 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000, 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000, }; -CutsceneData D_80B4D82C[] = { +u32 D_80B4D82C[] = { 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, 0x00000014, 0x424A667B, 0xFE4F0074, 0x00000000, 0x00000014, 0x425E6680, 0xFE510074, 0x00000000, 0x00000014, 0x4270001E, 0xFE550074, 0x00000000, 0x00000014, 0x4282000F, 0xFE580074, 0x00000000, 0x00000014, 0x428D999D, 0xFE5A0074, 0x00000000, 0x00000014, 0x4297332D, 0xFE5D0073, 0x00000000, 0xFF000014, 0x4297332D, 0xFE5D0074, 0x00000000, 0xFF00001E, 0x4297332D, 0xFE5D0073, 0x00000000, }; -CutsceneData D_80B4D8CC[] = { +u32 D_80B4D8CC[] = { 0x00000000, 0x427199B8, 0xFE200072, 0x00000000, 0x00000000, 0x4234CCDC, 0xFE200072, 0x00000000, 0x00000000, 0x4234CCDC, 0xFE260072, 0x00000000, 0x00000000, 0x424A667B, 0xFE280072, 0x00000000, 0x00000000, 0x425E6680, 0xFE2C0072, 0x00000000, 0x00000000, 0x4270001E, 0xFE2F0072, 0x00000000, 0x00000000, 0x4282000F, 0xFE310072, 0x00000000, 0x00000000, 0x428D999D, 0xFE340072, 0x00000000, 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000, 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000, }; -CutsceneData D_80B4D96C[] = { +u32 D_80B4D96C[] = { 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, 0x00000019, 0x4270001E, 0xFF8A0032, 0x01D30000, 0x00000019, 0x4270001E, 0xFF880032, 0x01D10000, 0x00000019, 0x4270001E, 0xFF850032, 0x01D00000, 0x00000019, 0x4270001E, 0xFF820032, 0x01CF0000, @@ -161,7 +295,7 @@ CutsceneData D_80B4D96C[] = { 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000, 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000, }; -CutsceneData D_80B4DA4C[] = { +u32 D_80B4DA4C[] = { 0x00000000, 0x41A33320, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, @@ -170,19 +304,19 @@ CutsceneData D_80B4DA4C[] = { 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000, }; -CutsceneData D_80B4DB2C[] = { +u32 D_80B4DB2C[] = { 0x0000001E, 0x41A66654, 0xFE550074, 0x00040000, 0x0000001E, 0x41A66654, 0xFE560073, 0x00040000, 0x0000001E, 0x41A66654, 0xFE530073, 0x00070000, 0x0000001E, 0x41A66654, 0xFE540072, 0x000C0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000, }; -CutsceneData D_80B4DBBC[] = { +u32 D_80B4DBBC[] = { 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000, }; -CutsceneData D_80B4DC4C[] = { +u32 D_80B4DC4C[] = { 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42373343, 0xFE29007A, 0x00000000, 0x0000000F, 0x42373343, 0xFE75008B, 0x00000000, 0x0000000F, 0x42373343, 0xFF3F00B7, @@ -191,7 +325,7 @@ CutsceneData D_80B4DC4C[] = { 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, 0x01AD0148, 0x00000000, }; -CutsceneData D_80B4DD3C[] = { +u32 D_80B4DD3C[] = { 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42373343, 0xFE5C0085, 0x00000000, 0x00000000, 0x42373343, 0xFEA80096, 0x00000000, 0x00000000, 0x42373343, 0xFF7100C2, @@ -200,7 +334,7 @@ CutsceneData D_80B4DD3C[] = { 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, 0x01E2014C, 0x00000000, }; -CutsceneData D_80B4DE2C[] = { +u32 D_80B4DE2C[] = { 0x00000019, 0x42726685, 0x00420194, 0x01A90000, 0x00000019, 0x427199B8, 0x00420194, 0x01A90000, 0x00000019, 0x425E6680, 0x00420194, 0x01AA0000, 0x00000019, 0x425CCCE6, 0x003F0175, 0x019D0000, 0x00000019, 0x424999AE, 0x001A0161, 0x01980000, 0x00000019, 0x424999AE, 0x00110145, 0x018D0000, @@ -209,7 +343,7 @@ CutsceneData D_80B4DE2C[] = { 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000, 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000, }; -CutsceneData D_80B4DF0C[] = { +u32 D_80B4DF0C[] = { 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x0031015B, 0x01A80000, @@ -218,63 +352,63 @@ CutsceneData D_80B4DF0C[] = { 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000, }; -CutsceneData D_80B4DFEC[] = { +u32 D_80B4DFEC[] = { 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE32007E, 0x00000000, 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000, 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000, }; -CutsceneData D_80B4E08C[] = { +u32 D_80B4E08C[] = { 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE59008E, 0x00000000, 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000, }; -CutsceneData D_80B4E12C[] = { +u32 D_80B4E12C[] = { 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0076, 0xFFFB0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000, }; -CutsceneData D_80B4E1BC[] = { +u32 D_80B4E1BC[] = { 0x00000000, 0x4234CCDC, 0xFDB50073, 0x000E0000, 0x00000000, 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0xFF000000, 0x4270CD09, 0xFDF70074, 0x00000000, 0xFF000000, 0x4270CC08, 0xFDF70074, 0x00000000, }; -CutsceneData D_80B4E24C[] = { +u32 D_80B4E24C[] = { 0x0000001E, 0x4270001E, 0x004B0034, 0x00320000, 0x0000001E, 0x4270001E, 0x004B0034, 0x00300000, 0x0000003C, 0x4270001E, 0x004A0034, 0x002D0000, 0x0000003C, 0x4270001E, 0x00310033, 0xFFD50000, 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000, 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000, }; -CutsceneData D_80B4E2CC[] = { +u32 D_80B4E2CC[] = { 0x00000000, 0x4270001E, 0x005A0034, 0x00350000, 0x00000000, 0x4270001E, 0x005A0034, 0x00320000, 0x00000000, 0x4270001E, 0x005A0034, 0x002D0000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000, 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000, }; -CutsceneData D_80B4E34C[] = { +u32 D_80B4E34C[] = { 0x0000001F, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, }; -CutsceneData D_80B4E3CC[] = { +u32 D_80B4E3CC[] = { 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, }; -CutsceneData D_80B4E44C[] = { +u32 D_80B4E44C[] = { 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000, 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000, }; -CutsceneData D_80B4E4CC[] = { +u32 D_80B4E4CC[] = { 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0xFF000000, 0x41A66654, 0xFDDB007C, diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 6e3375bd66..66441d956e 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -5,6 +5,9 @@ */ #include "z_en_zl2.h" +#include + +#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #define FLAGS 0x00000010 @@ -15,7 +18,78 @@ void EnZl2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnZl2_Update(Actor* thisx, GlobalContext* globalCtx); void EnZl2_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx); + +void func_80B50BBC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50C40(EnZl2* this, GlobalContext* globalCtx); +void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx); +void func_80B50D50(EnZl2* this, GlobalContext* globalCtx); +void func_80B50D94(EnZl2* this, GlobalContext* globalCtx); +void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx); +void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx); +void func_80B50E90(EnZl2* this, GlobalContext* globalCtx); +void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx); +void func_80B50F38(EnZl2* this, GlobalContext* globalCtx); +void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx); +void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51034(EnZl2* this, GlobalContext* globalCtx); +void func_80B51080(EnZl2* this, GlobalContext* globalCtx); +void func_80B510CC(EnZl2* this, GlobalContext* globalCtx); +void func_80B51118(EnZl2* this, GlobalContext* globalCtx); +void func_80B51164(EnZl2* this, GlobalContext* globalCtx); +void func_80B511B0(EnZl2* this, GlobalContext* globalCtx); +void func_80B511FC(EnZl2* this, GlobalContext* globalCtx); +void func_80B51250(EnZl2* this, GlobalContext* globalCtx); +void func_80B512B8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51310(EnZl2* this, GlobalContext* globalCtx); +void func_80B51A5C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx); +void func_80B51B44(EnZl2* this, GlobalContext* globalCtx); +void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx); +void func_80B51C64(EnZl2* this, GlobalContext* globalCtx); +void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx); +void func_80B52068(EnZl2* this, GlobalContext* globalCtx); +void func_80B52098(EnZl2* this, GlobalContext* globalCtx); +void func_80B52108(EnZl2* this, GlobalContext* globalCtx); +void func_80B521A0(EnZl2* this, GlobalContext* globalCtx); +void func_80B523BC(EnZl2* this, GlobalContext* globalCtx); +void func_80B523C8(EnZl2* this, GlobalContext* globalCtx); +void func_80B525D4(EnZl2* this, GlobalContext* globalCtx); + +UNK_TYPE D_80B52810[] = { + 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148, +}; + +UNK_TYPE D_80B52834[] = { + 0x06003508, + 0x06005548, + 0x06005948, +}; + +static EnZl2ActionFunc sActionFuncs[] = { + func_80B521A0, func_80B50BBC, func_80B50BEC, func_80B50C40, func_80B50CA8, func_80B50CFC, + func_80B50D50, func_80B50D94, func_80B50DE8, func_80B50E3C, func_80B50E90, func_80B50EE4, + func_80B50F38, func_80B50F8C, func_80B50FE8, func_80B51034, func_80B51080, func_80B510CC, + func_80B51118, func_80B51164, func_80B511B0, func_80B511FC, func_80B51250, func_80B512B8, + func_80B51310, func_80B51A5C, func_80B51A8C, func_80B51AE4, func_80B51B44, func_80B51BA8, + func_80B51C0C, func_80B51C64, func_80B51CA8, func_80B52068, func_80B52098, func_80B52108, +}; + +static EnZl2PreLimbDrawFunc sOverrideLimbDrawFuncs[] = { + func_80B4F45C, +}; + +static EnZl2DrawFunc sDrawFuncs[] = { + func_80B523BC, + func_80B523C8, + func_80B525D4, +}; + const ActorInit En_Zl2_InitVars = { ACTOR_EN_ZL2, ACTORTYPE_NPC, @@ -27,265 +101,1639 @@ const ActorInit En_Zl2_InitVars = { (ActorFunc)EnZl2_Update, (ActorFunc)EnZl2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4E9B0.s") +extern AnimationHeader D_0600325C; +extern AnimationHeader D_060003BC; +extern AnimationHeader D_06000A50; +extern AnimationHeader D_06000EB0; +extern AnimationHeader D_06001010; +extern AnimationHeader D_060013A0; +extern AnimationHeader D_06001670; +extern AnimationHeader D_06001B48; +extern AnimationHeader D_060022D0; +extern AnimationHeader D_06002750; +extern AnimationHeader D_06002B14; +extern AnimationHeader D_06002F30; +extern AnimationHeader D_06003538; +extern AnimationHeader D_06004900; +extern AnimationHeader D_06005F40; +extern AnimationHeader D_06006778; +extern AnimationHeader D_06007D0C; +extern AnimationHeader D_060087B8; +extern AnimationHeader D_060090D8; +extern AnimationHeader D_06009AD4; +extern AnimationHeader D_0600A15C; +extern AnimationHeader D_0600A79C; +extern AnimationHeader D_0600AAD4; +extern AnimationHeader D_0600AFE0; +extern AnimationHeader D_0600B224; +extern AnimationHeader D_0600B5FC; +extern Gfx D_0600BAE8[]; +extern SkeletonHeader D_06010D70; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EA40.s") +void EnZl2_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EAF4.s") + SkelAnime_Free(&this->skelAnime, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EBB8.s") +void func_80B4E9B0(EnZl2* this) { + s32 pad[4]; + s16* unk_194 = &this->unk_194; + s16* unk_192 = &this->unk_192; + s16* unk_190 = &this->unk_190; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EC48.s") + if (DECR(*unk_192) == 0) { + *unk_192 = Math_Rand_S16Offset(0x3C, 0x3C); + } + *unk_190 = *unk_192; + if (*unk_190 >= 3) { + *unk_190 = 0; + } + *unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ECE8.s") +void func_80B4EA40(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED04.s") + if (*unk_27C < 3.0f) { + *unk_190 = 0; + } else if (*unk_27C < 6.0f) { + *unk_190 = 1; + } else if (*unk_27C < 9.0f) { + *unk_190 = 2; + } else { + *unk_190 = 5; + this->unk_194 = *unk_190; + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED18.s") +void func_80B4EAF4(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED2C.s") + if (*unk_27C < 2.0f) { + *unk_190 = 5; + } else if (*unk_27C < 4.0f) { + *unk_190 = 2; + } else if (*unk_27C < 6.0f) { + *unk_190 = 1; + } else { + func_80B4E9B0(this); + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED74.s") +void func_80B4EBB8(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4ED94.s") + if (*unk_27C < 2.0f) { + *unk_190 = 0; + } else if (*unk_27C < 4.0f) { + *unk_190 = 1; + } else { + *unk_190 = 2; + this->unk_194 = *unk_190; + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EDB8.s") +void func_80B4EC48(EnZl2* this) { + s16* unk_190 = &this->unk_190; + f32* unk_27C = &this->unk_27C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EE38.s") + if (*unk_27C < 2.0f) { + *unk_190 = 2; + } else if (*unk_27C < 4.0f) { + *unk_190 = 1; + } else { + func_80B4E9B0(this); + return; + } + *unk_27C += 1.0f; + this->unk_194 = *unk_190; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4EF64.s") +void func_80B4ECE8(EnZl2* this, s16 arg1) { + this->unk_190 = arg1; + this->unk_194 = this->unk_190; +} +void func_80B4ED04(EnZl2* this, s16 arg1) { + this->unk_194 = arg1; +} + +void func_80B4ED18(EnZl2* this, s16 arg1) { + this->unk_198 = arg1; +} + +void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 EnZl2_FrameUpdateMatrix(EnZl2* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* EnZl2_GetNpcAction(GlobalContext* globalCtx, s32 idx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[idx]; + } + return NULL; +} + +void func_80B4EDB8(EnZl2* this, GlobalContext* globalCtx, s32 arg2) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, arg2); + + if (npcAction != NULL) { + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void func_80B4EE38(EnZl2* this, s16 arg1, s32 arg2) { + s32 phi_a3; + s32 temp_v1; + s32 phi_v0 = arg2; + + if (this->unk_24C != 0) { + temp_v1 = (s16)(arg1 + this->unk_1DC[phi_v0]); + phi_a3 = arg1 - this->unk_20C[phi_v0]; + phi_v0 = this->unk_1AC[phi_v0]; + + if ((s32)fabsf((f32)phi_a3) >= 0x8001) { + if (arg1 > 0) { + phi_a3 -= 0x10000; + } else { + phi_a3 += 0x10000; + } + } + if (phi_a3 != 0) { + phi_v0 += (phi_a3 - phi_v0) / 16; + } + if (phi_v0 != 0) { + phi_v0 -= (phi_v0 / 10); + } + if ((s16)(temp_v1 - arg1) != 0) { + phi_v0 -= ((s16)(temp_v1 - arg1) / 50); + } + temp_v1 += phi_v0; + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - arg1) >= -0x63) && + ((s16)(temp_v1 - arg1) < 0x64)) { + temp_v1 = arg1; + phi_v0 = 0; + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = temp_v1 - arg1; + } + this->unk_20C[arg2] = arg1; +} + +void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) { + s32 temp_t0 = arg2; + s32 temp_t2; + s32 temp_v1; + s32 phi_t1; + s32 phi_v0; + s32 phi_a0; + u32 zero; + f32 animCurrentFrame; + f32 unk_278; + + if (temp_t0 == 2) { + phi_a0 = 0x3A98; + phi_t1 = 0; + } else if (temp_t0 == 5) { + phi_a0 = 0x32C8; + phi_t1 = 3; + } else if (temp_t0 == 8) { + phi_a0 = 0x2EE0; + phi_t1 = 6; + } else if (temp_t0 == 11) { + phi_a0 = 0x4000; + phi_t1 = 9; + } else if (temp_t0 == 14) { + phi_a0 = 0x4000; + phi_t1 = 12; + } else if (temp_t0 == 17) { + phi_a0 = 0x4000; + phi_t1 = 15; + } else { + phi_a0 = 0x4000; + phi_t1 = 18; + } + + if (this->unk_24C != 0) { + phi_v0 = this->unk_1DC[temp_t0] + arg1; + temp_v1 = (s16)(phi_v0 & 0xFFFF); + temp_t2 = arg1 - this->unk_20C[temp_t0]; + phi_v0 = this->unk_1AC[temp_t0]; + + if ((s32)fabsf((f32)temp_t2) >= 0x8001) { + if (arg1 > 0) { + temp_t2 -= 0x10000; + } else { + temp_t2 += 0x10000; + } + } + if (phi_t1 >= 0) { + temp_t2 += (ABS(this->unk_1AC[phi_t1]) / 3); + } + if (temp_t2 != 0) { + phi_v0 += ((temp_t2 - phi_v0) / 16); + } + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + if ((s16)(temp_v1 - phi_a0) != 0) { + phi_v0 -= (s16)(temp_v1 - phi_a0) / 50; + } + temp_v1 += phi_v0; + + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - phi_a0) >= -0x63) && + ((s16)(temp_v1 - phi_a0) < 0x64)) { + temp_v1 = phi_a0; + phi_v0 = 0; + } + + zero = 0; + if (arg2 == 2) { + if ((this->action == 5) || (this->action == 30)) { + animCurrentFrame = this->skelAnime.animCurrentFrame; + unk_278 = this->unk_278; + temp_t0 = (s32)((3500.0f * animCurrentFrame) / unk_278) + phi_a0; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } else if ((this->action == 6) || (this->action == 31)) { + temp_t0 = phi_a0 + 0xDAC; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } else if (this->action == 20) { + temp_t0 = phi_a0 - 0x3E8; + if (temp_t0 >= temp_v1) { + if (phi_v0 < zero) { + phi_v0 += 1; + } + temp_v1 = temp_t0; + phi_v0 /= -2; + } + } + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = temp_v1 - arg1; + } + this->unk_20C[arg2] = arg1; +} + +#ifdef NON_MATCHING +// Some missing ABS instructions near the bottom of the section on lines 454-461 +void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { + s32 temp_v1; + s32 temp_t0; + s32 temp_t2; + s32 temp_t3; + s32 phi_v0; + s32 temp_1AC; + s32 index1AC; + s32 phi_t5; + + if (this->unk_24C != 0) { + temp_v1 = this->unk_1DC[arg2] - arg1; + temp_t0 = (s16)temp_v1; + temp_t2 = temp_t0; + temp_t3 = this->unk_1AC[arg2]; + phi_v0 = temp_t3; + temp_1AC = phi_v0; + temp_t3 = arg1 - this->unk_20C[arg2]; + + if (arg2 == 1) { + index1AC = 0; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 4) { + index1AC = 3; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 7) { + index1AC = 6; + phi_t5 = this->unk_1AC[index1AC]; + } else if (arg2 == 10) { + index1AC = 9; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else if (arg2 == 13) { + index1AC = 12; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else if (arg2 == 16) { + index1AC = 15; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } else { + index1AC = 18; + phi_t5 = ABS(this->unk_1AC[index1AC]); + } + + if ((s32)fabsf((f32)temp_t3) >= 0x8001) { + if (arg1 > 0) { + temp_t3 -= 0x10000; + } else { + temp_t3 += 0x10000; + } + } + if (index1AC >= 0) { + temp_t3 += phi_t5 / 3; + } + + if (temp_t3 != 0) { + phi_v0 += (temp_t3 - temp_1AC) / 16; + } + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + if (temp_t0 != 0) { + phi_v0 -= temp_t0 / 50; + } + temp_v1 += phi_v0; + if (((temp_1AC * phi_v0) <= 0) && (temp_t2 >= -0x63) && (temp_t2 < 0x64)) { + temp_v1 = 0; + phi_v0 = 0; + } + this->unk_1AC[arg2] = phi_v0; + this->unk_1DC[arg2] = arg1 + temp_v1; + } + this->unk_20C[arg2] = arg1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F230.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FCCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FDD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FE90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FED8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FEFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FF84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FFF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5008C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B500E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B501E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50260.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50278.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B503DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5042C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B504D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5053C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50580.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B505D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50618.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50670.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B506C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5073C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B507E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5082C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50880.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B508C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50928.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50980.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B509A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50A04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50BEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50C40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50CFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50D94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50DE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50E90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50EE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50F8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B510CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51118.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51164.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B511FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51250.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B512B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51310.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5135C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B513A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5146C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5149C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B514F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5154C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B515D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B516D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5175C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B517E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51824.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B5187C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B518C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51A8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51AE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51B44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51BA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51CA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51D24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51DA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51EBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B51FA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52068.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52098.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52108.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B521A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B52348.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Draw.s") +#endif + +s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + s32 pad; + EnZl2* this = THIS; + Mtx* sp74; + MtxF sp34; + Vec3s sp2C; + s16 pad2; + s16* unk_1DC = this->unk_1DC; + + if (limbIndex == 0xE) { + sp74 = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 7); + gSPSegment((*gfx)++, 0x0C, sp74); + + Matrix_Push(); + Matrix_Translate(pos->x, pos->y, pos->z, MTXMODE_APPLY); + Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); + Matrix_Push(); + Matrix_Translate(362.0f, -133.0f, 0.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 0); + func_80B4F230(this, sp2C.x, 1); + func_80B4EF64(this, sp2C.z, 2); + } + Matrix_RotateRPY(unk_1DC[0] + kREG(31), unk_1DC[1] + kREG(32), unk_1DC[2] + kREG(33), MTXMODE_APPLY); + Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[0], "../z_en_zl2.c", 1056); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 3); + func_80B4F230(this, sp2C.x, 4); + } + Matrix_RotateRPY(unk_1DC[3] + kREG(34), unk_1DC[4] + kREG(35), unk_1DC[5] + kREG(36), MTXMODE_APPLY); + Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[1], "../z_en_zl2.c", 1100); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 6); + func_80B4F230(this, sp2C.x, 7); + } + Matrix_RotateRPY(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY); + Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 9); + func_80B4F230(this, sp2C.x, 10); + func_80B4EF64(this, sp2C.z, 11); + } + Matrix_RotateRPY(unk_1DC[9] + kREG(40), unk_1DC[10] + kREG(41), unk_1DC[11] + kREG(42), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[3], "../z_en_zl2.c", 1145); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 12); + func_80B4F230(this, sp2C.x, 13); + func_80B4EF64(this, sp2C.z, 14); + } + Matrix_RotateRPY(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 15); + func_80B4F230(this, sp2C.x, 16); + func_80B4EF64(this, sp2C.z, 17); + } + Matrix_RotateRPY(unk_1DC[15] + kREG(46), unk_1DC[16] + kREG(47), unk_1DC[17] + kREG(48), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[5], "../z_en_zl2.c", 1189); + Matrix_Get(&sp34); + func_800D20CC(&sp34, &sp2C, 0); + if (func_800C0D28(globalCtx) == 0) { + func_80B4EE38(this, sp2C.y, 18); + func_80B4F230(this, sp2C.x, 19); + func_80B4EF64(this, sp2C.z, 20); + } + Matrix_RotateRPY(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208); + Matrix_Pull(); + Matrix_Pull(); + this->unk_24C = 1; + } + return 0; +} + +void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + EnZl2* this = THIS; + s32 pad[2]; + + if (limbIndex == 10) { + if ((this->unk_254 != 0) && (globalCtx->csCtx.frames >= 900)) { + gSPDisplayList((*gfx)++, &D_0600BAE8); + } + + { + Player* player = PLAYER; + Matrix_Push(); + if (player->unk_15D == 0xFF) { + Matrix_Put(&player->mf_A20); + Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY); + Matrix_RotateRPY(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY); + Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY); + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1253), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfx)++, &D_0600BAE8); + } + Matrix_Pull(); + } + } +} + +void func_80B4FCCC(EnZl2* this, GlobalContext* globalCtx) { + s32 unk_274 = this->unk_274; + + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[unk_274].segment); +} + +void func_80B4FD00(EnZl2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + fc = 0.0f; + unk0 = frameCount; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +void func_80B4FD90(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600B5FC, 0, 0.0f, 0); + this->action = 1; +} + +void func_80B4FDD4(EnZl2* this) { + if (func_800A56C8(&this->skelAnime, 14.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE); + } +} + +void func_80B4FE10(GlobalContext* globalCtx) { + if ((globalCtx->csCtx.frames >= 830) && (globalCtx->csCtx.frames < 1081)) { + func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); + } +} + +void func_80B4FE48(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG); +} + +void func_80B4FE6C(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH); +} + +void func_80B4FE90(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE); +} + +void func_80B4FEB4(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); +} + +void func_80B4FED8(EnZl2* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0); +} + +void EnZl2_GiveLightArrows(EnZl2* this, GlobalContext* globalCtx) { + Player* player; + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_244 == 0) { + player = PLAYER; + posX = player->actor.posRot.pos.x; + posY = player->actor.posRot.pos.y + 80.0f; + posZ = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 0x17); + Item_Give(globalCtx, ITEM_ARROW_LIGHT); + this->unk_244 = 1; + } +} + +void func_80B4FF84(EnZl2* this, GlobalContext* globalCtx) { + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_250 == 0) { + posX = this->actor.posRot.pos.x; + posY = this->actor.posRot.pos.y; + posZ = this->actor.posRot.pos.z; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 4); + this->unk_250 = 1; + } +} + +void func_80B4FFF0(EnZl2* this, GlobalContext* globalCtx) { + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_248 == 0) { + posX = this->actor.posRot.pos.x; + posY = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + posZ = this->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, + 0x4000, 0, 3); + this->unk_248 = 1; + } +} + +void func_80B5008C(EnZl2* this) { + Actor* attachedB = this->actor.attachedB; + + if (attachedB != NULL) { + attachedB->posRot.pos.x = this->actor.posRot.pos.x; + attachedB->posRot.pos.y = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + attachedB->posRot.pos.z = this->actor.posRot.pos.z; + } +} + +void func_80B500E0(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + Vec3f* thisPos = &this->actor.posRot.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 someFloat; + + if (npcAction != NULL) { + someFloat = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 8, 8); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + thisPos->x = ((endX - startX) * someFloat) + startX; + thisPos->y = ((endY - startY) * someFloat) + startY; + thisPos->z = ((endZ - startZ) * someFloat) + startZ; + } +} + +void func_80B501C4(EnZl2* this, s32 alpha) { + if (this->actor.attachedB != NULL) { + ((DoorWarp1*)this->actor.attachedB)->alpha = alpha; + } +} + +void func_80B501E8(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + this->actor.shape.unk_14 = this->alpha = + (1.0f - func_8006F93C(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames)) * 255.0f; + func_80B501C4(this, this->alpha); + } +} + +void func_80B50260(EnZl2* this, GlobalContext* globalCtx) { + this->action = 1; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B50278(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + this->actor.shape.unk_14 = 0xFF; + this->action = 2; + this->drawConfig = 1; +} + +void func_80B50304(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + ActorShape* actorShape = &this->actor.shape; + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + f32 actionXDelta; + f32 actionZDelta; + + actionXDelta = npcAction->endPos.x - npcAction->startPos.x; + actionZDelta = npcAction->endPos.z - npcAction->startPos.z; + func_80B4FD00(this, &D_060003BC, 0, -12.0f, 0); + this->action = 3; + this->drawConfig = 1; + this->unk_23C = 0.0f; + actorShape->unk_14 = 0xFF; + this->actor.posRot.rot.y = actorShape->rot.y = Math_atan2f(actionXDelta, actionZDelta) * 10430.3779296875f; +} + +void func_80B503DC(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if ((npcAction != NULL) && (globalCtx->csCtx.frames >= npcAction->endFrame)) { + this->action = 4; + } +} + +void func_80B5042C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_060022D0, 2, -8.0f, 0); + this->action = 5; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B50488(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002750, 0, 0.0f, 0); + this->action = 6; + this->drawConfig = 1; + } +} + +void func_80B504D4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600325C, 2, -8.0f, 0); + this->action = 7; + this->drawConfig = 1; + this->unk_27C = 0.0f; + func_80B4ED18(this, 1); + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B5053C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06003538, 0, 0.0f, 0); + this->action = 8; + } +} + +void func_80B50580(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06000A50, 2, -8.0f, 0); + this->action = 9; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B505D4(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06000EB0, 0, 0.0f, 0); + this->action = 10; + } +} + +void func_80B50618(EnZl2* this, GlobalContext* globalCtx) { + EnZl2_GiveLightArrows(this, globalCtx); + this->action = 11; +} + +void func_80B50644(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FF84(this, globalCtx); + this->action = 12; +} + +void func_80B50670(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600B5FC, 0, -8.0f, 0); + this->action = 13; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B506C4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600AAD4, 2, -8.0f, 0); + this->action = 14; + this->drawConfig = 1; + func_80B4ECE8(this, 4); + func_80B4ED18(this, 2); + this->actor.shape.unk_14 = 0xFF; + func_80B4FE90(this); +} + +void func_80B5073C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_0600AFE0, 0, 0.0f, 0); + this->action = 15; + } +} + +void func_80B50780(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06001670, 2, -8.0f, 0); + this->action = 16; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + func_80B4FFF0(this, globalCtx); + func_80B4ECE8(this, 3); +} + +void func_80B507E8(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06001B48, 0, 0.0f, 0); + this->action = 17; + } +} + +void func_80B5082C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06002B14, 2, -8.0f, 0); + this->action = 18; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B50880(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002F30, 0, 0.0f, 0); + this->action = 19; + func_80B4FEB4(this); + } +} + +void func_80B508C8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_06001010, 2, -8.0f, 0); + this->action = 20; + this->drawConfig = 1; + func_80B4ECE8(this, 6); + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B50928(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_060013A0, 0, 0.0f, 0); + this->action = 21; + func_80B4FED8(this); + } +} + +void func_80B50970(EnZl2* this, GlobalContext* globalCtx) { + this->action = 22; +} + +void func_80B50980(EnZl2* this, GlobalContext* globalCtx) { + this->action = 23; + this->drawConfig = 2; + this->alpha = 255; +} + +void func_80B509A0(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + if (globalCtx->csCtx.frames >= npcAction->endFrame) { + this->action = 24; + this->drawConfig = 0; + func_80B4FE6C(this); + } + } +} + +void func_80B50A04(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 newAction; + s32 unk_240; + + if (npcAction != NULL) { + newAction = npcAction->action; + unk_240 = this->unk_240; + if (newAction != unk_240) { + switch (newAction) { + case 1: + func_80B50260(this, globalCtx); + break; + case 2: + func_80B50278(this, globalCtx); + break; + case 3: + func_80B50304(this, globalCtx); + break; + case 4: + func_80B5042C(this, globalCtx); + break; + case 5: + func_80B504D4(this, globalCtx); + break; + case 6: + func_80B50580(this, globalCtx); + break; + case 7: + func_80B50618(this, globalCtx); + break; + case 8: + func_80B50670(this, globalCtx); + break; + case 9: + func_80B506C4(this, globalCtx); + break; + case 10: + func_80B50780(this, globalCtx); + break; + case 11: + func_80B5082C(this, globalCtx); + break; + case 12: + func_80B508C8(this, globalCtx); + break; + case 13: + func_80B50970(this, globalCtx); + break; + case 14: + func_80B50980(this, globalCtx); + break; + case 15: + func_80B50644(this, globalCtx); + break; + default: + osSyncPrintf("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_240 = newAction; + } + } +} + +void func_80B50BBC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B50A04(this, globalCtx); +} + +void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50C40(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FDD4(this); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B500E0(this, globalCtx); + func_80B503DC(this, globalCtx); +} + +void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4EA40(this); + func_80B50488(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50D50(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50D94(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4EAF4(this); + func_80B5053C(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + func_80B505D4(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B50E90(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50F38(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5073C(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51034(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51080(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B507E8(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B510CC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51118(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B50880(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51164(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B50A04(this, globalCtx); +} + +void func_80B511B0(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE10(globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B50928(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B511FC(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B5008C(this); + func_80B50A04(this, globalCtx); +} + +void func_80B51250(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4FE48(this); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B500E0(this, globalCtx); + func_80B5008C(this); + func_80B50A04(this, globalCtx); +} + +void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B501E8(this, globalCtx); + func_80B509A0(this, globalCtx); +} + +void func_80B51310(EnZl2* this, GlobalContext* globalCtx) { + Actor* attachedB; + + if (EnZl2_GetNpcAction(globalCtx, 0) == NULL) { + attachedB = this->actor.attachedB; + if (attachedB != NULL) { + Actor_Kill(attachedB); + } + Actor_Kill(&this->actor); + } +} + +void func_80B5135C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600A15C, 0, 0.0f, 0); + this->action = 25; + this->unk_254 = 1; +} + +void func_80B513A8(EnZl2* this, GlobalContext* globalCtx) { + Player* player; + f32 posX; + f32 posY; + f32 posZ; + + if (this->unk_250 == 0) { + player = PLAYER; + posX = player->actor.posRot.pos.x; + posY = player->actor.posRot.pos.y; + posZ = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 7); + this->unk_250 = 1; + } +} + +void func_80B51418(EnZl2* this, GlobalContext* globalCtx) { + func_80B4E9B0(this); + if (globalCtx->csCtx.frames < 431) { + func_80B4ED18(this, 1); + } else { + func_80B4ED18(this, 0); + } +} + +void func_80B5146C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4EA40(this); + func_80B4ED18(this, 0); +} + +void func_80B5149C(EnZl2* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames < 988) { + func_80B4ECE8(this, 7); + func_80B4ED04(this, 8); + } else { + func_80B4E9B0(this); + } + func_80B4ED18(this, 0); +} + +void func_80B514F8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4E9B0(this); + if (globalCtx->csCtx.frames < 1190) { + func_80B4ED18(this, 1); + } else { + func_80B4ED18(this, 0); + } +} + +void func_80B5154C(EnZl2* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx; + + if (this->skelAnime.mode != 0) { + func_80B4E9B0(this); + } else { + csCtx = &globalCtx->csCtx; + if (csCtx->frames < 0x5F0) { + func_80B4EBB8(this); + } else if (csCtx->frames == 0x5F0) { + this->unk_27C = 0.0f; + } else { + func_80B4EC48(this); + } + } +} + +void func_80B515C4(EnZl2* this) { + this->action = 25; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B515D8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FD00(this, &D_0600A15C, 0, -8.0f, 0); + func_80B4EDB8(this, globalCtx, 0); + this->action = 26; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B51644(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_060087B8, 0, -8.0f, 0); + } +} + +void func_80B51678(EnZl2* this) { + func_80B4FD00(this, &D_06007D0C, 2, -8.0f, 0); + this->action = 27; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B516D0(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06009AD4, 0, -8.0f, 0); + } +} + +void func_80B51704(EnZl2* this) { + func_80B4FD00(this, &D_060090D8, 2, -8.0f, 0); + this->action = 28; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B5175C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06006778, 0, -8.0f, 0); + } +} + +void func_80B51790(EnZl2* this) { + func_80B4FD00(this, &D_06005F40, 2, -8.0f, 0); + this->action = 29; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; +} + +void func_80B517E0(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_06002750, 0, -8.0f, 0); + this->action = 31; + } +} + +void func_80B51824(EnZl2* this) { + func_80B4FD00(this, &D_060022D0, 2, -8.0f, 0); + this->action = 30; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B5187C(EnZl2* this, s32 arg1) { + if (arg1 != 0) { + func_80B4FD00(this, &D_0600A79C, 0, -8.0f, 0); + this->unk_27C = 0.0f; + } +} + +void func_80B518C0(EnZl2* this) { + func_80B4FD00(this, SEGMENTED_TO_VIRTUAL(&D_06004900), 2, -8.0f, 0); + this->action = 32; + this->drawConfig = 1; + this->actor.shape.unk_14 = 0xFF; + this->unk_27C = 0.0f; +} + +void func_80B51948(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 newAction; + s32 unk_240; + + if (npcAction != NULL) { + newAction = npcAction->action; + unk_240 = this->unk_240; + if (newAction != unk_240) { + switch (newAction) { + case 1: + func_80B515C4(this); + break; + case 2: + func_80B515D8(this, globalCtx); + break; + case 16: + func_80B51678(this); + break; + case 17: + func_80B51704(this); + break; + case 18: + func_80B51790(this); + break; + case 4: + func_80B51824(this); + break; + case 20: + func_80B518C0(this); + break; + case 21: + func_80B513A8(this, globalCtx); + break; + default: + osSyncPrintf("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_240 = newAction; + } + } +} + +void func_80B51A5C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B51948(this, globalCtx); +} + +void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B51418(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B51948(this, globalCtx); +} + +void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + func_80B51644(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51B44(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5149C(this, globalCtx); + func_80B516D0(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B514F8(this, globalCtx); + func_80B5175C(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5146C(this, globalCtx); + func_80B517E0(this, EnZl2_FrameUpdateMatrix(this)); +} + +void func_80B51C64(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + EnZl2_FrameUpdateMatrix(this); + func_80B51948(this, globalCtx); +} + +void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B5154C(this, globalCtx); + func_80B5187C(this, EnZl2_FrameUpdateMatrix(this)); + func_80B51948(this, globalCtx); +} + +void func_80B51D0C(EnZl2* this, GlobalContext* globalCtx) { + this->action = 33; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B51D24(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + u32 sfxId; + SkelAnime* skelAnime = &this->skelAnime; + + if ((func_800A56C8(skelAnime, 6.0f)) || (func_800A56C8(skelAnime, 0.0f))) { + if (this->actor.bgCheckFlags & 1) { + sfxId = SFX_FLAG; + sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + func_80078914(&this->actor.projectedPos, sfxId); + } + } +} + +void func_80B51DA4(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + Vec3f* thisPos = &this->actor.posRot.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 someFloat; + + if (npcAction != NULL) { + someFloat = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 0, 8); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + thisPos->x = ((endX - startX) * someFloat) + startX; + thisPos->y = ((endY - startY) * someFloat) + startY; + thisPos->z = ((endZ - startZ) * someFloat) + startZ; + if (npcAction->endFrame < globalCtx->csCtx.frames) { + Actor_Kill(&this->actor); + } + } +} + +void func_80B51EA8(EnZl2* this) { + this->action = 33; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +void func_80B51EBC(EnZl2* this, GlobalContext* globalCtx) { + ActorShape* shape = &this->actor.shape; + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 pad[2]; + + this->actor.posRot.rot.y = shape->rot.y = npcAction->rot.y; + func_80B4FD00(this, &D_0600B224, 0, 0.0f, 0); + this->action = 34; + this->drawConfig = 1; + shape->unk_14 = 0xFF; +} + +void func_80B51F38(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + + if (npcAction != NULL) { + if (globalCtx->csCtx.frames - 8 >= npcAction->endFrame) { + func_80B4FD00(this, &D_0600B5FC, 0, -8.0f, 0); + this->action = 35; + } + } +} + +void func_80B51FA8(EnZl2* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0); + s32 action; + s32 unk_240; + + if (npcAction != NULL) { + action = npcAction->action; + unk_240 = this->unk_240; + if (action != unk_240) { + switch (action) { + case 1: + func_80B51EA8(this); + break; + case 2: + func_80B51EBC(this, globalCtx); + break; + case 14: + Actor_Kill(&this->actor); + break; + default: + osSyncPrintf("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->unk_240 = action; + } + } +} + +void func_80B52068(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B51FA8(this, globalCtx); +} + +void func_80B52098(EnZl2* this, GlobalContext* globalCtx) { + func_80B4FCCC(this, globalCtx); + func_80B4ED2C(this, globalCtx); + func_80B4E9B0(this); + EnZl2_FrameUpdateMatrix(this); + func_80B51D24(this, globalCtx); + func_80B51F38(this, globalCtx); + func_80B51DA4(this, globalCtx); +} + +void func_80B52108(EnZl2* this, GlobalContext* globalCtx) { +} + +void func_80B52114(EnZl2* this, GlobalContext* globalCtx) { + switch (this->actor.params) { + case 1: + func_80B5135C(this, globalCtx); + break; + case 4: + func_80B51D0C(this, globalCtx); + break; + case 0: + func_80B4FD90(this, globalCtx); + break; + default: + osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + func_80B4FD90(this, globalCtx); + } +} + +void func_80B521A0(EnZl2* this, GlobalContext* globalCtx) { + s32 pad; + ObjectContext* objectCtx = &globalCtx->objectCtx; + s32 bankIndex = Object_GetIndex(objectCtx, OBJECT_ZL2_ANIME1); + s32 pad2; + + if (bankIndex < 0) { + osSyncPrintf(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + return; + } + + if (Object_IsLoaded(objectCtx, bankIndex)) { + this->unk_274 = bankIndex; + func_80B4FCCC(this, globalCtx); + this->unk_278 = SkelAnime_GetFrameCount(&D_060022D0.genericHeader); + func_80B52114(this, globalCtx); + } +} + +void EnZl2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + + if (this->action < 0 || this->action >= 0x24 || sActionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void EnZl2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + ActorShape* actorShape = &thisx->shape; + s32 pad; + + ActorShape_Init(actorShape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + actorShape->unk_14 = 0; + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06010D70, NULL, NULL, NULL, 0); + + switch (thisx->params) { + case 1: + func_800F7260(0x6F); + break; + case 4: + gSaveContext.timer2State = 0; + break; + } +} + +s32 EnZl2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + EnZl2* this = THIS; + + if (this->overrideLimbDrawConfig < 0 || this->overrideLimbDrawConfig > 0 || + sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return 0; + } + return sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig](globalCtx, limbIndex, dList, pos, rot, thisx, gfx); +} + +void func_80B523BC(EnZl2* this, GlobalContext* globalCtx) { +} + +void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[3]; + s16 unk_190 = this->unk_190; + s16 unk_194 = this->unk_194; + u32 sp74 = D_80B52810[unk_190]; + u32 sp70 = D_80B52810[unk_194]; + SkelAnime* skelAnime = &this->skelAnime; + s16 unk_198 = this->unk_198; + u32 sp64 = D_80B52834[unk_198]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1623); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp74)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70)); + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(gfxCtx->polyOpa.p++, 0x0B, &D_80116280[2]); + + gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, &this->actor, gfxCtx->polyOpa.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1648); +} + +void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_190 = this->unk_190; + u32 sp78 = D_80B52810[unk_190]; + s16 unk_198 = this->unk_198; + SkelAnime* skelAnime = &this->skelAnime; + u32 sp6C = D_80B52834[unk_198]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1663); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + gSPSegment(gfxCtx->polyXlu.p++, 0x0B, &D_80116280[0]); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl2_OverrideLimbDraw, NULL, &this->actor, gfxCtx->polyXlu.p); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_zl2.c", 1692); +} + +void EnZl2_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnZl2* this = THIS; + + if ((this->drawConfig < 0) || (this->drawConfig >= 3) || (sDrawFuncs[this->drawConfig] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h index 3d689a5824..57fc6f7cda 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h @@ -6,9 +6,40 @@ struct EnZl2; +typedef void (*EnZl2ActionFunc)(struct EnZl2*, GlobalContext*); +typedef s32 (*EnZl2PreLimbDrawFunc)(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx, Gfx** gfx); +typedef void (*EnZl2DrawFunc)(struct EnZl2*, GlobalContext*); + typedef struct EnZl2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x134]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 unk_190; + /* 0x0192 */ s16 unk_192; + /* 0x0194 */ s16 unk_194; + /* 0x0196 */ char unk_196[0x2]; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ char unk_19A[0x2]; + /* 0x019C */ s32 action; + /* 0x01A0 */ s32 drawConfig; + /* 0x01A4 */ char unk_1A4[0x4]; + /* 0x01A8 */ s32 alpha; + /* 0x01AC */ s16 unk_1AC[0x18]; // ??? + /* 0x01DC */ s16 unk_1DC[0x18]; // ??? + /* 0x020C */ s16 unk_20C[0x18]; // ??? + /* 0x023C */ f32 unk_23C; + /* 0x0240 */ s32 unk_240; + /* 0x0244 */ s32 unk_244; + /* 0x0248 */ s32 unk_248; + /* 0x024C */ s32 unk_24C; + /* 0x0250 */ s32 unk_250; + /* 0x0254 */ s32 unk_254; + /* 0x0258 */ char unk_258[0xC]; + /* 0x0264 */ s32 overrideLimbDrawConfig; + /* 0x0268 */ char unk_268[0xC]; + /* 0x0274 */ s32 unk_274; + /* 0x0278 */ f32 unk_278; + /* 0x027C */ f32 unk_27C; } EnZl2; // size = 0x0280 extern const ActorInit En_Zl2_InitVars; diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 364725d0e3..5ade725b77 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -1,3 +1,9 @@ +/* + * File: z_en_fhg.c + * Overlay: ovl_En_fHG + * Description: Phantom Ganon's Horse + */ + #include "z_en_fhg.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h index fd9b3b3f29..81f3311939 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h @@ -8,7 +8,17 @@ struct EnfHG; typedef struct EnfHG { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x148]; + /* 0x014C */ char unk_14C[0x3]; + /* 0x014F */ u8 unk_14F; + /* 0x0150 */ char unk_150[0x77]; + /* 0x01C7 */ u8 unk_1C7; + /* 0x01C8 */ char unk_1C8; + /* 0x01C9 */ u8 flyMode; + /* 0x01CA */ u8 unk_1CA; + /* 0x01CB */ char unk_1CB[0x35]; + /* 0x0200 */ Vec3f unk_200; + /* 0x020C */ Vec3f unk_20C; + /* 0x0218 */ char unk_218[0x7C]; } EnfHG; // size = 0x0294 extern const ActorInit En_Fhg_InitVars; diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 2beda0fa45..632a5ddaf7 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -91,7 +91,7 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { } gfxCtx->overlay.p = func_80093F34(gfxCtx->overlay.p); gDPSetTextureLUT(gfxCtx->overlay.p++, G_TT_NONE); - gDPSetEnvColor(gfxCtx->overlay.p++, 0xFF, 0x78, 0x1E, 0x00); + gDPSetEnvColor(gfxCtx->overlay.p++, 255, 120, 30, 0); gDPSetRenderMode(gfxCtx->overlay.p++, G_RM_PASS, G_RM_XLU_SURF2); gSPClearGeometryMode(gfxCtx->overlay.p++, G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index a096cb8005..473ea95db4 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -147,7 +147,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) { // "Indicates start" = %s // Means start LOG_STRING("表示開始", "../z_magic_wind.c", 486); - func_8002F7DC(player, 0x087B); + func_8002F7DC(player, NA_SE_PL_MAGIC_WIND_WARP); break; } } @@ -177,7 +177,7 @@ void MagicWind_WaitForTimer(MagicWind* this, GlobalContext* globalCtx) { // Means start LOG_STRING("表示開始", "../z_magic_wind.c", 539); - func_8002F7DC(&player->actor, 0x87A); + func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_NORMAL); MagicWind_UpdateAlpha(1.0f); MagicWind_SetupAction(this, MagicWind_Grow); SkelCurve_Update(globalCtx, &this->skelCurve); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c index eece4ec38f..7a6a03a4b4 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c @@ -272,8 +272,8 @@ Gfx sInnerCylinderDList[] = { ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF), - gsDPSetEnvColor(0x96, 0xFF, 0x00, 0x00), + gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255), + gsDPSetEnvColor(150, 255, 0, 0), gsSPDisplayList(0x08000000), gsSPVertex(&sCylinderVtx[0], 18, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), @@ -299,8 +299,8 @@ Gfx sOuterCylinderDList[] = { ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF), - gsDPSetEnvColor(0x00, 0x96, 0x00, 0x00), + gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255), + gsDPSetEnvColor(0, 150, 0, 0), gsSPDisplayList(0x09000000), gsSPVertex(&sCylinderVtx[18], 18, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 0ad076509f..43eeb3bfc9 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -111,7 +111,7 @@ void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(thisx, NA_SE_EV_FOOT_SWITCH); func_80B92C5C(this); } else { - Audio_PlayActorSound2(thisx, 0x201E); + Audio_PlayActorSound2(thisx, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); } } diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c index 60462accc4..dda2580727 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c @@ -65,8 +65,8 @@ static Gfx sTextureDL[] = { GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), G_RM_AA_ZB_XLU_SURF2), gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF), - gsDPSetEnvColor(0xC8, 0xFF, 0x00, 0x80), + gsDPSetPrimColor(0x00, 0x00, 255, 255, 170, 255), + gsDPSetEnvColor(200, 255, 0, 128), gsSPEndDisplayList(), }; diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index d837acf14f..43b98c7850 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -163,8 +163,8 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xC8, 0xFF); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x96, 0x96, 0x00, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 200, 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 150, 150, 0, 128); gDPSetAlphaDither(gfxCtx->polyXlu.p++, G_AD_NOISE); gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_NOISE); diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c index 490d709c31..e2a9ebef23 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c @@ -125,7 +125,7 @@ static Gfx sTextureDL[] = { gsDPSetTextureLUT(G_TT_NONE), gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), G_RM_CLD_SURF2), - gsDPSetEnvColor(0x32, 0x32, 0x00, 0x00), + gsDPSetEnvColor(50, 50, 0, 0), gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 2fb18002c9..61c7bd7d95 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -114,11 +114,11 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params) { - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xAA, 0xFF, 0xFF, 0xFF); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x96, 0xFF, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 170, 255, 255, 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 150, 255, 128); } else { - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xC8, 0xFF); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 0x00, 0xFF, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 200, 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 0, 255, 128); } gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL); diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index e3706ee7d1..7b5d4d52e0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -84,7 +84,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->counter >= 80) { alpha = 12 * (100 - this->counter); } else { - alpha = 0xFF; + alpha = 255; } vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = @@ -104,8 +104,8 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 400), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x64, 0x00, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 100, 0, 128); gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL); gSPDisplayList(gfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, 1, scroll * (-6), 0, 64, 64)); diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index c891ade574..c7b4127a96 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -86,7 +86,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->counter >= 80) { alpha = 12 * (100 - this->counter); } else { - alpha = 0xFF; + alpha = 255; } vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = @@ -106,8 +106,8 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 353), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF); - gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0xC8, 0x00, 0x80); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 200, 0, 128); gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL); gSPDisplayList(gfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, 64, 1, scroll * 8, scroll * (-8), 64, 64)); diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index b0c84b8f04..726fb7b706 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -80,7 +80,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->counter >= 30) { alpha = 12 * (50 - this->counter); } else { - alpha = 0xFF; + alpha = 255; } vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 32b9f01a10..eb6d9f2986 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -1,10 +1,11 @@ /* * File: z_shot_sun.c * Overlay: ovl_Shot_Sun - * Description: Song of Storms Fairy + * Description: Lake Hylia Sun hitbox and Song of Storms Fairy spawner */ #include "z_shot_sun.h" +#include #define FLAGS 0x00000009 @@ -14,7 +15,13 @@ void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx); void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx); void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx); +void ShotSun_TriggerFairy(ShotSun* this, GlobalContext* globalCtx); +void func_80BADF0C(ShotSun* this, GlobalContext* globalCtx); +void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx); + +extern CutsceneData D_02007020[]; + const ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, ACTORTYPE_PROP, @@ -26,17 +33,158 @@ const ActorInit Shot_Sun_InitVars = { (ActorFunc)ShotSun_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000020, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 30, 60, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADDCC.s") +void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx) { + ShotSun* this = THIS; + s32 params; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADE74.s") + // Translation: Ocarina secret occurrence + osSyncPrintf("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", this->actor.params); + params = this->actor.params & 0xFF; + if (params == 0x40 || params == 0x41) { + this->unk_1A4 = 0; + this->actor.flags |= 0x10; + this->actor.flags |= 0x2000000; + this->actionFunc = func_80BADF0C; + this->actor.flags |= 0x8000000; + } else { + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actionFunc = ShotSun_UpdateHyliaSun; + this->actor.flags &= ~1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BADF0C.s") +void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx) { + ShotSun* this = THIS; + s32 params = this->actor.params & 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s") + if (params != 0x40 && params != 0x41) { + Collider_DestroyCylinder(globalCtx, &this->collider); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Update.s") +void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) { + s32 params = this->actor.params & 0xFF; + s32 fairyParams; + + if (this->timer > 0) { + this->timer--; + return; + } + + switch (params) { + case 0x40: + fairyParams = 7; + break; + case 0x41: + fairyParams = 7; + break; + } + + // UB: fairyParams may be uninitialized + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.initPosRot.pos.x, + this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyParams); + + Actor_Kill(&this->actor); +} + +void ShotSun_TriggerFairy(ShotSun* this, GlobalContext* globalCtx) { + if ((func_8005B198() == this->actor.type) || (this->timer != 0)) { + this->actionFunc = ShotSun_SpawnFairy; + this->timer = 50; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_KANKYO, this->actor.initPosRot.pos.x, + this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, 0x11); + + func_80078914(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR); + } +} + +void func_80BADF0C(ShotSun* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + s32 params = this->actor.params & 0xFF; + + if (func_800CB650(&this->actor.posRot.pos, &player->actor.posRot.pos) > 22500.0f) { + this->unk_1A4 = 0; + } else { + if (this->unk_1A4 == 0) { + if (!(player->stateFlags2 & 0x1000000)) { + player->stateFlags2 |= 0x800000; + return; + } else { + this->unk_1A4 = 1; + } + } + if (this->unk_1A4 == 1) { + func_8010BD58(globalCtx, 1); + this->unk_1A4 = 2; + return; + } + + if (this->unk_1A4 == 2 && globalCtx->msgCtx.unk_E3EE == 4) { + if ((params == 0x40 && globalCtx->msgCtx.unk_E3EC == 9) || + (params == 0x41 && globalCtx->msgCtx.unk_E3EC == 0xB)) { + this->actionFunc = ShotSun_TriggerFairy; + func_80080480(globalCtx, this); + this->timer = 0; + } else { + this->unk_1A4 = 0; + } + this->unk_1A4 = 0; + } + } +} + +void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx) { + Vec3s cylinderPos; + Player* player = PLAYER; + EnItem00* collectible; + s32 pad; + Vec3f spawnPos; + + if (this->collider.base.acFlags & 2) { + func_80078884(NA_SE_SY_CORRECT_CHIME); + osSyncPrintf(VT_FGCOL(CYAN) "SHOT_SUN HIT!!!!!!!\n" VT_RST); + if (INV_CONTENT(SLOT_ARROW_FIRE) == ITEM_NONE) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_ETCETERA, 700.0f, -800.0f, 7261.0f, 0, 0, 0, 7); + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02007020); + if (1) {} + gSaveContext.cutsceneTrigger = 1; + } else { + spawnPos.x = 700.0f; + spawnPos.y = -800.0f; + spawnPos.z = 7261.0f; + + collectible = Item_DropCollectible(globalCtx, &spawnPos, ITEM00_MAGIC_LARGE); + if (collectible != NULL) { + collectible->unk_15A = 6000; + collectible->actor.speedXZ = 0.0f; + } + } + Actor_Kill(&this->actor); + } else { + if (!(120.0f < this->actor.xzDistFromLink) && gSaveContext.dayTime >= 0x4555 && gSaveContext.dayTime < 0x5000) { + cylinderPos.x = player->unk_95C.x + globalCtx->envCtx.unk_04.x * 0.16666667f; + cylinderPos.y = player->unk_95C.y - 30.0f + globalCtx->envCtx.unk_04.y * 0.16666667f; + cylinderPos.z = player->unk_95C.z + globalCtx->envCtx.unk_04.z * 0.16666667f; + + this->hitboxPos = cylinderPos; + + func_80062718(&this->collider, &cylinderPos); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } +} + +void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx) { + ShotSun* this = THIS; + this->actionFunc(this, globalCtx); +} diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index ec2b14a8f3..d796e4cabe 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -10,9 +10,11 @@ typedef void (*ShotSunActionFunc)(struct ShotSun*, GlobalContext*); typedef struct ShotSun { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4C]; + /* 0x014C */ ColliderCylinder collider; /* 0x0198 */ ShotSunActionFunc actionFunc; - /* 0x019C */ char unk_19C[0xC]; + /* 0x019C */ Vec3s hitboxPos; + /* 0x01A2 */ s16 timer; // Frames until fairy spawns + /* 0x01A4 */ u8 unk_1A4; } ShotSun; // size = 0x01A8 extern const ActorInit Shot_Sun_InitVars; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h new file mode 100644 index 0000000000..f3f355a358 --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h @@ -0,0 +1,17 @@ +#ifndef _Z_EFF_SS_FHGFLASH_h_ +#define _Z_EFF_SS_FHGFLASH_h_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; + /* 0x24 */ s16 unk_24; + /* 0x26 */ u8 unk_26; + /* 0x28 */ Actor* unk_28; + /* 0x2C */ u8 unk_2C; +} EffectSsFhgFlashInitParams; + +#endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 9b84df0bdf..fd309b7339 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -1,6 +1,53 @@ -#include -#include +/* + * File: z_eff_ss_solder_srch_ball.c + * Overlay: ovl_Effect_Ss_Solder_Srch_Ball + * Description: Vision sphere for courtyard guards + */ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s") +#include "z_eff_ss_solder_srch_ball.h" -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s") +u32 EffectSsSolderSrchBall_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsSolderSrchBall_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); + +EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars = { + EFFECT_SS_SOLDER_SRCH_BALL, + EffectSsSolderSrchBall_Init, +}; + +u32 EffectSsSolderSrchBall_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsSolderSrchBallInitParams* initParams = (EffectSsSolderSrchBallInitParams*)initParamsx; + + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->update = EffectSsSolderSrchBall_Update; + this->life = 100; + this->regs[1] = initParams->unk_24; + this->unk_3C = initParams->linkDetected; + return 1; +} + +void EffectSsSolderSrchBall_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad; + f32 playerPosDiffX; + f32 playerPosDiffY; + f32 playerPosDiffZ; + s16* linkDetected; + Player* player = PLAYER; + + linkDetected = this->unk_3C; + + playerPosDiffX = player->actor.posRot.pos.x - this->pos.x; + playerPosDiffY = player->actor.posRot.pos.y - this->pos.y; + playerPosDiffZ = player->actor.posRot.pos.z - this->pos.z; + + if (!func_8003E30C(&globalCtx->colCtx, &this->pos, 30.0f)) { + if (sqrtf(SQ(playerPosDiffX) + SQ(playerPosDiffY) + SQ(playerPosDiffZ)) < 70.0f) { + *linkDetected = true; + } + } else { + if (this->life > 1) { + this->life = 1; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h new file mode 100644 index 0000000000..aba123fefa --- /dev/null +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -0,0 +1,15 @@ +#ifndef _Z_EFF_SS_SOLDERSRCHBALL_H_ +#define _Z_EFF_SS_SOLDERSRCHBALL_H_ + +#include +#include + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ Vec3f accel; + /* 0x24 */ s16 unk_24; + /* 0x28 */ s16* linkDetected; +} EffectSsSolderSrchBallInitParams; + +#endif diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 429735fa34..d9e8ff2580 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -172,8 +172,6 @@ static SceneSelectEntry sScenes[] = { { "title", Select_LoadTitle, 0x0000 }, }; -#ifdef NON_MATCHING -// mostly regalloc, a good amount of instruction ordering. confirmed equivalent in game. void Select_UpdateMenu(SelectContext* this) { Input* controller1; s32 pad; @@ -315,7 +313,8 @@ void Select_UpdateMenu(SelectContext* this) { } if (CHECK_PAD(controller1->press, L_TRIG)) { - this->unk_1DC = (++this->unk_1DC + 7) % 7; + this->unk_1DC++; + this->unk_1DC = (this->unk_1DC + 7) % 7; this->currentScene = this->unk_20C = this->unk_1E0[this->unk_1DC]; } @@ -325,9 +324,12 @@ void Select_UpdateMenu(SelectContext* this) { this->unk_220 = 0; this->unk_21C = 0; - this->currentScene = (++this->currentScene + this->count) % this->count; + this->currentScene++; + this->currentScene = (this->currentScene + this->count) % this->count; + if (this->currentScene == ((this->unk_20C + this->count + 0x13) % this->count)) { - this->unk_20C = (++this->unk_20C + this->count) % this->count; + this->unk_20C++; + this->unk_20C = (this->unk_20C + this->count) % this->count; } } @@ -336,13 +338,16 @@ void Select_UpdateMenu(SelectContext* this) { this->unk_21C = 0; if (this->currentScene == this->unk_20C) { - this->unk_20C = ((this->unk_20C - 2) + this->count) % this->count; + this->unk_20C -= 2; + this->unk_20C = (this->unk_20C + this->count) % this->count; } - this->currentScene = ((--this->currentScene) + this->count) % this->count; + this->currentScene--; + this->currentScene = (this->currentScene + this->count) % this->count; if (this->currentScene == ((this->unk_20C + this->count) % this->count)) { - this->unk_20C = (--this->unk_20C + this->count) % this->count; + this->unk_20C--; + this->unk_20C = (this->unk_20C + this->count) % this->count; } } @@ -369,9 +374,6 @@ void Select_UpdateMenu(SelectContext* this) { this->unk_230 = 0; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_select/Select_UpdateMenu.s") -#endif void Select_PrintMenu(SelectContext* this, GfxPrint* printer) { s32 scene; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index bc01afc7a4..456c87fd1f 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -21,10 +21,10 @@ void Title_PrintBuildInfo(Gfx** gfxp) { printer = alloca(sizeof(GfxPrint)); GfxPrint_Init(printer); GfxPrint_Open(printer, g); - GfxPrint_SetColor(printer, 0xFF, 0x9B, 0xFF, 0xFF); + GfxPrint_SetColor(printer, 255, 155, 255, 255); GfxPrint_SetPos(printer, 9, 21); GfxPrint_Printf(printer, "NOT MARIO CLUB VERSION"); - GfxPrint_SetColor(printer, 0xFF, 0xFF, 0xFF, 0xFF); + GfxPrint_SetColor(printer, 255, 255, 255, 255); GfxPrint_SetPos(printer, 7, 23); GfxPrint_Printf(printer, "[Creator:%s]", gBuildTeam); GfxPrint_SetPos(printer, 7, 24); @@ -180,7 +180,7 @@ void Title_Init(TitleContext* this) { func_800A9CD4(&this->state, &this->sram); this->ult = 0; this->unk_1D4 = 0x14; - this->coverAlpha = 0xFF; + this->coverAlpha = 255; this->addAlpha = -3; this->visibleDuration = 0x3C; } diff --git a/sym_info.py b/sym_info.py old mode 100644 new mode 100755 diff --git a/tools/ZAP2 b/tools/ZAP2 index 5685472826..a781b7b098 160000 --- a/tools/ZAP2 +++ b/tools/ZAP2 @@ -1 +1 @@ -Subproject commit 5685472826f809702314387dc1a97bd048e82c76 +Subproject commit a781b7b098472076f99f52e4ad214823ea91be2d diff --git a/tools/csdis.py b/tools/csdis.py new file mode 100755 index 0000000000..cfc266719e --- /dev/null +++ b/tools/csdis.py @@ -0,0 +1,483 @@ +#!/usr/bin/env python3 + +from overlayhelpers import filemap + +import argparse +import struct + +""" +Enumerations +""" + +command_continue_stop = { + 0x00: "CS_CMD_CONTINUE", + 0xFF: "CS_CMD_STOP", +} + +cutscene_terminator_destinations = { + 0x00: "INVALID_DESTINATION_0", + 0x01: "CUTSCENE_MAP_GANON_HORSE", + 0x02: "CUTSCENE_MAP_THREE_GODESSES_POST_DEKU_TREE", + 0x03: "GERUDO_VALLEY_DIN", + 0x04: "DEATH_MOUNTAIN_TRAIL_NAYRU", + 0x05: "KOKIRI_FOREST_FARORE", + 0x06: "CUTSCENE_MAP_TRIFORCE_CREATION", + 0x07: "KOKIRI_FOREST_RECEIVE_KOKIRI_EMERALD", + 0x08: "TEMPLE_OF_TIME_AFTER_USE_MS", + 0x09: "GERUDO_VALLEY_DIN_2", + 0x0A: "LINKS_HOUSE_INTRO", + 0x0B: "KOKIRI_FOREST_INTRO", + 0x0C: "DEATH_MOUNTAIN_TRAIL_AFTER_GORON_RUBY", + 0x0D: "ZORAS_FOUNTAIN_AFTER_ZORAS_SAPPHIRE", + 0x0E: "KOKIRI_FOREST_AFTER_KOKIRI_EMERALD", + 0x0F: "TEMPLE_OF_TIME_KOKIRI_EMERALD", #unused + 0x10: "TEMPLE_OF_TIME_GORON_RUBY", #unused + 0x11: "TEMPLE_OF_TIME_ZORAS_SAPPHIRE", #unused + 0x12: "TEMPLE_OF_TIME_AFTER_USE_MS_FIRST", + 0x13: "DEATH_MOUNTAIN_TRAIL_AFTER_INTRO", + 0x14: "INVALID_DESTINATION_14", + 0x15: "LAKE_HYLIA_WATER_RISES", + 0x16: "DESERT_COLOSSUS_REQUIEM", + 0x17: "CUTSCENE_MAP_CURSE_YOU", + 0x18: "JABU_JABU_INTRO", + 0x19: "CHAMBER_OF_SAGES_LIGHT_MEDALLION", + 0x1A: "TEMPLE_OF_TIME_KOKIRI_EMERALD_2", #duplicate of 0x000F + 0x1B: "TEMPLE_OF_TIME_GORON_RUBY_2", #duplicate of 0x0010 + 0x1C: "TEMPLE_OF_TIME_ZORAS_SAPPHIRE_2", #duplicate of 0x0011 + 0x1D: "CHAMBER_OF_SAGES_FOREST_MEDALLION", + 0x1E: "CHAMBER_OF_SAGES_FIRE_MEDALLION", + 0x1F: "CHAMBER_OF_SAGES_WATER_MEDALLION", + 0x20: "HYRULE_FIELD_FLASHBACK", #lacs part 4 + 0x21: "HYRULE_FIELD_AFTER_LAKE_HYLIA_OWL", + 0x22: "CUTSCENE_MAP_GANON_AFTER_USE_MS", + 0x23: "HYRULE_FIELD_INTRO_ZELDA_ESCAPE", + 0x24: "INVALID_DESTINATION_24", + 0x25: "INVALID_DESTINATION_25", + 0x26: "CUTSCENE_MAP_SHEIKAH_LEGEND", #lacs part 2 + 0x27: "TEMPLE_OF_TIME_ZELDA_REVEAL", #lacs part 3 + 0x28: "TEMPLE_OF_TIME_GET_LIGHT_ARROWS", #lacs part 5 + 0x29: "LAKE_HYLIA_AFTER_BLUE_WARP", + 0x2A: "KAKARIKO_VILLAGE_DRAIN_WELL", + 0x2B: "WINDMILL_AFTER_DRAIN_WELL", + 0x2C: "TEMPLE_OF_TIME_AFTER_DOOR_OF_TIME_OPENS", + 0x2D: "INVALID_DESTINATION_2D", + 0x2E: "TEMPLE_OF_TIME_AFTER_USE_MS_FIRST_2", #duplicate of 0x0012 + 0x2F: "KAKARIKO_VILLAGE_NOCTURNE_PART_2", + 0x30: "DESERT_COLOSSUS_AFTER_REQUIEM", + 0x31: "TEMPLE_OF_TIME_AFTER_LIGHT_ARROWS", + 0x32: "KAKARIKO_VILLAGE_AFTER_NOCTURNE", + 0x33: "HYRULE_FIELD_IMPA_ESCORT_CS", + 0x34: "TEMPLE_OF_TIME_SONG_OF_TIME", + 0x35: "HYRULE_FIELD_AFTER_SONG_OF_TIME", + 0x36: "GERUDO_VALLEY_CREDITS", + 0x37: "GERUDO_FORTRESS_CREDITS", + 0x38: "KAKARIKO_VILLAGE_CREDITS", + 0x39: "DEATH_MOUNTAIN_TRAIL_CREDITS_1", + 0x3A: "GORON_CITY_CREDITS", #unused? + 0x3B: "LAKE_HYLIA_CREDITS", + 0x3C: "ZORAS_FOUNTAIN_CREDITS", #unused + 0x3D: "ZORAS_DOMAIN_CREDITS", + 0x3E: "KOKIRI_FOREST_CREDITS_1", + 0x3F: "KOKIRI_FOREST_CREDITS_2", + 0x40: "HYRULE_FIELD_CREDITS", + 0x41: "LON_LON_RANCH_CREDITS_1", + 0x42: "KAKARIKO_VILLAGE_AFTER_TRAIL_OWL", + 0x43: "HTRULE_FIELD_UNUSED_ENTRANCE", + 0x44: "CUTSCENE_MAP_FIRE", + 0x45: "KOKIRI_FOREST_POST_FOREST_MEDALLION", + 0x46: "DEATH_MOUNTAIN_TRAIL_CREDITS_2", + 0x47: "TEMPLE_OF_TIME_CREDITS", + 0x48: "ZELDAS_COURTYARD_CREDITS", + 0x49: "LON_LON_RANCH_CREDITS_1_2", #duplicate of 0x0041 + 0x4A: "LON_LON_RANCH_CREDITS_2", + 0x4B: "LON_LON_RANCH_CREDITS_3", + 0x4C: "LON_LON_RANCH_CREDITS_4", + 0x4D: "LON_LON_RANCH_CREDITS_5", + 0x4E: "LON_LON_RANCH_CREDITS_6", + 0x4F: "LON_LON_RANCH_NO_CS_1", + 0x50: "LON_LON_RANCH_NO_CS_2", + 0x51: "LON_LON_RANCH_NO_CS_3", + 0x52: "LON_LON_RANCH_NO_CS_4", + 0x53: "LON_LON_RANCH_NO_CS_5", + 0x54: "LON_LON_RANCH_NO_CS_6", + 0x55: "LON_LON_RANCH_NO_CS_7", + 0x56: "LON_LON_RANCH_NO_CS_8", + 0x57: "LON_LON_RANCH_NO_CS_9", + 0x58: "LON_LON_RANCH_NO_CS_10", + 0x59: "LON_LON_RANCH_NO_CS_11", + 0x5A: "LON_LON_RANCH_NO_CS_12", + 0x5B: "LON_LON_RANCH_NO_CS_13", + 0x5C: "LON_LON_RANCH_NO_CS_14", + 0x5D: "LON_LON_RANCH_NO_CS_15", + 0x5E: "LON_LON_RANCH_NO_CS_EPONAS_SONG", + 0x5F: "CONDITIONAL_DESTINATION", # more descriptive name? + 0x60: "DESERT_COLOSSUS_SPIRIT_BLUE_WARP", + 0x61: "GRAVEYARD_AFTER_SHADOW_BLUE_WARP", + 0x62: "DEATH_MOUNTAIN_CRATER_AFTER_FIRE_BLUE_WARP", + 0x63: "SACRED_FOREST_MEADOW_AFTER_FOREST_BLUE_WARP", + 0x64: "KOKIRI_FOREST_AFTER_FOREST_BLUE_WARP", + 0x65: "DESERT_COLOSSUS_AFTER_SILVER_GAUNTLETS", + 0x66: "TEMPLE_OF_TIME_FRONT_OF_PEDESTAL", + 0x67: "HYRULE_FIELD_TITLE_SCREEN", + 0x68: "SPIRIT_TEMPLE_BOSS_TITLE_SCREEN", + 0x69: "GRAVEYARD_SUNS_SONG", + 0x6A: "ROYAL_FAMILYS_TOMB_SUNS_SONG", + 0x6B: "GANONS_CASTLE_AFTER_FOREST_TRIAL", + 0x6C: "GANONS_CASTLE_AFTER_WATER_TRIAL", + 0x6D: "GANONS_CASTLE_AFTER_SHADOW_TRIAL", + 0x6E: "GANONS_CASTLE_AFTER_FIRE_TRIAL", + 0x6F: "GANONS_CASTLE_AFTER_LIGHT_TRIAL", + 0x70: "GANONS_CASTLE_AFTER_SPIRIT_TRIAL", + 0x71: "GANONS_CASTLE_DISPEL_BARRIER_IF_CONDITIONS", + 0x72: "HYRULE_FIELD_INTRO", + 0x73: "HYRULE_FIELD_AFTER_IMPA_ESCORT", + 0x74: "DESERT_COLOSSUS_SPIRIT_BLUE_WARP_2", + 0x75: "HYRULE_FIELD_SKY", + 0x76: "GANON_BATTLE_TOWER_COLLAPSE", + 0x77: "ZELDAS_COURTYARD_RECEIVE_LETTER", +} + +ocarina_action_ids = { + 0x00: "OCARINA_ACTION_UNK_0", + 0x01: "OCARINA_ACTION_FREE_PLAY_OCARINA", + 0x02: "OCARINA_ACTION_MINUET", + 0x03: "OCARINA_ACTION_BOLERO", + 0x04: "OCARINA_ACTION_SERENADE", + 0x05: "OCARINA_ACTION_REQUIEM", + 0x06: "OCARINA_ACTION_NOCTURNE", + 0x07: "OCARINA_ACTION_PRELUDE", + 0x08: "OCARINA_ACTION_SARIAS_SONG", + 0x09: "OCARINA_ACTION_EPONAS_SONG", + 0x0A: "OCARINA_ACTION_ZELDAS_LULLABY", + 0x0B: "OCARINA_ACTION_SUNS_SONG", + 0x0C: "OCARINA_ACTION_SONG_OF_TIME", + 0x0D: "OCARINA_ACTION_SONG_OF_STORMS", + 0x0E: "OCARINA_ACTION_OCARINA_ACTION_UNK_E", + 0x0F: "OCARINA_ACTION_MINUET_PLAYBACK", + 0x10: "OCARINA_ACTION_BOLERO_PLAYBACK", + 0x11: "OCARINA_ACTION_SERENADE_PLAYBACK", + 0x12: "OCARINA_ACTION_REQUIEM_PLAYBACK", + 0x13: "OCARINA_ACTION_NOCTURNE_PLAYBACK", + 0x14: "OCARINA_ACTION_PRELUDE_PLAYBACK", + 0x15: "OCARINA_ACTION_SARIAS_SONG_PLAYBACK", + 0x16: "OCARINA_ACTION_EPONAS_SONG_PLAYBACK", + 0x17: "OCARINA_ACTION_ZELDAS_LULLABY_PLAYBACK", + 0x18: "OCARINA_ACTION_SUNS_SONG_PLAYBACK", + 0x19: "OCARINA_ACTION_SONG_OF_TIME_PLAYBACK", + 0x1A: "OCARINA_ACTION_SONG_OF_STORMS_PLAYBACK", +} + +""" +Entry format: + + (n1, n2, n3, ...) : (cmd, nwords, continuestopbyte, cmdentrieswd, listitem, nwordslist) + + n1, n2, n3, ... : command types + cmd : command macro + nwords : number of words this command is encoded in + continuestopbyte : the location of the continue/stop flag byte, if this command type has one, counted as number of bytes into the command + cmdentrieswd : the word index (from 0) containing the number of list items, a negative value specifies a hardcoded number of entries that are always guaranteed to follow + listitem : the list item macro if this macro is a list type, the name __SPECIAL is reserved for conditional output that needs custom handling + nwordslist : number of words this list item is encoded in + +Argument format: + + %[bn|hn|wn]:[N]:[s|x|en] + + b : byte + h : halfword + w : word + n: nth byte/halfword/word in the Nth word + + N : word number to search in, 0 is command type + + s : decimal + u : decimal unsigned + x : hex + f : float + e : enumeration + n : unique identifier of which enum to use +""" +cutscene_command_macros = { + -1: + ("CS_END()", 1, None, None, + None, None), + 3: + ("CS_MISC_LIST(%w1:1:s)", 2, None, 0, + "CS_MISC(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x, %w1:10:x, %w1:11:x, %w1:12:x)", 12), + 4: + ("CS_LIGHTING_LIST(%w1:1:s)", 2, None, 0, + "CS_LIGHTING(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12), + 86: + ("CS_PLAY_BGM_LIST(%w1:1:s)", 2, None, 0, + "CS_PLAY_BGM(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12), + 87: + ("CS_STOP_BGM_LIST(%w1:1:s)", 2, None, 0, + "CS_STOP_BGM(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12), + 124: + ("CS_FADE_BGM_LIST(%w1:1:s)", 2, None, 0, + "CS_FADE_BGM(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x)", 12), + 9: + ("CS_CMD_09_LIST(%w1:1:s)", 2, None, 0, + "CS_CMD_09(%h2:1:x, %h1:1:s, %h2:2:s, %b2:2:x, %b1:2:x, %b4:3:x, %b3:3:x, %h1:3:x)", 3), + 140: + ("CS_TIME_LIST(%w1:1:s)", 2, None, 0, + "CS_TIME(%h2:1:x, %h1:1:s, %h2:2:s, %b2:2:x, %b1:2:x, %w1:3:x)", 3), + 10: + ("CS_PLAYER_ACTION_LIST(%w1:1:s)", 2, None, 0, + "CS_PLAYER_ACTION(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %h2:3:x, %h1:3:x, %w1:4:s, %w1:5:s, %w1:6:s, %w1:7:s, %w1:8:s, %w1:9:s, %w1:10:f, %w1:11:f, %w1:12:f)", 12), + (15,17,18,23,34,39,46,76,85,93,105,107,110,119,123,138,139,144, # npc action 1 + 14,16,24,35,40,48,64,68,70,78,80,94,116,118,120,125,131,141, # npc action 2 + 25,36,41,50,67,69,72,74,81,106,117,121,126,132, # npc action 3 + 29,37,42,51,53,63,65,66,75,82,108,127,133, # npc action 4 + 30,38,43,47,54,79,83,128,135, # npc action 5 + 44,55,77,84,90,129,136, # npc action 6 + 31,52,57,58,88,115,130,137, # npc action 7 + 49,60,89,111,114,134,142, # npc action 8 + 62, # npc action 9 + 143): # npc action 10 + ("CS_NPC_ACTION_LIST(%w1:0:s, %w1:1:s)", 2, None, 0, + "CS_NPC_ACTION(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %h2:3:x, %h1:3:x, %w1:4:s, %w1:5:s, %w1:6:s, %w1:7:s, %w1:8:s, %w1:9:s, %w1:10:f, %w1:11:f, %w1:12:f)", 12), + 1: + ("CS_CAM_POS_LIST(%h1:1:s, %h2:2:s)", 3, 0, None, + "CS_CAM_POS(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 5: + ("CS_CAM_POS_PLAYER_LIST(%h1:1:s, %h2:2:s)", 3, 0, None, + "CS_CAM_POS_PLAYER(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 2: + ("CS_CAM_FOCUS_POINT_LIST(%h1:1:s, %h2:2:s)", 3, 0, None, + "CS_CAM_FOCUS_POINT(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 6: + ("CS_CAM_FOCUS_POINT_PLAYER_LIST(%h1:1:s, %h2:2:s)", 3, 0, None, + "CS_CAM_FOCUS_POINT_PLAYER(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 7: + ("CS_CMD_07_LIST(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x)", 3, None, -1, + "CS_CMD_07(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 8: + ("CS_CMD_08_LIST(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x)", 3, None, -1, + "CS_CMD_08(%b4:1:e0, %b3:1:x, %h1:1:s, %w1:2:f, %h2:3:s, %h1:3:s, %h2:4:s, %h1:4:x)", 4), + 1000: + ("CS_TERMINATOR(%h2:2:e1, %h1:2:s, %h2:3:s)", 4, None, None, + None, None), + 19: + ("CS_TEXT_LIST(%w1:1:s)", 2, None, 0, + "__SPECIAL(CS_TEXT_LIST)", 3), + 45: + ("CS_SCENE_TRANS_FX(%h2:2:x, %h1:2:s, %h2:3:s)", 4, None, None, + None, None), +} + +begin_cutscene_entry = ("CS_BEGIN_CUTSCENE(%w1:0:s, %w1:1:s)", 2, None, None, + None, None) + +unk_data_entry = ("CS_UNK_DATA_LIST(%w1:0:x, %w1:1:s)", 2, None, 0, + "CS_UNK_DATA(%w1:1:x, %w1:2:x, %w1:3:x, %w1:4:x, %w1:5:x, %w1:6:x, %w1:7:x, %w1:8:x, %w1:9:x, %w1:10:x, %w1:11:x, %w1:12:x)", 12) + +linesep = "\n" +indent = " " +line_end = "," + linesep + +""" +Since multiple command ids can map to the same command macro, to shorten the dictionary +we introduce a function to allow these command ids to be grouped into tuples. +""" +def multi_key(key): + for k in cutscene_command_macros.keys(): + if type(k) is int: + if k == key: + return cutscene_command_macros[k] + elif key in k: + return cutscene_command_macros[k] + +""" +Args +""" + +def arg_count(cmd_def): + return len([x for x in cmd_def.split("(")[1].split(")")[0].split(",")]) if "()" not in cmd_def else 0 + +def arg_part(arg, num): + return arg.replace("%","").split(":")[num] + +def args_list(cmd_def): + return [x.strip() for x in cmd_def.split("(")[1].split(")")[0].split(",")] + +""" +Type conversion +""" + +def get_byte(word, num): + return struct.unpack(">bbbb", struct.pack(">I", word))[num] + +def get_byte_unsigned(word, num): + return struct.unpack(">BBBB", struct.pack(">I", word))[num] + +def get_short(word, num): + return struct.unpack(">hh", struct.pack(">I", word))[num] + +def get_short_unsigned(word, num): + return struct.unpack(">HH", struct.pack(">I", word))[num] + +def get_word(word): + return struct.unpack(">i", struct.pack(">I", word))[0] + +def get_word_unsigned(word): + return struct.unpack(">I", struct.pack(">I", word))[0] + +def get_float(word): + return struct.unpack(">f", struct.pack(">i", word))[0] + +""" +Formatting +""" + +def pad(string, length): + string = string.replace("0x","") + if len(string) < length: + return pad("0"+string, length) + else: + return string + +def format_arg(arg, words): + word = words[int(arg_part(arg, 1))] # the word to look in + arg_type = arg_part(arg, 0).strip()[0] # the type, b/h/w, tells you what part of the word to look in + arg_type_num = int(arg_part(arg, 0).strip()[1]) # the type num, depends on type + value = 0 + unsigned_value = 0 + pad_len = 0 + if arg_type == "b": + value = get_byte(word, 4 - arg_type_num) + unsigned_value = get_byte_unsigned(word, 4 - arg_type_num) + pad_len = 2 + elif arg_type == "h": + value = get_short(word, 2 - arg_type_num) + unsigned_value = get_short_unsigned(word, 2 - arg_type_num) + pad_len = 4 + elif arg_type == "w": + value = get_word(word) + unsigned_value = get_word_unsigned(word) + pad_len = 8 + else: + print("Something went wrong!") # TODO more debug info + os._exit(1) + format_type = arg_part(arg, 2).strip() # the format type, how to express the final value + result = "" + if "e" in format_type: + enum_no = int(format_type[1]) + if enum_no == 0: + result = command_continue_stop[unsigned_value] + elif enum_no == 1: + result = cutscene_terminator_destinations[unsigned_value] + elif enum_no == 2: + result = ocarina_action_ids[unsigned_value] + elif format_type == "u": + result = str(value) + elif format_type == "s": + result = str(value) + elif format_type == "x": + result = "0x" + pad(hex(unsigned_value), pad_len).upper() + elif format_type == "f": + result = str(get_float(value))+"f" + else: + print("Something went wrong!") # TODO more debug info + os._exit(1) + return result + +def format_cmd(cmd, words): + if "__SPECIAL" in cmd: + # special handling for textbox list macros, as there are multiple dependent on particular values + if "CS_TEXT_LIST" in cmd: + if get_short_unsigned(words[1], 0) == 0xFFFF: + cmd = "CS_TEXT_NONE(%h1:1:s, %h2:2:s)" + elif get_short(words[2], 1) == 2: + cmd = "CS_TEXT_LEARN_SONG(%h2:1:e2, %h1:1:s, %h2:2:s, %h2:3:x)" + else: + cmd = "CS_TEXT_DISPLAY_TEXTBOX(%h2:1:x, %h1:1:s, %h2:2:s, %h1:2:x, %h2:3:x, %h1:3:x)" + for arg in args_list(cmd): + cmd = cmd.replace(arg, format_arg(arg, words)) + return cmd + +""" +Cutscene parser + +Note that this isn't protected against indexing errors since a cutscene should always +end before the end of the file it's in. +""" + +def disassemble_cutscene(cs_in): + i = 0 + total_entries = cs_in[i] + i+=1 + cutscene_end_frame = cs_in[i] + i+=1 + if (total_entries < 0 or cutscene_end_frame < 0): + print("This cutscene would abort if played in-engine") + if total_entries < 0: + return "Could not disassemble cutscene: Number of commands is negative" + macros = format_cmd(begin_cutscene_entry[0], [total_entries, cutscene_end_frame])+line_end + for k in range(0,total_entries+1): + cmd_type = cs_in[i] + if (cmd_type == 0xFFFFFFFF): + return macros + multi_key(-1)[0]+line_end + entry = multi_key(cmd_type) + if entry is None: + entry = unk_data_entry + cmd_macro = entry[0] + n_words = entry[1] + macros += format_cmd(cmd_macro, [cs_in[i+j] for j in range(0, n_words)])+line_end + list_item = entry[4] + if list_item is not None: # Not all macros have associated list item macros + continue_stop = entry[2] + cmd_entries = entry[3] + n_words_list_item = entry[5] + if continue_stop is not None: # Not all macros have a continue/stop flag + i += n_words + do_continue = True + while do_continue: + # "Integer Divide" by 4 to get the word it's in + # Modulo operator to get the byte relative to the start of the word + do_continue = True if get_byte(cs_in[i+(continue_stop // 4)], continue_stop % 4) == 0x00 else False + macros += indent+format_cmd(list_item, [0, *[cs_in[i+j] for j in range(0, n_words_list_item)]])+line_end + i += n_words_list_item + elif cmd_entries is not None: # Not all macros have a defined number of entries + if cmd_entries < 0: # Some have a fixed number of entries + num_entries = -cmd_entries + else: # Some specify their number of entries + num_entries = cs_in[i+cmd_entries+1] + i += n_words + for n in range(0,num_entries): + macros += indent+format_cmd(list_item, [0, *[cs_in[i+j] for j in range(0, n_words_list_item)]])+line_end + i += n_words_list_item + else: + i += n_words + print("Warning: cutscene reached maximum entries without encountering a CS_END command") + return macros + +def hex_parse(s): + return int(s, 16) + +def main(): + parser = argparse.ArgumentParser(description="Disassembles cutscenes for OoT") + parser.add_argument('address', help="VRAM or ROM address to disassemble at", type=hex_parse) + args = parser.parse_args() + + file_result = None + if args.address >= 0x80000000: + file_result = filemap.GetFromVRam(args.address) + else: + file_result = filemap.GetFromRom(args.address) + if file_result is None: + print("Invalid address") + os._exit(1) + print(file_result) + print() + + cs_data = None + with open("baserom/" + file_result.name, "rb") as ovl_file: + ovl_file.seek(file_result.offset) + cs_data = [i[0] for i in struct.iter_unpack(">I", bytearray(ovl_file.read()))] + if cs_data is not None: + print("static CutsceneData D_" + hex(args.address).replace("0x","").upper() + "[] = {\n" + indent+disassemble_cutscene(cs_data).replace(linesep,linesep+indent).rstrip()+"\n};") + +if __name__ == "__main__": + main() diff --git a/tools/m2ctx.py b/tools/m2ctx.py index e4e0af1a80..279209c709 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -55,7 +55,7 @@ def main(): output = import_c_file(c_file_path) - with open(os.path.join(root_dir, "ctx.c"), "w") as f: + with open(os.path.join(root_dir, "ctx.c"), "w", encoding="UTF-8") as f: f.write(output) diff --git a/tools/overlayhelpers/filemap.py b/tools/overlayhelpers/filemap.py index 83141b0c46..c406fdfed3 100644 --- a/tools/overlayhelpers/filemap.py +++ b/tools/overlayhelpers/filemap.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +import os import struct import json @@ -119,7 +120,7 @@ def GetFromRom(addr): return FileResult(key, vrom, None, offset) #CreateTable() -with open("filetable.json", "r") as table: +with open(os.path.join(os.path.dirname(__file__), 'filetable.json'), "r") as table: table = json.load(table) table["va"] = {int(k):v for k,v in table["va"].items()} table["ra"] = {int(k):v for k,v in table["ra"].items()} diff --git a/tools/rgba5551.py b/tools/rgba5551.py new file mode 100755 index 0000000000..9b5377643f --- /dev/null +++ b/tools/rgba5551.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 + +import argparse + +def decode_rgba5551(short, max=False): + red = (short & 0xF800) >> 8 + green = (short & 0x07C0) >> 3 + blue = (short & 0x003E) << 2 + alpha = 1 if (short % 2) else 0 + if max: + red |= red >> 5 + green |= green >> 5 + blue |= blue >> 5 + return (red, green, blue, alpha) + +def u16(x): + x = int(x, 16) + if x > 0xFFFF: + raise argparse.ArgumentTypeError("expecting a short (u16) representing a single color.") + return x + +def main(): + parser = argparse.ArgumentParser(description="Decodes a color encoded in rgba5551.") + parser.add_argument("short", type=u16, help="u16 raw value of the color to decode") + args = parser.parse_args() + print("Min: GPACK_RGBA5551(%d, %d, %d, %d)" % decode_rgba5551(args.short, max=False)) + print("Max: GPACK_RGBA5551(%d, %d, %d, %d)" % decode_rgba5551(args.short, max=True)) + print("Note: All RGB values between these encode to the given value.") + print(" Use the representation that makes the most sense.\n") + +if __name__ == "__main__": + main() diff --git a/undefined_syms.txt b/undefined_syms.txt index d1b56525f6..4b4435ed0e 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -240,6 +240,10 @@ D_06008D90 = 0x06008D90; D_060093BC = 0x060093BC; D_06009EE0 = 0x06009EE0; +// z_en_md +D_06007FB8 = 0x06007FB8; +D_060002C8 = 0x060002C8; + // z_en_ms D_060005EC = 0x060005EC; D_06003DC0 = 0x06003DC0; @@ -286,6 +290,11 @@ D_04037880 = 0x04037880; D_0600006C = 0x0600006C; D_06002190 = 0x06002190; +// z_en_blkobj +D_060014E0 = 0x060014E0; +D_060053D0 = 0x060053D0; +D_06007564 = 0x06007564; + // z_en_lightbox D_06001F10 = 0x06001F10; D_06000B70 = 0x06000B70; @@ -352,6 +361,21 @@ D_06004930 = 0x06004930; D_0600E680 = 0x0600E680; D_0600FEF0 = 0x0600FEF0; +// z_demo_sa +D_06001334 = 0x06001334; +D_060021D8 = 0x060021D8; +D_06007B80 = 0x06007B80; +D_0600B1A0 = 0x0600B1A0; +D_0600DF80 = 0x0600DF80; +D_0600E500 = 0x0600E500; +D_0600F580 = 0x0600F580; +D_0600FCE0 = 0x0600FCE0; +D_0600FFD4 = 0x0600FFD4; +D_0601113C = 0x0601113C; +D_060135EC = 0x060135EC; +D_06013CD8 = 0x06013CD8; +D_060140BC = 0x060140BC; + // z_en_test D_0600316C = 0x0600316C; D_06007C28 = 0x06007C28; @@ -390,6 +414,36 @@ D_0600BC90 = 0x0600BC90; D_0600BCA0 = 0x0600BCA0; D_0600BE40 = 0x0600BE40; +// z_en_zl2 +D_0600325C = 0x0600325C; +D_060003BC = 0x060003BC; +D_06000A50 = 0x06000A50; +D_06000EB0 = 0x06000EB0; +D_06001010 = 0x06001010; +D_060013A0 = 0x060013A0; +D_06001670 = 0x06001670; +D_06001B48 = 0x06001B48; +D_060022D0 = 0x060022D0; +D_06002750 = 0x06002750; +D_06002B14 = 0x06002B14; +D_06002F30 = 0x06002F30; +D_06003538 = 0x06003538; +D_06004900 = 0x06004900; +D_06005F40 = 0x06005F40; +D_06006778 = 0x06006778; +D_06007D0C = 0x06007D0C; +D_060087B8 = 0x060087B8; +D_060090D8 = 0x060090D8; +D_06009AD4 = 0x06009AD4; +D_0600A15C = 0x0600A15C; +D_0600A79C = 0x0600A79C; +D_0600AAD4 = 0x0600AAD4; +D_0600AFE0 = 0x0600AFE0; +D_0600B224 = 0x0600B224; +D_0600B5FC = 0x0600B5FC; +D_0600BAE8 = 0x0600BAE8; +D_06010D70 = 0x06010D70; + // z_arms_hook D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0; @@ -640,6 +694,17 @@ D_06003128 = 0x06003128; D_060042AC = 0x060042AC; D_060059B0 = 0x060059B0; +// z_en_heishi1 +D_06005880 = 0x06005880; +D_06005C30 = 0x06005C30; +D_0600BAC8 = 0x0600BAC8; + // z_Bg_Spot16_Doughnut D_06000660 = 0x06000660; D_06000FC0 = 0x06000FC0; + +// z_en_fhg_fire display lists +D_0600FAA0 = 0x0600FAA0; +D_0600FCF8 = 0x0600FCF8; +D_060105E0 = 0x060105E0; +D_06012160 = 0x06012160;